From b0e65477adebf5a6d0118706e2e90883f5f24df5 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 3 Aug 2018 14:05:58 +0200 Subject: [client] ConnectWindow: Cancel -> Close --- gui/client/connect.ui | 27 ++++++++++-- i18n/client/pvsclient_ar_JO.ts | 14 +++--- i18n/client/pvsclient_de_DE.ts | 18 ++++---- i18n/client/pvsclient_es_MX.ts | 14 +++--- i18n/client/pvsclient_fr_FR.ts | 14 +++--- i18n/client/pvsclient_pl_PL.ts | 14 +++--- i18n/server/pvsmgr_de_DE.ts | 68 +++++++++++++++--------------- i18n/server/pvsmgr_es_MX.ts | 66 ++++++++++++++--------------- i18n/server/pvsmgr_fr_FR.ts | 66 ++++++++++++++--------------- i18n/server/pvsmgr_pl_PL.ts | 66 ++++++++++++++--------------- src/client/connectwindow/connectwindow.cpp | 4 +- src/client/connectwindow/connectwindow.h | 2 +- 12 files changed, 197 insertions(+), 176 deletions(-) diff --git a/gui/client/connect.ui b/gui/client/connect.ui index 39649e2..0bfc654 100644 --- a/gui/client/connect.ui +++ b/gui/client/connect.ui @@ -33,7 +33,16 @@ - + + 0 + + + 0 + + + 0 + + 0 @@ -91,7 +100,16 @@ - + + 0 + + + 0 + + + 0 + + 0 @@ -131,7 +149,7 @@ - Cancel + Close false @@ -179,6 +197,9 @@ Connect + + true + true diff --git a/i18n/client/pvsclient_ar_JO.ts b/i18n/client/pvsclient_ar_JO.ts index c9741ab..a09813c 100644 --- a/i18n/client/pvsclient_ar_JO.ts +++ b/i18n/client/pvsclient_ar_JO.ts @@ -79,32 +79,32 @@ - + Connection - + Connect to - + Manual Connection - + Session Name - - Cancel + + Close - + Connect diff --git a/i18n/client/pvsclient_de_DE.ts b/i18n/client/pvsclient_de_DE.ts index a72880e..65f6298 100644 --- a/i18n/client/pvsclient_de_DE.ts +++ b/i18n/client/pvsclient_de_DE.ts @@ -1,6 +1,6 @@ - + ConnectWindow @@ -9,32 +9,32 @@ Verbinde zu PVS Sitzung - + Connection Verbindung - + Connect to Verbinden zu - + Manual Connection Manuelle Verbindung - + Session Name Sitzungsname - - Cancel - Abbrechen + + Close + Schließen - + Connect Verbinden diff --git a/i18n/client/pvsclient_es_MX.ts b/i18n/client/pvsclient_es_MX.ts index 73f235c..9bb6d74 100644 --- a/i18n/client/pvsclient_es_MX.ts +++ b/i18n/client/pvsclient_es_MX.ts @@ -9,32 +9,32 @@ - + Connection - + Connect to - + Manual Connection - + Session Name - - Cancel + + Close - + Connect Conectar diff --git a/i18n/client/pvsclient_fr_FR.ts b/i18n/client/pvsclient_fr_FR.ts index c9741ab..a09813c 100644 --- a/i18n/client/pvsclient_fr_FR.ts +++ b/i18n/client/pvsclient_fr_FR.ts @@ -79,32 +79,32 @@ - + Connection - + Connect to - + Manual Connection - + Session Name - - Cancel + + Close - + Connect diff --git a/i18n/client/pvsclient_pl_PL.ts b/i18n/client/pvsclient_pl_PL.ts index c9741ab..a09813c 100644 --- a/i18n/client/pvsclient_pl_PL.ts +++ b/i18n/client/pvsclient_pl_PL.ts @@ -79,32 +79,32 @@ - + Connection - + Connect to - + Manual Connection - + Session Name - - Cancel + + Close - + Connect diff --git a/i18n/server/pvsmgr_de_DE.ts b/i18n/server/pvsmgr_de_DE.ts index 40de23b..ec6ebe5 100644 --- a/i18n/server/pvsmgr_de_DE.ts +++ b/i18n/server/pvsmgr_de_DE.ts @@ -1,10 +1,10 @@ - + ConnectionFrame - + EXAM-MODE KLAUSURMODUS @@ -126,88 +126,88 @@ Raum neu laden - - + + Question Frage - + Are you sure you want to exit? Wollen Sie den PVS-Manager wirklich beenden? - + Do you want to delete and disconnect any clients not belonging to the current room layout? Möchten Sie alle Teilnehmer, die nicht zum aktuellen Raumplan gehören, aus der Sitzung entfernen? - - - - - + + + + + Selection Auswahl - + This client is still connected. Dieser Client ist noch verbunden. - + Warning Warnung - + Are you sure you want to delete the selected client? Möchten Sie den gewählten Client löschen? - + Session Name: %1 [click to edit] Sitzungsname: %1 [anklicken editiert] - + No item selected, please select room! Keine Auswahl getroffen, bitte einen Raum auswählen! - + Are you sure you want to reload the room? Note that all clients will be deleted. Wollen Sie den Raum wirklich neu laden? Beachten Sie, dass alle Clienten gelöscht werden. - - - - - - - - - - - - - + + + + + + + + + + + + + Projection Projektion - - - + + + No client is selected. Kein Client ausgewählt. - + The selected client is not connected. Ausgewählter Client ist nicht verbunden. diff --git a/i18n/server/pvsmgr_es_MX.ts b/i18n/server/pvsmgr_es_MX.ts index 7c0bcf4..64369ce 100644 --- a/i18n/server/pvsmgr_es_MX.ts +++ b/i18n/server/pvsmgr_es_MX.ts @@ -4,7 +4,7 @@ ConnectionFrame - + EXAM-MODE @@ -126,88 +126,88 @@ - - + + Question - + Are you sure you want to exit? - + Do you want to delete and disconnect any clients not belonging to the current room layout? - - - - - + + + + + Selection - + This client is still connected. - + Warning - + Are you sure you want to delete the selected client? - + Session Name: %1 [click to edit] - + No item selected, please select room! - + Are you sure you want to reload the room? Note that all clients will be deleted. - - - - - - - - - - - - - + + + + + + + + + + + + + Projection - - - + + + No client is selected. - + The selected client is not connected. diff --git a/i18n/server/pvsmgr_fr_FR.ts b/i18n/server/pvsmgr_fr_FR.ts index 8f8e058..3d1f321 100644 --- a/i18n/server/pvsmgr_fr_FR.ts +++ b/i18n/server/pvsmgr_fr_FR.ts @@ -4,7 +4,7 @@ ConnectionFrame - + EXAM-MODE @@ -126,88 +126,88 @@ - - + + Question - + Are you sure you want to exit? - + Do you want to delete and disconnect any clients not belonging to the current room layout? - - - - - + + + + + Selection - + This client is still connected. - + Warning - + Are you sure you want to delete the selected client? - + Session Name: %1 [click to edit] - + No item selected, please select room! - + Are you sure you want to reload the room? Note that all clients will be deleted. - - - - - - - - - - - - - + + + + + + + + + + + + + Projection - - - + + + No client is selected. - + The selected client is not connected. diff --git a/i18n/server/pvsmgr_pl_PL.ts b/i18n/server/pvsmgr_pl_PL.ts index 8f8e058..3d1f321 100644 --- a/i18n/server/pvsmgr_pl_PL.ts +++ b/i18n/server/pvsmgr_pl_PL.ts @@ -4,7 +4,7 @@ ConnectionFrame - + EXAM-MODE @@ -126,88 +126,88 @@ - - + + Question - + Are you sure you want to exit? - + Do you want to delete and disconnect any clients not belonging to the current room layout? - - - - - + + + + + Selection - + This client is still connected. - + Warning - + Are you sure you want to delete the selected client? - + Session Name: %1 [click to edit] - + No item selected, please select room! - + Are you sure you want to reload the room? Note that all clients will be deleted. - - - - - - - - - - - - - + + + + + + + + + + + + + Projection - - - + + + No client is selected. - + The selected client is not connected. diff --git a/src/client/connectwindow/connectwindow.cpp b/src/client/connectwindow/connectwindow.cpp index a9f0996..7674cc2 100644 --- a/src/client/connectwindow/connectwindow.cpp +++ b/src/client/connectwindow/connectwindow.cpp @@ -40,7 +40,7 @@ ConnectWindow::ConnectWindow(QWidget *parent) : QWidget(parent) // Set actions of buttons connect(_ui->btn_connection, SIGNAL(clicked()), this, SLOT(onBtnConnection())); - connect(_ui->btn_hide, SIGNAL(clicked()), this, SLOT(onBtnCancel())); + connect(_ui->btn_hide, SIGNAL(clicked()), this, SLOT(onBtnHide())); connect(_ui->comboBox_rooms, SIGNAL(currentIndexChanged(int)), this, SLOT(onRoomSelection(int))); @@ -263,7 +263,7 @@ void ConnectWindow::setAvailableRooms(QList m) * Handle click on Cancel/Hide Button. * Just hide the window. */ -void ConnectWindow::onBtnCancel() +void ConnectWindow::onBtnHide() { this->hide(); } diff --git a/src/client/connectwindow/connectwindow.h b/src/client/connectwindow/connectwindow.h index a6c7942..9fcaf4e 100644 --- a/src/client/connectwindow/connectwindow.h +++ b/src/client/connectwindow/connectwindow.h @@ -83,7 +83,7 @@ protected: protected slots: void doShow(); void onBtnConnection(); - void onBtnCancel(); + void onBtnHide(); void onRoomSelection(int index); -- cgit v1.2.3-55-g7522