Merge branch 'master' of ssh://git.openslx.org/pvs

1 files changed, 36 insertions, 38 deletions

diff --git a/src/gui/mainWindow.cpp b/src/gui/mainWindow.cpp
index 1376851..beb80f4 100644
--- a/src/gui/mainWindow.cpp
+++ b/src/gui/mainWindow.cpp
@@ -68,6 +68,8 @@ MainWindow::MainWindow(QWidget *parent) :
 
 	_aboutDialog = new AboutDialog(this);
 
+	displayedClientNameEnum = 0;
+
 	PVSConnectionManager::getManager();
 
 	//set the maximum width for list content
@@ -112,8 +114,6 @@ MainWindow::MainWindow(QWidget *parent) :
 	connect(ui->actionProjection, SIGNAL(triggered()), this, SLOT(projecttoolbar()));
 	connect(ui->actionUnprojection, SIGNAL(triggered()), this, SLOT(unprojecttoolbar()));
 	connect(ui->actionDozent, SIGNAL(triggered()), this, SLOT(setdozenttoolbar()));
-	connect(ui->actionShowProcesses, SIGNAL(triggered()), this, SLOT(showProcesses()));
-	connect(ui->actionStartProcess, SIGNAL(triggered()), this, SLOT(startProcess()));
 
 	// Ui specific settings
 
@@ -791,57 +791,47 @@ void MainWindow::unCloseUp(ConnectionFrame* connFrame)
 	conWin->setCloseupFrame(NULL);
 }
 
-/*	Perform some action if actionShowProcesses button was pressed
- *
- */
+//	Perform some action if actionShowProcesses button was pressed
 void MainWindow::showProcesses()
 {
-	std::list<QString>* selectedClients =
-			MainWindow::getConnectionList()->getSelectedClients();
-	if (selectedClients->size() >= 1)
+	if (PVSConnectionManager::getManager()->getConnections().size() > 0)
 	{
-		ProcessDialog procDialog;
-		procDialog.exec();
-
+		ProcessDialog procShowDialog(0,displayedClientNameEnum);
+		procShowDialog.exec();
 	}
-	else
-	{
-		QString
-				message =
-						QString(
-								tr(
-										"This operation can only be performed if you have selected at least one Client!"));
-		QMessageBox::information(this, "PVS", message);
-	}
-
 }
 
 
-/*	Perform some action if actionStartProcess button was pressed
- *
- */
+//	Perform some action if actionStartProcess button was pressed
 void MainWindow::startProcess()
 {
 	std::list<QString>* selectedClients =
 			MainWindow::getConnectionList()->getSelectedClients();
 	if (selectedClients->size() >= 1)
 	{
-		// do stuff
-		/*PVSClient * pvsClient =
-							PVSConnectionManager::getManager()->getClientFromIp(
-									selectedClients->front().toStdString().c_str());*/
-
-		ProcessesStartDialog procD;
-		QString myString = NULL;
-		int result  = procD.exec();
-
-		if (result == 1)
+		ProcessesStartDialog procStartDialog;
+		procToStart = "";
+		int result = procStartDialog.exec();
+		if (result == 1) //if result == 1 we clicked send on our button then
+						 //procToStart is set to the text that was given in our messageEdit
 		{
-			myString = MainWindow::getWindow()->getProcessesDialog();
-			if(!myString.isEmpty())
-				MainWindow::getConnectionWindow()->commandStations("STARTPROCESS",myString);
+			std::list<QString>::iterator itSelected;
+			for (itSelected = selectedClients->begin(); itSelected != selectedClients->end();
+					itSelected++)
+			{
+				std::list<PVSClient*> listAll =
+						PVSConnectionManager::getManager()->getConnections();
+				for (std::list<PVSClient*>::iterator itAll = listAll.begin();
+						itAll != listAll.end(); itAll++)
+				{
+					if ((*itSelected) == (*itAll)->getIp())
+					{
+						(*itAll)->sendMessage(PVSCOMMAND, "STARTPROCESS", procToStart);
+						break;
+					}
+				}
+			}
 		}
-
 	}
 	else
 	{
@@ -901,6 +891,7 @@ void MainWindow::createProfile()
 
 void MainWindow::showusername()
 {
+	displayedClientNameEnum = 2;
 	MainWindow::getConnectionList()->setColumnHidden(2, false);
 	MainWindow::getConnectionList()->setColumnHidden(0, true);
 	MainWindow::getConnectionList()->setColumnHidden(1, true);
@@ -908,6 +899,7 @@ void MainWindow::showusername()
 
 void MainWindow::showname()
 {
+	displayedClientNameEnum = 0;
 	MainWindow::getConnectionList()->setColumnHidden(0, false);
 	MainWindow::getConnectionList()->setColumnHidden(1, true);
 	MainWindow::getConnectionList()->setColumnHidden(2, true);
@@ -915,6 +907,7 @@ void MainWindow::showname()
 
 void MainWindow::showip()
 {
+	displayedClientNameEnum = 1;
 	MainWindow::getConnectionList()->setColumnHidden(1, false);
 	MainWindow::getConnectionList()->setColumnHidden(2, true);
 	MainWindow::getConnectionList()->setColumnHidden(0, true);
@@ -1314,6 +1307,11 @@ void MainWindow::configureNetwork()
 	}
 }
 
+int MainWindow::getDisplayedClientNameEnum()
+{
+	return displayedClientNameEnum;
+}
+
 MainWindow* MainWindow::myself = NULL;
 ConnectionList* MainWindow::conList = NULL;
 ConnectionWindow* MainWindow::conWin = NULL;