Merge remote branch 'openslx/master' into mcastft

Conflicts:
	CMakeLists.txt
	pvsmgr.qrc
	src/gui/clientConfigDialog.cpp
	src/gui/mainWindow.cpp
	src/gui/ui/mainwindow.ui
	src/gui/ui/mainwindowtouch.ui
	src/pvs.cpp
	src/pvs.h
	src/pvsDaemon.cpp
	src/pvsgui.cpp

1 files changed, 82 insertions, 49 deletions

diff --git a/i18n/pvsgui_fr_FR.ts b/i18n/pvsgui_fr_FR.ts
index f3e6d65..59b40b9 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>&amp;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 &apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gui/clientChatDialog.cpp" line="212"/>
+        <location filename="../src/gui/clientChatDialog.cpp" line="210"/>
         <source>&apos; 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 &lt;</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>
@@ -331,42 +331,32 @@
 <context>
     <name>ClientToolbarClass</name>
     <message>
-        <location filename="../build/ui_clientToolbar.h" line="179"/>
+        <location filename="../build/ui_clientToolbar.h" line="166"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../build/ui_clientToolbar.h" line="181"/>
+        <location filename="../build/ui_clientToolbar.h" line="168"/>
         <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../build/ui_clientToolbar.h" line="183"/>
+        <location filename="../build/ui_clientToolbar.h" line="170"/>
         <source>Host:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../build/ui_clientToolbar.h" line="185"/>
+        <location filename="../build/ui_clientToolbar.h" line="172"/>
         <source>Click to connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../build/ui_clientToolbar.h" line="187"/>
+        <location filename="../build/ui_clientToolbar.h" line="174"/>
         <source>-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../build/ui_clientToolbar.h" line="189"/>
-        <source>Enable/Disable VNC only for this session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../build/ui_clientToolbar.h" line="191"/>
-        <source>Allow VNC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../build/ui_clientToolbar.h" line="192"/>
+        <location filename="../build/ui_clientToolbar.h" line="175"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -404,84 +394,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PVSGUI</name>
     <message>
-        <location filename="../src/pvsgui.cpp" line="28"/>
+        <location filename="../src/pvsgui.cpp" line="35"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/pvsgui.cpp" line="189"/>
+        <source>Show &amp;toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsgui.cpp" line="191"/>
         <source>&amp;Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="190"/>
+        <location filename="../src/pvsgui.cpp" line="192"/>
         <source>C&amp;hat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="191"/>
+        <location filename="../src/pvsgui.cpp" line="193"/>
         <source>&amp;Send File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="192"/>
+        <location filename="../src/pvsgui.cpp" line="194"/>
         <source>&amp;Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="193"/>
+        <location filename="../src/pvsgui.cpp" line="195"/>
         <source>&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="194"/>
+        <location filename="../src/pvsgui.cpp" line="196"/>
         <source>&amp;About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="195"/>
+        <location filename="../src/pvsgui.cpp" line="197"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="282"/>
-        <location filename="../src/pvsgui.cpp" line="297"/>
-        <location filename="../src/pvsgui.cpp" line="377"/>
+        <location filename="../src/pvsgui.cpp" line="285"/>
+        <location filename="../src/pvsgui.cpp" line="300"/>
+        <location filename="../src/pvsgui.cpp" line="380"/>
         <source>PVS Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="282"/>
+        <location filename="../src/pvsgui.cpp" line="285"/>
         <source>Please enter password (If not needed leave blank):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="298"/>
+        <location filename="../src/pvsgui.cpp" line="301"/>
         <source>Are you sure you want to disconnect?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="321"/>
-        <location filename="../src/pvsgui.cpp" line="343"/>
+        <location filename="../src/pvsgui.cpp" line="324"/>
+        <location filename="../src/pvsgui.cpp" line="346"/>
         <source>PVS connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="321"/>
-        <location filename="../src/pvsgui.cpp" line="335"/>
+        <location filename="../src/pvsgui.cpp" line="324"/>
+        <location filename="../src/pvsgui.cpp" line="338"/>
         <source>Connected to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="343"/>
-        <location filename="../src/pvsgui.cpp" line="355"/>
+        <location filename="../src/pvsgui.cpp" line="346"/>
+        <location filename="../src/pvsgui.cpp" line="358"/>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="377"/>
+        <location filename="../src/pvsgui.cpp" line="380"/>
         <source>New host available: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../src/pvsgui.cpp" line="419"/>
+        <source>Usage: pvsgui [OPTIONS]...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsgui.cpp" line="420"/>
+        <source>Start the Pool Video Switch GUI.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsgui.cpp" line="421"/>
+        <source>Options:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsgui.cpp" line="422"/>
+        <source>Start only with systray icon.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsgui.cpp" line="423"/>
+        <source>Show this help text and quit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsgui.cpp" line="424"/>
+        <source>Show version and quit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsgui.cpp" line="433"/>
+        <source>Version: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>