summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--i18n/server/pvsmgr_ar_JO.ts36
-rw-r--r--i18n/server/pvsmgr_de_DE.ts36
-rw-r--r--i18n/server/pvsmgr_es_MX.ts36
-rw-r--r--i18n/server/pvsmgr_fr_FR.ts36
-rw-r--r--i18n/server/pvsmgr_pl_PL.ts36
-rw-r--r--src/server/mainwindow/mainwindow.cpp8
-rw-r--r--src/server/net/client.cpp2
7 files changed, 99 insertions, 91 deletions
diff --git a/i18n/server/pvsmgr_ar_JO.ts b/i18n/server/pvsmgr_ar_JO.ts
index 1cb3f91..14637a7 100644
--- a/i18n/server/pvsmgr_ar_JO.ts
+++ b/i18n/server/pvsmgr_ar_JO.ts
@@ -15,48 +15,48 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="434"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="462"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="467"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="472"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="499"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="527"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="532"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="537"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="442"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="470"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="475"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="480"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="507"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="535"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="540"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="545"/>
<source>Projection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="435"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="463"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="528"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="443"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="471"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="536"/>
<source>No projection source selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="468"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="500"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="533"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="476"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="508"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="541"/>
<source>No tutor defined, or tutor is offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="473"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="481"/>
<source>Selected projection target is tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="538"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="546"/>
<source>Selected projection source is tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="747"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="755"/>
<source>Projection Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="748"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="756"/>
<source>Could not send screen contents of %1 to other clients: VNC Startup failed.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/i18n/server/pvsmgr_de_DE.ts b/i18n/server/pvsmgr_de_DE.ts
index 108af6f..403028e 100644
--- a/i18n/server/pvsmgr_de_DE.ts
+++ b/i18n/server/pvsmgr_de_DE.ts
@@ -68,48 +68,48 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="434"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="462"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="467"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="472"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="499"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="527"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="532"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="537"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="442"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="470"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="475"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="480"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="507"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="535"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="540"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="545"/>
<source>Projection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="435"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="463"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="528"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="443"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="471"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="536"/>
<source>No projection source selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="468"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="500"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="533"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="476"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="508"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="541"/>
<source>No tutor defined, or tutor is offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="473"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="481"/>
<source>Selected projection target is tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="538"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="546"/>
<source>Selected projection source is tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="747"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="755"/>
<source>Projection Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="748"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="756"/>
<source>Could not send screen contents of %1 to other clients: VNC Startup failed.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/i18n/server/pvsmgr_es_MX.ts b/i18n/server/pvsmgr_es_MX.ts
index ed260d1..15a673a 100644
--- a/i18n/server/pvsmgr_es_MX.ts
+++ b/i18n/server/pvsmgr_es_MX.ts
@@ -271,48 +271,48 @@ Perform an unprojection or remove remote help to get a target.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="434"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="462"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="467"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="472"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="499"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="527"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="532"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="537"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="442"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="470"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="475"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="480"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="507"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="535"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="540"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="545"/>
<source>Projection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="435"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="463"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="528"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="443"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="471"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="536"/>
<source>No projection source selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="468"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="500"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="533"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="476"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="508"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="541"/>
<source>No tutor defined, or tutor is offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="473"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="481"/>
<source>Selected projection target is tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="538"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="546"/>
<source>Selected projection source is tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="747"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="755"/>
<source>Projection Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="748"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="756"/>
<source>Could not send screen contents of %1 to other clients: VNC Startup failed.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/i18n/server/pvsmgr_fr_FR.ts b/i18n/server/pvsmgr_fr_FR.ts
index 1cb3f91..14637a7 100644
--- a/i18n/server/pvsmgr_fr_FR.ts
+++ b/i18n/server/pvsmgr_fr_FR.ts
@@ -15,48 +15,48 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="434"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="462"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="467"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="472"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="499"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="527"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="532"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="537"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="442"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="470"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="475"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="480"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="507"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="535"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="540"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="545"/>
<source>Projection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="435"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="463"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="528"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="443"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="471"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="536"/>
<source>No projection source selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="468"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="500"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="533"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="476"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="508"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="541"/>
<source>No tutor defined, or tutor is offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="473"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="481"/>
<source>Selected projection target is tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="538"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="546"/>
<source>Selected projection source is tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="747"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="755"/>
<source>Projection Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="748"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="756"/>
<source>Could not send screen contents of %1 to other clients: VNC Startup failed.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/i18n/server/pvsmgr_pl_PL.ts b/i18n/server/pvsmgr_pl_PL.ts
index 1cb3f91..14637a7 100644
--- a/i18n/server/pvsmgr_pl_PL.ts
+++ b/i18n/server/pvsmgr_pl_PL.ts
@@ -15,48 +15,48 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="434"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="462"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="467"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="472"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="499"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="527"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="532"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="537"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="442"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="470"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="475"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="480"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="507"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="535"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="540"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="545"/>
<source>Projection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="435"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="463"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="528"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="443"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="471"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="536"/>
<source>No projection source selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="468"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="500"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="533"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="476"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="508"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="541"/>
<source>No tutor defined, or tutor is offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="473"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="481"/>
<source>Selected projection target is tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="538"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="546"/>
<source>Selected projection source is tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="747"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="755"/>
<source>Projection Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="748"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="756"/>
<source>Could not send screen contents of %1 to other clients: VNC Startup failed.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp
index 48a1a57..67d88d0 100644
--- a/src/server/mainwindow/mainwindow.cpp
+++ b/src/server/mainwindow/mainwindow.cpp
@@ -357,17 +357,22 @@ void MainWindow::prepareForProjection(Client * const from, Client * const to)
{
// Projection source is never allowed to be an active VNC viewer
if (from->isActiveVncClient())
+ {
+ qDebug("From is active client, stopping...");
from->stopVncClient();
+ }
if (to == NULL)
{
// One to many
+ qDebug("One to many requested...");
from->setProjectionSource(true);
if (from->isActiveVncServer())
{
// From is already active, if there is at least one active client, assume it is not
// shutting down, so we can directly tell the new client to connect to it
+ qDebug("Source is already running a VNC server....");
for (QList<ConnectionFrame*>::iterator it(_clientFrames.begin()); it != _clientFrames.end(); ++it)
{
Client *c = (**it).client();
@@ -376,11 +381,14 @@ void MainWindow::prepareForProjection(Client * const from, Client * const to)
if (c->currentProjectionSource() != from->id())
continue;
// Yep :-)
+ qDebug("Reusing because of active client");
this->onVncServerStateChange(from);
return;
}
+ qDebug("But no active client found....");
}
// Could not take shortcut, (re)start VNC server on source
+ qDebug("Starting VNC server on source machine");
from->startVncServer();
return;
}
diff --git a/src/server/net/client.cpp b/src/server/net/client.cpp
index e2ea933..30e323a 100644
--- a/src/server/net/client.cpp
+++ b/src/server/net/client.cpp
@@ -264,7 +264,7 @@ void Client::startVncServer()
_vncPort = 0;
_toClient.reset();
_toClient.setField(_ID, _VNCSERVER);
- _toClient.setField(_ENABLE, __FALSE);
+ _toClient.setField(_ENABLE, __TRUE);
sendMessage(_toClient);
}
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-05-18 07:49:39 +0200