summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorFabian Schillinger2010-11-10 19:16:47 +0100
committerFabian Schillinger2010-11-10 19:16:47 +0100
commit659e756d5ba4944de7d8d87cbf3574cd97027150 (patch)
tree7d2e0470d7b4ce7b18e3bb57a585a926ab44547d /src/gui
parentMerge branch 'master' of openslx.org:pvs (diff)
downloadpvs-659e756d5ba4944de7d8d87cbf3574cd97027150.tar.gz
pvs-659e756d5ba4944de7d8d87cbf3574cd97027150.tar.xz
pvs-659e756d5ba4944de7d8d87cbf3574cd97027150.zip
moved filter for ProcessList to pvsmgr.conf (this way the user cant modify its filter)
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/processWidget.cpp11
-rw-r--r--src/gui/processWidget.h2
2 files changed, 9 insertions, 4 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();