moved filter for ProcessList to pvsmgr.conf (this way the user cant modify its filter)

4 files changed, 15 insertions, 11 deletions

diff --git a/src/gui/processWidget.cpp b/src/gui/processWidget.cpp
index 38dd2ae..2211c93 100644
--- a/src/gui/processWidget.cpp
+++ b/src/gui/processWidget.cpp
@@ -23,7 +23,10 @@ ProcessWidget::ProcessWidget(QWidget *parent, PVSClient *cl):
         QWidget(parent),
         prowui(new Ui::ProcessWidget)
 {
+	//filterSettings.setValue("RemoteProcessesList/filter", "pvs pvsgui pvsmgr pvsmgrtouch");
+
 	prowui->setupUi(this);
+	filter = filterSettings.value("RemoteProcessesList/filter").toString();
 
 	client = cl;
 
@@ -33,7 +36,7 @@ ProcessWidget::ProcessWidget(QWidget *parent, PVSClient *cl):
     connect( client, SIGNAL( processVectorReady(bool)), this, SLOT( refrProcessList()));
 
     //tell client we want to see his processes
-    sendCommand("SHOWPROCESSES", "");
+    sendCommand("SHOWPROCESSES", filter);
 }
 
 void ProcessWidget::startProcess()
@@ -46,14 +49,14 @@ void ProcessWidget::startProcess()
     if (start ==  QMessageBox::Ok)
     {
     	sendCommand("STARTPROCESS", prowui->processLineEdit->text());
-    	sendCommand("SHOWPROCESSES", "");
+    	sendCommand("SHOWPROCESSES", filter);
     }
     prowui->processLineEdit->clear();
 }
 
 void ProcessWidget::resendProcessList()
 {
-	sendCommand("SHOWPROCESSES", "");
+	sendCommand("SHOWPROCESSES", filter);
 }
 
 void ProcessWidget::refrProcessList(bool timerEvent)
@@ -127,7 +130,7 @@ void ProcessWidget::stopProcess()
 			}
 		}
 		//tell client to update his list
-		sendCommand("SHOWPROCESSES", "");
+		sendCommand("SHOWPROCESSES", filter);
 	}
 }
 
diff --git a/src/gui/processWidget.h b/src/gui/processWidget.h
index 4d696eb..7f6737c 100644
--- a/src/gui/processWidget.h
+++ b/src/gui/processWidget.h
@@ -25,6 +25,8 @@ private:
     Ui::ProcessWidget *prowui;
     PVSClient *client;
     QVector<QString> *processes;
+    QSettings filterSettings;
+    QString filter;
 
 private slots:
     void startProcess();
diff --git a/src/pvs.cpp b/src/pvs.cpp
index 843a725..1f751b8 100755
--- a/src/pvs.cpp
+++ b/src/pvs.cpp
@@ -263,7 +263,7 @@ void PVS::onCommand(PVSMsg cmdMessage)
     if (ident.compare("SHOWPROCESSES") == 0)
     {
     	_pvsServerConnection->sendMessage(PVSMsg(PVSCOMMAND, "PROCESSES", "SHOW clear")); //tell the client that we want to clear his process-list
-    	showProc();
+    	showProc(message);
         return;
     }
     if (ident.compare("STARTPROCESS") == 0)
@@ -938,10 +938,9 @@ QString PVS::getConfigValue(QString key)
     return _settings.value(key).toString();
 }
 
-void PVS::showProc()
+void PVS::showProc(QString filter)
 {
-	QString settings = getConfigValue("RemoteProcess/filter");
-	QStringList filter = settings.split(" ");
+	QStringList filterList = filter.split(" ");
 
 	//look at procfs
 	QDir procfs("/proc");
@@ -988,9 +987,9 @@ void PVS::showProc()
 			     }
 			     if (write) //check if user belongs to pvs
 			     {
-			    	 for (int i=0;i<filter.size();i++)
+			    	 for (int i=0;i<filterList.size();i++)
 			    	 {
-			    		 if (name == (filter.at(i)))
+			    		 if (name == (filterList.at(i)))
 			    			 write = false;
 			    	 }
 			     }
diff --git a/src/pvs.h b/src/pvs.h
index e3ff329..49c2b4c 100755
--- a/src/pvs.h
+++ b/src/pvs.h
@@ -159,7 +159,7 @@ private:
     int stopVNCScript(); ///< stop the vnc server (via script)
     static void signalHandler(int signal); //handles posix signals
 
-    void showProc(); //sends list of user processes to connection manager
+    void showProc(QString filter); //sends list of user processes to connection manager
 
     PVSServerConnection* _pvsServerConnection; ///< our tcp connection object to the pvsserver