diff options
| -rwxr-xr-x | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | i18n/pvs_ar_JO.ts | 139 | ||||
| -rw-r--r-- | i18n/pvs_de_DE.ts | 141 | ||||
| -rw-r--r-- | i18n/pvs_es_MX.ts | 139 | ||||
| -rw-r--r-- | i18n/pvs_fr_FR.ts | 139 | ||||
| -rw-r--r-- | i18n/pvs_pl_PL.ts | 139 | ||||
| -rw-r--r-- | i18n/pvsgui_ar_JO.ts | 66 | ||||
| -rw-r--r-- | i18n/pvsgui_de_DE.ts | 66 | ||||
| -rw-r--r-- | i18n/pvsgui_es_MX.ts | 66 | ||||
| -rw-r--r-- | i18n/pvsgui_fr_FR.ts | 66 | ||||
| -rw-r--r-- | i18n/pvsgui_pl_PL.ts | 66 | ||||
| -rw-r--r-- | org.openslx.pvs.service | 2 | ||||
| -rw-r--r-- | src/gui/clientChatDialog.cpp | 2 | ||||
| -rw-r--r-- | src/gui/clientConfigDialog.cpp | 2 | ||||
| -rw-r--r-- | src/gui/clientFileSendDialog.cpp | 2 | ||||
| -rw-r--r-- | src/gui/clientVNCViewer.cpp | 2 | ||||
| -rwxr-xr-x | src/pvs.cpp | 9 | ||||
| -rwxr-xr-x | src/pvs.h | 2 | ||||
| -rwxr-xr-x | src/pvsDaemon.cpp | 132 | ||||
| -rw-r--r-- | src/pvsgui.cpp | 34 | ||||
| -rw-r--r-- | src/pvsgui.h | 1 | ||||
| -rw-r--r-- | src/version.h | 4 |
22 files changed, 931 insertions, 290 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ac01c9..e364528 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -381,7 +381,7 @@ SET( CPACK_SET_DESTDIR "ON" ) SET( CPACK_PACKAGE_NAME "pvs" ) SET( CPACK_PACKAGE_VERSION_MAJOR "2" ) SET( CPACK_PACKAGE_VERSION_MINOR "0" ) -SET( CPACK_PACKAGE_VERSION_PATCH "1" ) +SET( CPACK_PACKAGE_VERSION_PATCH "3" ) SET( CPACK_PACKAGE_DESCRIPTION_SUMMARY "Pool Video Switch" ) SET( CPACK_PACKAGE_DESCRIPTION "") SET( CPACK_PACKAGE_CONTACT "Simon Wittenberg <wittenb@informatik.uni-freiburg.de>" ) diff --git a/i18n/pvs_ar_JO.ts b/i18n/pvs_ar_JO.ts index 38bf578..a57e4bd 100644 --- a/i18n/pvs_ar_JO.ts +++ b/i18n/pvs_ar_JO.ts @@ -4,24 +4,155 @@ <context> <name>PVS</name> <message> - <location filename="../src/pvs.cpp" line="275"/> + <location filename="../src/pvs.cpp" line="277"/> <source>Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="353"/> + <location filename="../src/pvs.cpp" line="355"/> <source>VNC connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="353"/> + <location filename="../src/pvs.cpp" line="355"/> <source>The host </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="355"/> + <location filename="../src/pvs.cpp" line="357"/> <source> requested your screen!</source> <translation type="unfinished"></translation> </message> </context> +<context> + <name>QObject</name> + <message> + <location filename="../src/pvsDaemon.cpp" line="29"/> + <source>Version: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="31"/> + <source>Usage:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="31"/> + <source><<option> <value>, ... ></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="32"/> + <source>Options:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="33"/> + <source>-vncScriptFile <fullpath\filename></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="33"/> + <source>Specifies a custom location for the vnc-start/stop-script.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="33"/> + <source>If not specified, /usr/bin/pvs-vncsrv is expected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="34"/> + <source>-freq <seconds></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="34"/> + <source>Specifies how long to wait until a reconnection attempt is made.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="34"/> + <source>Default is 5.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="35"/> + <source>-port <port></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="35"/> + <source>Specifies on which port to run.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="35"/> + <source>Default is </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="36"/> + <source>-h or --help</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="36"/> + <source>Shows this help text and exits.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="37"/> + <source>-v or --version</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="37"/> + <source>Shows the current version and exits.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="38"/> + <source>-d or --daemon</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="38"/> + <source>Start as daemon.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="39"/> + <source>-c <string command>:<string value></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="39"/> + <source>Sends the command and the optional value to a running PVS-Client.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="39"/> + <source>Command and value may not contain spaces or colons.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="39"/> + <source>The dividing colon is mandatory.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="40"/> + <source>Prints out available commands to use with -c.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="49"/> + <source>Use -h or --help to get a listing of all options. +-v or --version gives you the current version. + +</source> + <translation type="unfinished"></translation> + </message> +</context> </TS> diff --git a/i18n/pvs_de_DE.ts b/i18n/pvs_de_DE.ts index 38bf578..a58199c 100644 --- a/i18n/pvs_de_DE.ts +++ b/i18n/pvs_de_DE.ts @@ -1,27 +1,158 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.0" language="de_DE"> <context> <name>PVS</name> <message> - <location filename="../src/pvs.cpp" line="275"/> + <location filename="../src/pvs.cpp" line="277"/> <source>Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="353"/> + <location filename="../src/pvs.cpp" line="355"/> <source>VNC connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="353"/> + <location filename="../src/pvs.cpp" line="355"/> <source>The host </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="355"/> + <location filename="../src/pvs.cpp" line="357"/> <source> requested your screen!</source> <translation type="unfinished"></translation> </message> </context> +<context> + <name>QObject</name> + <message> + <location filename="../src/pvsDaemon.cpp" line="29"/> + <source>Version: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="31"/> + <source>Usage:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="31"/> + <source><<option> <value>, ... ></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="32"/> + <source>Options:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="33"/> + <source>-vncScriptFile <fullpath\filename></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="33"/> + <source>Specifies a custom location for the vnc-start/stop-script.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="33"/> + <source>If not specified, /usr/bin/pvs-vncsrv is expected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="34"/> + <source>-freq <seconds></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="34"/> + <source>Specifies how long to wait until a reconnection attempt is made.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="34"/> + <source>Default is 5.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="35"/> + <source>-port <port></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="35"/> + <source>Specifies on which port to run.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="35"/> + <source>Default is </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="36"/> + <source>-h or --help</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="36"/> + <source>Shows this help text and exits.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="37"/> + <source>-v or --version</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="37"/> + <source>Shows the current version and exits.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="38"/> + <source>-d or --daemon</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="38"/> + <source>Start as daemon.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="39"/> + <source>-c <string command>:<string value></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="39"/> + <source>Sends the command and the optional value to a running PVS-Client.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="39"/> + <source>Command and value may not contain spaces or colons.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="39"/> + <source>The dividing colon is mandatory.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="40"/> + <source>Prints out available commands to use with -c.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="49"/> + <source>Use -h or --help to get a listing of all options. +-v or --version gives you the current version. + +</source> + <translation type="unfinished"></translation> + </message> +</context> </TS> diff --git a/i18n/pvs_es_MX.ts b/i18n/pvs_es_MX.ts index 38bf578..a57e4bd 100644 --- a/i18n/pvs_es_MX.ts +++ b/i18n/pvs_es_MX.ts @@ -4,24 +4,155 @@ <context> <name>PVS</name> <message> - <location filename="../src/pvs.cpp" line="275"/> + <location filename="../src/pvs.cpp" line="277"/> <source>Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="353"/> + <location filename="../src/pvs.cpp" line="355"/> <source>VNC connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="353"/> + <location filename="../src/pvs.cpp" line="355"/> <source>The host </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="355"/> + <location filename="../src/pvs.cpp" line="357"/> <source> requested your screen!</source> <translation type="unfinished"></translation> </message> </context> +<context> + <name>QObject</name> + <message> + <location filename="../src/pvsDaemon.cpp" line="29"/> + <source>Version: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="31"/> + <source>Usage:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="31"/> + <source><<option> <value>, ... ></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="32"/> + <source>Options:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="33"/> + <source>-vncScriptFile <fullpath\filename></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="33"/> + <source>Specifies a custom location for the vnc-start/stop-script.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="33"/> + <source>If not specified, /usr/bin/pvs-vncsrv is expected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="34"/> + <source>-freq <seconds></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="34"/> + <source>Specifies how long to wait until a reconnection attempt is made.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="34"/> + <source>Default is 5.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="35"/> + <source>-port <port></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="35"/> + <source>Specifies on which port to run.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="35"/> + <source>Default is </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="36"/> + <source>-h or --help</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="36"/> + <source>Shows this help text and exits.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="37"/> + <source>-v or --version</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="37"/> + <source>Shows the current version and exits.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="38"/> + <source>-d or --daemon</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="38"/> + <source>Start as daemon.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="39"/> + <source>-c <string command>:<string value></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="39"/> + <source>Sends the command and the optional value to a running PVS-Client.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="39"/> + <source>Command and value may not contain spaces or colons.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="39"/> + <source>The dividing colon is mandatory.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="40"/> + <source>Prints out available commands to use with -c.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="49"/> + <source>Use -h or --help to get a listing of all options. +-v or --version gives you the current version. + +</source> + <translation type="unfinished"></translation> + </message> +</context> </TS> diff --git a/i18n/pvs_fr_FR.ts b/i18n/pvs_fr_FR.ts index 38bf578..a57e4bd 100644 --- a/i18n/pvs_fr_FR.ts +++ b/i18n/pvs_fr_FR.ts @@ -4,24 +4,155 @@ <context> <name>PVS</name> <message> - <location filename="../src/pvs.cpp" line="275"/> + <location filename="../src/pvs.cpp" line="277"/> <source>Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="353"/> + <location filename="../src/pvs.cpp" line="355"/> <source>VNC connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="353"/> + <location filename="../src/pvs.cpp" line="355"/> <source>The host </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="355"/> + <location filename="../src/pvs.cpp" line="357"/> <source> requested your screen!</source> <translation type="unfinished"></translation> </message> </context> +<context> + <name>QObject</name> + <message> + <location filename="../src/pvsDaemon.cpp" line="29"/> + <source>Version: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="31"/> + <source>Usage:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="31"/> + <source><<option> <value>, ... ></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="32"/> + <source>Options:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="33"/> + <source>-vncScriptFile <fullpath\filename></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="33"/> + <source>Specifies a custom location for the vnc-start/stop-script.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="33"/> + <source>If not specified, /usr/bin/pvs-vncsrv is expected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="34"/> + <source>-freq <seconds></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="34"/> + <source>Specifies how long to wait until a reconnection attempt is made.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="34"/> + <source>Default is 5.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="35"/> + <source>-port <port></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="35"/> + <source>Specifies on which port to run.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="35"/> + <source>Default is </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="36"/> + <source>-h or --help</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="36"/> + <source>Shows this help text and exits.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="37"/> + <source>-v or --version</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="37"/> + <source>Shows the current version and exits.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="38"/> + <source>-d or --daemon</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="38"/> + <source>Start as daemon.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="39"/> + <source>-c <string command>:<string value></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="39"/> + <source>Sends the command and the optional value to a running PVS-Client.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="39"/> + <source>Command and value may not contain spaces or colons.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="39"/> + <source>The dividing colon is mandatory.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="40"/> + <source>Prints out available commands to use with -c.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="49"/> + <source>Use -h or --help to get a listing of all options. +-v or --version gives you the current version. + +</source> + <translation type="unfinished"></translation> + </message> +</context> </TS> diff --git a/i18n/pvs_pl_PL.ts b/i18n/pvs_pl_PL.ts index 38bf578..a57e4bd 100644 --- a/i18n/pvs_pl_PL.ts +++ b/i18n/pvs_pl_PL.ts @@ -4,24 +4,155 @@ <context> <name>PVS</name> <message> - <location filename="../src/pvs.cpp" line="275"/> + <location filename="../src/pvs.cpp" line="277"/> <source>Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="353"/> + <location filename="../src/pvs.cpp" line="355"/> <source>VNC connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="353"/> + <location filename="../src/pvs.cpp" line="355"/> <source>The host </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="355"/> + <location filename="../src/pvs.cpp" line="357"/> <source> requested your screen!</source> <translation type="unfinished"></translation> </message> </context> +<context> + <name>QObject</name> + <message> + <location filename="../src/pvsDaemon.cpp" line="29"/> + <source>Version: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="31"/> + <source>Usage:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="31"/> + <source><<option> <value>, ... ></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="32"/> + <source>Options:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="33"/> + <source>-vncScriptFile <fullpath\filename></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="33"/> + <source>Specifies a custom location for the vnc-start/stop-script.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="33"/> + <source>If not specified, /usr/bin/pvs-vncsrv is expected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="34"/> + <source>-freq <seconds></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="34"/> + <source>Specifies how long to wait until a reconnection attempt is made.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="34"/> + <source>Default is 5.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="35"/> + <source>-port <port></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="35"/> + <source>Specifies on which port to run.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="35"/> + <source>Default is </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="36"/> + <source>-h or --help</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="36"/> + <source>Shows this help text and exits.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="37"/> + <source>-v or --version</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="37"/> + <source>Shows the current version and exits.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="38"/> + <source>-d or --daemon</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="38"/> + <source>Start as daemon.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="39"/> + <source>-c <string command>:<string value></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="39"/> + <source>Sends the command and the optional value to a running PVS-Client.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="39"/> + <source>Command and value may not contain spaces or colons.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="39"/> + <source>The dividing colon is mandatory.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="40"/> + <source>Prints out available commands to use with -c.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsDaemon.cpp" line="49"/> + <source>Use -h or --help to get a listing of all options. +-v or --version gives you the current version. + +</source> + <translation type="unfinished"></translation> + </message> +</context> </TS> diff --git a/i18n/pvsgui_ar_JO.ts b/i18n/pvsgui_ar_JO.ts index 04d9717..83560ba 100644 --- a/i18n/pvsgui_ar_JO.ts +++ b/i18n/pvsgui_ar_JO.ts @@ -40,47 +40,47 @@ <context> <name>ClientChatDialog</name> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="65"/> + <location filename="../src/gui/clientChatDialog.cpp" line="63"/> <source>&Send File...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="178"/> + <location filename="../src/gui/clientChatDialog.cpp" line="176"/> <source> has joined the chat.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="184"/> + <location filename="../src/gui/clientChatDialog.cpp" line="182"/> <source> has left the chat.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="211"/> + <location filename="../src/gui/clientChatDialog.cpp" line="209"/> <source>PVS File Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="212"/> + <location filename="../src/gui/clientChatDialog.cpp" line="210"/> <source>Send file '</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="212"/> + <location filename="../src/gui/clientChatDialog.cpp" line="210"/> <source>' to </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="231"/> + <location filename="../src/gui/clientChatDialog.cpp" line="229"/> <source>Connected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="241"/> + <location filename="../src/gui/clientChatDialog.cpp" line="239"/> <source>Disconnected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="280"/> + <location filename="../src/gui/clientChatDialog.cpp" line="278"/> <source>Message from <</source> <translation type="unfinished"></translation> </message> @@ -260,23 +260,23 @@ <context> <name>ClientFileSendDialog</name> <message> - <location filename="../src/gui/clientFileSendDialog.cpp" line="68"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="66"/> <source>Open File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientFileSendDialog.cpp" line="186"/> - <location filename="../src/gui/clientFileSendDialog.cpp" line="192"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="184"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="190"/> <source>PVS - File Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientFileSendDialog.cpp" line="187"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="185"/> <source>File Transfer complete.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientFileSendDialog.cpp" line="193"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="191"/> <source>File Transfer canceled!</source> <translation type="unfinished"></translation> </message> @@ -399,77 +399,77 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="175"/> + <location filename="../src/pvsgui.cpp" line="181"/> <source>&Disconnect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="176"/> + <location filename="../src/pvsgui.cpp" line="182"/> <source>C&hat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="177"/> + <location filename="../src/pvsgui.cpp" line="183"/> <source>&Send File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="178"/> + <location filename="../src/pvsgui.cpp" line="184"/> <source>&Config</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="179"/> + <location filename="../src/pvsgui.cpp" line="185"/> <source>&Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="180"/> + <location filename="../src/pvsgui.cpp" line="186"/> <source>&About</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="181"/> + <location filename="../src/pvsgui.cpp" line="187"/> <source>&Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="268"/> - <location filename="../src/pvsgui.cpp" line="283"/> - <location filename="../src/pvsgui.cpp" line="363"/> + <location filename="../src/pvsgui.cpp" line="274"/> + <location filename="../src/pvsgui.cpp" line="289"/> + <location filename="../src/pvsgui.cpp" line="369"/> <source>PVS Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="268"/> + <location filename="../src/pvsgui.cpp" line="274"/> <source>Please enter password (If not needed leave blank):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="284"/> + <location filename="../src/pvsgui.cpp" line="290"/> <source>Are you sure you want to disconnect?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="307"/> - <location filename="../src/pvsgui.cpp" line="329"/> + <location filename="../src/pvsgui.cpp" line="313"/> + <location filename="../src/pvsgui.cpp" line="335"/> <source>PVS connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="307"/> - <location filename="../src/pvsgui.cpp" line="321"/> + <location filename="../src/pvsgui.cpp" line="313"/> + <location filename="../src/pvsgui.cpp" line="327"/> <source>Connected to </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="329"/> - <location filename="../src/pvsgui.cpp" line="341"/> + <location filename="../src/pvsgui.cpp" line="335"/> + <location filename="../src/pvsgui.cpp" line="347"/> <source>Disconnected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="363"/> + <location filename="../src/pvsgui.cpp" line="369"/> <source>New host available: </source> <translation type="unfinished"></translation> </message> diff --git a/i18n/pvsgui_de_DE.ts b/i18n/pvsgui_de_DE.ts index 544ebff..d49306a 100644 --- a/i18n/pvsgui_de_DE.ts +++ b/i18n/pvsgui_de_DE.ts @@ -40,47 +40,47 @@ <context> <name>ClientChatDialog</name> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="65"/> + <location filename="../src/gui/clientChatDialog.cpp" line="63"/> <source>&Send File...</source> <translation>Datei &Senden...</translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="178"/> + <location filename="../src/gui/clientChatDialog.cpp" line="176"/> <source> has joined the chat.</source> <translation> ist dem Chat beigetreten.</translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="184"/> + <location filename="../src/gui/clientChatDialog.cpp" line="182"/> <source> has left the chat.</source> <translation> hat den Chat verlassen.</translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="211"/> + <location filename="../src/gui/clientChatDialog.cpp" line="209"/> <source>PVS File Transfer</source> <translation>PVS Dateiübertragung</translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="212"/> + <location filename="../src/gui/clientChatDialog.cpp" line="210"/> <source>Send file '</source> <translation>Datei senden '</translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="212"/> + <location filename="../src/gui/clientChatDialog.cpp" line="210"/> <source>' to </source> <translation>' an </translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="231"/> + <location filename="../src/gui/clientChatDialog.cpp" line="229"/> <source>Connected.</source> <translation>Verbunden.</translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="241"/> + <location filename="../src/gui/clientChatDialog.cpp" line="239"/> <source>Disconnected.</source> <translation>Getrennt.</translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="280"/> + <location filename="../src/gui/clientChatDialog.cpp" line="278"/> <source>Message from <</source> <translation>Nachricht von <</translation> </message> @@ -260,23 +260,23 @@ <context> <name>ClientFileSendDialog</name> <message> - <location filename="../src/gui/clientFileSendDialog.cpp" line="68"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="66"/> <source>Open File</source> <translation>Datei Öffnen</translation> </message> <message> - <location filename="../src/gui/clientFileSendDialog.cpp" line="186"/> - <location filename="../src/gui/clientFileSendDialog.cpp" line="192"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="184"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="190"/> <source>PVS - File Transfer</source> <translation>PBS -Dateiübertragung</translation> </message> <message> - <location filename="../src/gui/clientFileSendDialog.cpp" line="187"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="185"/> <source>File Transfer complete.</source> <translation>Dateiübertragung beendet.</translation> </message> <message> - <location filename="../src/gui/clientFileSendDialog.cpp" line="193"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="191"/> <source>File Transfer canceled!</source> <translation>Dateiübertragung abgebrochen!</translation> </message> @@ -407,77 +407,77 @@ p, li { white-space: pre-wrap; } <translation>Verbinden</translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="175"/> + <location filename="../src/pvsgui.cpp" line="181"/> <source>&Disconnect</source> <translation>&Trennen</translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="176"/> + <location filename="../src/pvsgui.cpp" line="182"/> <source>C&hat</source> <translation></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="177"/> + <location filename="../src/pvsgui.cpp" line="183"/> <source>&Send File</source> <translation>Datei &Senden</translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="178"/> + <location filename="../src/pvsgui.cpp" line="184"/> <source>&Config</source> <translation>&Konfiguration</translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="179"/> + <location filename="../src/pvsgui.cpp" line="185"/> <source>&Information</source> <translation>&Information</translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="180"/> + <location filename="../src/pvsgui.cpp" line="186"/> <source>&About</source> <translation>&Über</translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="181"/> + <location filename="../src/pvsgui.cpp" line="187"/> <source>&Quit</source> <translation>&Beenden</translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="268"/> - <location filename="../src/pvsgui.cpp" line="283"/> - <location filename="../src/pvsgui.cpp" line="363"/> + <location filename="../src/pvsgui.cpp" line="274"/> + <location filename="../src/pvsgui.cpp" line="289"/> + <location filename="../src/pvsgui.cpp" line="369"/> <source>PVS Connection</source> <translation>PVS Verbindung</translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="268"/> + <location filename="../src/pvsgui.cpp" line="274"/> <source>Please enter password (If not needed leave blank):</source> <translation>Bitte geben sie ein Passwor ein (Falls nicht erforderlich einfach leer lassen):</translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="284"/> + <location filename="../src/pvsgui.cpp" line="290"/> <source>Are you sure you want to disconnect?</source> <translation>Sind sie sicher dass sie die Verbindung trennen möchten?</translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="307"/> - <location filename="../src/pvsgui.cpp" line="329"/> + <location filename="../src/pvsgui.cpp" line="313"/> + <location filename="../src/pvsgui.cpp" line="335"/> <source>PVS connection</source> <translation>PVS Verbindung</translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="307"/> - <location filename="../src/pvsgui.cpp" line="321"/> + <location filename="../src/pvsgui.cpp" line="313"/> + <location filename="../src/pvsgui.cpp" line="327"/> <source>Connected to </source> <translation>Verbunden mit </translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="329"/> - <location filename="../src/pvsgui.cpp" line="341"/> + <location filename="../src/pvsgui.cpp" line="335"/> + <location filename="../src/pvsgui.cpp" line="347"/> <source>Disconnected</source> <translation>Getrennt</translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="363"/> + <location filename="../src/pvsgui.cpp" line="369"/> <source>New host available: </source> <translation>Neuer Host verfügbar: </translation> </message> diff --git a/i18n/pvsgui_es_MX.ts b/i18n/pvsgui_es_MX.ts index 855ee9b..92db9d7 100644 --- a/i18n/pvsgui_es_MX.ts +++ b/i18n/pvsgui_es_MX.ts @@ -40,47 +40,47 @@ <context> <name>ClientChatDialog</name> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="65"/> + <location filename="../src/gui/clientChatDialog.cpp" line="63"/> <source>&Send File...</source> <translation>Enviar archivo...</translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="178"/> + <location filename="../src/gui/clientChatDialog.cpp" line="176"/> <source> has joined the chat.</source> <translation> ha ingresado al chat.</translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="184"/> + <location filename="../src/gui/clientChatDialog.cpp" line="182"/> <source> has left the chat.</source> <translation> ha abandonado el chat</translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="211"/> + <location filename="../src/gui/clientChatDialog.cpp" line="209"/> <source>PVS File Transfer</source> <translation>PVS Transferencia de datos</translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="212"/> + <location filename="../src/gui/clientChatDialog.cpp" line="210"/> <source>Send file '</source> <translation>Enviar archivo '</translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="212"/> + <location filename="../src/gui/clientChatDialog.cpp" line="210"/> <source>' to </source> <translation>' a </translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="231"/> + <location filename="../src/gui/clientChatDialog.cpp" line="229"/> <source>Connected.</source> <translation>Conectado.</translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="241"/> + <location filename="../src/gui/clientChatDialog.cpp" line="239"/> <source>Disconnected.</source> <translation>Desconectado.</translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="280"/> + <location filename="../src/gui/clientChatDialog.cpp" line="278"/> <source>Message from <</source> <translation>Mensaje de <</translation> </message> @@ -260,23 +260,23 @@ <context> <name>ClientFileSendDialog</name> <message> - <location filename="../src/gui/clientFileSendDialog.cpp" line="68"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="66"/> <source>Open File</source> <translation>Abrir archivo</translation> </message> <message> - <location filename="../src/gui/clientFileSendDialog.cpp" line="186"/> - <location filename="../src/gui/clientFileSendDialog.cpp" line="192"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="184"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="190"/> <source>PVS - File Transfer</source> <translation>PVS - Transferencia de datos</translation> </message> <message> - <location filename="../src/gui/clientFileSendDialog.cpp" line="187"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="185"/> <source>File Transfer complete.</source> <translation>La transferencia de datos ha sido completada.</translation> </message> <message> - <location filename="../src/gui/clientFileSendDialog.cpp" line="193"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="191"/> <source>File Transfer canceled!</source> <translation>La transferencia de datos ha sido cancelada!</translation> </message> @@ -419,77 +419,77 @@ p, li { white-space: pre-wrap; } <translation>Conectar</translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="175"/> + <location filename="../src/pvsgui.cpp" line="181"/> <source>&Disconnect</source> <translation>&Desconectar</translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="176"/> + <location filename="../src/pvsgui.cpp" line="182"/> <source>C&hat</source> <translation>???</translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="177"/> + <location filename="../src/pvsgui.cpp" line="183"/> <source>&Send File</source> <translation>&Enviar archivo</translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="178"/> + <location filename="../src/pvsgui.cpp" line="184"/> <source>&Config</source> <translation>&Configuración</translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="179"/> + <location filename="../src/pvsgui.cpp" line="185"/> <source>&Information</source> <translation>&Información</translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="180"/> + <location filename="../src/pvsgui.cpp" line="186"/> <source>&About</source> <translation>&Acerca de</translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="181"/> + <location filename="../src/pvsgui.cpp" line="187"/> <source>&Quit</source> <translation>&Cerrar</translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="268"/> - <location filename="../src/pvsgui.cpp" line="283"/> - <location filename="../src/pvsgui.cpp" line="363"/> + <location filename="../src/pvsgui.cpp" line="274"/> + <location filename="../src/pvsgui.cpp" line="289"/> + <location filename="../src/pvsgui.cpp" line="369"/> <source>PVS Connection</source> <translation>PVS Connección</translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="268"/> + <location filename="../src/pvsgui.cpp" line="274"/> <source>Please enter password (If not needed leave blank):</source> <translation>Porfavor ingrese una contraseña (Deje la seccion vacia si no lo necesita):</translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="284"/> + <location filename="../src/pvsgui.cpp" line="290"/> <source>Are you sure you want to disconnect?</source> <translation>Realmente desea desconectarse?</translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="307"/> - <location filename="../src/pvsgui.cpp" line="329"/> + <location filename="../src/pvsgui.cpp" line="313"/> + <location filename="../src/pvsgui.cpp" line="335"/> <source>PVS connection</source> <translation>PVS Connección</translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="307"/> - <location filename="../src/pvsgui.cpp" line="321"/> + <location filename="../src/pvsgui.cpp" line="313"/> + <location filename="../src/pvsgui.cpp" line="327"/> <source>Connected to </source> <translation>Connectar a </translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="329"/> - <location filename="../src/pvsgui.cpp" line="341"/> + <location filename="../src/pvsgui.cpp" line="335"/> + <location filename="../src/pvsgui.cpp" line="347"/> <source>Disconnected</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="363"/> + <location filename="../src/pvsgui.cpp" line="369"/> <source>New host available: </source> <translation>Nuevo Host disponible: </translation> </message> diff --git a/i18n/pvsgui_fr_FR.ts b/i18n/pvsgui_fr_FR.ts index 04d9717..83560ba 100644 --- a/i18n/pvsgui_fr_FR.ts +++ b/i18n/pvsgui_fr_FR.ts @@ -40,47 +40,47 @@ <context> <name>ClientChatDialog</name> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="65"/> + <location filename="../src/gui/clientChatDialog.cpp" line="63"/> <source>&Send File...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="178"/> + <location filename="../src/gui/clientChatDialog.cpp" line="176"/> <source> has joined the chat.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="184"/> + <location filename="../src/gui/clientChatDialog.cpp" line="182"/> <source> has left the chat.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="211"/> + <location filename="../src/gui/clientChatDialog.cpp" line="209"/> <source>PVS File Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="212"/> + <location filename="../src/gui/clientChatDialog.cpp" line="210"/> <source>Send file '</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="212"/> + <location filename="../src/gui/clientChatDialog.cpp" line="210"/> <source>' to </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="231"/> + <location filename="../src/gui/clientChatDialog.cpp" line="229"/> <source>Connected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="241"/> + <location filename="../src/gui/clientChatDialog.cpp" line="239"/> <source>Disconnected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="280"/> + <location filename="../src/gui/clientChatDialog.cpp" line="278"/> <source>Message from <</source> <translation type="unfinished"></translation> </message> @@ -260,23 +260,23 @@ <context> <name>ClientFileSendDialog</name> <message> - <location filename="../src/gui/clientFileSendDialog.cpp" line="68"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="66"/> <source>Open File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientFileSendDialog.cpp" line="186"/> - <location filename="../src/gui/clientFileSendDialog.cpp" line="192"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="184"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="190"/> <source>PVS - File Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientFileSendDialog.cpp" line="187"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="185"/> <source>File Transfer complete.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientFileSendDialog.cpp" line="193"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="191"/> <source>File Transfer canceled!</source> <translation type="unfinished"></translation> </message> @@ -399,77 +399,77 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="175"/> + <location filename="../src/pvsgui.cpp" line="181"/> <source>&Disconnect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="176"/> + <location filename="../src/pvsgui.cpp" line="182"/> <source>C&hat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="177"/> + <location filename="../src/pvsgui.cpp" line="183"/> <source>&Send File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="178"/> + <location filename="../src/pvsgui.cpp" line="184"/> <source>&Config</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="179"/> + <location filename="../src/pvsgui.cpp" line="185"/> <source>&Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="180"/> + <location filename="../src/pvsgui.cpp" line="186"/> <source>&About</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="181"/> + <location filename="../src/pvsgui.cpp" line="187"/> <source>&Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="268"/> - <location filename="../src/pvsgui.cpp" line="283"/> - <location filename="../src/pvsgui.cpp" line="363"/> + <location filename="../src/pvsgui.cpp" line="274"/> + <location filename="../src/pvsgui.cpp" line="289"/> + <location filename="../src/pvsgui.cpp" line="369"/> <source>PVS Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="268"/> + <location filename="../src/pvsgui.cpp" line="274"/> <source>Please enter password (If not needed leave blank):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="284"/> + <location filename="../src/pvsgui.cpp" line="290"/> <source>Are you sure you want to disconnect?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="307"/> - <location filename="../src/pvsgui.cpp" line="329"/> + <location filename="../src/pvsgui.cpp" line="313"/> + <location filename="../src/pvsgui.cpp" line="335"/> <source>PVS connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="307"/> - <location filename="../src/pvsgui.cpp" line="321"/> + <location filename="../src/pvsgui.cpp" line="313"/> + <location filename="../src/pvsgui.cpp" line="327"/> <source>Connected to </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="329"/> - <location filename="../src/pvsgui.cpp" line="341"/> + <location filename="../src/pvsgui.cpp" line="335"/> + <location filename="../src/pvsgui.cpp" line="347"/> <source>Disconnected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="363"/> + <location filename="../src/pvsgui.cpp" line="369"/> <source>New host available: </source> <translation type="unfinished"></translation> </message> diff --git a/i18n/pvsgui_pl_PL.ts b/i18n/pvsgui_pl_PL.ts index 04d9717..83560ba 100644 --- a/i18n/pvsgui_pl_PL.ts +++ b/i18n/pvsgui_pl_PL.ts @@ -40,47 +40,47 @@ <context> <name>ClientChatDialog</name> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="65"/> + <location filename="../src/gui/clientChatDialog.cpp" line="63"/> <source>&Send File...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="178"/> + <location filename="../src/gui/clientChatDialog.cpp" line="176"/> <source> has joined the chat.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="184"/> + <location filename="../src/gui/clientChatDialog.cpp" line="182"/> <source> has left the chat.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="211"/> + <location filename="../src/gui/clientChatDialog.cpp" line="209"/> <source>PVS File Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="212"/> + <location filename="../src/gui/clientChatDialog.cpp" line="210"/> <source>Send file '</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="212"/> + <location filename="../src/gui/clientChatDialog.cpp" line="210"/> <source>' to </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="231"/> + <location filename="../src/gui/clientChatDialog.cpp" line="229"/> <source>Connected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="241"/> + <location filename="../src/gui/clientChatDialog.cpp" line="239"/> <source>Disconnected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientChatDialog.cpp" line="280"/> + <location filename="../src/gui/clientChatDialog.cpp" line="278"/> <source>Message from <</source> <translation type="unfinished"></translation> </message> @@ -260,23 +260,23 @@ <context> <name>ClientFileSendDialog</name> <message> - <location filename="../src/gui/clientFileSendDialog.cpp" line="68"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="66"/> <source>Open File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientFileSendDialog.cpp" line="186"/> - <location filename="../src/gui/clientFileSendDialog.cpp" line="192"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="184"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="190"/> <source>PVS - File Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientFileSendDialog.cpp" line="187"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="185"/> <source>File Transfer complete.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/clientFileSendDialog.cpp" line="193"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="191"/> <source>File Transfer canceled!</source> <translation type="unfinished"></translation> </message> @@ -399,77 +399,77 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="175"/> + <location filename="../src/pvsgui.cpp" line="181"/> <source>&Disconnect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="176"/> + <location filename="../src/pvsgui.cpp" line="182"/> <source>C&hat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="177"/> + <location filename="../src/pvsgui.cpp" line="183"/> <source>&Send File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="178"/> + <location filename="../src/pvsgui.cpp" line="184"/> <source>&Config</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="179"/> + <location filename="../src/pvsgui.cpp" line="185"/> <source>&Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="180"/> + <location filename="../src/pvsgui.cpp" line="186"/> <source>&About</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="181"/> + <location filename="../src/pvsgui.cpp" line="187"/> <source>&Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="268"/> - <location filename="../src/pvsgui.cpp" line="283"/> - <location filename="../src/pvsgui.cpp" line="363"/> + <location filename="../src/pvsgui.cpp" line="274"/> + <location filename="../src/pvsgui.cpp" line="289"/> + <location filename="../src/pvsgui.cpp" line="369"/> <source>PVS Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="268"/> + <location filename="../src/pvsgui.cpp" line="274"/> <source>Please enter password (If not needed leave blank):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="284"/> + <location filename="../src/pvsgui.cpp" line="290"/> <source>Are you sure you want to disconnect?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="307"/> - <location filename="../src/pvsgui.cpp" line="329"/> + <location filename="../src/pvsgui.cpp" line="313"/> + <location filename="../src/pvsgui.cpp" line="335"/> <source>PVS connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="307"/> - <location filename="../src/pvsgui.cpp" line="321"/> + <location filename="../src/pvsgui.cpp" line="313"/> + <location filename="../src/pvsgui.cpp" line="327"/> <source>Connected to </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="329"/> - <location filename="../src/pvsgui.cpp" line="341"/> + <location filename="../src/pvsgui.cpp" line="335"/> + <location filename="../src/pvsgui.cpp" line="347"/> <source>Disconnected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsgui.cpp" line="363"/> + <location filename="../src/pvsgui.cpp" line="369"/> <source>New host available: </source> <translation type="unfinished"></translation> </message> diff --git a/org.openslx.pvs.service b/org.openslx.pvs.service index 0398081..91a3e67 100644 --- a/org.openslx.pvs.service +++ b/org.openslx.pvs.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.openslx.pvs -Exec=@CMAKE_INSTALL_PREFIX@/bin/pvs +Exec=@CMAKE_INSTALL_PREFIX@/bin/pvs -d diff --git a/src/gui/clientChatDialog.cpp b/src/gui/clientChatDialog.cpp index 7c32790..163ac92 100644 --- a/src/gui/clientChatDialog.cpp +++ b/src/gui/clientChatDialog.cpp @@ -29,8 +29,6 @@ ClientChatDialog::ClientChatDialog(QWidget *parent) : // connect to D-Bus and get interface QDBusConnection dbus = QDBusConnection::sessionBus(); - dbus.registerObject("/chat", this); - dbus.registerService("org.openslx.pvsgui"); _ifaceDBus = new OrgOpenslxPvsInterface("org.openslx.pvs", "/", dbus, this); connect(_ifaceDBus, SIGNAL(chat_receive(QString, QString, QString)), this, SLOT(receive(QString, QString, QString))); diff --git a/src/gui/clientConfigDialog.cpp b/src/gui/clientConfigDialog.cpp index 3e1ee50..0ee5908 100644 --- a/src/gui/clientConfigDialog.cpp +++ b/src/gui/clientConfigDialog.cpp @@ -28,8 +28,6 @@ ClientConfigDialog::ClientConfigDialog(QWidget *parent) : // connect to D-Bus and get interface QDBusConnection dbus = QDBusConnection::sessionBus(); - dbus.registerObject("/config", this); - dbus.registerService("org.openslx.pvsgui"); _ifaceDBus = new OrgOpenslxPvsInterface("org.openslx.pvs", "/", dbus, this); } diff --git a/src/gui/clientFileSendDialog.cpp b/src/gui/clientFileSendDialog.cpp index ccb44b3..b4512c0 100644 --- a/src/gui/clientFileSendDialog.cpp +++ b/src/gui/clientFileSendDialog.cpp @@ -28,8 +28,6 @@ ClientFileSendDialog::ClientFileSendDialog(QWidget *parent) : // connect to D-Bus and get interface QDBusConnection dbus = QDBusConnection::sessionBus(); - dbus.registerObject("/filesend", this); - dbus.registerService("org.openslx.pvsgui"); _ifaceDBus = new OrgOpenslxPvsInterface("org.openslx.pvs", "/", dbus, this); // get current users name from backend diff --git a/src/gui/clientVNCViewer.cpp b/src/gui/clientVNCViewer.cpp index d6a218b..d794b0b 100644 --- a/src/gui/clientVNCViewer.cpp +++ b/src/gui/clientVNCViewer.cpp @@ -22,8 +22,6 @@ ClientVNCViewer::ClientVNCViewer(QWidget *parent) : { // connect to D-Bus and get interface QDBusConnection dbus = QDBusConnection::sessionBus(); - dbus.registerObject("/vnc", this); - dbus.registerService("org.openslx.pvsgui"); _ifaceDBus = new OrgOpenslxPvsInterface("org.openslx.pvs", "/", dbus, this); connect(_ifaceDBus, SIGNAL(project(QString, int, QString, bool, bool, int)), this, SLOT(open(QString, int, QString, bool, bool, int))); diff --git a/src/pvs.cpp b/src/pvs.cpp index 1c08be5..21b7bdf 100755 --- a/src/pvs.cpp +++ b/src/pvs.cpp @@ -53,8 +53,10 @@ PVS::PVS() : // connect to D-Bus new PvsAdaptor(this); QDBusConnection dbus = QDBusConnection::sessionBus(); - dbus.registerObject("/", this); - dbus.registerService("org.openslx.pvs"); + if (!dbus.registerObject("/", this)) + qDebug("[ERROR] DBus: Could not register object"); + if (!dbus.registerService("org.openslx.pvs")) + qDebug("[ERROR] DBus: Could not register service"); _sdClient = new PVSServiceDiscovery(this); @@ -552,9 +554,10 @@ int PVS::stopVNCScript() } } -void PVS::start() +bool PVS::start() { _pvsServerConnection->sendMessage(PVSMsg(PVSCOMMAND, "PROJECTING", "YES")); + return true; } void PVS::onConnected(QString name) @@ -69,7 +69,7 @@ public: void guiDelHost(QString host); public Q_SLOTS: - void start(); + bool start(); void quit(); void chat_send(QString nick_to, QString nick_from, QString msg); QString chat_getNickname(); diff --git a/src/pvsDaemon.cpp b/src/pvsDaemon.cpp index e9479df..b23bc57 100755 --- a/src/pvsDaemon.cpp +++ b/src/pvsDaemon.cpp @@ -9,14 +9,12 @@ #include "src/core/pvsChatClient.h" PVS *mainClient = NULL; - -// This define works as a switch whether to run as deamon or regular app -#define as_daemon +QTextStream qout(stdout); /// VERSION_STRING is defined in src/version.h void printVersion(bool doExit) { - + QTextStream qout(stdout); printf("Version:\t"VERSION_STRING"\n"); if (doExit) exit(0); @@ -25,30 +23,31 @@ void printVersion(bool doExit) /// outputs the full help text void printHelp() { - printf("**************************************************************\n"); - printf("\nPool Video Switch Client\n"); - printf("**************************************************************\n"); - printVersion(false); - printf("**************************************************************\n"); - printf("Usage:\tpoolVSClient <<option> <value>, ... >\n\n"); - printf("Options:\n\n"); - printf("-vncScriptFile <fullpath\\filename>\n\tSpecifies a custom location for the vnc-start/stop-script.\n\tIf not specified, ~/.pvs/pvs-vncsrv is expected.\n\n"); - printf("-freq <seconds>\n\tSpecifies how long to wait until a reconnection attempt is made.\n\tDefault is 5.\n\n"); - printf("-port <port>\n\tSpecifies on which port to run.\n\tDefault is %d.\n\n", SERVER_PORT_INT); - printf("-h or --help\n\t Shows this help text and exits.\n\n"); - printf("-v or --version\n\t Shows the current version and exits.\n"); - printf( - "-c <string command>:<string value> \n\t Sends the command and the optional value to a running PVS-Client.\n\t Command and value may not contain spaces or colons.\n\t The dividing colon is mandatory.\n"); - printf("-commands: \n\tPrints out available commands to use with -c . \n "); - printf("**************************************************************\n"); + qout << "**************************************************************\n"; + qout << "Pool Video Switch Client\n"; + qout << "**************************************************************\n"; + qout << QObject::tr("Version: ") << VERSION_STRING << "\n"; + qout << "**************************************************************\n"; + qout << QObject::tr("Usage:") << "\tpoolVSClient " << QObject::tr("<<option> <value>, ... >") << "\n\n"; + qout << QObject::tr("Options:") << "\n\n"; + qout << QObject::tr("-vncScriptFile <fullpath\\filename>") << "\n\t" << QObject::tr("Specifies a custom location for the vnc-start/stop-script.")<< "\n\t" << QObject::tr("If not specified, /usr/bin/pvs-vncsrv is expected.") << "\n\n"; + qout << QObject::tr("-freq <seconds>") << "\n\t" << QObject::tr("Specifies how long to wait until a reconnection attempt is made.") << "\n\t" << QObject::tr("Default is 5.") << "\n\n"; + qout << QObject::tr("-port <port>") << "\n\t" << QObject::tr("Specifies on which port to run.") << "\n\t" << QObject::tr("Default is ") << SERVER_PORT_INT << ".\n\n"; + qout << QObject::tr("-h or --help") << "\n\t" << QObject::tr("Shows this help text and exits.") << "\n\n"; + qout << QObject::tr("-v or --version") << "\n\t" << QObject::tr("Shows the current version and exits.") << "\n"; + qout << QObject::tr("-d or --daemon") << "\n\t" << QObject::tr("Start as daemon.") << "\n"; + qout << QObject::tr("-c <string command>:<string value>") << "\n\t" << QObject::tr("Sends the command and the optional value to a running PVS-Client.") << "\n\t" << QObject::tr("Command and value may not contain spaces or colons.") << "\n\t" << QObject::tr("The dividing colon is mandatory.") << "\n"; + qout << "-commands: \n\t" << QObject::tr("Prints out available commands to use with -c.") << "\n"; + qout << "**************************************************************\n"; + qout.flush(); exit(0); } /// outputs a brief help text void printNotice() { - printf( - "Use -h or --help to get a listing of all options.\n-v or --version gives you the current version.\n\n"); + qout << QObject::tr("Use -h or --help to get a listing of all options.\n-v or --version gives you the current version.\n\n"); + qout.flush(); } void printCommands() @@ -64,6 +63,7 @@ void printCommands() /// int main(int argc, char** argv) { + bool daemon = false; int frequency = 5; int port = -1; @@ -99,7 +99,6 @@ int main(int argc, char** argv) exit(0); } - printf("UDS Communicator is running.\n"); int option_index = 0; while (1) @@ -109,6 +108,7 @@ int main(int argc, char** argv) { "help", no_argument, 0, 'h' }, { "commands", no_argument, 0, 'o' }, { "version", no_argument, 0, 'v' }, + { "daemon", no_argument, 0, 'd' }, { "port", required_argument, 0, 'p' }, { "freq", required_argument, 0, 'f' }, { "client", required_argument, 0, 'e' }, @@ -117,7 +117,7 @@ int main(int argc, char** argv) }; /* getopt_long stores the option index here. */ - int c = getopt_long(argc, argv, "hvoc:f:e:s:p:", long_options, + int c = getopt_long(argc, argv, "hovdc:f:e:s:p:", long_options, &option_index); option_index++; if (c == -1) @@ -134,6 +134,9 @@ int main(int argc, char** argv) case 'v': printVersion(true); break; + case 'd': + daemon = true; + break; case 'c': { if (option_index + 1 < argc) @@ -297,58 +300,41 @@ int main(int argc, char** argv) ConsoleLog setLogName(QString("log.client")); ConsoleLog writeLine(QString("PVS-Client started.")); -#ifdef as_daemon - - /*Alex: neu schreiben als pvsdaemon_win32.cpp und minimieren in Task-Leiste*/ - #ifndef __WIN32__ - /* Our process ID and Session ID */ - pid_t pid, sid; - - /* Fork off the parent process */ - pid = fork(); - if (pid < 0) + if (daemon) { - exit(-1); - } - /* If we got a good PID, then - we can exit the parent process. */ - if (pid > 0) - { - exit(0); + #ifndef __WIN32__ + pid_t pid, sid; // our process ID and session ID + + // fork off the parent process + pid = fork(); + if (pid < 0) + exit(-1); + + // if we got a good PID, then we can exit the parent process. + if (pid > 0) + exit(0); + + // change the file mode mask + umask(0); + + // create a new SID for the child process + sid = setsid(); + if (sid < 0) + exit(-1); + + // change the current working directory + if ((chdir("/")) < 0) + exit(-1); + + // close out the standard file descriptors + close(STDIN_FILENO); + freopen ((QString(getHomeDir()).append(QString("/.pvs/dump"))).toUtf8() + .data(),"w",stdout); + //close(STDOUT_FILENO); + close(STDERR_FILENO); + #endif /*__WIN32__*/ } - /* Change the file mode mask */ - umask(0); - - /* Open any logs here */ - - /* Create a new SID for the child process */ - sid = setsid(); - if (sid < 0) - { - /* Log the failure */ - exit(-1); - } - - /* Change the current working directory */ - if ((chdir("/")) < 0) - { - /* Log the failure */ - exit(-1); - } - - /* Close out the standard file descriptors */ - close(STDIN_FILENO); - freopen ((QString(getHomeDir()).append(QString("/.pvs/dump"))).toUtf8().data(),"w",stdout); - //close(STDOUT_FILENO); - close(STDERR_FILENO); - #endif /*__WIN32__*/ - /* Daemon-specific initialization goes here */ - - /* The Big Loop */ - -#endif - mainClient = new PVS(); PVSSettingsManager::getManager()->setConfigFile(getPolicyFilePath("clientconf")); com.getDispatcher()->addListener("*", mainClient, &PVS::onDaemonCommand); diff --git a/src/pvsgui.cpp b/src/pvsgui.cpp index b2f0a8f..0d89027 100644 --- a/src/pvsgui.cpp +++ b/src/pvsgui.cpp @@ -51,31 +51,37 @@ PVSGUI::PVSGUI(QWidget *parent) : // connect to D-Bus and get interface QDBusConnection dbus = QDBusConnection::sessionBus(); - dbus.registerObject("/", this); - dbus.registerService("org.openslx.pvsgui"); _ifaceDBus = new OrgOpenslxPvsInterface("org.openslx.pvs", "/", dbus, this); - _ifaceDBus->start(); // start pvs if not running + if (dbus.isConnected()) + qDebug("[%s] Connection to DBus successful.", metaObject()->className()); + else + qDebug("[%s] ERROR: Could not connect to DBus!", metaObject()->className()); - // get available hosts - QDBusPendingReply<QStringList> reply0 = _ifaceDBus->getAvailableHosts(); + // start pvs if not running + QDBusPendingReply<bool> reply0 = _ifaceDBus->start(); reply0.waitForFinished(); - QStringList hosts = reply0.value(); - if (reply0.isValid() && !hosts.isEmpty()) + if (reply0.isValid() && reply0.value()) + qDebug("[%s] Connection to PVS daemon successful.", metaObject()->className()); + else + qDebug("[%s] ERROR: Could not connect to PVS daemon!", metaObject()->className()); + + // get available hosts + QDBusPendingReply<QStringList> reply1 = _ifaceDBus->getAvailableHosts(); + reply1.waitForFinished(); + QStringList hosts = reply1.value(); + if (reply1.isValid() && !hosts.isEmpty()) foreach (QString host, hosts) addHost(host); // already connected? - QDBusPendingReply<QString> reply1 = _ifaceDBus->isConnected(); - reply1.waitForFinished(); - QString host = reply1.value(); - if (reply1.isValid() && host != "") + QDBusPendingReply<QString> reply2 = _ifaceDBus->isConnected(); + reply2.waitForFinished(); + QString host = reply2.value(); + if (reply2.isValid() && host != "") connected(host); else disconnected(); - if (dbus.isConnected()) - qDebug("[%s] Connection to DBus successful!", metaObject()->className()); - // listen on port 29481 for incoming file transfers _serverSocket = new QTcpServer(); _serverSocket->listen(QHostAddress::Any, 29481); diff --git a/src/pvsgui.h b/src/pvsgui.h index 90fe50e..ec7c6d7 100644 --- a/src/pvsgui.h +++ b/src/pvsgui.h @@ -30,7 +30,6 @@ class PVSGUI: public QWidget, private Ui_ClientToolbarClass { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "org.openslx.pvsgui") public: PVSGUI(QWidget *parent = 0); diff --git a/src/version.h b/src/version.h index 69a3bde..9f1450d 100644 --- a/src/version.h +++ b/src/version.h @@ -1,2 +1,2 @@ -#define VERSION_STRING "2.0.2.0" -#define VERSION_NUMBER 2020 +#define VERSION_STRING "2.0.3" +#define VERSION_NUMBER 203 |