summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gui/client/connect.ui27
-rw-r--r--i18n/client/pvsclient_ar_JO.ts14
-rw-r--r--i18n/client/pvsclient_de_DE.ts18
-rw-r--r--i18n/client/pvsclient_es_MX.ts14
-rw-r--r--i18n/client/pvsclient_fr_FR.ts14
-rw-r--r--i18n/client/pvsclient_pl_PL.ts14
-rw-r--r--i18n/server/pvsmgr_de_DE.ts68
-rw-r--r--i18n/server/pvsmgr_es_MX.ts66
-rw-r--r--i18n/server/pvsmgr_fr_FR.ts66
-rw-r--r--i18n/server/pvsmgr_pl_PL.ts66
-rw-r--r--src/client/connectwindow/connectwindow.cpp4
-rw-r--r--src/client/connectwindow/connectwindow.h2
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 @@
</property>
<widget class="QWidget" name="page0">
<layout class="QVBoxLayout" name="verticalLayout_2">
- <property name="margin">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
<number>0</number>
</property>
<item>
@@ -91,7 +100,16 @@
</widget>
<widget class="QWidget" name="page1">
<layout class="QHBoxLayout" name="sw_p1_hl">
- <property name="margin">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
<number>0</number>
</property>
<item>
@@ -131,7 +149,7 @@
<item>
<widget class="QPushButton" name="btn_hide">
<property name="text">
- <string>Cancel</string>
+ <string>Close</string>
</property>
<property name="autoDefault">
<bool>false</bool>
@@ -179,6 +197,9 @@
<property name="text">
<string>Connect</string>
</property>
+ <property name="autoDefault">
+ <bool>true</bool>
+ </property>
<property name="default">
<bool>true</bool>
</property>
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 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="42"/>
+ <location filename="../../gui/client/connect.ui" line="51"/>
<source>Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="48"/>
+ <location filename="../../gui/client/connect.ui" line="57"/>
<source>Connect to</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="67"/>
+ <location filename="../../gui/client/connect.ui" line="76"/>
<source>Manual Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="73"/>
+ <location filename="../../gui/client/connect.ui" line="82"/>
<source>Session Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="134"/>
- <source>Cancel</source>
+ <location filename="../../gui/client/connect.ui" line="152"/>
+ <source>Close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="180"/>
+ <location filename="../../gui/client/connect.ui" line="198"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
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 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.1" language="de_DE" sourcelanguage="en_US">
+<TS version="2.0" language="de_DE" sourcelanguage="en_US">
<context>
<name>ConnectWindow</name>
<message>
@@ -9,32 +9,32 @@
<translation>Verbinde zu PVS Sitzung</translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="42"/>
+ <location filename="../../gui/client/connect.ui" line="51"/>
<source>Connection</source>
<translation>Verbindung</translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="48"/>
+ <location filename="../../gui/client/connect.ui" line="57"/>
<source>Connect to</source>
<translation>Verbinden zu</translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="67"/>
+ <location filename="../../gui/client/connect.ui" line="76"/>
<source>Manual Connection</source>
<translation>Manuelle Verbindung</translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="73"/>
+ <location filename="../../gui/client/connect.ui" line="82"/>
<source>Session Name</source>
<translation>Sitzungsname</translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="134"/>
- <source>Cancel</source>
- <translation>Abbrechen</translation>
+ <location filename="../../gui/client/connect.ui" line="152"/>
+ <source>Close</source>
+ <translation>Schließen</translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="180"/>
+ <location filename="../../gui/client/connect.ui" line="198"/>
<source>Connect</source>
<translation>Verbinden</translation>
</message>
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 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="42"/>
+ <location filename="../../gui/client/connect.ui" line="51"/>
<source>Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="48"/>
+ <location filename="../../gui/client/connect.ui" line="57"/>
<source>Connect to</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="67"/>
+ <location filename="../../gui/client/connect.ui" line="76"/>
<source>Manual Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="73"/>
+ <location filename="../../gui/client/connect.ui" line="82"/>
<source>Session Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="134"/>
- <source>Cancel</source>
+ <location filename="../../gui/client/connect.ui" line="152"/>
+ <source>Close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="180"/>
+ <location filename="../../gui/client/connect.ui" line="198"/>
<source>Connect</source>
<translation type="unfinished">Conectar</translation>
</message>
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 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="42"/>
+ <location filename="../../gui/client/connect.ui" line="51"/>
<source>Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="48"/>
+ <location filename="../../gui/client/connect.ui" line="57"/>
<source>Connect to</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="67"/>
+ <location filename="../../gui/client/connect.ui" line="76"/>
<source>Manual Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="73"/>
+ <location filename="../../gui/client/connect.ui" line="82"/>
<source>Session Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="134"/>
- <source>Cancel</source>
+ <location filename="../../gui/client/connect.ui" line="152"/>
+ <source>Close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="180"/>
+ <location filename="../../gui/client/connect.ui" line="198"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
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 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="42"/>
+ <location filename="../../gui/client/connect.ui" line="51"/>
<source>Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="48"/>
+ <location filename="../../gui/client/connect.ui" line="57"/>
<source>Connect to</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="67"/>
+ <location filename="../../gui/client/connect.ui" line="76"/>
<source>Manual Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="73"/>
+ <location filename="../../gui/client/connect.ui" line="82"/>
<source>Session Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="134"/>
- <source>Cancel</source>
+ <location filename="../../gui/client/connect.ui" line="152"/>
+ <source>Close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="180"/>
+ <location filename="../../gui/client/connect.ui" line="198"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
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 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="de_DE" sourcelanguage="en_US">
+<TS version="2.1" language="de_DE" sourcelanguage="en_US">
<context>
<name>ConnectionFrame</name>
<message>
- <location filename="../../src/server/connectionframe/connectionframe.cpp" line="101"/>
+ <location filename="../../src/server/connectionframe/connectionframe.cpp" line="103"/>
<source>EXAM-MODE</source>
<translation>KLAUSURMODUS</translation>
</message>
@@ -126,88 +126,88 @@
<translation>Raum neu laden</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="426"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="664"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="434"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="684"/>
<source>Question</source>
<translation>Frage</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="426"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="434"/>
<source>Are you sure you want to exit?</source>
<translation>Wollen Sie den PVS-Manager wirklich beenden?</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="664"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="684"/>
<source>Do you want to delete and disconnect any clients
not belonging to the current room layout?</source>
<translation>Möchten Sie alle Teilnehmer, die nicht zum aktuellen Raumplan gehören, aus der Sitzung entfernen?</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1004"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1011"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1047"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1279"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1283"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1024"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1031"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1067"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1298"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1302"/>
<source>Selection</source>
<translation>Auswahl</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1283"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1302"/>
<source>This client is still connected.</source>
<translation>Dieser Client ist noch verbunden.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1286"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1305"/>
<source>Warning</source>
<translation>Warnung</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1286"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1305"/>
<source>Are you sure you want to delete the selected client?</source>
<translation>Möchten Sie den gewählten Client löschen?</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="652"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="672"/>
<source>Session Name: %1 [click to edit]</source>
<translation>Sitzungsname: %1 [anklicken editiert]</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="785"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="805"/>
<source>No item selected, please select room!</source>
<translation>Keine Auswahl getroffen, bitte einen Raum auswählen!</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="788"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="808"/>
<source>Are you sure you want to reload the room?
Note that all clients will be deleted.</source>
<translation>Wollen Sie den Raum wirklich neu laden? Beachten Sie, dass alle Clienten gelöscht werden.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="850"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="852"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="854"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="882"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="884"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="886"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="888"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="890"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="931"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="933"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="935"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="937"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="939"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="870"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="872"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="874"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="902"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="904"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="906"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="908"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="910"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="951"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="953"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="955"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="957"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="959"/>
<source>Projection</source>
<translation>Projektion</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1004"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1047"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1279"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1024"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1067"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1298"/>
<source>No client is selected.</source>
<translation>Kein Client ausgewählt.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1011"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1031"/>
<source>The selected client is not connected.</source>
<translation>Ausgewählter Client ist nicht verbunden.</translation>
</message>
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 @@
<context>
<name>ConnectionFrame</name>
<message>
- <location filename="../../src/server/connectionframe/connectionframe.cpp" line="101"/>
+ <location filename="../../src/server/connectionframe/connectionframe.cpp" line="103"/>
<source>EXAM-MODE</source>
<translation type="unfinished"></translation>
</message>
@@ -126,88 +126,88 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="426"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="664"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="434"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="684"/>
<source>Question</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="426"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="434"/>
<source>Are you sure you want to exit?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="664"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="684"/>
<source>Do you want to delete and disconnect any clients
not belonging to the current room layout?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1004"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1011"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1047"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1279"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1283"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1024"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1031"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1067"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1298"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1302"/>
<source>Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1283"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1302"/>
<source>This client is still connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1286"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1305"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1286"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1305"/>
<source>Are you sure you want to delete the selected client?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="652"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="672"/>
<source>Session Name: %1 [click to edit]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="785"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="805"/>
<source>No item selected, please select room!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="788"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="808"/>
<source>Are you sure you want to reload the room?
Note that all clients will be deleted.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="850"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="852"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="854"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="882"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="884"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="886"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="888"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="890"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="931"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="933"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="935"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="937"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="939"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="870"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="872"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="874"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="902"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="904"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="906"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="908"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="910"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="951"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="953"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="955"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="957"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="959"/>
<source>Projection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1004"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1047"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1279"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1024"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1067"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1298"/>
<source>No client is selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1011"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1031"/>
<source>The selected client is not connected.</source>
<translation type="unfinished"></translation>
</message>
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 @@
<context>
<name>ConnectionFrame</name>
<message>
- <location filename="../../src/server/connectionframe/connectionframe.cpp" line="101"/>
+ <location filename="../../src/server/connectionframe/connectionframe.cpp" line="103"/>
<source>EXAM-MODE</source>
<translation type="unfinished"></translation>
</message>
@@ -126,88 +126,88 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="426"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="664"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="434"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="684"/>
<source>Question</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="426"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="434"/>
<source>Are you sure you want to exit?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="664"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="684"/>
<source>Do you want to delete and disconnect any clients
not belonging to the current room layout?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1004"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1011"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1047"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1279"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1283"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1024"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1031"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1067"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1298"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1302"/>
<source>Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1283"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1302"/>
<source>This client is still connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1286"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1305"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1286"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1305"/>
<source>Are you sure you want to delete the selected client?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="652"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="672"/>
<source>Session Name: %1 [click to edit]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="785"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="805"/>
<source>No item selected, please select room!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="788"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="808"/>
<source>Are you sure you want to reload the room?
Note that all clients will be deleted.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="850"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="852"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="854"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="882"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="884"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="886"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="888"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="890"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="931"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="933"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="935"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="937"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="939"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="870"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="872"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="874"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="902"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="904"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="906"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="908"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="910"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="951"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="953"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="955"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="957"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="959"/>
<source>Projection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1004"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1047"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1279"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1024"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1067"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1298"/>
<source>No client is selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1011"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1031"/>
<source>The selected client is not connected.</source>
<translation type="unfinished"></translation>
</message>
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 @@
<context>
<name>ConnectionFrame</name>
<message>
- <location filename="../../src/server/connectionframe/connectionframe.cpp" line="101"/>
+ <location filename="../../src/server/connectionframe/connectionframe.cpp" line="103"/>
<source>EXAM-MODE</source>
<translation type="unfinished"></translation>
</message>
@@ -126,88 +126,88 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="426"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="664"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="434"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="684"/>
<source>Question</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="426"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="434"/>
<source>Are you sure you want to exit?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="664"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="684"/>
<source>Do you want to delete and disconnect any clients
not belonging to the current room layout?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1004"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1011"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1047"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1279"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1283"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1024"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1031"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1067"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1298"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1302"/>
<source>Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1283"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1302"/>
<source>This client is still connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1286"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1305"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1286"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1305"/>
<source>Are you sure you want to delete the selected client?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="652"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="672"/>
<source>Session Name: %1 [click to edit]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="785"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="805"/>
<source>No item selected, please select room!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="788"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="808"/>
<source>Are you sure you want to reload the room?
Note that all clients will be deleted.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="850"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="852"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="854"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="882"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="884"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="886"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="888"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="890"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="931"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="933"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="935"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="937"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="939"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="870"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="872"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="874"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="902"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="904"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="906"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="908"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="910"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="951"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="953"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="955"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="957"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="959"/>
<source>Projection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1004"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1047"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1279"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1024"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1067"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1298"/>
<source>No client is selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1011"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1031"/>
<source>The selected client is not connected.</source>
<translation type="unfinished"></translation>
</message>
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<Room> 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);
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-11-21 14:07:38 +0100