Merge branch 'master' of openslx.org:pvs

Conflicts:
	CMakeLists.txt
	src/core/pvsConnectionManager.cpp
	src/pvs.cpp
	src/pvs.h

1 files changed, 35 insertions, 19 deletions

diff --git a/src/gui/mainWindow.cpp b/src/gui/mainWindow.cpp
index 815f001..b6878e8 100644
--- a/src/gui/mainWindow.cpp
+++ b/src/gui/mainWindow.cpp
@@ -16,7 +16,10 @@
 
 #include <QtGui>
 #include <QFileDialog>
+#include <QBuffer>
+#include <QDataStream>
 #include <src/gui/mainWindow.h>
+#include <src/net/mcast/McastConfiguration.h>
 using namespace std;
 
 // setting the IF-DEF Block for the touchgui and the normal gui, for later use
@@ -35,6 +38,7 @@ using namespace std;
 #include <src/gui/processesDialog.h>
 //#include <src/gui/dialog.h>
 #include <src/core/pvsConnectionManager.h>
+#include <src/gui/multicastConfigDialog.h>
 #include <iostream>
 
 MainWindow::MainWindow(QWidget *parent) :
@@ -133,6 +137,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->actionShowProcesses, SIGNAL(triggered()), this, SLOT(showProcesses()));
 	ui->actionShowProcesses->setStatusTip(tr("Show Processes of the selected Client"));
 	connect(ui->actionStartProcess, SIGNAL(triggered()), this, SLOT(startProcess()));
@@ -163,7 +168,6 @@ MainWindow::MainWindow(QWidget *parent) :
 	_serverSocket = new QTcpServer();
 	_serverSocket->listen(QHostAddress::Any, 29481);
 	connect(_serverSocket, SIGNAL(newConnection()), this, SLOT(incomingFile()));
-
 }
 
 MainWindow::~MainWindow()
@@ -270,24 +274,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);
@@ -1277,6 +1281,18 @@ 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;
 ConnectionWindow* MainWindow::conWin = NULL;