diff options
| -rwxr-xr-x | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | i18n/pvs_ar_JO.ts | 58 | ||||
| -rw-r--r-- | i18n/pvs_de_DE.ts | 58 | ||||
| -rw-r--r-- | i18n/pvs_es_MX.ts | 58 | ||||
| -rw-r--r-- | i18n/pvs_fr_FR.ts | 58 | ||||
| -rw-r--r-- | i18n/pvs_pl_PL.ts | 58 | ||||
| -rw-r--r-- | misc/pvs.conf | 3 | ||||
| -rwxr-xr-x | src/pvs.cpp | 11 | ||||
| -rwxr-xr-x | src/pvsDaemon.cpp | 107 | ||||
| -rw-r--r-- | src/pvsmgr.cpp | 2 | ||||
| -rw-r--r-- | src/pvsmgrtouch.cpp | 3 | ||||
| -rwxr-xr-x | src/util/consoleLogger.cpp | 6 | ||||
| -rw-r--r-- | src/util/pvsSettingsManager.cpp | 185 | ||||
| -rw-r--r-- | src/util/pvsSettingsManager.h | 50 |
14 files changed, 177 insertions, 482 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f829f33..a98022d 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,7 +68,6 @@ SET( PVSMGR_SRCS src/net/pvsClientConnection.cpp src/net/pvsServiceBroadcast.cpp src/util/consoleLogger.cpp - src/util/pvsSettingsManager.cpp src/util/util.cpp src/net/SslServer.cpp src/util/CertManager.cpp @@ -88,7 +87,6 @@ SET( PVS_SRCS src/util/util.cpp src/util/consoleLogger.cpp src/util/clientGUIUtils${sysdep_suffix}.cpp - src/util/pvsSettingsManager.cpp src/core/pvsChatClient.cpp src/net/pvsServiceDiscovery.cpp src/net/pvsDiscoveredServer.cpp diff --git a/i18n/pvs_ar_JO.ts b/i18n/pvs_ar_JO.ts index 4fe4627..2f5b77e 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="284"/> + <location filename="../src/pvs.cpp" line="277"/> <source>Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="362"/> + <location filename="../src/pvs.cpp" line="355"/> <source>VNC connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="362"/> + <location filename="../src/pvs.cpp" line="355"/> <source>The host </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="364"/> + <location filename="../src/pvs.cpp" line="357"/> <source> requested your screen!</source> <translation type="unfinished"></translation> </message> @@ -27,127 +27,127 @@ <context> <name>QObject</name> <message> - <location filename="../src/pvsDaemon.cpp" line="29"/> + <location filename="../src/pvsDaemon.cpp" line="28"/> <source>Version: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="31"/> + <location filename="../src/pvsDaemon.cpp" line="30"/> <source>Usage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="31"/> + <location filename="../src/pvsDaemon.cpp" line="30"/> <source><<option> <value>, ... ></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="32"/> + <location filename="../src/pvsDaemon.cpp" line="31"/> <source>Options:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="33"/> + <location filename="../src/pvsDaemon.cpp" line="32"/> <source>-vncScriptFile <fullpath\filename></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="33"/> + <location filename="../src/pvsDaemon.cpp" line="32"/> <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"/> + <location filename="../src/pvsDaemon.cpp" line="32"/> <source>If not specified, /usr/bin/pvs-vncsrv is expected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="34"/> + <location filename="../src/pvsDaemon.cpp" line="33"/> <source>-freq <seconds></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="34"/> + <location filename="../src/pvsDaemon.cpp" line="33"/> <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"/> + <location filename="../src/pvsDaemon.cpp" line="33"/> <source>Default is 5.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="35"/> + <location filename="../src/pvsDaemon.cpp" line="34"/> <source>-port <port></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="35"/> + <location filename="../src/pvsDaemon.cpp" line="34"/> <source>Specifies on which port to run.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="35"/> + <location filename="../src/pvsDaemon.cpp" line="34"/> <source>Default is </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="36"/> + <location filename="../src/pvsDaemon.cpp" line="35"/> <source>-h or --help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="36"/> + <location filename="../src/pvsDaemon.cpp" line="35"/> <source>Shows this help text and exits.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="37"/> + <location filename="../src/pvsDaemon.cpp" line="36"/> <source>-v or --version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="37"/> + <location filename="../src/pvsDaemon.cpp" line="36"/> <source>Shows the current version and exits.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="38"/> + <location filename="../src/pvsDaemon.cpp" line="37"/> <source>-d or --daemon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="38"/> + <location filename="../src/pvsDaemon.cpp" line="37"/> <source>Start as daemon.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="39"/> + <location filename="../src/pvsDaemon.cpp" line="38"/> <source>-c <string command>:<string value></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="39"/> + <location filename="../src/pvsDaemon.cpp" line="38"/> <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"/> + <location filename="../src/pvsDaemon.cpp" line="38"/> <source>Command and value may not contain spaces or colons.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="39"/> + <location filename="../src/pvsDaemon.cpp" line="38"/> <source>The dividing colon is mandatory.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="40"/> + <location filename="../src/pvsDaemon.cpp" line="39"/> <source>Prints out available commands to use with -c.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="49"/> + <location filename="../src/pvsDaemon.cpp" line="48"/> <source>Use -h or --help to get a listing of all options. -v or --version gives you the current version. diff --git a/i18n/pvs_de_DE.ts b/i18n/pvs_de_DE.ts index 7bd9dff..20da674 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="284"/> + <location filename="../src/pvs.cpp" line="277"/> <source>Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="362"/> + <location filename="../src/pvs.cpp" line="355"/> <source>VNC connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="362"/> + <location filename="../src/pvs.cpp" line="355"/> <source>The host </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="364"/> + <location filename="../src/pvs.cpp" line="357"/> <source> requested your screen!</source> <translation type="unfinished"></translation> </message> @@ -27,127 +27,127 @@ <context> <name>QObject</name> <message> - <location filename="../src/pvsDaemon.cpp" line="29"/> + <location filename="../src/pvsDaemon.cpp" line="28"/> <source>Version: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="31"/> + <location filename="../src/pvsDaemon.cpp" line="30"/> <source>Usage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="31"/> + <location filename="../src/pvsDaemon.cpp" line="30"/> <source><<option> <value>, ... ></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="32"/> + <location filename="../src/pvsDaemon.cpp" line="31"/> <source>Options:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="33"/> + <location filename="../src/pvsDaemon.cpp" line="32"/> <source>-vncScriptFile <fullpath\filename></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="33"/> + <location filename="../src/pvsDaemon.cpp" line="32"/> <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"/> + <location filename="../src/pvsDaemon.cpp" line="32"/> <source>If not specified, /usr/bin/pvs-vncsrv is expected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="34"/> + <location filename="../src/pvsDaemon.cpp" line="33"/> <source>-freq <seconds></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="34"/> + <location filename="../src/pvsDaemon.cpp" line="33"/> <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"/> + <location filename="../src/pvsDaemon.cpp" line="33"/> <source>Default is 5.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="35"/> + <location filename="../src/pvsDaemon.cpp" line="34"/> <source>-port <port></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="35"/> + <location filename="../src/pvsDaemon.cpp" line="34"/> <source>Specifies on which port to run.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="35"/> + <location filename="../src/pvsDaemon.cpp" line="34"/> <source>Default is </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="36"/> + <location filename="../src/pvsDaemon.cpp" line="35"/> <source>-h or --help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="36"/> + <location filename="../src/pvsDaemon.cpp" line="35"/> <source>Shows this help text and exits.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="37"/> + <location filename="../src/pvsDaemon.cpp" line="36"/> <source>-v or --version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="37"/> + <location filename="../src/pvsDaemon.cpp" line="36"/> <source>Shows the current version and exits.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="38"/> + <location filename="../src/pvsDaemon.cpp" line="37"/> <source>-d or --daemon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="38"/> + <location filename="../src/pvsDaemon.cpp" line="37"/> <source>Start as daemon.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="39"/> + <location filename="../src/pvsDaemon.cpp" line="38"/> <source>-c <string command>:<string value></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="39"/> + <location filename="../src/pvsDaemon.cpp" line="38"/> <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"/> + <location filename="../src/pvsDaemon.cpp" line="38"/> <source>Command and value may not contain spaces or colons.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="39"/> + <location filename="../src/pvsDaemon.cpp" line="38"/> <source>The dividing colon is mandatory.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="40"/> + <location filename="../src/pvsDaemon.cpp" line="39"/> <source>Prints out available commands to use with -c.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="49"/> + <location filename="../src/pvsDaemon.cpp" line="48"/> <source>Use -h or --help to get a listing of all options. -v or --version gives you the current version. diff --git a/i18n/pvs_es_MX.ts b/i18n/pvs_es_MX.ts index 4fe4627..2f5b77e 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="284"/> + <location filename="../src/pvs.cpp" line="277"/> <source>Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="362"/> + <location filename="../src/pvs.cpp" line="355"/> <source>VNC connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="362"/> + <location filename="../src/pvs.cpp" line="355"/> <source>The host </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="364"/> + <location filename="../src/pvs.cpp" line="357"/> <source> requested your screen!</source> <translation type="unfinished"></translation> </message> @@ -27,127 +27,127 @@ <context> <name>QObject</name> <message> - <location filename="../src/pvsDaemon.cpp" line="29"/> + <location filename="../src/pvsDaemon.cpp" line="28"/> <source>Version: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="31"/> + <location filename="../src/pvsDaemon.cpp" line="30"/> <source>Usage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="31"/> + <location filename="../src/pvsDaemon.cpp" line="30"/> <source><<option> <value>, ... ></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="32"/> + <location filename="../src/pvsDaemon.cpp" line="31"/> <source>Options:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="33"/> + <location filename="../src/pvsDaemon.cpp" line="32"/> <source>-vncScriptFile <fullpath\filename></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="33"/> + <location filename="../src/pvsDaemon.cpp" line="32"/> <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"/> + <location filename="../src/pvsDaemon.cpp" line="32"/> <source>If not specified, /usr/bin/pvs-vncsrv is expected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="34"/> + <location filename="../src/pvsDaemon.cpp" line="33"/> <source>-freq <seconds></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="34"/> + <location filename="../src/pvsDaemon.cpp" line="33"/> <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"/> + <location filename="../src/pvsDaemon.cpp" line="33"/> <source>Default is 5.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="35"/> + <location filename="../src/pvsDaemon.cpp" line="34"/> <source>-port <port></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="35"/> + <location filename="../src/pvsDaemon.cpp" line="34"/> <source>Specifies on which port to run.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="35"/> + <location filename="../src/pvsDaemon.cpp" line="34"/> <source>Default is </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="36"/> + <location filename="../src/pvsDaemon.cpp" line="35"/> <source>-h or --help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="36"/> + <location filename="../src/pvsDaemon.cpp" line="35"/> <source>Shows this help text and exits.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="37"/> + <location filename="../src/pvsDaemon.cpp" line="36"/> <source>-v or --version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="37"/> + <location filename="../src/pvsDaemon.cpp" line="36"/> <source>Shows the current version and exits.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="38"/> + <location filename="../src/pvsDaemon.cpp" line="37"/> <source>-d or --daemon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="38"/> + <location filename="../src/pvsDaemon.cpp" line="37"/> <source>Start as daemon.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="39"/> + <location filename="../src/pvsDaemon.cpp" line="38"/> <source>-c <string command>:<string value></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="39"/> + <location filename="../src/pvsDaemon.cpp" line="38"/> <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"/> + <location filename="../src/pvsDaemon.cpp" line="38"/> <source>Command and value may not contain spaces or colons.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="39"/> + <location filename="../src/pvsDaemon.cpp" line="38"/> <source>The dividing colon is mandatory.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="40"/> + <location filename="../src/pvsDaemon.cpp" line="39"/> <source>Prints out available commands to use with -c.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="49"/> + <location filename="../src/pvsDaemon.cpp" line="48"/> <source>Use -h or --help to get a listing of all options. -v or --version gives you the current version. diff --git a/i18n/pvs_fr_FR.ts b/i18n/pvs_fr_FR.ts index 4fe4627..2f5b77e 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="284"/> + <location filename="../src/pvs.cpp" line="277"/> <source>Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="362"/> + <location filename="../src/pvs.cpp" line="355"/> <source>VNC connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="362"/> + <location filename="../src/pvs.cpp" line="355"/> <source>The host </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="364"/> + <location filename="../src/pvs.cpp" line="357"/> <source> requested your screen!</source> <translation type="unfinished"></translation> </message> @@ -27,127 +27,127 @@ <context> <name>QObject</name> <message> - <location filename="../src/pvsDaemon.cpp" line="29"/> + <location filename="../src/pvsDaemon.cpp" line="28"/> <source>Version: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="31"/> + <location filename="../src/pvsDaemon.cpp" line="30"/> <source>Usage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="31"/> + <location filename="../src/pvsDaemon.cpp" line="30"/> <source><<option> <value>, ... ></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="32"/> + <location filename="../src/pvsDaemon.cpp" line="31"/> <source>Options:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="33"/> + <location filename="../src/pvsDaemon.cpp" line="32"/> <source>-vncScriptFile <fullpath\filename></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="33"/> + <location filename="../src/pvsDaemon.cpp" line="32"/> <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"/> + <location filename="../src/pvsDaemon.cpp" line="32"/> <source>If not specified, /usr/bin/pvs-vncsrv is expected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="34"/> + <location filename="../src/pvsDaemon.cpp" line="33"/> <source>-freq <seconds></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="34"/> + <location filename="../src/pvsDaemon.cpp" line="33"/> <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"/> + <location filename="../src/pvsDaemon.cpp" line="33"/> <source>Default is 5.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="35"/> + <location filename="../src/pvsDaemon.cpp" line="34"/> <source>-port <port></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="35"/> + <location filename="../src/pvsDaemon.cpp" line="34"/> <source>Specifies on which port to run.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="35"/> + <location filename="../src/pvsDaemon.cpp" line="34"/> <source>Default is </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="36"/> + <location filename="../src/pvsDaemon.cpp" line="35"/> <source>-h or --help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="36"/> + <location filename="../src/pvsDaemon.cpp" line="35"/> <source>Shows this help text and exits.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="37"/> + <location filename="../src/pvsDaemon.cpp" line="36"/> <source>-v or --version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="37"/> + <location filename="../src/pvsDaemon.cpp" line="36"/> <source>Shows the current version and exits.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="38"/> + <location filename="../src/pvsDaemon.cpp" line="37"/> <source>-d or --daemon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="38"/> + <location filename="../src/pvsDaemon.cpp" line="37"/> <source>Start as daemon.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="39"/> + <location filename="../src/pvsDaemon.cpp" line="38"/> <source>-c <string command>:<string value></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="39"/> + <location filename="../src/pvsDaemon.cpp" line="38"/> <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"/> + <location filename="../src/pvsDaemon.cpp" line="38"/> <source>Command and value may not contain spaces or colons.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="39"/> + <location filename="../src/pvsDaemon.cpp" line="38"/> <source>The dividing colon is mandatory.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="40"/> + <location filename="../src/pvsDaemon.cpp" line="39"/> <source>Prints out available commands to use with -c.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="49"/> + <location filename="../src/pvsDaemon.cpp" line="48"/> <source>Use -h or --help to get a listing of all options. -v or --version gives you the current version. diff --git a/i18n/pvs_pl_PL.ts b/i18n/pvs_pl_PL.ts index 4fe4627..2f5b77e 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="284"/> + <location filename="../src/pvs.cpp" line="277"/> <source>Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="362"/> + <location filename="../src/pvs.cpp" line="355"/> <source>VNC connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="362"/> + <location filename="../src/pvs.cpp" line="355"/> <source>The host </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvs.cpp" line="364"/> + <location filename="../src/pvs.cpp" line="357"/> <source> requested your screen!</source> <translation type="unfinished"></translation> </message> @@ -27,127 +27,127 @@ <context> <name>QObject</name> <message> - <location filename="../src/pvsDaemon.cpp" line="29"/> + <location filename="../src/pvsDaemon.cpp" line="28"/> <source>Version: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="31"/> + <location filename="../src/pvsDaemon.cpp" line="30"/> <source>Usage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="31"/> + <location filename="../src/pvsDaemon.cpp" line="30"/> <source><<option> <value>, ... ></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="32"/> + <location filename="../src/pvsDaemon.cpp" line="31"/> <source>Options:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="33"/> + <location filename="../src/pvsDaemon.cpp" line="32"/> <source>-vncScriptFile <fullpath\filename></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="33"/> + <location filename="../src/pvsDaemon.cpp" line="32"/> <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"/> + <location filename="../src/pvsDaemon.cpp" line="32"/> <source>If not specified, /usr/bin/pvs-vncsrv is expected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="34"/> + <location filename="../src/pvsDaemon.cpp" line="33"/> <source>-freq <seconds></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="34"/> + <location filename="../src/pvsDaemon.cpp" line="33"/> <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"/> + <location filename="../src/pvsDaemon.cpp" line="33"/> <source>Default is 5.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="35"/> + <location filename="../src/pvsDaemon.cpp" line="34"/> <source>-port <port></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="35"/> + <location filename="../src/pvsDaemon.cpp" line="34"/> <source>Specifies on which port to run.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="35"/> + <location filename="../src/pvsDaemon.cpp" line="34"/> <source>Default is </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="36"/> + <location filename="../src/pvsDaemon.cpp" line="35"/> <source>-h or --help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="36"/> + <location filename="../src/pvsDaemon.cpp" line="35"/> <source>Shows this help text and exits.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="37"/> + <location filename="../src/pvsDaemon.cpp" line="36"/> <source>-v or --version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="37"/> + <location filename="../src/pvsDaemon.cpp" line="36"/> <source>Shows the current version and exits.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="38"/> + <location filename="../src/pvsDaemon.cpp" line="37"/> <source>-d or --daemon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="38"/> + <location filename="../src/pvsDaemon.cpp" line="37"/> <source>Start as daemon.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="39"/> + <location filename="../src/pvsDaemon.cpp" line="38"/> <source>-c <string command>:<string value></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="39"/> + <location filename="../src/pvsDaemon.cpp" line="38"/> <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"/> + <location filename="../src/pvsDaemon.cpp" line="38"/> <source>Command and value may not contain spaces or colons.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="39"/> + <location filename="../src/pvsDaemon.cpp" line="38"/> <source>The dividing colon is mandatory.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="40"/> + <location filename="../src/pvsDaemon.cpp" line="39"/> <source>Prints out available commands to use with -c.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pvsDaemon.cpp" line="49"/> + <location filename="../src/pvsDaemon.cpp" line="48"/> <source>Use -h or --help to get a listing of all options. -v or --version gives you the current version. diff --git a/misc/pvs.conf b/misc/pvs.conf index f91a63c..93c4ac5 100644 --- a/misc/pvs.conf +++ b/misc/pvs.conf @@ -1,3 +1,6 @@ +[VNC] +script=/usr/local/bin/pvs-vncsrv + [Permissions] vnc_lecturer=ro vnc_other=no diff --git a/src/pvs.cpp b/src/pvs.cpp index 61df049..07b9005 100755 --- a/src/pvs.cpp +++ b/src/pvs.cpp @@ -30,13 +30,6 @@ extern PVS *mainClient; PVS::PVS() : QObject() { - if (!QFile::exists(_settings.fileName())) - { - QDir::root().mkpath(QFileInfo(_settings.fileName()).path()); - QFile::copy("/etc/openslx/pvs.conf", _settings.fileName()); - } - - _pvsServerConnection = new PVSServerConnection(this); _locked = false; _vncAllowed = false; @@ -61,9 +54,9 @@ PVS::PVS() : new PvsAdaptor(this); QDBusConnection dbus = QDBusConnection::sessionBus(); if (!dbus.registerObject("/", this)) - qDebug("[ERROR] DBus: Could not register object"); + printf("[ERROR] DBus: Could not register object\n"); if (!dbus.registerService("org.openslx.pvs")) - qDebug("[ERROR] DBus: Could not register service"); + printf("[ERROR] DBus: Could not register service\n"); _sdClient = new PVSServiceDiscovery(this); diff --git a/src/pvsDaemon.cpp b/src/pvsDaemon.cpp index b23bc57..a0405d0 100755 --- a/src/pvsDaemon.cpp +++ b/src/pvsDaemon.cpp @@ -3,7 +3,6 @@ #include <stdlib.h> #include "pvs.h" #include "src/net/pvsLocalhostCommunicator.h" -#include "src/util/pvsSettingsManager.h" #include "setup.h" #include "src/net/pvsMsg.h" #include "src/core/pvsChatClient.h" @@ -67,19 +66,6 @@ int main(int argc, char** argv) int frequency = 5; int port = -1; - QFileInfo script; - #ifdef __WIN32__ - //TODO Win32 - if (!script.exists()) - script.setFile(getHomeDir() + "/.pvs/pvs-vncsrv_win32.bat"); - #else - script.setFile("/usr/bin/pvs-vncsrv"); - if (!script.exists()) - script.setFile("/usr/local/bin/pvs-vncsrv"); - if (!script.exists()) - script.setFile(getHomeDir() + "/.pvs/pvs-vncsrv"); - #endif //__WIN32__ - QCoreApplication app(argc, argv); app.setOrganizationName("openslx"); app.setOrganizationDomain("openslx.org"); @@ -89,6 +75,27 @@ int main(int argc, char** argv) translator.load(":pvs"); app.installTranslator(&translator); + QFileInfo script; +#ifdef __WIN32__ + //TODO Win32 + if (!script.exists()) + script.setFile(getHomeDir() + "/.pvs/pvs-vncsrv_win32.bat"); +#else + QSettings settings; + if (!QFile::exists(settings.fileName())) + { + QDir::root().mkpath(QFileInfo(settings.fileName()).path()); + QFile::copy("/etc/openslx/pvs.conf", settings.fileName()); + } + QString s = settings.value("VNC/script").toString(); + script.setFile(s); + if (!script.exists()) + script.setFile("/usr/bin/pvs-vncsrv"); + if (!script.exists()) + script.setFile("/usr/local/bin/pvs-vncsrv"); + if (!script.exists()) + script.setFile(getHomeDir() + "/.pvs/pvs-vncsrv"); +#endif //__WIN32__ PVSLocalhostCommunicator com(getPolicyFilePath(QString( ".comfile"))); @@ -149,73 +156,17 @@ int main(int argc, char** argv) } else { - QStringList line = QString::fromLocal8Bit(argv[option_index - + 1]).split(":"); - QString &ident = line[0]; - QString message; - if (line.size() > 1) - message = line[1]; - if (ident.size() > 0) // no use sending empty idents... not even sure if this COULD happen - { - bool flag = false; - if (ident == "make") - PVSSettingsManager::getManager()->setConfigs(); - else if (ident == "chat" && message == "boss") - { - PVSSettingsManager::getManager()->reWriteConfigs("chatmode", "bossmode"); - flag = true; - - } - else if (ident == "chat" && message == "all") - { - PVSSettingsManager::getManager()->reWriteConfigs("chatmode", "community"); - flag = true; - } - else if (ident == "chat" && message == "private") - { - PVSSettingsManager::getManager()->reWriteConfigs("chatmode", "private"); - flag = true; - } - else if (ident == "chat" && message == "on") - { - PVSSettingsManager::getManager()->reWriteConfigs("chatstate", "on"); - flag = true; - } - else if (ident == "chat" && message == "off") - { - PVSSettingsManager::getManager()->reWriteConfigs("chatstate", "off"); - flag = true; - } - else if (ident == "room") - { - //PVSSettingsManager::getManager()->reWriteConfigs(ident, message); - flag = true; - } - else if (ident == "stop" && message == NULL) - flag = true; - else - printf("option %s doesn't exist\n", ident.toUtf8().data()); - - if (flag) - { - qDebug("Will send i: %s, m: %s\n", ident.toUtf8().data(), message.toUtf8().data()); - com.sendCommand(ident, message); - QCoreApplication::processEvents(QEventLoop::AllEvents); - printf("Sent command. Exiting.\n"); - } - } - - else - printf("Something went horribly wrong, since the ident is empty.\n"); - - } + printf("Will send i: %s, m: %s\n", argv[option_index + 1], ""); + com.sendCommand(QString(argv[option_index + 1]), ""); + QCoreApplication::processEvents(QEventLoop::AllEvents); + printf("Sent command. Exiting.\n"); + } } else { printf("Error. No command issued. Exiting.\n"); } exit(0); // and gone - break; } case 'f': { @@ -336,7 +287,6 @@ int main(int argc, char** argv) } mainClient = new PVS(); - PVSSettingsManager::getManager()->setConfigFile(getPolicyFilePath("clientconf")); com.getDispatcher()->addListener("*", mainClient, &PVS::onDaemonCommand); if (port <= 0) @@ -347,11 +297,6 @@ int main(int argc, char** argv) createPolicyDir(); createPolicyFiles(); - // long int gr = 0; - mainClient->setScriptPath(script.filePath()); app.exec(); - delete mainClient; - - return 0; } diff --git a/src/pvsmgr.cpp b/src/pvsmgr.cpp index 83f5fe0..dd00c0e 100644 --- a/src/pvsmgr.cpp +++ b/src/pvsmgr.cpp @@ -18,7 +18,6 @@ #include <QtGui/QDesktopServices> #include "gui/mainWindow.h" #include "util/consoleLogger.h" -#include "util/pvsSettingsManager.h" #include "util/CertManager.h" QApplication *qtApp; @@ -47,7 +46,6 @@ int main(int argc, char** argv) exit(123); } */ - PVSSettingsManager::getManager()->setConfigFile(getPolicyFilePath("serverconf")); MainWindow w; w.show(); return qtApp->exec(); diff --git a/src/pvsmgrtouch.cpp b/src/pvsmgrtouch.cpp index fa34294..d14ea56 100644 --- a/src/pvsmgrtouch.cpp +++ b/src/pvsmgrtouch.cpp @@ -16,9 +16,7 @@ #include <QtGui> #include <QtGui/QDesktopServices> -#include "gui/touchgui.h" #include "util/consoleLogger.h" -#include "util/pvsSettingsManager.h" #include "util/CertManager.h" QApplication *qtApp; @@ -47,7 +45,6 @@ int main(int argc, char** argv) exit(123); } */ - PVSSettingsManager::getManager()->setConfigFile(getPolicyFilePath("serverconf")); pvsMainWindow w; w.show(); return qtApp->exec(); diff --git a/src/util/consoleLogger.cpp b/src/util/consoleLogger.cpp index ae29989..5d07dbe 100755 --- a/src/util/consoleLogger.cpp +++ b/src/util/consoleLogger.cpp @@ -233,14 +233,10 @@ void ConsoleLogger::_prepareLog() fullpath.append(_logName); _logFile.open(fullpath.toUtf8().data(), std::ofstream::out | std::ofstream::app); if (_logFile.good()) - { _logFileGood = true; - writeTerminal(QString("LogPath/Name changed to: ").append(fullpath)); - } else - { printf("ERROR: Logfile ( %s ) not accessible/found. Logs will not be available.\n", _logPath.toUtf8().data()); - } + _logFile.close(); } diff --git a/src/util/pvsSettingsManager.cpp b/src/util/pvsSettingsManager.cpp deleted file mode 100644 index a6a742b..0000000 --- a/src/util/pvsSettingsManager.cpp +++ /dev/null @@ -1,185 +0,0 @@ -#include "pvsSettingsManager.h" -#include "TextFile.h" - -PVSSettingsManager* PVSSettingsManager::getManager() -{ - if (myself) - return myself; - else - return myself = new PVSSettingsManager; -} - -void PVSSettingsManager::setConfigFile(QString path) -{ - if (path.size() && fileExists(path)) - { - _path = path; - _parseFile(_path); - - } - else - ConsoleLog writeError(QString("Can't open config file \"").append(QString(path).append("\""))); -} - -bool PVSSettingsManager::hasEntry(QString name) -{ - for (SettingsIter it = settingsList.begin(); it != settingsList.end(); it++) - { - if ((*it).first.compare(name) == 0) - { - return true; - } - } - return false; -} - -QString PVSSettingsManager::getEntryString(QString name) -{ - for (SettingsIter it = settingsList.begin(); it != settingsList.end(); it++) - { - if ((*it).first.compare(name) == 0) - { - return (*it).second; - } - } - return QString(); -} - -void PVSSettingsManager::writeEntry(QString name, QString value) -{ - if (name.size() && value.size()) - return; - bool unique = true; - for (SettingsIter it = settingsList.begin(); it != settingsList.end(); it++) - { - if ((*it).first.compare(name) == 0) - { - unique = false; - (*it).second = value; - break; - } - } - if (unique) - { - SettingsEntry tmp(name, value); - settingsList.push_back(tmp); - } -} - - -PVSSettingsManager* PVSSettingsManager::myself = NULL; - -PVSSettingsManager::PVSSettingsManager() -{ - -} - -void PVSSettingsManager::setConfigs() -{ - //default settings - _configs.setValue("Chat/chatstate", "on"); - _configs.setValue("Chat/chatmode", "bossmode"); - _configs.setValue("Room/roomId", "0"); - _configs.setValue("VNC/permit", "off"); - _configs.setValue("VNC/quality", "high"); - _configs.sync(); -} -void PVSSettingsManager::reWriteConfigs(QString set, QString val) -{ - _configs.setValue(set, val); - _configs.sync(); -} - -void PVSSettingsManager::readConfigs(QString sett, QString vall) -{ - //TODO: read the config file.. - _configs.value("Chat/chatstate").toBool(); - _configs.value("Chat/chatmode").toString(); - _configs.value("Room/room").toInt(); - _configs.value("VNC/permit").toBool(); - _configs.value("VNC/quality").toString(); -} - -void PVSSettingsManager::_parseFile(QString path) -{ - QString line; - TextFile file(path); - - SettingsList tmpList; - - if (file.good()) - { - while (!file.eof()) - { - line = file.readLine(); - if (!(line.length() <=1)) // ignore blank - { - if (!(line[0] == '#' || line[0] == '/' || line[0] == '[')) // ignore comments and section headers - { - SettingsEntry tmp = _parseLine(line); - if (tmp.first.size() && tmp.second.size()) - { - bool unique = true; - for (SettingsIter it = tmpList.begin(); it != tmpList.end(); it++) - { - if ((*it).first.compare(tmp.first) == 0) - { - unique = false; - break; - } - } - if (unique) - tmpList.push_back(tmp); - } - } - } - } - } - else - { - ConsoleLog writeError(QString("No configfile \"").append(QString(path).append("\" found or file corrupt."))); - } - - if (tmpList.size()) - settingsList = tmpList; -} -#ifdef verbose -ConsoleLog writeLine(QString("Dumping Config Content of ").append(QString(path).append(" : "))); -for (SettingsIter it = settingsList.begin(); it != settingsList.end(); it++) -{ - ConsoleLog writeLine(QString("Option: ").append(QString((*it).first).append(QString(" | Value: ").append((*it).second)))); -} -ConsoleLog writeLine(QString("End of ").append(QString(path).append("."))); -#endif - -SettingsEntry PVSSettingsManager::_parseLine(QString line) -{ - QString name; - QString value; - - name = lineSplitter(line, "=\n\t", true); - value = lineSplitter(line, "=\n\t", false); - - if (!(name.size() && value.size())) - return SettingsEntry("",""); - - - // remove whitespaces in front of option name - for (int i = 0; i < name.size(); i++) - { - if (name[i] == '\t' || name[i] == ' ') - { - name.remove(i, 1); - i--; - } - else - break; - } - // whitespaces after the value are trimmed by the lineSplitter - - SettingsEntry tmp(name, value); - return tmp; -} - - - diff --git a/src/util/pvsSettingsManager.h b/src/util/pvsSettingsManager.h deleted file mode 100644 index 78607eb..0000000 --- a/src/util/pvsSettingsManager.h +++ /dev/null @@ -1,50 +0,0 @@ -/// documentation test 1 -/// line 2 -/// line 3 -#ifndef _PVSSETTINGSMANGER_H_ -#define _PVSSETTINGSMANGER_H_ - -#include <list> -#include <map> -#include <src/util/util.h> -#include <src/util/consoleLogger.h> -#include <QSettings> - - -/// documentation test 1.1 -/// line 2.1 -/// line 3.1 - -typedef std::pair<QString, QString> SettingsEntry; ///< first = option name, second = option value -typedef std::list<SettingsEntry> SettingsList; ///< obvious -typedef std::list<SettingsEntry>::iterator SettingsIter; - - -class PVSSettingsManager; -/// documentation test 1.2 -/// line 2.2 -/// line 3.2 -class PVSSettingsManager -{ -public: - static PVSSettingsManager* getManager(); - void setConfigFile(QString path); - bool hasEntry(QString name); - QString getEntryString(QString name); - void writeEntry(QString name, QString value); - void setConfigs(); - void reWriteConfigs(QString set, QString val); - void readConfigs(QString sett, QString vall); -private: - static PVSSettingsManager* myself; - PVSSettingsManager(); - void _parseFile(QString path); - SettingsEntry _parseLine(QString line); - QString _path; - SettingsList settingsList; - QSettings _configs; - -}; - - -#endif |