Removed irritating cam - icon in toolbar of client. Plus added some translations in client.

7 files changed, 78 insertions, 83 deletions

diff --git a/gui/client/toolbar.ui b/gui/client/toolbar.ui
index d2bf09a..0c21f70 100644
--- a/gui/client/toolbar.ui
+++ b/gui/client/toolbar.ui
@@ -168,9 +168,6 @@ p, li { white-space: pre-wrap; }
         <property name="text">
          <string/>
         </property>
-        <property name="pixmap">
-         <pixmap resource="../../pvsclient.qrc">:/cam32.svg</pixmap>
-        </property>
         <property name="scaledContents">
          <bool>true</bool>
         </property>
@@ -181,8 +178,6 @@ p, li { white-space: pre-wrap; }
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="../../pvsclient.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>
diff --git a/i18n/client/pvsclient_ar_JO.ts b/i18n/client/pvsclient_ar_JO.ts
index 6ecdc20..97187d8 100644
--- a/i18n/client/pvsclient_ar_JO.ts
+++ b/i18n/client/pvsclient_ar_JO.ts
@@ -108,39 +108,39 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="252"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="253"/>
         <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="273"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="274"/>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="331"/>
-        <source>Über PVS Client</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="332"/>
+        <source>About PVS Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="332"/>
-        <source>Der PVS Client ist Teil eines Softwaresystems zur Verwaltung des visuellen Datenverkehrs innerhalb der Poolräume zwischen Dozenten und Studenten-PCs und wurde zur Vereinfachung des Informationsflusses in Seminaren und allgemeinem eLearning entwickelt.</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="333"/>
+        <source>The PVS - client is part of a software system for managing the virtual data traffic within the computer pools, between the tutor&apos;s and student&apos;s PCs. It has been developed to simplify the information traffic in seminars and general eLearning.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="258"/>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="285"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="259"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="286"/>
         <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="156"/>
+        <location filename="../../build/ui_toolbar.h" line="155"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="158"/>
-        <location filename="../../build/ui_toolbar.h" line="160"/>
+        <location filename="../../build/ui_toolbar.h" line="157"/>
+        <location filename="../../build/ui_toolbar.h" line="159"/>
         <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/client/pvsclient_de_DE.ts b/i18n/client/pvsclient_de_DE.ts
index 2a0dedb..0ef73c3 100644
--- a/i18n/client/pvsclient_de_DE.ts
+++ b/i18n/client/pvsclient_de_DE.ts
@@ -6,22 +6,22 @@
     <message>
         <location filename="../../build/ui_connect.h" line="151"/>
         <source>Connect to PVS session</source>
-        <translation type="unfinished">Verbinde zu PVS Sitzung</translation>
+        <translation>Verbinde zu PVS Sitzung</translation>
     </message>
     <message>
         <location filename="../../build/ui_connect.h" line="152"/>
         <source>Session Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Sitzungsname:</translation>
     </message>
     <message>
         <location filename="../../build/ui_connect.h" line="154"/>
         <source>Connect</source>
-        <translation type="unfinished">Verbinden</translation>
+        <translation>Verbinden</translation>
     </message>
     <message>
         <location filename="../../build/ui_connect.h" line="155"/>
         <source>Hide</source>
-        <translation type="unfinished">Ausblenden</translation>
+        <translation>Ausblenden</translation>
     </message>
     <message>
         <location filename="../../src/client/connectwindow/connectwindow.cpp" line="70"/>
@@ -31,7 +31,7 @@
     <message>
         <location filename="../../src/client/connectwindow/connectwindow.cpp" line="71"/>
         <source>Connected to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbinde zu %1</translation>
     </message>
     <message>
         <location filename="../../src/client/connectwindow/connectwindow.cpp" line="78"/>
@@ -82,12 +82,12 @@
     <message>
         <location filename="../../src/client/connectwindow/connectwindow.cpp" line="106"/>
         <source>Invalid certificate.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ungültiges Zertifikat.</translation>
     </message>
     <message>
         <location filename="../../src/client/connectwindow/connectwindow.cpp" line="109"/>
         <source>Invalid Ssl hash: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ungültiger Ssl hash: %1.</translation>
     </message>
 </context>
 <context>
@@ -95,12 +95,12 @@
     <message>
         <location filename="../../src/client/toolbar/toolbar.cpp" line="92"/>
         <source>Set &amp;session ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Setze &amp;Sitzungsname</translation>
     </message>
     <message>
         <location filename="../../src/client/toolbar/toolbar.cpp" line="93"/>
         <source>&amp;Was ist das hier?</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Was ist das hier?</translation>
     </message>
     <message>
         <location filename="../../src/client/toolbar/toolbar.cpp" line="94"/>
@@ -108,41 +108,41 @@
         <translation>&amp;Beenden</translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="252"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="253"/>
         <source>Streaming</source>
-        <translation type="unfinished"></translation>
+        <translation>Übertragung</translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="273"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="274"/>
         <source>Offline</source>
         <translation>Offline</translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="331"/>
-        <source>Über PVS Client</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="332"/>
+        <source>About PVS Client</source>
+        <translation>Über PVS Client</translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="332"/>
-        <source>Der PVS Client ist Teil eines Softwaresystems zur Verwaltung des visuellen Datenverkehrs innerhalb der Poolräume zwischen Dozenten und Studenten-PCs und wurde zur Vereinfachung des Informationsflusses in Seminaren und allgemeinem eLearning entwickelt.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="333"/>
+        <source>The PVS - client is part of a software system for managing the virtual data traffic within the computer pools, between the tutor&apos;s and student&apos;s PCs. It has been developed to simplify the information traffic in seminars and general eLearning.</source>
+        <translation>Der PVS - Client ist Teil eines Softwaresystems für die Steuerung des virtuellen Datenverkehrs in den Poolräumen zwischen den Dozenten- und Studenten - PCs. Es wurde zur Vereinfachung des Informationsflusses und allgemeinem eLearning entwickelt.</translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="258"/>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="285"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="259"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="286"/>
         <source>Online</source>
         <translation>Online</translation>
     </message>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="156"/>
+        <location filename="../../build/ui_toolbar.h" line="155"/>
         <source>Form</source>
-        <translation type="unfinished">Form</translation>
+        <translation>Form</translation>
     </message>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="158"/>
-        <location filename="../../build/ui_toolbar.h" line="160"/>
+        <location filename="../../build/ui_toolbar.h" line="157"/>
+        <location filename="../../build/ui_toolbar.h" line="159"/>
         <source>Menu</source>
-        <translation type="unfinished">Menü</translation>
+        <translation>Menü</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/client/pvsclient_es_MX.ts b/i18n/client/pvsclient_es_MX.ts
index 8014e15..35b89f1 100644
--- a/i18n/client/pvsclient_es_MX.ts
+++ b/i18n/client/pvsclient_es_MX.ts
@@ -108,39 +108,39 @@
         <translation type="unfinished">&amp;Cerrar</translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="252"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="253"/>
         <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="273"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="274"/>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="331"/>
-        <source>Über PVS Client</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="332"/>
+        <source>About PVS Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="332"/>
-        <source>Der PVS Client ist Teil eines Softwaresystems zur Verwaltung des visuellen Datenverkehrs innerhalb der Poolräume zwischen Dozenten und Studenten-PCs und wurde zur Vereinfachung des Informationsflusses in Seminaren und allgemeinem eLearning entwickelt.</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="333"/>
+        <source>The PVS - client is part of a software system for managing the virtual data traffic within the computer pools, between the tutor&apos;s and student&apos;s PCs. It has been developed to simplify the information traffic in seminars and general eLearning.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="258"/>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="285"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="259"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="286"/>
         <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="156"/>
+        <location filename="../../build/ui_toolbar.h" line="155"/>
         <source>Form</source>
         <translation type="unfinished">de</translation>
     </message>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="158"/>
-        <location filename="../../build/ui_toolbar.h" line="160"/>
+        <location filename="../../build/ui_toolbar.h" line="157"/>
+        <location filename="../../build/ui_toolbar.h" line="159"/>
         <source>Menu</source>
         <translation type="unfinished">Menu</translation>
     </message>
diff --git a/i18n/client/pvsclient_fr_FR.ts b/i18n/client/pvsclient_fr_FR.ts
index 6ecdc20..97187d8 100644
--- a/i18n/client/pvsclient_fr_FR.ts
+++ b/i18n/client/pvsclient_fr_FR.ts
@@ -108,39 +108,39 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="252"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="253"/>
         <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="273"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="274"/>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="331"/>
-        <source>Über PVS Client</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="332"/>
+        <source>About PVS Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="332"/>
-        <source>Der PVS Client ist Teil eines Softwaresystems zur Verwaltung des visuellen Datenverkehrs innerhalb der Poolräume zwischen Dozenten und Studenten-PCs und wurde zur Vereinfachung des Informationsflusses in Seminaren und allgemeinem eLearning entwickelt.</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="333"/>
+        <source>The PVS - client is part of a software system for managing the virtual data traffic within the computer pools, between the tutor&apos;s and student&apos;s PCs. It has been developed to simplify the information traffic in seminars and general eLearning.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="258"/>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="285"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="259"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="286"/>
         <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="156"/>
+        <location filename="../../build/ui_toolbar.h" line="155"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="158"/>
-        <location filename="../../build/ui_toolbar.h" line="160"/>
+        <location filename="../../build/ui_toolbar.h" line="157"/>
+        <location filename="../../build/ui_toolbar.h" line="159"/>
         <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/client/pvsclient_pl_PL.ts b/i18n/client/pvsclient_pl_PL.ts
index 6ecdc20..97187d8 100644
--- a/i18n/client/pvsclient_pl_PL.ts
+++ b/i18n/client/pvsclient_pl_PL.ts
@@ -108,39 +108,39 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="252"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="253"/>
         <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="273"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="274"/>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="331"/>
-        <source>Über PVS Client</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="332"/>
+        <source>About PVS Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="332"/>
-        <source>Der PVS Client ist Teil eines Softwaresystems zur Verwaltung des visuellen Datenverkehrs innerhalb der Poolräume zwischen Dozenten und Studenten-PCs und wurde zur Vereinfachung des Informationsflusses in Seminaren und allgemeinem eLearning entwickelt.</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="333"/>
+        <source>The PVS - client is part of a software system for managing the virtual data traffic within the computer pools, between the tutor&apos;s and student&apos;s PCs. It has been developed to simplify the information traffic in seminars and general eLearning.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="258"/>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="285"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="259"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="286"/>
         <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="156"/>
+        <location filename="../../build/ui_toolbar.h" line="155"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="158"/>
-        <location filename="../../build/ui_toolbar.h" line="160"/>
+        <location filename="../../build/ui_toolbar.h" line="157"/>
+        <location filename="../../build/ui_toolbar.h" line="159"/>
         <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/client/toolbar/toolbar.cpp b/src/client/toolbar/toolbar.cpp
index 4b64b62..e3859fd 100644
--- a/src/client/toolbar/toolbar.cpp
+++ b/src/client/toolbar/toolbar.cpp
@@ -67,7 +67,7 @@ Toolbar::Toolbar(const bool autoConnect, QWidget *parent) : Toolbar(parent)
  */
 Toolbar::Toolbar(QWidget *parent) :
 	QWidget(parent), _ui(new Ui::Toolbar), _hideTimer(this), _connection(NULL),
-	_blinkTimer(this),_cam32(":cam32.svg"),	_beWatchedEye(":eye")
+	_blinkTimer(this),_cam32(QPixmap()),	_beWatchedEye(":eye")
 {
 	/* Initialize the GUI */
 	_ui->setupUi(this);
@@ -98,6 +98,7 @@ Toolbar::Toolbar(QWidget *parent) :
 	_menu->addSeparator();
 	_menu->addAction(_acnQuit);
 	_ui->cmdMenu->setMenu(_menu);
+
 	// Connect the signals
 	connect(_menu, SIGNAL(aboutToHide()), this, SLOT(hideBar()));
 	connect(_acnDisconnect, SIGNAL(triggered()), _connectWindow, SLOT(show()));
@@ -253,7 +254,7 @@ void Toolbar::onVncServerIsRunning(int port)
 		showBar();
 	}	else {
 		_blinkTimer.stop();
-		_ui->icon_cam->setPixmap(_cam32);
+		_ui->icon_cam->setPixmap(QPixmap());
 		_ui->lblStatus->setStyleSheet("color:green");
 		_ui->lblStatus->setText(tr("Online"));
 		hideBar();
@@ -328,12 +329,11 @@ void Toolbar::showAboutDialog()
 {
 	QMessageBox msgBox(
 				QMessageBox::NoIcon,
-				tr("Über PVS Client"),
-				tr("Der PVS Client ist Teil eines Softwaresystems zur Verwaltung "\
-				"des visuellen Datenverkehrs innerhalb der Poolräume zwischen "\
-				"Dozenten und Studenten-PCs und wurde zur Vereinfachung des "\
-				"Informationsflusses in Seminaren und allgemeinem eLearning "\
-				"entwickelt."),
+				tr("About PVS Client"),
+				tr("The PVS - client is part of a software system for managing the "\
+					 "virtual data traffic within the computer pools, between the tutor's "\
+					 "and student's PCs. It has been developed to simplify the information "\
+					 "traffic in seminars and general eLearning."),
 				QMessageBox::NoButton,
 				this,
 				Qt::Dialog|Qt::MSWindowsFixedSizeDialogHint|Qt::WindowStaysOnTopHint);