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

1 files changed, 6 insertions, 5 deletions

diff --git a/src/gui/mainWindow.h b/src/gui/mainWindow.h
index 58787ed..272d057 100644
--- a/src/gui/mainWindow.h
+++ b/src/gui/mainWindow.h
@@ -96,8 +96,8 @@ public:
     void setMsgDialog(QString msgd){msgDialog = msgd;};
     QString getMsgDialog(){return msgDialog;};
 
-    void setProcessesDialog(QString procd){procDialog = procd;};
-    QString getProcessesDialog(){return procDialog;};
+    void setProcessesDialog(QString procd){procToStart = procd;};
+    QString getProcessesDialog(){return procToStart;};
 
     bool isLockAllStatus()
     {
@@ -106,8 +106,6 @@ public:
 
     void appendLogMsg();
 
-
-
 protected:
     void closeEvent(QCloseEvent *e);
     void changeEvent(QEvent *e);
@@ -128,6 +126,8 @@ private:
     QString _sessionName;
     QString _profilName;
 
+    int displayedClientNameEnum; //to tell if username, loginname or ip is shown in clientList
+
     QStringList _chatListClients;
 
 
@@ -139,7 +139,7 @@ private:
     AboutDialog      *_aboutDialog;
 
     QString msgDialog;
-    QString procDialog;
+    QString procToStart;
     bool    bgimage;
     bool    locked, locked1;
     bool    force_square;
@@ -188,6 +188,7 @@ public slots:
     void startChatDialog();
     void showProcesses();
     void startProcess();
+    int getDisplayedClientNameEnum();
 
 private slots:
 	void onToggleLog(bool showtime);