Merge branch 'master' of openslx.org:pvs

Conflicts:
	i18n/pvs_ar_JO.ts
	i18n/pvs_de_DE.ts
	i18n/pvs_es_MX.ts
	i18n/pvs_fr_FR.ts
	i18n/pvs_pl_PL.ts

18 files changed, 261 insertions, 271 deletions

diff --git a/.gitignore b/.gitignore
index d9453b2..41df4f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 .cproject
 .project
 build/
-
+i18n/
diff --git a/i18n/pvs_ar_JO.ts b/i18n/pvs_ar_JO.ts
index f5b5dc5..e9a460f 100644
--- a/i18n/pvs_ar_JO.ts
+++ b/i18n/pvs_ar_JO.ts
@@ -9,17 +9,29 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../src/pvs.cpp" line="363"/>
+=======
+        <location filename="../src/pvs.cpp" line="337"/>
+>>>>>>> 25305a6ef01120bf3b0d929bae0ba7693f41c46b
         <source>VNC connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../src/pvs.cpp" line="363"/>
+=======
+        <location filename="../src/pvs.cpp" line="337"/>
+>>>>>>> 25305a6ef01120bf3b0d929bae0ba7693f41c46b
         <source>The host </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../src/pvs.cpp" line="365"/>
+=======
+        <location filename="../src/pvs.cpp" line="339"/>
+>>>>>>> 25305a6ef01120bf3b0d929bae0ba7693f41c46b
         <source> requested your screen!</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/pvs_de_DE.ts b/i18n/pvs_de_DE.ts
index f5b5dc5..e9a460f 100644
--- a/i18n/pvs_de_DE.ts
+++ b/i18n/pvs_de_DE.ts
@@ -9,17 +9,29 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../src/pvs.cpp" line="363"/>
+=======
+        <location filename="../src/pvs.cpp" line="337"/>
+>>>>>>> 25305a6ef01120bf3b0d929bae0ba7693f41c46b
         <source>VNC connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../src/pvs.cpp" line="363"/>
+=======
+        <location filename="../src/pvs.cpp" line="337"/>
+>>>>>>> 25305a6ef01120bf3b0d929bae0ba7693f41c46b
         <source>The host </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../src/pvs.cpp" line="365"/>
+=======
+        <location filename="../src/pvs.cpp" line="339"/>
+>>>>>>> 25305a6ef01120bf3b0d929bae0ba7693f41c46b
         <source> requested your screen!</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/pvs_es_MX.ts b/i18n/pvs_es_MX.ts
index f5b5dc5..e9a460f 100644
--- a/i18n/pvs_es_MX.ts
+++ b/i18n/pvs_es_MX.ts
@@ -9,17 +9,29 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../src/pvs.cpp" line="363"/>
+=======
+        <location filename="../src/pvs.cpp" line="337"/>
+>>>>>>> 25305a6ef01120bf3b0d929bae0ba7693f41c46b
         <source>VNC connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../src/pvs.cpp" line="363"/>
+=======
+        <location filename="../src/pvs.cpp" line="337"/>
+>>>>>>> 25305a6ef01120bf3b0d929bae0ba7693f41c46b
         <source>The host </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../src/pvs.cpp" line="365"/>
+=======
+        <location filename="../src/pvs.cpp" line="339"/>
+>>>>>>> 25305a6ef01120bf3b0d929bae0ba7693f41c46b
         <source> requested your screen!</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/pvs_fr_FR.ts b/i18n/pvs_fr_FR.ts
index f5b5dc5..e9a460f 100644
--- a/i18n/pvs_fr_FR.ts
+++ b/i18n/pvs_fr_FR.ts
@@ -9,17 +9,29 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../src/pvs.cpp" line="363"/>
+=======
+        <location filename="../src/pvs.cpp" line="337"/>
+>>>>>>> 25305a6ef01120bf3b0d929bae0ba7693f41c46b
         <source>VNC connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../src/pvs.cpp" line="363"/>
+=======
+        <location filename="../src/pvs.cpp" line="337"/>
+>>>>>>> 25305a6ef01120bf3b0d929bae0ba7693f41c46b
         <source>The host </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../src/pvs.cpp" line="365"/>
+=======
+        <location filename="../src/pvs.cpp" line="339"/>
+>>>>>>> 25305a6ef01120bf3b0d929bae0ba7693f41c46b
         <source> requested your screen!</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/pvs_pl_PL.ts b/i18n/pvs_pl_PL.ts
index f5b5dc5..e9a460f 100644
--- a/i18n/pvs_pl_PL.ts
+++ b/i18n/pvs_pl_PL.ts
@@ -9,17 +9,29 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../src/pvs.cpp" line="363"/>
+=======
+        <location filename="../src/pvs.cpp" line="337"/>
+>>>>>>> 25305a6ef01120bf3b0d929bae0ba7693f41c46b
         <source>VNC connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../src/pvs.cpp" line="363"/>
+=======
+        <location filename="../src/pvs.cpp" line="337"/>
+>>>>>>> 25305a6ef01120bf3b0d929bae0ba7693f41c46b
         <source>The host </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../src/pvs.cpp" line="365"/>
+=======
+        <location filename="../src/pvs.cpp" line="339"/>
+>>>>>>> 25305a6ef01120bf3b0d929bae0ba7693f41c46b
         <source> requested your screen!</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/pvsgui_ar_JO.ts b/i18n/pvsgui_ar_JO.ts
index f3e6d65..04d9717 100644
--- a/i18n/pvsgui_ar_JO.ts
+++ b/i18n/pvsgui_ar_JO.ts
@@ -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; }
@@ -409,77 +399,77 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="189"/>
+        <location filename="../src/pvsgui.cpp" line="175"/>
         <source>&amp;Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="190"/>
+        <location filename="../src/pvsgui.cpp" line="176"/>
         <source>C&amp;hat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="191"/>
+        <location filename="../src/pvsgui.cpp" line="177"/>
         <source>&amp;Send File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="192"/>
+        <location filename="../src/pvsgui.cpp" line="178"/>
         <source>&amp;Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="193"/>
+        <location filename="../src/pvsgui.cpp" line="179"/>
         <source>&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="194"/>
+        <location filename="../src/pvsgui.cpp" line="180"/>
         <source>&amp;About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="195"/>
+        <location filename="../src/pvsgui.cpp" line="181"/>
         <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="268"/>
+        <location filename="../src/pvsgui.cpp" line="283"/>
+        <location filename="../src/pvsgui.cpp" line="363"/>
         <source>PVS Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="282"/>
+        <location filename="../src/pvsgui.cpp" line="268"/>
         <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="284"/>
         <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="307"/>
+        <location filename="../src/pvsgui.cpp" line="329"/>
         <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="335"/>
         <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="329"/>
+        <location filename="../src/pvsgui.cpp" line="341"/>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="377"/>
+        <location filename="../src/pvsgui.cpp" line="363"/>
         <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 9acab81..544ebff 100644
--- a/i18n/pvsgui_de_DE.ts
+++ b/i18n/pvsgui_de_DE.ts
@@ -331,42 +331,40 @@
 <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></translation>
     </message>
     <message>
-        <location filename="../build/ui_clientToolbar.h" line="181"/>
+        <location filename="../build/ui_clientToolbar.h" line="168"/>
         <source>Menu</source>
         <translation>Menü</translation>
     </message>
     <message>
-        <location filename="../build/ui_clientToolbar.h" line="183"/>
+        <location filename="../build/ui_clientToolbar.h" line="170"/>
         <source>Host:</source>
         <translation></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>Zum Verbinden Klicken</translation>
     </message>
     <message>
-        <location filename="../build/ui_clientToolbar.h" line="187"/>
+        <location filename="../build/ui_clientToolbar.h" line="174"/>
         <source>-</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../build/ui_clientToolbar.h" line="189"/>
         <source>Enable/Disable VNC only for this session</source>
-        <translation>VNC nur für diese Sitzung ein- und ausschalten</translation>
+        <translation type="obsolete">VNC nur für diese Sitzung ein- und ausschalten</translation>
     </message>
     <message>
-        <location filename="../build/ui_clientToolbar.h" line="191"/>
         <source>Allow VNC</source>
-        <translation>VNC erlauben</translation>
+        <translation type="obsolete">VNC erlauben</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; }
@@ -409,77 +407,77 @@ p, li { white-space: pre-wrap; }
         <translation>Verbinden</translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="189"/>
+        <location filename="../src/pvsgui.cpp" line="175"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;Trennen</translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="190"/>
+        <location filename="../src/pvsgui.cpp" line="176"/>
         <source>C&amp;hat</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="191"/>
+        <location filename="../src/pvsgui.cpp" line="177"/>
         <source>&amp;Send File</source>
         <translation>Datei &amp;Senden</translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="192"/>
+        <location filename="../src/pvsgui.cpp" line="178"/>
         <source>&amp;Config</source>
         <translation>&amp;Konfiguration</translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="193"/>
+        <location filename="../src/pvsgui.cpp" line="179"/>
         <source>&amp;Information</source>
         <translation>&amp;Information</translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="194"/>
+        <location filename="../src/pvsgui.cpp" line="180"/>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="195"/>
+        <location filename="../src/pvsgui.cpp" line="181"/>
         <source>&amp;Quit</source>
         <translation>&amp;Beenden</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="268"/>
+        <location filename="../src/pvsgui.cpp" line="283"/>
+        <location filename="../src/pvsgui.cpp" line="363"/>
         <source>PVS Connection</source>
         <translation>PVS Verbindung</translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="282"/>
+        <location filename="../src/pvsgui.cpp" line="268"/>
         <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="298"/>
+        <location filename="../src/pvsgui.cpp" line="284"/>
         <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="321"/>
-        <location filename="../src/pvsgui.cpp" line="343"/>
+        <location filename="../src/pvsgui.cpp" line="307"/>
+        <location filename="../src/pvsgui.cpp" line="329"/>
         <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="335"/>
         <source>Connected to </source>
         <translation>Verbunden mit </translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="343"/>
-        <location filename="../src/pvsgui.cpp" line="355"/>
+        <location filename="../src/pvsgui.cpp" line="329"/>
+        <location filename="../src/pvsgui.cpp" line="341"/>
         <source>Disconnected</source>
         <translation>Getrennt</translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="377"/>
+        <location filename="../src/pvsgui.cpp" line="363"/>
         <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 32b6195..855ee9b 100644
--- a/i18n/pvsgui_es_MX.ts
+++ b/i18n/pvsgui_es_MX.ts
@@ -331,42 +331,40 @@
 <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>de</translation>
     </message>
     <message>
-        <location filename="../build/ui_clientToolbar.h" line="181"/>
+        <location filename="../build/ui_clientToolbar.h" line="168"/>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
     <message>
-        <location filename="../build/ui_clientToolbar.h" line="183"/>
+        <location filename="../build/ui_clientToolbar.h" line="170"/>
         <source>Host:</source>
         <translation>Host:</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>Click para conectar</translation>
     </message>
     <message>
-        <location filename="../build/ui_clientToolbar.h" line="187"/>
+        <location filename="../build/ui_clientToolbar.h" line="174"/>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
-        <location filename="../build/ui_clientToolbar.h" line="189"/>
         <source>Enable/Disable VNC only for this session</source>
-        <translation>Avilitar/Desavilitar VNC solamente para esta sesión</translation>
+        <translation type="obsolete">Avilitar/Desavilitar VNC solamente para esta sesión</translation>
     </message>
     <message>
-        <location filename="../build/ui_clientToolbar.h" line="191"/>
         <source>Allow VNC</source>
-        <translation>Permitir VNC</translation>
+        <translation type="obsolete">Permitir VNC</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; }
@@ -421,77 +419,77 @@ p, li { white-space: pre-wrap; }
         <translation>Conectar</translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="189"/>
+        <location filename="../src/pvsgui.cpp" line="175"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;Desconectar</translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="190"/>
+        <location filename="../src/pvsgui.cpp" line="176"/>
         <source>C&amp;hat</source>
         <translation>???</translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="191"/>
+        <location filename="../src/pvsgui.cpp" line="177"/>
         <source>&amp;Send File</source>
         <translation>&amp;Enviar archivo</translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="192"/>
+        <location filename="../src/pvsgui.cpp" line="178"/>
         <source>&amp;Config</source>
         <translation>&amp;Configuración</translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="193"/>
+        <location filename="../src/pvsgui.cpp" line="179"/>
         <source>&amp;Information</source>
         <translation>&amp;Información</translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="194"/>
+        <location filename="../src/pvsgui.cpp" line="180"/>
         <source>&amp;About</source>
         <translation>&amp;Acerca de</translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="195"/>
+        <location filename="../src/pvsgui.cpp" line="181"/>
         <source>&amp;Quit</source>
         <translation>&amp;Cerrar</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="268"/>
+        <location filename="../src/pvsgui.cpp" line="283"/>
+        <location filename="../src/pvsgui.cpp" line="363"/>
         <source>PVS Connection</source>
         <translation>PVS Connección</translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="282"/>
+        <location filename="../src/pvsgui.cpp" line="268"/>
         <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="298"/>
+        <location filename="../src/pvsgui.cpp" line="284"/>
         <source>Are you sure you want to disconnect?</source>
         <translation>Realmente desea desconectarse?</translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="321"/>
-        <location filename="../src/pvsgui.cpp" line="343"/>
+        <location filename="../src/pvsgui.cpp" line="307"/>
+        <location filename="../src/pvsgui.cpp" line="329"/>
         <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="335"/>
         <source>Connected to </source>
         <translation>Connectar a </translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="343"/>
-        <location filename="../src/pvsgui.cpp" line="355"/>
+        <location filename="../src/pvsgui.cpp" line="329"/>
+        <location filename="../src/pvsgui.cpp" line="341"/>
         <source>Disconnected</source>
         <translation>Desconectado</translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="377"/>
+        <location filename="../src/pvsgui.cpp" line="363"/>
         <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 f3e6d65..04d9717 100644
--- a/i18n/pvsgui_fr_FR.ts
+++ b/i18n/pvsgui_fr_FR.ts
@@ -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; }
@@ -409,77 +399,77 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="189"/>
+        <location filename="../src/pvsgui.cpp" line="175"/>
         <source>&amp;Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="190"/>
+        <location filename="../src/pvsgui.cpp" line="176"/>
         <source>C&amp;hat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="191"/>
+        <location filename="../src/pvsgui.cpp" line="177"/>
         <source>&amp;Send File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="192"/>
+        <location filename="../src/pvsgui.cpp" line="178"/>
         <source>&amp;Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="193"/>
+        <location filename="../src/pvsgui.cpp" line="179"/>
         <source>&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="194"/>
+        <location filename="../src/pvsgui.cpp" line="180"/>
         <source>&amp;About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="195"/>
+        <location filename="../src/pvsgui.cpp" line="181"/>
         <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="268"/>
+        <location filename="../src/pvsgui.cpp" line="283"/>
+        <location filename="../src/pvsgui.cpp" line="363"/>
         <source>PVS Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="282"/>
+        <location filename="../src/pvsgui.cpp" line="268"/>
         <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="284"/>
         <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="307"/>
+        <location filename="../src/pvsgui.cpp" line="329"/>
         <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="335"/>
         <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="329"/>
+        <location filename="../src/pvsgui.cpp" line="341"/>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="377"/>
+        <location filename="../src/pvsgui.cpp" line="363"/>
         <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 f3e6d65..04d9717 100644
--- a/i18n/pvsgui_pl_PL.ts
+++ b/i18n/pvsgui_pl_PL.ts
@@ -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; }
@@ -409,77 +399,77 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="189"/>
+        <location filename="../src/pvsgui.cpp" line="175"/>
         <source>&amp;Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="190"/>
+        <location filename="../src/pvsgui.cpp" line="176"/>
         <source>C&amp;hat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="191"/>
+        <location filename="../src/pvsgui.cpp" line="177"/>
         <source>&amp;Send File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="192"/>
+        <location filename="../src/pvsgui.cpp" line="178"/>
         <source>&amp;Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="193"/>
+        <location filename="../src/pvsgui.cpp" line="179"/>
         <source>&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="194"/>
+        <location filename="../src/pvsgui.cpp" line="180"/>
         <source>&amp;About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="195"/>
+        <location filename="../src/pvsgui.cpp" line="181"/>
         <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="268"/>
+        <location filename="../src/pvsgui.cpp" line="283"/>
+        <location filename="../src/pvsgui.cpp" line="363"/>
         <source>PVS Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="282"/>
+        <location filename="../src/pvsgui.cpp" line="268"/>
         <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="284"/>
         <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="307"/>
+        <location filename="../src/pvsgui.cpp" line="329"/>
         <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="335"/>
         <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="329"/>
+        <location filename="../src/pvsgui.cpp" line="341"/>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvsgui.cpp" line="377"/>
+        <location filename="../src/pvsgui.cpp" line="363"/>
         <source>New host available: </source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/gui/clientConfigDialog.cpp b/src/gui/clientConfigDialog.cpp
index 76b4f5e..3e1ee50 100644
--- a/src/gui/clientConfigDialog.cpp
+++ b/src/gui/clientConfigDialog.cpp
@@ -26,6 +26,12 @@ ClientConfigDialog::ClientConfigDialog(QWidget *parent) :
     connect(radioButtonOtherRO, SIGNAL(clicked()), this,
             SLOT(checkPermissions()));
 
+    // 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);
+
 }
 
 ClientConfigDialog::~ClientConfigDialog()
@@ -49,50 +55,66 @@ void ClientConfigDialog::readSettings()
     else
         comboBox->setCurrentIndex(_settings.value("Display/location").toInt());
 
-    if (_settings.value("Permissions/vnc_lecturer").toString() == "rw")
-        radioButtonLecturerRW->setChecked(true);
-    else if (_settings.value("Permissions/vnc_lecturer").toString() == "ro")
-        radioButtonLecturerRO->setChecked(true);
-    else
-        radioButtonLecturerNO->setChecked(true);
-    if (_settings.value("Permissions/vnc_other").toString() == "rw")
-        radioButtonOtherRW->setChecked(true);
-    else if (_settings.value("Permissions/vnc_other").toString() == "ro")
-        radioButtonOtherRO->setChecked(true);
-    else
-        radioButtonOtherNO->setChecked(true);
-    checkBoxAllowChat->setChecked(
-        _settings.value("Permissions/allow_chat").toBool());
-    checkBoxAllowFiletransfer->setChecked(_settings.value(
-                                              "Permissions/allow_filetransfer").toBool());
-
-    qDebug("[%s] Setting read from: '%s'", metaObject()->className(),
-           qPrintable(_settings.fileName()));
+    QDBusPendingReply<QString> reply = _ifaceDBus->getConfigValue("Permissions/vnc_lecturer");
+    reply.waitForFinished();
+    if (reply.isValid())
+    {
+        if (reply.value() == "rw")
+            radioButtonLecturerRW->setChecked(true);
+        else if (reply.value() == "ro")
+            radioButtonLecturerRO->setChecked(true);
+        else
+            radioButtonLecturerNO->setChecked(true);
+    }
+
+    reply = _ifaceDBus->getConfigValue("Permissions/vnc_other");
+    reply.waitForFinished();
+    if (reply.isValid())
+    {
+        if (reply.value() == "rw")
+            radioButtonOtherRW->setChecked(true);
+        else if (reply.value() == "ro")
+            radioButtonOtherRO->setChecked(true);
+        else
+            radioButtonOtherNO->setChecked(true);
+    }
+
+    reply = _ifaceDBus->getConfigValue("Permissions/allow_chat");
+    reply.waitForFinished();
+    if (reply.isValid())
+        checkBoxAllowChat->setChecked(reply.value() == "T");
+
+    reply = _ifaceDBus->getConfigValue("Permissions/allow_filetransfer");
+    reply.waitForFinished();
+    if (reply.isValid())
+        checkBoxAllowFiletransfer->setChecked(reply.value() == "T");
+
 }
 
 void ClientConfigDialog::writeSettings()
 {
     _settings.setValue("Display/location", comboBox->currentIndex());
+
     if (radioButtonLecturerRW->isChecked())
-        _settings.setValue("Permissions/vnc_lecturer", "rw");
+        _ifaceDBus->setConfigValue("Permissions/vnc_lecturer", "rw");
     else if (radioButtonLecturerRO->isChecked())
-        _settings.setValue("Permissions/vnc_lecturer", "ro");
+        _ifaceDBus->setConfigValue("Permissions/vnc_lecturer", "ro");
     else
-        _settings.setValue("Permissions/vnc_lecturer", "no");
+        _ifaceDBus->setConfigValue("Permissions/vnc_lecturer", "no");
     if (radioButtonOtherRW->isChecked())
-        _settings.setValue("Permissions/vnc_other", "rw");
+        _ifaceDBus->setConfigValue("Permissions/vnc_other", "rw");
     else if (radioButtonOtherRO->isChecked())
-        _settings.setValue("Permissions/vnc_other", "ro");
+        _ifaceDBus->setConfigValue("Permissions/vnc_other", "ro");
     else
-        _settings.setValue("Permissions/vnc_other", "no");
-    _settings.setValue("Permissions/allow_chat", checkBoxAllowChat->isChecked());
-    _settings.setValue("Permissions/allow_filetransfer",
-                       checkBoxAllowFiletransfer->isChecked());
+        _ifaceDBus->setConfigValue("Permissions/vnc_other", "no");
+
+    _ifaceDBus->setConfigValue("Permissions/allow_chat",
+            QString(checkBoxAllowChat->isChecked() ? "T" : "F"));
+    _ifaceDBus->setConfigValue("Permissions/allow_filetransfer",
+            QString(checkBoxAllowFiletransfer->isChecked() ? "T" : "F"));
+
     _settings.sync();
     emit configChanged();
-
-    qDebug("[%s] Settings written to: '%s'.", metaObject()->className(),
-           qPrintable(_settings.fileName()));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/gui/clientConfigDialog.h b/src/gui/clientConfigDialog.h
index 706bd8a..98da54f 100644
--- a/src/gui/clientConfigDialog.h
+++ b/src/gui/clientConfigDialog.h
@@ -15,6 +15,7 @@
 #define CLIENTCONFIGDIALOG_H_
 
 #include <QtGui>
+#include "pvsinterface.h"
 #include "ui_clientConfigDialog.h"
 
 class ClientConfigDialog: public QDialog, private Ui::ClientConfigDialogClass
@@ -37,6 +38,7 @@ private Q_SLOTS:
     void checkPermissions();
 
 private:
+    OrgOpenslxPvsInterface *_ifaceDBus;
     QSettings _settings;
 
 };
diff --git a/src/gui/ui/clientToolbar.ui b/src/gui/ui/clientToolbar.ui
index 5a59c5f..51cb62e 100644
--- a/src/gui/ui/clientToolbar.ui
+++ b/src/gui/ui/clientToolbar.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>577</width>
+    <width>463</width>
     <height>28</height>
    </rect>
   </property>
@@ -144,35 +144,6 @@ p, li { white-space: pre-wrap; }
        </spacer>
       </item>
       <item>
-       <widget class="QCheckBox" name="vncCheckBox">
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>Enable/Disable VNC only for this session</string>
-        </property>
-        <property name="text">
-         <string>Allow VNC</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
        <widget class="QLabel" name="label">
         <property name="text">
          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
diff --git a/src/pvs.cpp b/src/pvs.cpp
index 66a1c88..d09d407 100644
--- a/src/pvs.cpp
+++ b/src/pvs.cpp
@@ -330,24 +330,9 @@ bool PVS::allowExists()
  */
 bool PVS::getVNCAllow()
 {
-    if (allowExists())
-    {
-        if (getAllowed())
-        {
-            _vncAllowed = true;
-        }
-        else
-        {
-            _vncAllowed = false;
-        }
-    }
-    else
-    {
-        ConsoleLog writeError("No .allow file found.");
-        _vncAllowed = false;
-        //make sure the vncsever is off
-		ConsoleLog writeError("Shutting down vnc-server because we have no .allow file.");
-    }
+
+    QString value = getConfigValue("Permissions/vnc_lecturer");
+    _vncAllowed = (value == "rw" || value == "ro");
 
     if (_vncAllowed && _vncRequested)
     {
@@ -640,3 +625,15 @@ void PVS::signalHandler(int signal)
 
 }
 
+void PVS::setConfigValue(QString key, QString value)
+{
+    _settings.setValue(key, value);
+    _settings.sync();
+    getVNCAllow();
+}
+
+QString PVS::getConfigValue(QString key)
+{
+    return _settings.value(key).toString();
+}
+
diff --git a/src/pvs.h b/src/pvs.h
index 4b1e29e..ba696d8 100644
--- a/src/pvs.h
+++ b/src/pvs.h
@@ -80,6 +80,9 @@ public Q_SLOTS:
     QStringList getAvailableHosts();
     QString getIpByNick(QString nick);
 
+    void setConfigValue(QString key, QString value);
+    QString getConfigValue(QString key);
+
 Q_SIGNALS:
     void project(QString host, int port, QString passwd, bool fullscreen,
                  bool smoothTransformation, int quality);
@@ -131,8 +134,6 @@ private:
 
     PVSServerConnection* _pvsServerConnection; ///< our tcp connection object to the pvsserver
 
-    QSettings _settings;
-
     PVSServiceDiscovery *_sdClient;
 
     PVSChatClient *_chat;
@@ -142,5 +143,7 @@ private:
     int _timerLockTest;
     int _timerLockDelay;
 
+    QSettings _settings;
+
 };
 #endif /* PVSCLIENT_H_ */
diff --git a/src/pvsgui.cpp b/src/pvsgui.cpp
index 25f1cd6..6fdd673 100644
--- a/src/pvsgui.cpp
+++ b/src/pvsgui.cpp
@@ -76,18 +76,6 @@ PVSGUI::PVSGUI(QWidget *parent) :
     if (dbus.isConnected())
         qDebug("[%s] Connection to DBus successful!", metaObject()->className());
 
-    // TODO: perhaps this can go if fadi does his work
-    // check if vnc is allowed and setup checkbox
-    QFile file(QDir::toNativeSeparators(QDir::homePath() + "/.pvs/.allow"));
-    if (file.open(QIODevice::ReadOnly | QIODevice::Text))
-    {
-        QTextStream in(&file);
-        QString line = in.readLine();
-        if (line == "1")
-            vncCheckBox->setChecked(true);
-        file.close();
-    }
-
     // listen on port 29481 for incoming file transfers
     _serverSocket = new QTcpServer();
     _serverSocket->listen(QHostAddress::Any, 29481);
@@ -108,8 +96,6 @@ PVSGUI::PVSGUI(QWidget *parent) :
     connect(_hostMenu, SIGNAL(aboutToHide()), this, SLOT(hide()));
     connect(_hostMenu, SIGNAL(triggered(QAction*)), this,
             SLOT(pvsConnect(QAction*)));
-    connect(vncCheckBox, SIGNAL(stateChanged(int)), this,
-            SLOT(setVncAllow(int)));
 
     // signals & slots - dbus
     connect(_ifaceDBus, SIGNAL(showMessage(QString, QString, bool)), this,
@@ -392,22 +378,6 @@ void PVSGUI::delHost(QString host)
     }
 }
 
-// TODO: perhaps this can go if fadi does his work
-void PVSGUI::setVncAllow(int i)
-{
-    QFile file(QDir::toNativeSeparators(QDir::homePath() + "/.pvs/.allow"));
-    if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
-        return;
-
-    QTextStream out(&file);
-    if (i == 0)
-        out << 0;
-    else
-        out << 1;
-
-    file.close();
-}
-
 void PVSGUI::sendFile()
 {
     ClientFileSendDialog *d = new ClientFileSendDialog();
diff --git a/src/pvsgui.h b/src/pvsgui.h
index f9a0ab8..90fe50e 100644
--- a/src/pvsgui.h
+++ b/src/pvsgui.h
@@ -62,7 +62,6 @@ private Q_SLOTS:
     void delHost(QString host);
     void pvsConnect(QAction *action);
     void pvsDisconnect();
-    void setVncAllow(int i);
     void sendFile();
     void receiveFile();