From 5bcf831e1734be78d9468631926e875a5b05e11f Mon Sep 17 00:00:00 2001 From: Sebastien Braun Date: Sun, 3 Oct 2010 23:27:39 +0200 Subject: Implement Network-wide Configuration Interface for Multicast File Transfer --- src/gui/mainWindow.cpp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'src/gui/mainWindow.cpp') diff --git a/src/gui/mainWindow.cpp b/src/gui/mainWindow.cpp index eb15e82..c911721 100644 --- a/src/gui/mainWindow.cpp +++ b/src/gui/mainWindow.cpp @@ -16,7 +16,10 @@ #include #include +#include +#include #include +#include using namespace std; // setting the IF-DEF Block for the touchgui and the normal gui, for later use @@ -34,6 +37,7 @@ using namespace std; #include //#include #include +#include #include MainWindow::MainWindow(QWidget *parent) : @@ -129,6 +133,7 @@ MainWindow::MainWindow(QWidget *parent) : ui->actionFoto->setStatusTip(tr("Make a screenshot for the selected client(s)")); ui->actionLock->setStatusTip(tr("Lock or Unlock all Clients")); connect(ui->actionCreate_profile, SIGNAL(triggered()), this, SLOT(createProfile())); + connect(ui->actionConfigure_Network, SIGNAL(triggered()), this, SLOT(configureNetwork())); connect(ui->actionShow_Username, SIGNAL(triggered()), this, SLOT(showusername())); connect(ui->actionShow_Hostname_IP, SIGNAL(triggered()), this, SLOT(showip())); @@ -1197,7 +1202,17 @@ void MainWindow::startChatDialog() sChatDialog.raise();//show the chat dialog on top level } - +void MainWindow::configureNetwork() +{ + PVSServer* server = PVSConnectionManager::getManager()->getServer(); + McastConfiguration mc(*(server->getMulticastConfiguration())); + MulticastConfigDialog* mcd = new MulticastConfigDialog(&mc, this); + int result = mcd->exec(); + if(result == QDialog::Accepted) + { + server->multicastReconfigure(&mc); + } +} MainWindow* MainWindow::myself = NULL; ConnectionList* MainWindow::conList = NULL; -- cgit v1.2.3-55-g7522 From dd39677f10aaba9196b3119b9b38cd77e34b1df3 Mon Sep 17 00:00:00 2001 From: Sebastien Braun Date: Tue, 5 Oct 2010 15:42:45 +0200 Subject: Whitespace fix --- src/gui/mainWindow.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/gui/mainWindow.cpp') diff --git a/src/gui/mainWindow.cpp b/src/gui/mainWindow.cpp index c911721..1ed3ef2 100644 --- a/src/gui/mainWindow.cpp +++ b/src/gui/mainWindow.cpp @@ -160,8 +160,6 @@ MainWindow::MainWindow(QWidget *parent) : _serverSocket = new QTcpServer(); _serverSocket->listen(QHostAddress::Any, 29481); connect(_serverSocket, SIGNAL(newConnection()), this, SLOT(incomingFile())); - - } MainWindow::~MainWindow() -- cgit v1.2.3-55-g7522 From 3be768a6b55af9356d45aac1fb0533b3dc8ddcd8 Mon Sep 17 00:00:00 2001 From: jjl Date: Thu, 14 Oct 2010 17:39:51 +0200 Subject: [PVSMGR] dummies removed --- src/gui/mainWindow.cpp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'src/gui/mainWindow.cpp') diff --git a/src/gui/mainWindow.cpp b/src/gui/mainWindow.cpp index 0f2fd0e..79ae004 100644 --- a/src/gui/mainWindow.cpp +++ b/src/gui/mainWindow.cpp @@ -270,24 +270,24 @@ void MainWindow::loadSettings() if (current.compare("default") == 0) { setWindowTitle("PVSmgr - Default"); - QPoint pos1 = settings.value("default/1", QPoint(0, 0)).toPoint(); - MainWindow::getConnectionWindow()->addFrameBySettings("1", pos1); - QPoint pos2 = settings.value("default/2", QPoint(194, 0)).toPoint(); - MainWindow::getConnectionWindow()->addFrameBySettings("2", pos2); - QPoint pos3 = settings.value("default/3", QPoint(388, 0)).toPoint(); - MainWindow::getConnectionWindow()->addFrameBySettings("3", pos3); - QPoint pos4 = settings.value("default/4", QPoint(582, 0)).toPoint(); - MainWindow::getConnectionWindow()->addFrameBySettings("4", pos4); - QPoint pos5 = settings.value("default/5", QPoint(0, 173)).toPoint(); - MainWindow::getConnectionWindow()->addFrameBySettings("5", pos5); - QPoint pos6 = settings.value("default/6", QPoint(194, 173)).toPoint(); - MainWindow::getConnectionWindow()->addFrameBySettings("6", pos6); - QPoint pos7 = settings.value("default/7", QPoint(388, 173)).toPoint(); - MainWindow::getConnectionWindow()->addFrameBySettings("7", pos7); - QPoint pos8 = settings.value("default/8", QPoint(582, 173)).toPoint(); - MainWindow::getConnectionWindow()->addFrameBySettings("8", pos8); - QPoint pos9 = settings.value("default/9", QPoint(293, 346)).toPoint(); - MainWindow::getConnectionWindow()->addFrameBySettings("9", pos9); +// QPoint pos1 = settings.value("default/1", QPoint(0, 0)).toPoint(); +// MainWindow::getConnectionWindow()->addFrameBySettings("1", pos1); +// QPoint pos2 = settings.value("default/2", QPoint(194, 0)).toPoint(); +// MainWindow::getConnectionWindow()->addFrameBySettings("2", pos2); +// QPoint pos3 = settings.value("default/3", QPoint(388, 0)).toPoint(); +// MainWindow::getConnectionWindow()->addFrameBySettings("3", pos3); +// QPoint pos4 = settings.value("default/4", QPoint(582, 0)).toPoint(); +// MainWindow::getConnectionWindow()->addFrameBySettings("4", pos4); +// QPoint pos5 = settings.value("default/5", QPoint(0, 173)).toPoint(); +// MainWindow::getConnectionWindow()->addFrameBySettings("5", pos5); +// QPoint pos6 = settings.value("default/6", QPoint(194, 173)).toPoint(); +// MainWindow::getConnectionWindow()->addFrameBySettings("6", pos6); +// QPoint pos7 = settings.value("default/7", QPoint(388, 173)).toPoint(); +// MainWindow::getConnectionWindow()->addFrameBySettings("7", pos7); +// QPoint pos8 = settings.value("default/8", QPoint(582, 173)).toPoint(); +// MainWindow::getConnectionWindow()->addFrameBySettings("8", pos8); +// QPoint pos9 = settings.value("default/9", QPoint(293, 346)).toPoint(); +// MainWindow::getConnectionWindow()->addFrameBySettings("9", pos9); QString title = "PVSmgr - "; title.append(_profilName); -- cgit v1.2.3-55-g7522