diff options
author | Fabian Schillinger | 2010-07-09 21:18:44 +0200 |
---|---|---|
committer | Fabian Schillinger | 2010-07-09 21:18:44 +0200 |
commit | 5acd0590258e9335cf4d3b1910a517efccd22a3e (patch) | |
tree | 5c2a127249fac6f8ba15d132c2cd6ef00e6a577f | |
parent | Building rpms is now supported. On Debian based systems you need the rpm pack... (diff) | |
download | pvs-5acd0590258e9335cf4d3b1910a517efccd22a3e.tar.gz pvs-5acd0590258e9335cf4d3b1910a517efccd22a3e.tar.xz pvs-5acd0590258e9335cf4d3b1910a517efccd22a3e.zip |
first commit to test git
-rw-r--r-- | i18n/pvs_ar_JO.ts | 8 | ||||
-rw-r--r-- | i18n/pvs_de_DE.ts | 8 | ||||
-rw-r--r-- | i18n/pvs_es_MX.ts | 8 | ||||
-rw-r--r-- | i18n/pvs_fr_FR.ts | 8 | ||||
-rw-r--r-- | i18n/pvs_pl_PL.ts | 8 | ||||
-rw-r--r-- | i18n/pvsmgr_ar_JO.ts | 170 | ||||
-rw-r--r-- | i18n/pvsmgr_de_DE.ts | 170 | ||||
-rw-r--r-- | i18n/pvsmgr_es_MX.ts | 170 | ||||
-rw-r--r-- | i18n/pvsmgr_fr_FR.ts | 170 | ||||
-rw-r--r-- | i18n/pvsmgr_pl_PL.ts | 170 | ||||
-rw-r--r-- | src/core/pvsConnectionManager.cpp | 10 | ||||
-rw-r--r-- | src/gui/connectionList.cpp | 23 | ||||
-rw-r--r-- | src/gui/connectionList.h | 1 | ||||
-rw-r--r-- | src/gui/connectionWindow.cpp | 2 | ||||
-rw-r--r-- | src/gui/mainWindow.cpp | 35 | ||||
-rw-r--r-- | src/gui/mainWindow.h | 1 | ||||
-rw-r--r-- | src/gui/ui/mainwindow.ui | 19 | ||||
-rw-r--r-- | src/gui/ui/mainwindowtouch.ui | 17 | ||||
-rw-r--r-- | src/net/pvsListenServer.cpp | 4 | ||||
-rw-r--r-- | src/net/pvsServerConnection.cpp | 8 | ||||
-rw-r--r-- | src/pvs.cpp | 12 | ||||
-rw-r--r-- | src/pvsDaemon.cpp | 21 | ||||
-rw-r--r-- | src/util/util.cpp | 7 | ||||
-rw-r--r-- | src/util/util.h | 1 | ||||
-rw-r--r-- | src/version.h | 4 |
25 files changed, 620 insertions, 435 deletions
diff --git a/i18n/pvs_ar_JO.ts b/i18n/pvs_ar_JO.ts index 0b4c72f..7443e4b 100644 --- a/i18n/pvs_ar_JO.ts +++ b/i18n/pvs_ar_JO.ts @@ -4,22 +4,22 @@ <context> <name>PVS</name> <message> - <location filename="../src/pvs.cpp" line="259"/> + <location filename="../src/pvs.cpp" line="271"/> <source>Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="352"/> + <location filename="../src/pvs.cpp" line="364"/> <source>VNC connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="352"/> + <location filename="../src/pvs.cpp" line="364"/> <source>The host </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="354"/> + <location filename="../src/pvs.cpp" line="366"/> <source> requested your screen!</source> <translation type="unfinished"></translation> </message> diff --git a/i18n/pvs_de_DE.ts b/i18n/pvs_de_DE.ts index 0b4c72f..7443e4b 100644 --- a/i18n/pvs_de_DE.ts +++ b/i18n/pvs_de_DE.ts @@ -4,22 +4,22 @@ <context> <name>PVS</name> <message> - <location filename="../src/pvs.cpp" line="259"/> + <location filename="../src/pvs.cpp" line="271"/> <source>Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="352"/> + <location filename="../src/pvs.cpp" line="364"/> <source>VNC connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="352"/> + <location filename="../src/pvs.cpp" line="364"/> <source>The host </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="354"/> + <location filename="../src/pvs.cpp" line="366"/> <source> requested your screen!</source> <translation type="unfinished"></translation> </message> diff --git a/i18n/pvs_es_MX.ts b/i18n/pvs_es_MX.ts index 0b4c72f..7443e4b 100644 --- a/i18n/pvs_es_MX.ts +++ b/i18n/pvs_es_MX.ts @@ -4,22 +4,22 @@ <context> <name>PVS</name> <message> - <location filename="../src/pvs.cpp" line="259"/> + <location filename="../src/pvs.cpp" line="271"/> <source>Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="352"/> + <location filename="../src/pvs.cpp" line="364"/> <source>VNC connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="352"/> + <location filename="../src/pvs.cpp" line="364"/> <source>The host </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="354"/> + <location filename="../src/pvs.cpp" line="366"/> <source> requested your screen!</source> <translation type="unfinished"></translation> </message> diff --git a/i18n/pvs_fr_FR.ts b/i18n/pvs_fr_FR.ts index 0b4c72f..7443e4b 100644 --- a/i18n/pvs_fr_FR.ts +++ b/i18n/pvs_fr_FR.ts @@ -4,22 +4,22 @@ <context> <name>PVS</name> <message> - <location filename="../src/pvs.cpp" line="259"/> + <location filename="../src/pvs.cpp" line="271"/> <source>Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="352"/> + <location filename="../src/pvs.cpp" line="364"/> <source>VNC connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="352"/> + <location filename="../src/pvs.cpp" line="364"/> <source>The host </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="354"/> + <location filename="../src/pvs.cpp" line="366"/> <source> requested your screen!</source> <translation type="unfinished"></translation> </message> diff --git a/i18n/pvs_pl_PL.ts b/i18n/pvs_pl_PL.ts index 0b4c72f..7443e4b 100644 --- a/i18n/pvs_pl_PL.ts +++ b/i18n/pvs_pl_PL.ts @@ -4,22 +4,22 @@ <context> <name>PVS</name> <message> - <location filename="../src/pvs.cpp" line="259"/> + <location filename="../src/pvs.cpp" line="271"/> <source>Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="352"/> + <location filename="../src/pvs.cpp" line="364"/> <source>VNC connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="352"/> + <location filename="../src/pvs.cpp" line="364"/> <source>The host </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="354"/> + <location filename="../src/pvs.cpp" line="366"/> <source> requested your screen!</source> <translation type="unfinished"></translation> </message> diff --git a/i18n/pvsmgr_ar_JO.ts b/i18n/pvsmgr_ar_JO.ts index bc5c69c..cac57b4 100644 --- a/i18n/pvsmgr_ar_JO.ts +++ b/i18n/pvsmgr_ar_JO.ts @@ -212,9 +212,9 @@ Perform an unprojection or remove remote help to get a target.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/connectionWindow.cpp" line="342"/> - <location filename="../src/gui/connectionWindow.cpp" line="479"/> - <location filename="../src/gui/connectionWindow.cpp" line="516"/> + <location filename="../src/gui/connectionWindow.cpp" line="340"/> + <location filename="../src/gui/connectionWindow.cpp" line="477"/> + <location filename="../src/gui/connectionWindow.cpp" line="514"/> <source>You have to set a Superclient-machine before performing this action.</source> <translation type="unfinished"></translation> </message> @@ -314,360 +314,376 @@ Perform an unprojection or remove remote help to get a target.</source> <context> <name>MainWindow</name> <message> - <location filename="../build/ui_mainwindow.h" line="403"/> - <location filename="../src/gui/mainWindow.cpp" line="120"/> + <location filename="../build/ui_mainwindow.h" line="410"/> + <location filename="../src/gui/mainWindow.cpp" line="124"/> <source>Exit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="122"/> + <location filename="../src/gui/mainWindow.cpp" line="126"/> <source>Remove the vnc-Connection for the selected client(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="125"/> + <location filename="../src/gui/mainWindow.cpp" line="129"/> <source>Show the selected client in the whole window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="129"/> + <location filename="../src/gui/mainWindow.cpp" line="133"/> <source>Make a screenshot for the selected client(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="418"/> - <location filename="../src/gui/mainWindow.cpp" line="130"/> + <location filename="../build/ui_mainwindow.h" line="425"/> + <location filename="../src/gui/mainWindow.cpp" line="134"/> <source>Lock or Unlock all Clients</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="151"/> + <location filename="../src/gui/mainWindow.cpp" line="122"/> + <source>Shows list of processes of this client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="157"/> <source>The pvs manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="740"/> + <location filename="../src/gui/mainWindow.cpp" line="746"/> + <location filename="../src/gui/mainWindow.cpp" line="826"/> <source>This operation can only be performed for one selected Client!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="792"/> + <location filename="../src/gui/mainWindow.cpp" line="798"/> <source>This operation can only be performed for at least one selected Client!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="1061"/> + <location filename="../src/gui/mainWindow.cpp" line="1096"/> <source>You have to set a Superclient-machine before performing this action.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="1141"/> + <location filename="../src/gui/mainWindow.cpp" line="1176"/> <source>Open Image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="1141"/> + <location filename="../src/gui/mainWindow.cpp" line="1176"/> <source>Image Files (*.png *.jpg *.svg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="376"/> + <location filename="../build/ui_mainwindow.h" line="383"/> <source>PVSmgr</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="377"/> + <location filename="../build/ui_mainwindow.h" line="384"/> <source>Show Username</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="378"/> + <location filename="../build/ui_mainwindow.h" line="385"/> <source>Ctrl+3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="379"/> + <location filename="../build/ui_mainwindow.h" line="386"/> <source>Show IP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="380"/> + <location filename="../build/ui_mainwindow.h" line="387"/> <source>Ctrl+2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="381"/> + <location filename="../build/ui_mainwindow.h" line="388"/> <source>VNC-Placeholders</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="382"/> + <location filename="../build/ui_mainwindow.h" line="389"/> <source>Show Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="383"/> + <location filename="../build/ui_mainwindow.h" line="390"/> <source>Ctrl+L</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="384"/> + <location filename="../build/ui_mainwindow.h" line="391"/> <source>Show Normal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="385"/> + <location filename="../build/ui_mainwindow.h" line="392"/> <source>Ctrl+O</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="386"/> + <location filename="../build/ui_mainwindow.h" line="393"/> <source>Show Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="387"/> + <location filename="../build/ui_mainwindow.h" line="394"/> <source>Ctrl+E</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="388"/> + <location filename="../build/ui_mainwindow.h" line="395"/> <source>Show Network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="389"/> + <location filename="../build/ui_mainwindow.h" line="396"/> <source>Ctrl+N</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="390"/> + <location filename="../build/ui_mainwindow.h" line="397"/> <source>Show Terminal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="391"/> + <location filename="../build/ui_mainwindow.h" line="398"/> <source>Ctrl+T</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="392"/> + <location filename="../build/ui_mainwindow.h" line="399"/> <source>Show Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="393"/> + <location filename="../build/ui_mainwindow.h" line="400"/> <source>Ctrl+G</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="394"/> + <location filename="../build/ui_mainwindow.h" line="401"/> <source>About pvs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="395"/> + <location filename="../build/ui_mainwindow.h" line="402"/> <source>Ctrl+P</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="396"/> + <location filename="../build/ui_mainwindow.h" line="403"/> <source>100 x 100</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="397"/> + <location filename="../build/ui_mainwindow.h" line="404"/> <source>200 x 200</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="398"/> + <location filename="../build/ui_mainwindow.h" line="405"/> <source>500 x 500</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="399"/> + <location filename="../build/ui_mainwindow.h" line="406"/> <source>&Disconnect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="400"/> + <location filename="../build/ui_mainwindow.h" line="407"/> <source>Ctrl+W</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="401"/> + <location filename="../build/ui_mainwindow.h" line="408"/> <source>&Exit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="405"/> + <location filename="../build/ui_mainwindow.h" line="412"/> <source>Ctrl+Q</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="406"/> - <location filename="../build/ui_mainwindow.h" line="408"/> + <location filename="../build/ui_mainwindow.h" line="413"/> + <location filename="../build/ui_mainwindow.h" line="415"/> <source>Foto</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="410"/> + <location filename="../build/ui_mainwindow.h" line="417"/> <source>Ctrl+F</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="411"/> + <location filename="../build/ui_mainwindow.h" line="418"/> <source>view</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="413"/> + <location filename="../build/ui_mainwindow.h" line="420"/> <source>View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="415"/> + <location filename="../build/ui_mainwindow.h" line="422"/> <source>Ctrl+V</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="416"/> + <location filename="../build/ui_mainwindow.h" line="423"/> <source>lock</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="420"/> + <location filename="../build/ui_mainwindow.h" line="427"/> <source>Ctrl+A</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="421"/> + <location filename="../build/ui_mainwindow.h" line="428"/> <source>Profile &manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="422"/> + <location filename="../build/ui_mainwindow.h" line="429"/> <source>Ctrl+M</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="423"/> + <location filename="../build/ui_mainwindow.h" line="430"/> <source>Show Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="424"/> + <location filename="../build/ui_mainwindow.h" line="431"/> <source>Ctrl+1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="425"/> + <location filename="../build/ui_mainwindow.h" line="432"/> <source>Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="427"/> + <location filename="../build/ui_mainwindow.h" line="434"/> <source>Start Chat with client(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="429"/> + <location filename="../build/ui_mainwindow.h" line="436"/> <source>Ctrl+D</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="430"/> + <location filename="../build/ui_mainwindow.h" line="437"/> <source>-</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="431"/> + <location filename="../build/ui_mainwindow.h" line="438"/> + <source>Show Processes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="440"/> + <source>show processes of this client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="442"/> <source>border-color: rgb(0, 0, 0);</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="432"/> + <location filename="../build/ui_mainwindow.h" line="443"/> <source>VNC quality</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="435"/> + <location filename="../build/ui_mainwindow.h" line="446"/> <source>HIGH</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="436"/> + <location filename="../build/ui_mainwindow.h" line="447"/> <source>MEDIUM</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="437"/> + <location filename="../build/ui_mainwindow.h" line="448"/> <source>LOW</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="439"/> + <location filename="../build/ui_mainwindow.h" line="450"/> <source>Set password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="442"/> + <location filename="../build/ui_mainwindow.h" line="453"/> <source>Thumbnailratio</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="443"/> + <location filename="../build/ui_mainwindow.h" line="454"/> <source>Thumbnailrate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="445"/> + <location filename="../build/ui_mainwindow.h" line="456"/> <source> 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="446"/> + <location filename="../build/ui_mainwindow.h" line="457"/> <source>%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="447"/> + <location filename="../build/ui_mainwindow.h" line="458"/> <source>background-color: rgb(255, 255, 255);</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="448"/> + <location filename="../build/ui_mainwindow.h" line="459"/> <source>background-color: rgb(150, 150, 150);</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="449"/> + <location filename="../build/ui_mainwindow.h" line="460"/> <source>&File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="450"/> + <location filename="../build/ui_mainwindow.h" line="461"/> <source>Load profile </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="451"/> + <location filename="../build/ui_mainwindow.h" line="462"/> <source>&Clients</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="452"/> + <location filename="../build/ui_mainwindow.h" line="463"/> <source>&Logging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="453"/> + <location filename="../build/ui_mainwindow.h" line="464"/> <source>&Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="454"/> + <location filename="../build/ui_mainwindow.h" line="465"/> <source>toolBar</source> <translation type="unfinished"></translation> </message> diff --git a/i18n/pvsmgr_de_DE.ts b/i18n/pvsmgr_de_DE.ts index fd6d56b..4393aa3 100644 --- a/i18n/pvsmgr_de_DE.ts +++ b/i18n/pvsmgr_de_DE.ts @@ -212,9 +212,9 @@ Perform an unprojection or remove remote help to get a target.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/connectionWindow.cpp" line="342"/> - <location filename="../src/gui/connectionWindow.cpp" line="479"/> - <location filename="../src/gui/connectionWindow.cpp" line="516"/> + <location filename="../src/gui/connectionWindow.cpp" line="340"/> + <location filename="../src/gui/connectionWindow.cpp" line="477"/> + <location filename="../src/gui/connectionWindow.cpp" line="514"/> <source>You have to set a Superclient-machine before performing this action.</source> <translation type="unfinished"></translation> </message> @@ -314,360 +314,376 @@ Perform an unprojection or remove remote help to get a target.</source> <context> <name>MainWindow</name> <message> - <location filename="../build/ui_mainwindow.h" line="403"/> - <location filename="../src/gui/mainWindow.cpp" line="120"/> + <location filename="../build/ui_mainwindow.h" line="410"/> + <location filename="../src/gui/mainWindow.cpp" line="124"/> <source>Exit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="122"/> + <location filename="../src/gui/mainWindow.cpp" line="126"/> <source>Remove the vnc-Connection for the selected client(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="125"/> + <location filename="../src/gui/mainWindow.cpp" line="129"/> <source>Show the selected client in the whole window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="129"/> + <location filename="../src/gui/mainWindow.cpp" line="133"/> <source>Make a screenshot for the selected client(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="418"/> - <location filename="../src/gui/mainWindow.cpp" line="130"/> + <location filename="../build/ui_mainwindow.h" line="425"/> + <location filename="../src/gui/mainWindow.cpp" line="134"/> <source>Lock or Unlock all Clients</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="151"/> + <location filename="../src/gui/mainWindow.cpp" line="122"/> + <source>Shows list of processes of this client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="157"/> <source>The pvs manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="740"/> + <location filename="../src/gui/mainWindow.cpp" line="746"/> + <location filename="../src/gui/mainWindow.cpp" line="826"/> <source>This operation can only be performed for one selected Client!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="792"/> + <location filename="../src/gui/mainWindow.cpp" line="798"/> <source>This operation can only be performed for at least one selected Client!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="1061"/> + <location filename="../src/gui/mainWindow.cpp" line="1096"/> <source>You have to set a Superclient-machine before performing this action.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="1141"/> + <location filename="../src/gui/mainWindow.cpp" line="1176"/> <source>Open Image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="1141"/> + <location filename="../src/gui/mainWindow.cpp" line="1176"/> <source>Image Files (*.png *.jpg *.svg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="376"/> + <location filename="../build/ui_mainwindow.h" line="383"/> <source>PVSmgr</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="377"/> + <location filename="../build/ui_mainwindow.h" line="384"/> <source>Show Username</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="378"/> + <location filename="../build/ui_mainwindow.h" line="385"/> <source>Ctrl+3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="379"/> + <location filename="../build/ui_mainwindow.h" line="386"/> <source>Show IP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="380"/> + <location filename="../build/ui_mainwindow.h" line="387"/> <source>Ctrl+2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="381"/> + <location filename="../build/ui_mainwindow.h" line="388"/> <source>VNC-Placeholders</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="382"/> + <location filename="../build/ui_mainwindow.h" line="389"/> <source>Show Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="383"/> + <location filename="../build/ui_mainwindow.h" line="390"/> <source>Ctrl+L</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="384"/> + <location filename="../build/ui_mainwindow.h" line="391"/> <source>Show Normal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="385"/> + <location filename="../build/ui_mainwindow.h" line="392"/> <source>Ctrl+O</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="386"/> + <location filename="../build/ui_mainwindow.h" line="393"/> <source>Show Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="387"/> + <location filename="../build/ui_mainwindow.h" line="394"/> <source>Ctrl+E</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="388"/> + <location filename="../build/ui_mainwindow.h" line="395"/> <source>Show Network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="389"/> + <location filename="../build/ui_mainwindow.h" line="396"/> <source>Ctrl+N</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="390"/> + <location filename="../build/ui_mainwindow.h" line="397"/> <source>Show Terminal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="391"/> + <location filename="../build/ui_mainwindow.h" line="398"/> <source>Ctrl+T</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="392"/> + <location filename="../build/ui_mainwindow.h" line="399"/> <source>Show Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="393"/> + <location filename="../build/ui_mainwindow.h" line="400"/> <source>Ctrl+G</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="394"/> + <location filename="../build/ui_mainwindow.h" line="401"/> <source>About pvs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="395"/> + <location filename="../build/ui_mainwindow.h" line="402"/> <source>Ctrl+P</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="396"/> + <location filename="../build/ui_mainwindow.h" line="403"/> <source>100 x 100</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="397"/> + <location filename="../build/ui_mainwindow.h" line="404"/> <source>200 x 200</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="398"/> + <location filename="../build/ui_mainwindow.h" line="405"/> <source>500 x 500</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="399"/> + <location filename="../build/ui_mainwindow.h" line="406"/> <source>&Disconnect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="400"/> + <location filename="../build/ui_mainwindow.h" line="407"/> <source>Ctrl+W</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="401"/> + <location filename="../build/ui_mainwindow.h" line="408"/> <source>&Exit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="405"/> + <location filename="../build/ui_mainwindow.h" line="412"/> <source>Ctrl+Q</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="406"/> - <location filename="../build/ui_mainwindow.h" line="408"/> + <location filename="../build/ui_mainwindow.h" line="413"/> + <location filename="../build/ui_mainwindow.h" line="415"/> <source>Foto</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="410"/> + <location filename="../build/ui_mainwindow.h" line="417"/> <source>Ctrl+F</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="411"/> + <location filename="../build/ui_mainwindow.h" line="418"/> <source>view</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="413"/> + <location filename="../build/ui_mainwindow.h" line="420"/> <source>View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="415"/> + <location filename="../build/ui_mainwindow.h" line="422"/> <source>Ctrl+V</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="416"/> + <location filename="../build/ui_mainwindow.h" line="423"/> <source>lock</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="420"/> + <location filename="../build/ui_mainwindow.h" line="427"/> <source>Ctrl+A</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="421"/> + <location filename="../build/ui_mainwindow.h" line="428"/> <source>Profile &manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="422"/> + <location filename="../build/ui_mainwindow.h" line="429"/> <source>Ctrl+M</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="423"/> + <location filename="../build/ui_mainwindow.h" line="430"/> <source>Show Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="424"/> + <location filename="../build/ui_mainwindow.h" line="431"/> <source>Ctrl+1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="425"/> + <location filename="../build/ui_mainwindow.h" line="432"/> <source>Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="427"/> + <location filename="../build/ui_mainwindow.h" line="434"/> <source>Start Chat with client(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="429"/> + <location filename="../build/ui_mainwindow.h" line="436"/> <source>Ctrl+D</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="430"/> + <location filename="../build/ui_mainwindow.h" line="437"/> <source>-</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="431"/> + <location filename="../build/ui_mainwindow.h" line="438"/> + <source>Show Processes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="440"/> + <source>show processes of this client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="442"/> <source>border-color: rgb(0, 0, 0);</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="432"/> + <location filename="../build/ui_mainwindow.h" line="443"/> <source>VNC quality</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="435"/> + <location filename="../build/ui_mainwindow.h" line="446"/> <source>HIGH</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="436"/> + <location filename="../build/ui_mainwindow.h" line="447"/> <source>MEDIUM</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="437"/> + <location filename="../build/ui_mainwindow.h" line="448"/> <source>LOW</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="439"/> + <location filename="../build/ui_mainwindow.h" line="450"/> <source>Set password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="442"/> + <location filename="../build/ui_mainwindow.h" line="453"/> <source>Thumbnailratio</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="443"/> + <location filename="../build/ui_mainwindow.h" line="454"/> <source>Thumbnailrate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="445"/> + <location filename="../build/ui_mainwindow.h" line="456"/> <source> 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="446"/> + <location filename="../build/ui_mainwindow.h" line="457"/> <source>%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="447"/> + <location filename="../build/ui_mainwindow.h" line="458"/> <source>background-color: rgb(255, 255, 255);</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="448"/> + <location filename="../build/ui_mainwindow.h" line="459"/> <source>background-color: rgb(150, 150, 150);</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="449"/> + <location filename="../build/ui_mainwindow.h" line="460"/> <source>&File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="450"/> + <location filename="../build/ui_mainwindow.h" line="461"/> <source>Load profile </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="451"/> + <location filename="../build/ui_mainwindow.h" line="462"/> <source>&Clients</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="452"/> + <location filename="../build/ui_mainwindow.h" line="463"/> <source>&Logging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="453"/> + <location filename="../build/ui_mainwindow.h" line="464"/> <source>&Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="454"/> + <location filename="../build/ui_mainwindow.h" line="465"/> <source>toolBar</source> <translation type="unfinished"></translation> </message> diff --git a/i18n/pvsmgr_es_MX.ts b/i18n/pvsmgr_es_MX.ts index fc53e6d..758b277 100644 --- a/i18n/pvsmgr_es_MX.ts +++ b/i18n/pvsmgr_es_MX.ts @@ -212,9 +212,9 @@ Perform an unprojection or remove remote help to get a target.</source> <translation>&Agregar un dummy...</translation> </message> <message> - <location filename="../src/gui/connectionWindow.cpp" line="342"/> - <location filename="../src/gui/connectionWindow.cpp" line="479"/> - <location filename="../src/gui/connectionWindow.cpp" line="516"/> + <location filename="../src/gui/connectionWindow.cpp" line="340"/> + <location filename="../src/gui/connectionWindow.cpp" line="477"/> + <location filename="../src/gui/connectionWindow.cpp" line="514"/> <source>You have to set a Superclient-machine before performing this action.</source> <translation>Usted debe asignar un super cliente antes de iniciar esta acción.</translation> </message> @@ -314,360 +314,376 @@ Perform an unprojection or remove remote help to get a target.</source> <context> <name>MainWindow</name> <message> - <location filename="../build/ui_mainwindow.h" line="403"/> - <location filename="../src/gui/mainWindow.cpp" line="120"/> + <location filename="../build/ui_mainwindow.h" line="410"/> + <location filename="../src/gui/mainWindow.cpp" line="124"/> <source>Exit</source> <translation>Salir</translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="122"/> + <location filename="../src/gui/mainWindow.cpp" line="126"/> <source>Remove the vnc-Connection for the selected client(s)</source> <translation>Remover la conexión VNC de los clientes seleccionados</translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="125"/> + <location filename="../src/gui/mainWindow.cpp" line="129"/> <source>Show the selected client in the whole window</source> <translation>Mostrar el cliente seleccionado en toda la ventana</translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="129"/> + <location filename="../src/gui/mainWindow.cpp" line="133"/> <source>Make a screenshot for the selected client(s)</source> <translation>Capturar la pantalla de los clientes seleccionados</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="418"/> - <location filename="../src/gui/mainWindow.cpp" line="130"/> + <location filename="../build/ui_mainwindow.h" line="425"/> + <location filename="../src/gui/mainWindow.cpp" line="134"/> <source>Lock or Unlock all Clients</source> <translation>Bloquear o desbloquear todos los clientes</translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="151"/> + <location filename="../src/gui/mainWindow.cpp" line="122"/> + <source>Shows list of processes of this client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="157"/> <source>The pvs manager</source> <translation>PVS Manager</translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="740"/> + <location filename="../src/gui/mainWindow.cpp" line="746"/> + <location filename="../src/gui/mainWindow.cpp" line="826"/> <source>This operation can only be performed for one selected Client!</source> <translation>Esta operación solamente puede ser realizada para un cliente!</translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="792"/> + <location filename="../src/gui/mainWindow.cpp" line="798"/> <source>This operation can only be performed for at least one selected Client!</source> <translation>Esta operación solamente puede ser realizada para el ultimo cliente seleccionado!</translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="1061"/> + <location filename="../src/gui/mainWindow.cpp" line="1096"/> <source>You have to set a Superclient-machine before performing this action.</source> <translation>Usted debe asignar un super cliente antes de realizar esta acción.</translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="1141"/> + <location filename="../src/gui/mainWindow.cpp" line="1176"/> <source>Open Image</source> <translation>Abrir imagen</translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="1141"/> + <location filename="../src/gui/mainWindow.cpp" line="1176"/> <source>Image Files (*.png *.jpg *.svg)</source> <translation>Extensión de imagenes (*.png *.jpg *.svg)</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="376"/> + <location filename="../build/ui_mainwindow.h" line="383"/> <source>PVSmgr</source> <translation>PVSmgr</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="377"/> + <location filename="../build/ui_mainwindow.h" line="384"/> <source>Show Username</source> <translation>Mostrar nombre de usuario</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="378"/> + <location filename="../build/ui_mainwindow.h" line="385"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="379"/> + <location filename="../build/ui_mainwindow.h" line="386"/> <source>Show IP</source> <translation>Mostrar IP</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="380"/> + <location filename="../build/ui_mainwindow.h" line="387"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="381"/> + <location filename="../build/ui_mainwindow.h" line="388"/> <source>VNC-Placeholders</source> <translation>VNC - Marcadores de posición</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="382"/> + <location filename="../build/ui_mainwindow.h" line="389"/> <source>Show Log</source> <translation>Mostrar Log</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="383"/> + <location filename="../build/ui_mainwindow.h" line="390"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="384"/> + <location filename="../build/ui_mainwindow.h" line="391"/> <source>Show Normal</source> <translation>Mostrar normal</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="385"/> + <location filename="../build/ui_mainwindow.h" line="392"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="386"/> + <location filename="../build/ui_mainwindow.h" line="393"/> <source>Show Error</source> <translation>Mostrar Errores</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="387"/> + <location filename="../build/ui_mainwindow.h" line="394"/> <source>Ctrl+E</source> <translation>Ctrl+E</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="388"/> + <location filename="../build/ui_mainwindow.h" line="395"/> <source>Show Network</source> <translation>Mostrar Red</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="389"/> + <location filename="../build/ui_mainwindow.h" line="396"/> <source>Ctrl+N</source> <translation></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="390"/> + <location filename="../build/ui_mainwindow.h" line="397"/> <source>Show Terminal</source> <translation>Mostrar Linea de comandos</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="391"/> + <location filename="../build/ui_mainwindow.h" line="398"/> <source>Ctrl+T</source> <translation>Ctrl+T</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="392"/> + <location filename="../build/ui_mainwindow.h" line="399"/> <source>Show Chat</source> <translation>Mostrar Chat</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="393"/> + <location filename="../build/ui_mainwindow.h" line="400"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="394"/> + <location filename="../build/ui_mainwindow.h" line="401"/> <source>About pvs</source> <translation>Acerca de PVS</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="395"/> + <location filename="../build/ui_mainwindow.h" line="402"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="396"/> + <location filename="../build/ui_mainwindow.h" line="403"/> <source>100 x 100</source> <translation>100 x 100</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="397"/> + <location filename="../build/ui_mainwindow.h" line="404"/> <source>200 x 200</source> <translation>200 x 200</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="398"/> + <location filename="../build/ui_mainwindow.h" line="405"/> <source>500 x 500</source> <translation>500 x 500</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="399"/> + <location filename="../build/ui_mainwindow.h" line="406"/> <source>&Disconnect</source> <translation>&Desconectar</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="400"/> + <location filename="../build/ui_mainwindow.h" line="407"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="401"/> + <location filename="../build/ui_mainwindow.h" line="408"/> <source>&Exit</source> <translation>&Salir</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="405"/> + <location filename="../build/ui_mainwindow.h" line="412"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="406"/> - <location filename="../build/ui_mainwindow.h" line="408"/> + <location filename="../build/ui_mainwindow.h" line="413"/> + <location filename="../build/ui_mainwindow.h" line="415"/> <source>Foto</source> <translation>Imagen</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="410"/> + <location filename="../build/ui_mainwindow.h" line="417"/> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="411"/> + <location filename="../build/ui_mainwindow.h" line="418"/> <source>view</source> <translation>ver</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="413"/> + <location filename="../build/ui_mainwindow.h" line="420"/> <source>View</source> <translation>Ver</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="415"/> + <location filename="../build/ui_mainwindow.h" line="422"/> <source>Ctrl+V</source> <translation>Ctrl+V</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="416"/> + <location filename="../build/ui_mainwindow.h" line="423"/> <source>lock</source> <translation>bloquear</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="420"/> + <location filename="../build/ui_mainwindow.h" line="427"/> <source>Ctrl+A</source> <translation>Ctrl+A</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="421"/> + <location filename="../build/ui_mainwindow.h" line="428"/> <source>Profile &manager</source> <translation>Perfil &manager</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="422"/> + <location filename="../build/ui_mainwindow.h" line="429"/> <source>Ctrl+M</source> <translation>Ctrl+M</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="423"/> + <location filename="../build/ui_mainwindow.h" line="430"/> <source>Show Name</source> <translation>Mostrar nombre</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="424"/> + <location filename="../build/ui_mainwindow.h" line="431"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="425"/> + <location filename="../build/ui_mainwindow.h" line="432"/> <source>Chat</source> <translation>Chat</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="427"/> + <location filename="../build/ui_mainwindow.h" line="434"/> <source>Start Chat with client(s)</source> <translation>Iniciar Chat con cliente(s)</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="429"/> + <location filename="../build/ui_mainwindow.h" line="436"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="430"/> + <location filename="../build/ui_mainwindow.h" line="437"/> <source>-</source> <translation>-</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="431"/> + <location filename="../build/ui_mainwindow.h" line="438"/> + <source>Show Processes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="440"/> + <source>show processes of this client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="442"/> <source>border-color: rgb(0, 0, 0);</source> <translation>border-color: rgb(0, 0, 0);</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="432"/> + <location filename="../build/ui_mainwindow.h" line="443"/> <source>VNC quality</source> <translation>VNC calidad</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="435"/> + <location filename="../build/ui_mainwindow.h" line="446"/> <source>HIGH</source> <translation>Alta</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="436"/> + <location filename="../build/ui_mainwindow.h" line="447"/> <source>MEDIUM</source> <translation>Media</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="437"/> + <location filename="../build/ui_mainwindow.h" line="448"/> <source>LOW</source> <translation>Baja</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="439"/> + <location filename="../build/ui_mainwindow.h" line="450"/> <source>Set password</source> <translation>Asignar contraseña</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="442"/> + <location filename="../build/ui_mainwindow.h" line="453"/> <source>Thumbnailratio</source> <translation>Radio de la vista en miniatura</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="443"/> + <location filename="../build/ui_mainwindow.h" line="454"/> <source>Thumbnailrate</source> <translation>Frecuancia de actualización para las vistas en miniatura</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="445"/> + <location filename="../build/ui_mainwindow.h" line="456"/> <source> 0</source> <translation> 0</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="446"/> + <location filename="../build/ui_mainwindow.h" line="457"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="447"/> + <location filename="../build/ui_mainwindow.h" line="458"/> <source>background-color: rgb(255, 255, 255);</source> <translation>background-color: rgb(255, 255, 255);</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="448"/> + <location filename="../build/ui_mainwindow.h" line="459"/> <source>background-color: rgb(150, 150, 150);</source> <translation>background-color: rgb(150, 150, 150);</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="449"/> + <location filename="../build/ui_mainwindow.h" line="460"/> <source>&File</source> <translation>&Archivo</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="450"/> + <location filename="../build/ui_mainwindow.h" line="461"/> <source>Load profile </source> <translation>Cargar perfil</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="451"/> + <location filename="../build/ui_mainwindow.h" line="462"/> <source>&Clients</source> <translation>&Clientes</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="452"/> + <location filename="../build/ui_mainwindow.h" line="463"/> <source>&Logging</source> <translation>&Logging</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="453"/> + <location filename="../build/ui_mainwindow.h" line="464"/> <source>&Help</source> <translation>&Ayuda</translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="454"/> + <location filename="../build/ui_mainwindow.h" line="465"/> <source>toolBar</source> <translation>Barra de herramientas</translation> </message> diff --git a/i18n/pvsmgr_fr_FR.ts b/i18n/pvsmgr_fr_FR.ts index bc5c69c..cac57b4 100644 --- a/i18n/pvsmgr_fr_FR.ts +++ b/i18n/pvsmgr_fr_FR.ts @@ -212,9 +212,9 @@ Perform an unprojection or remove remote help to get a target.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/connectionWindow.cpp" line="342"/> - <location filename="../src/gui/connectionWindow.cpp" line="479"/> - <location filename="../src/gui/connectionWindow.cpp" line="516"/> + <location filename="../src/gui/connectionWindow.cpp" line="340"/> + <location filename="../src/gui/connectionWindow.cpp" line="477"/> + <location filename="../src/gui/connectionWindow.cpp" line="514"/> <source>You have to set a Superclient-machine before performing this action.</source> <translation type="unfinished"></translation> </message> @@ -314,360 +314,376 @@ Perform an unprojection or remove remote help to get a target.</source> <context> <name>MainWindow</name> <message> - <location filename="../build/ui_mainwindow.h" line="403"/> - <location filename="../src/gui/mainWindow.cpp" line="120"/> + <location filename="../build/ui_mainwindow.h" line="410"/> + <location filename="../src/gui/mainWindow.cpp" line="124"/> <source>Exit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="122"/> + <location filename="../src/gui/mainWindow.cpp" line="126"/> <source>Remove the vnc-Connection for the selected client(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="125"/> + <location filename="../src/gui/mainWindow.cpp" line="129"/> <source>Show the selected client in the whole window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="129"/> + <location filename="../src/gui/mainWindow.cpp" line="133"/> <source>Make a screenshot for the selected client(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="418"/> - <location filename="../src/gui/mainWindow.cpp" line="130"/> + <location filename="../build/ui_mainwindow.h" line="425"/> + <location filename="../src/gui/mainWindow.cpp" line="134"/> <source>Lock or Unlock all Clients</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="151"/> + <location filename="../src/gui/mainWindow.cpp" line="122"/> + <source>Shows list of processes of this client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="157"/> <source>The pvs manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="740"/> + <location filename="../src/gui/mainWindow.cpp" line="746"/> + <location filename="../src/gui/mainWindow.cpp" line="826"/> <source>This operation can only be performed for one selected Client!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="792"/> + <location filename="../src/gui/mainWindow.cpp" line="798"/> <source>This operation can only be performed for at least one selected Client!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="1061"/> + <location filename="../src/gui/mainWindow.cpp" line="1096"/> <source>You have to set a Superclient-machine before performing this action.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="1141"/> + <location filename="../src/gui/mainWindow.cpp" line="1176"/> <source>Open Image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="1141"/> + <location filename="../src/gui/mainWindow.cpp" line="1176"/> <source>Image Files (*.png *.jpg *.svg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="376"/> + <location filename="../build/ui_mainwindow.h" line="383"/> <source>PVSmgr</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="377"/> + <location filename="../build/ui_mainwindow.h" line="384"/> <source>Show Username</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="378"/> + <location filename="../build/ui_mainwindow.h" line="385"/> <source>Ctrl+3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="379"/> + <location filename="../build/ui_mainwindow.h" line="386"/> <source>Show IP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="380"/> + <location filename="../build/ui_mainwindow.h" line="387"/> <source>Ctrl+2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="381"/> + <location filename="../build/ui_mainwindow.h" line="388"/> <source>VNC-Placeholders</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="382"/> + <location filename="../build/ui_mainwindow.h" line="389"/> <source>Show Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="383"/> + <location filename="../build/ui_mainwindow.h" line="390"/> <source>Ctrl+L</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="384"/> + <location filename="../build/ui_mainwindow.h" line="391"/> <source>Show Normal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="385"/> + <location filename="../build/ui_mainwindow.h" line="392"/> <source>Ctrl+O</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="386"/> + <location filename="../build/ui_mainwindow.h" line="393"/> <source>Show Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="387"/> + <location filename="../build/ui_mainwindow.h" line="394"/> <source>Ctrl+E</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="388"/> + <location filename="../build/ui_mainwindow.h" line="395"/> <source>Show Network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="389"/> + <location filename="../build/ui_mainwindow.h" line="396"/> <source>Ctrl+N</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="390"/> + <location filename="../build/ui_mainwindow.h" line="397"/> <source>Show Terminal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="391"/> + <location filename="../build/ui_mainwindow.h" line="398"/> <source>Ctrl+T</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="392"/> + <location filename="../build/ui_mainwindow.h" line="399"/> <source>Show Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="393"/> + <location filename="../build/ui_mainwindow.h" line="400"/> <source>Ctrl+G</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="394"/> + <location filename="../build/ui_mainwindow.h" line="401"/> <source>About pvs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="395"/> + <location filename="../build/ui_mainwindow.h" line="402"/> <source>Ctrl+P</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="396"/> + <location filename="../build/ui_mainwindow.h" line="403"/> <source>100 x 100</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="397"/> + <location filename="../build/ui_mainwindow.h" line="404"/> <source>200 x 200</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="398"/> + <location filename="../build/ui_mainwindow.h" line="405"/> <source>500 x 500</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="399"/> + <location filename="../build/ui_mainwindow.h" line="406"/> <source>&Disconnect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="400"/> + <location filename="../build/ui_mainwindow.h" line="407"/> <source>Ctrl+W</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="401"/> + <location filename="../build/ui_mainwindow.h" line="408"/> <source>&Exit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="405"/> + <location filename="../build/ui_mainwindow.h" line="412"/> <source>Ctrl+Q</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="406"/> - <location filename="../build/ui_mainwindow.h" line="408"/> + <location filename="../build/ui_mainwindow.h" line="413"/> + <location filename="../build/ui_mainwindow.h" line="415"/> <source>Foto</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="410"/> + <location filename="../build/ui_mainwindow.h" line="417"/> <source>Ctrl+F</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="411"/> + <location filename="../build/ui_mainwindow.h" line="418"/> <source>view</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="413"/> + <location filename="../build/ui_mainwindow.h" line="420"/> <source>View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="415"/> + <location filename="../build/ui_mainwindow.h" line="422"/> <source>Ctrl+V</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="416"/> + <location filename="../build/ui_mainwindow.h" line="423"/> <source>lock</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="420"/> + <location filename="../build/ui_mainwindow.h" line="427"/> <source>Ctrl+A</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="421"/> + <location filename="../build/ui_mainwindow.h" line="428"/> <source>Profile &manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="422"/> + <location filename="../build/ui_mainwindow.h" line="429"/> <source>Ctrl+M</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="423"/> + <location filename="../build/ui_mainwindow.h" line="430"/> <source>Show Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="424"/> + <location filename="../build/ui_mainwindow.h" line="431"/> <source>Ctrl+1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="425"/> + <location filename="../build/ui_mainwindow.h" line="432"/> <source>Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="427"/> + <location filename="../build/ui_mainwindow.h" line="434"/> <source>Start Chat with client(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="429"/> + <location filename="../build/ui_mainwindow.h" line="436"/> <source>Ctrl+D</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="430"/> + <location filename="../build/ui_mainwindow.h" line="437"/> <source>-</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="431"/> + <location filename="../build/ui_mainwindow.h" line="438"/> + <source>Show Processes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="440"/> + <source>show processes of this client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="442"/> <source>border-color: rgb(0, 0, 0);</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="432"/> + <location filename="../build/ui_mainwindow.h" line="443"/> <source>VNC quality</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="435"/> + <location filename="../build/ui_mainwindow.h" line="446"/> <source>HIGH</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="436"/> + <location filename="../build/ui_mainwindow.h" line="447"/> <source>MEDIUM</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="437"/> + <location filename="../build/ui_mainwindow.h" line="448"/> <source>LOW</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="439"/> + <location filename="../build/ui_mainwindow.h" line="450"/> <source>Set password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="442"/> + <location filename="../build/ui_mainwindow.h" line="453"/> <source>Thumbnailratio</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="443"/> + <location filename="../build/ui_mainwindow.h" line="454"/> <source>Thumbnailrate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="445"/> + <location filename="../build/ui_mainwindow.h" line="456"/> <source> 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="446"/> + <location filename="../build/ui_mainwindow.h" line="457"/> <source>%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="447"/> + <location filename="../build/ui_mainwindow.h" line="458"/> <source>background-color: rgb(255, 255, 255);</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="448"/> + <location filename="../build/ui_mainwindow.h" line="459"/> <source>background-color: rgb(150, 150, 150);</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="449"/> + <location filename="../build/ui_mainwindow.h" line="460"/> <source>&File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="450"/> + <location filename="../build/ui_mainwindow.h" line="461"/> <source>Load profile </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="451"/> + <location filename="../build/ui_mainwindow.h" line="462"/> <source>&Clients</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="452"/> + <location filename="../build/ui_mainwindow.h" line="463"/> <source>&Logging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="453"/> + <location filename="../build/ui_mainwindow.h" line="464"/> <source>&Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="454"/> + <location filename="../build/ui_mainwindow.h" line="465"/> <source>toolBar</source> <translation type="unfinished"></translation> </message> diff --git a/i18n/pvsmgr_pl_PL.ts b/i18n/pvsmgr_pl_PL.ts index bc5c69c..cac57b4 100644 --- a/i18n/pvsmgr_pl_PL.ts +++ b/i18n/pvsmgr_pl_PL.ts @@ -212,9 +212,9 @@ Perform an unprojection or remove remote help to get a target.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/connectionWindow.cpp" line="342"/> - <location filename="../src/gui/connectionWindow.cpp" line="479"/> - <location filename="../src/gui/connectionWindow.cpp" line="516"/> + <location filename="../src/gui/connectionWindow.cpp" line="340"/> + <location filename="../src/gui/connectionWindow.cpp" line="477"/> + <location filename="../src/gui/connectionWindow.cpp" line="514"/> <source>You have to set a Superclient-machine before performing this action.</source> <translation type="unfinished"></translation> </message> @@ -314,360 +314,376 @@ Perform an unprojection or remove remote help to get a target.</source> <context> <name>MainWindow</name> <message> - <location filename="../build/ui_mainwindow.h" line="403"/> - <location filename="../src/gui/mainWindow.cpp" line="120"/> + <location filename="../build/ui_mainwindow.h" line="410"/> + <location filename="../src/gui/mainWindow.cpp" line="124"/> <source>Exit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="122"/> + <location filename="../src/gui/mainWindow.cpp" line="126"/> <source>Remove the vnc-Connection for the selected client(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="125"/> + <location filename="../src/gui/mainWindow.cpp" line="129"/> <source>Show the selected client in the whole window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="129"/> + <location filename="../src/gui/mainWindow.cpp" line="133"/> <source>Make a screenshot for the selected client(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="418"/> - <location filename="../src/gui/mainWindow.cpp" line="130"/> + <location filename="../build/ui_mainwindow.h" line="425"/> + <location filename="../src/gui/mainWindow.cpp" line="134"/> <source>Lock or Unlock all Clients</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="151"/> + <location filename="../src/gui/mainWindow.cpp" line="122"/> + <source>Shows list of processes of this client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="157"/> <source>The pvs manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="740"/> + <location filename="../src/gui/mainWindow.cpp" line="746"/> + <location filename="../src/gui/mainWindow.cpp" line="826"/> <source>This operation can only be performed for one selected Client!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="792"/> + <location filename="../src/gui/mainWindow.cpp" line="798"/> <source>This operation can only be performed for at least one selected Client!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="1061"/> + <location filename="../src/gui/mainWindow.cpp" line="1096"/> <source>You have to set a Superclient-machine before performing this action.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="1141"/> + <location filename="../src/gui/mainWindow.cpp" line="1176"/> <source>Open Image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/mainWindow.cpp" line="1141"/> + <location filename="../src/gui/mainWindow.cpp" line="1176"/> <source>Image Files (*.png *.jpg *.svg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="376"/> + <location filename="../build/ui_mainwindow.h" line="383"/> <source>PVSmgr</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="377"/> + <location filename="../build/ui_mainwindow.h" line="384"/> <source>Show Username</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="378"/> + <location filename="../build/ui_mainwindow.h" line="385"/> <source>Ctrl+3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="379"/> + <location filename="../build/ui_mainwindow.h" line="386"/> <source>Show IP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="380"/> + <location filename="../build/ui_mainwindow.h" line="387"/> <source>Ctrl+2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="381"/> + <location filename="../build/ui_mainwindow.h" line="388"/> <source>VNC-Placeholders</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="382"/> + <location filename="../build/ui_mainwindow.h" line="389"/> <source>Show Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="383"/> + <location filename="../build/ui_mainwindow.h" line="390"/> <source>Ctrl+L</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="384"/> + <location filename="../build/ui_mainwindow.h" line="391"/> <source>Show Normal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="385"/> + <location filename="../build/ui_mainwindow.h" line="392"/> <source>Ctrl+O</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="386"/> + <location filename="../build/ui_mainwindow.h" line="393"/> <source>Show Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="387"/> + <location filename="../build/ui_mainwindow.h" line="394"/> <source>Ctrl+E</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="388"/> + <location filename="../build/ui_mainwindow.h" line="395"/> <source>Show Network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="389"/> + <location filename="../build/ui_mainwindow.h" line="396"/> <source>Ctrl+N</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="390"/> + <location filename="../build/ui_mainwindow.h" line="397"/> <source>Show Terminal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="391"/> + <location filename="../build/ui_mainwindow.h" line="398"/> <source>Ctrl+T</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="392"/> + <location filename="../build/ui_mainwindow.h" line="399"/> <source>Show Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="393"/> + <location filename="../build/ui_mainwindow.h" line="400"/> <source>Ctrl+G</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="394"/> + <location filename="../build/ui_mainwindow.h" line="401"/> <source>About pvs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="395"/> + <location filename="../build/ui_mainwindow.h" line="402"/> <source>Ctrl+P</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="396"/> + <location filename="../build/ui_mainwindow.h" line="403"/> <source>100 x 100</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="397"/> + <location filename="../build/ui_mainwindow.h" line="404"/> <source>200 x 200</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="398"/> + <location filename="../build/ui_mainwindow.h" line="405"/> <source>500 x 500</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="399"/> + <location filename="../build/ui_mainwindow.h" line="406"/> <source>&Disconnect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="400"/> + <location filename="../build/ui_mainwindow.h" line="407"/> <source>Ctrl+W</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="401"/> + <location filename="../build/ui_mainwindow.h" line="408"/> <source>&Exit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="405"/> + <location filename="../build/ui_mainwindow.h" line="412"/> <source>Ctrl+Q</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="406"/> - <location filename="../build/ui_mainwindow.h" line="408"/> + <location filename="../build/ui_mainwindow.h" line="413"/> + <location filename="../build/ui_mainwindow.h" line="415"/> <source>Foto</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="410"/> + <location filename="../build/ui_mainwindow.h" line="417"/> <source>Ctrl+F</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="411"/> + <location filename="../build/ui_mainwindow.h" line="418"/> <source>view</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="413"/> + <location filename="../build/ui_mainwindow.h" line="420"/> <source>View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="415"/> + <location filename="../build/ui_mainwindow.h" line="422"/> <source>Ctrl+V</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="416"/> + <location filename="../build/ui_mainwindow.h" line="423"/> <source>lock</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="420"/> + <location filename="../build/ui_mainwindow.h" line="427"/> <source>Ctrl+A</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="421"/> + <location filename="../build/ui_mainwindow.h" line="428"/> <source>Profile &manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="422"/> + <location filename="../build/ui_mainwindow.h" line="429"/> <source>Ctrl+M</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="423"/> + <location filename="../build/ui_mainwindow.h" line="430"/> <source>Show Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="424"/> + <location filename="../build/ui_mainwindow.h" line="431"/> <source>Ctrl+1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="425"/> + <location filename="../build/ui_mainwindow.h" line="432"/> <source>Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="427"/> + <location filename="../build/ui_mainwindow.h" line="434"/> <source>Start Chat with client(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="429"/> + <location filename="../build/ui_mainwindow.h" line="436"/> <source>Ctrl+D</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="430"/> + <location filename="../build/ui_mainwindow.h" line="437"/> <source>-</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="431"/> + <location filename="../build/ui_mainwindow.h" line="438"/> + <source>Show Processes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="440"/> + <source>show processes of this client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="442"/> <source>border-color: rgb(0, 0, 0);</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="432"/> + <location filename="../build/ui_mainwindow.h" line="443"/> <source>VNC quality</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="435"/> + <location filename="../build/ui_mainwindow.h" line="446"/> <source>HIGH</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="436"/> + <location filename="../build/ui_mainwindow.h" line="447"/> <source>MEDIUM</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="437"/> + <location filename="../build/ui_mainwindow.h" line="448"/> <source>LOW</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="439"/> + <location filename="../build/ui_mainwindow.h" line="450"/> <source>Set password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="442"/> + <location filename="../build/ui_mainwindow.h" line="453"/> <source>Thumbnailratio</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="443"/> + <location filename="../build/ui_mainwindow.h" line="454"/> <source>Thumbnailrate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="445"/> + <location filename="../build/ui_mainwindow.h" line="456"/> <source> 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="446"/> + <location filename="../build/ui_mainwindow.h" line="457"/> <source>%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="447"/> + <location filename="../build/ui_mainwindow.h" line="458"/> <source>background-color: rgb(255, 255, 255);</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="448"/> + <location filename="../build/ui_mainwindow.h" line="459"/> <source>background-color: rgb(150, 150, 150);</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="449"/> + <location filename="../build/ui_mainwindow.h" line="460"/> <source>&File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="450"/> + <location filename="../build/ui_mainwindow.h" line="461"/> <source>Load profile </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="451"/> + <location filename="../build/ui_mainwindow.h" line="462"/> <source>&Clients</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="452"/> + <location filename="../build/ui_mainwindow.h" line="463"/> <source>&Logging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="453"/> + <location filename="../build/ui_mainwindow.h" line="464"/> <source>&Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../build/ui_mainwindow.h" line="454"/> + <location filename="../build/ui_mainwindow.h" line="465"/> <source>toolBar</source> <translation type="unfinished"></translation> </message> diff --git a/src/core/pvsConnectionManager.cpp b/src/core/pvsConnectionManager.cpp index 8a35ca9..aabd869 100644 --- a/src/core/pvsConnectionManager.cpp +++ b/src/core/pvsConnectionManager.cpp @@ -93,6 +93,14 @@ void PVSConnectionManager::onClientRemove(PVSClientConnection* removedConnection } // Inform all chat clients about a new event. +// hier eventuell prozesse anzeigen einbinden +// +// +// +// +// +// +// void PVSConnectionManager::sendEventToClients(QString event, PVSClientConnection* connection, QString clientName) { if(event.compare("addedConnection") == 0) @@ -109,6 +117,8 @@ void PVSConnectionManager::sendEventToClients(QString event, PVSClientConnection if(event.compare("addedClient") == 0) { // send name to everybody to all connected clients. + _pvsServer.sendToAll(PVSMsg(PVSCOMMAND, "SHOWPROCESSES", "")); + ConsoleLog writeNetwork("SHOWPROCESSES sent..."); _pvsServer.sendToAll(PVSMsg(PVSMESSAGE, "clientToAdd", ":" + clientName, 0)); connection->push_back_send(PVSMsg(PVSMESSAGE, "assignedName", ":" + clientName, 0)); connection->push_back_send(PVSMsg(PVSMESSAGE, "clientToAdd", ":PVSMGR:local", 0)); diff --git a/src/gui/connectionList.cpp b/src/gui/connectionList.cpp index 2f9829e..61be876 100644 --- a/src/gui/connectionList.cpp +++ b/src/gui/connectionList.cpp @@ -432,6 +432,14 @@ void ConnectionList::on_remoteHelp() } } +/* + * + */ +void ConnectionList::showProcesses() +{ + MainWindow::getConnectionWindow()->messageStations("BROADCAST","SHOWPROCESSES"); +} + void ConnectionList::on_lock() { MainWindow::getConnectionWindow()->lockStations(); @@ -442,6 +450,21 @@ void ConnectionList::on_unlock() MainWindow::getConnectionWindow()->unlockStations(); } +/* Hier werden Nachrichten vom Server versendet: +* Type: PVSMESSAGE +* Ident: BROADCAST +* Msg: die Nachricht +* +* Wenn Ident: LOCKSTATION -> locke Client +* +* +* +* +* +* +* +*/ + void ConnectionList::on_message() { Dialog msgD; diff --git a/src/gui/connectionList.h b/src/gui/connectionList.h index 50d8924..29dd174 100644 --- a/src/gui/connectionList.h +++ b/src/gui/connectionList.h @@ -108,6 +108,7 @@ public slots: virtual void on_projection(); virtual void on_unprojection(); virtual void on_lock(); + virtual void showProcesses(); virtual void on_unlock(); virtual void on_message(); virtual void on_lock_with_message(); diff --git a/src/gui/connectionWindow.cpp b/src/gui/connectionWindow.cpp index cf51051..9e7b370 100644 --- a/src/gui/connectionWindow.cpp +++ b/src/gui/connectionWindow.cpp @@ -263,8 +263,6 @@ bool ConnectionWindow::remoteHelp(QString sname) { } - - bool ConnectionWindow::lockStations() { if (std::list<QString>* lockList = MainWindow::getConnectionList()->getSelectedClients()) { if (!lockList->empty()) { diff --git a/src/gui/mainWindow.cpp b/src/gui/mainWindow.cpp index eb15e82..4cd6997 100644 --- a/src/gui/mainWindow.cpp +++ b/src/gui/mainWindow.cpp @@ -116,6 +116,10 @@ MainWindow::MainWindow(QWidget *parent) : // toolbar and actions in pvsmgr + + //testweise chat starten beim klicken auf processlist + connect(ui->actionShowProcesses, SIGNAL(triggered()), this, SLOT(showProcesses())); + ui->actionShowProcesses->setStatusTip(tr("Shows list of processes of this client")); connect(ui->action_Exit, SIGNAL(triggered()), this, SLOT(close())); ui->action_Exit->setStatusTip(tr("Exit")); connect(ui->action_Disconnect, SIGNAL(triggered()), this, SLOT(disconnect())); @@ -130,6 +134,8 @@ MainWindow::MainWindow(QWidget *parent) : ui->actionLock->setStatusTip(tr("Lock or Unlock all Clients")); connect(ui->actionCreate_profile, SIGNAL(triggered()), this, SLOT(createProfile())); + + connect(ui->actionShow_Username, SIGNAL(triggered()), this, SLOT(showusername())); connect(ui->actionShow_Hostname_IP, SIGNAL(triggered()), this, SLOT(showip())); connect(ui->actionShow_Fullname, SIGNAL(triggered()), this, SLOT(showname())); @@ -795,6 +801,35 @@ void MainWindow::foto() // makes a screenshot of the selected client } } +/* + * test if a client is selected and then make him tell his processlist + * + * + * + * + * + */ + +void MainWindow::showProcesses() +{ + std::list<QString>* selectedClients = + MainWindow::getConnectionList()->getSelectedClients(); + if (selectedClients->size() == 1) + { + // do stuff + } + else + { + QString + message = + QString( + tr( + "This operation can only be performed for one selected Client!")); + QMessageBox::information(this, "PVS", message); + } +} + + void MainWindow::createProfile() { profileDialog proDiag; diff --git a/src/gui/mainWindow.h b/src/gui/mainWindow.h index 00bd927..5e20af2 100644 --- a/src/gui/mainWindow.h +++ b/src/gui/mainWindow.h @@ -171,6 +171,7 @@ public slots: void projecttoolbar(); void unprojecttoolbar(); void closeUp(); + void showProcesses(); void foto(); void backgroundpicture(); void repaintbackgroundpicture(); diff --git a/src/gui/ui/mainwindow.ui b/src/gui/ui/mainwindow.ui index eb49d1b..b5ac0e3 100644 --- a/src/gui/ui/mainwindow.ui +++ b/src/gui/ui/mainwindow.ui @@ -28,8 +28,8 @@ <rect> <x>0</x> <y>0</y> - <width>776</width> - <height>534</height> + <width>778</width> + <height>542</height> </rect> </property> <layout class="QGridLayout" name="gridLayout_2"> @@ -195,7 +195,7 @@ <x>0</x> <y>0</y> <width>838</width> - <height>28</height> + <height>23</height> </rect> </property> <widget class="QMenu" name="menu_File"> @@ -286,6 +286,7 @@ <addaction name="actionView"/> <addaction name="actionLock"/> <addaction name="actionChat"/> + <addaction name="actionShowProcesses"/> </widget> <action name="actionShow_Username"> <property name="checkable"> @@ -531,6 +532,18 @@ <string>-</string> </property> </action> + <action name="actionShowProcesses"> + <property name="icon"> + <iconset resource="../../../pvsmgr.qrc"> + <normaloff>:/finder</normaloff>:/finder</iconset> + </property> + <property name="text"> + <string>Show Processes</string> + </property> + <property name="toolTip"> + <string>show processes of this client</string> + </property> + </action> </widget> <layoutdefault spacing="6" margin="11"/> <resources> diff --git a/src/gui/ui/mainwindowtouch.ui b/src/gui/ui/mainwindowtouch.ui index 9030b17..f8e76c0 100644 --- a/src/gui/ui/mainwindowtouch.ui +++ b/src/gui/ui/mainwindowtouch.ui @@ -28,8 +28,8 @@ <rect> <x>0</x> <y>0</y> - <width>1327</width> - <height>658</height> + <width>1329</width> + <height>660</height> </rect> </property> <layout class="QGridLayout" name="gridLayout_3"> @@ -365,6 +365,7 @@ <addaction name="actionresetall"/> <addaction name="separator"/> <addaction name="actionDozent"/> + <addaction name="actionShowProcesses"/> </widget> <action name="actionShow_Username"> <property name="checkable"> @@ -636,6 +637,18 @@ <string>Ctrl+D</string> </property> </action> + <action name="actionShowProcesses"> + <property name="icon"> + <iconset resource="../../../pvsmgr.qrc"> + <normaloff>:/finder</normaloff>:/finder</iconset> + </property> + <property name="text"> + <string>Show Processes</string> + </property> + <property name="toolTip"> + <string>show processes of this client</string> + </property> + </action> </widget> <layoutdefault spacing="6" margin="11"/> <resources> diff --git a/src/net/pvsListenServer.cpp b/src/net/pvsListenServer.cpp index f21303e..1dac9c0 100644 --- a/src/net/pvsListenServer.cpp +++ b/src/net/pvsListenServer.cpp @@ -245,8 +245,8 @@ bool PVSListenServer::init() return false; } ConsoleLog writeNetwork( - QString("Server is listening. Socket: ").append(ptr2String( - _listenSocket))); + QString("Server is listening. Socket: ").append(int2String( + (int) _listenSocket))); connect(_listenSocket, SIGNAL(newConnection()), this, SLOT( server_connectionRequest())); diff --git a/src/net/pvsServerConnection.cpp b/src/net/pvsServerConnection.cpp index 04a1ef6..1ce9904 100644 --- a/src/net/pvsServerConnection.cpp +++ b/src/net/pvsServerConnection.cpp @@ -133,6 +133,14 @@ void PVSServerConnection::onPing(PVSMsg pingmsg) } } +/* Hier werden Nachrichten behandelt, die vom Client kommen + * + * + * + * + * + */ + void PVSServerConnection::handleClientMsg(PVSMsg receiver) { // FIXME: @SimonR, this line cuase problems with pvs in daemon mode and dbus diff --git a/src/pvs.cpp b/src/pvs.cpp index 2069e36..1531c3d 100644 --- a/src/pvs.cpp +++ b/src/pvs.cpp @@ -176,6 +176,18 @@ void PVS::onCommand(PVSMsg cmdMessage) unlock(); return; } + if (ident.compare("SHOWPROCESSES") == 0) + { + // show processes + // ConsoleLog writeNetwork(system("ps -f -N -U root")); + // emit showMessage("SHOWPROCESSES", "proce", true); + return; + } + if (ident.compare("KILLPROCESS") == 0) + { + // do stuff if process has to be killed + return; + } #ifdef never // prototype diff --git a/src/pvsDaemon.cpp b/src/pvsDaemon.cpp index e87bfe7..961e0f3 100644 --- a/src/pvsDaemon.cpp +++ b/src/pvsDaemon.cpp @@ -66,13 +66,11 @@ int main(int argc, char** argv) { int frequency = 5; int port = -1; - - QFileInfo script; - script.setFile("/usr/bin/pvs-vncsrv"); - if (!script.exists()) - script.setFile("/usr/local/bin/pvs-vncsrv"); - if (!script.exists()) - script.setFile("/home/" + getUserName() + "/.pvs/pvs-vncsrv"); + QString homeDir("/home/"); + QString scriptPath = homeDir; + scriptPath.append(getUserName().append(QString("/.pvs/pvs-vncsrv"))); + QString scriptName; + scriptName = getFilenameFromPath(scriptPath); QCoreApplication app(argc, argv); app.setOrganizationName("openslx"); @@ -261,7 +259,8 @@ int main(int argc, char** argv) { if (option_index + 1 < argc) { - script.setFile(QString(argv[option_index + 1])); + scriptPath = QString(argv[option_index + 1]); + scriptName = getFilenameFromPath(scriptPath); option_index++; continue; } @@ -348,13 +347,13 @@ int main(int argc, char** argv) if (port <= 0) port = SERVER_PORT_INT; ConsoleLog writeLine(QString("TCP-Port: ").append(int2String(port))); - mainClient->setScriptPath(script.filePath()); - ConsoleLog writeLine(QString("VNCScriptPath: ").append(script.filePath())); + mainClient->setScriptPath(scriptPath); + ConsoleLog writeLine(QString("VNCScriptPath: ").append(scriptPath)); createPolicyDir(); createPolicyFiles(); // long int gr = 0; - mainClient->setScriptPath(script.filePath()); + mainClient->setScriptPath(scriptPath); app.exec(); delete mainClient; diff --git a/src/util/util.cpp b/src/util/util.cpp index 946168e..c2d06a0 100644 --- a/src/util/util.cpp +++ b/src/util/util.cpp @@ -325,13 +325,6 @@ QString int2String(int intInt) return QString(tmp); } -QString ptr2String(void* ptr) -{ - char tmp[50]; - snprintf(tmp, 49, "%p", ptr); - return QString(tmp); -} - int string2Int(QString string) { return atoi(string.toUtf8().data()); diff --git a/src/util/util.h b/src/util/util.h index 6ddefc6..37565cb 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -46,7 +46,6 @@ QString readPassFromPassFile(); bool getAllowed(); QString int2String(int intInt); -QString ptr2String(void* ptr); int string2Int(QString string); int string2Int(QString string); //} // end namespace util diff --git a/src/version.h b/src/version.h index ac24ac2..c217c07 100644 --- a/src/version.h +++ b/src/version.h @@ -1,2 +1,2 @@ -#define VERSION_STRING "2.0.1.0" -#define VERSION_NUMBER 2010 +#define VERSION_STRING "1.9.8.0" +#define VERSION_NUMBER 1980 |