From 6e2cd17c9bb575fe7cedcd9e352757691ffd642c Mon Sep 17 00:00:00 2001
From: Björn Hagemeister
Date: Wed, 17 Sep 2014 14:59:44 +0200
Subject: Removed irritating cam - icon in toolbar of client. Plus added some
translations in client.
---
gui/client/toolbar.ui | 7 +-----
i18n/client/pvsclient_ar_JO.ts | 22 +++++++++----------
i18n/client/pvsclient_de_DE.ts | 50 +++++++++++++++++++++---------------------
i18n/client/pvsclient_es_MX.ts | 22 +++++++++----------
i18n/client/pvsclient_fr_FR.ts | 22 +++++++++----------
i18n/client/pvsclient_pl_PL.ts | 22 +++++++++----------
src/client/toolbar/toolbar.cpp | 16 +++++++-------
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; }
-
- :/cam32.svg
-
true
@@ -181,8 +178,6 @@ p, li { white-space: pre-wrap; }
-
-
-
+
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 @@
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
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 @@
- Verbinde zu PVS Sitzung
+ Verbinde zu PVS Sitzung
-
+ Sitzungsname:
- Verbinden
+ Verbinden
- Ausblenden
+ Ausblenden
@@ -31,7 +31,7 @@
-
+ Verbinde zu %1
@@ -82,12 +82,12 @@
-
+ Ungültiges Zertifikat.
-
+ Ungültiger Ssl hash: %1.
@@ -95,12 +95,12 @@
-
+ Setze &Sitzungsname
-
+ &Was ist das hier?
@@ -108,41 +108,41 @@
&Beenden
-
+
-
+ Übertragung
-
+
Offline
-
-
-
+
+
+ Über PVS Client
-
-
-
+
+
+ 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.
-
-
+
+
Online
-
+
- Form
+ Form
-
-
+
+
- Menü
+ Menü
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 @@
&Cerrar
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
de
-
-
+
+
Menu
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 @@
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
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 @@
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
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);
--
cgit v1.2.3-55-g7522