Merge branch 'master' of git.openslx.org:pvs2

(Eye icon for VNC streaming)

Conflicts:
	pvsclient.qrc
	src/client/toolbar/toolbar.cpp

7 files changed, 48 insertions, 279 deletions

diff --git a/icons/cam_off32.svg b/icons/cam_off32.svg
deleted file mode 100644
index 2df7e9c..0000000
--- a/icons/cam_off32.svg
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="cam_on32.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   style="display:inline"
-   enable-background="new">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 16 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="32 : 16 : 1"
-       inkscape:persp3d-origin="16 : 10.666667 : 1"
-       id="perspective2476" />
-    <filter
-       inkscape:collect="always"
-       id="filter3249">
-      <feBlend
-         inkscape:collect="always"
-         mode="lighten"
-         in2="BackgroundImage"
-         id="feBlend3251" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.02381"
-     inkscape:cx="10.394302"
-     inkscape:cy="19.913197"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:window-width="1024"
-     inkscape:window-height="710"
-     inkscape:window-x="-4"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2410"
-       visible="true"
-       enabled="true"
-       dotted="false" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Zeichnung"
-     style="display:inline;filter:url(#filter3249)">
-    <path
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.31199998;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 7.7249594,2.1626795 C 4.4957594,2.1626795 1.8749594,4.7834796 1.8749594,8.0126796 C 1.8749594,10.095133 2.9648234,11.924089 4.6049594,12.960804 L 4.6049594,19.32268 C 4.6049594,20.18692 5.3007194,20.88268 6.1649594,20.88268 L 9.2264598,20.88268 L 4.5869594,28.275054 C 4.3708994,28.649282 4.5003554,29.126622 4.8745754,29.34268 L 5.5473314,29.73268 C 5.9215634,29.94874 6.3988994,29.819277 6.6149594,29.445054 L 11.927204,20.88268 L 13.662704,20.88268 L 18.97496,29.445054 C 19.19102,29.819282 19.668356,29.948735 20.042576,29.73268 L 20.715332,29.34268 C 21.089564,29.12662 21.21902,28.649278 21.00296,28.275054 L 16.36346,20.88268 L 20.20496,20.88268 C 21.0692,20.88268 21.76496,20.18692 21.76496,19.32268 L 21.76496,18.46468 C 22.325624,18.204431 24.411872,17.382582 26.28896,18.54268 C 27.179144,19.092846 27.270764,20.488512 28.16096,21.03868 C 28.758116,21.407742 29.279804,21.407742 29.87696,21.03868 C 30.322052,20.763596 30.032288,20.31392 30.03296,19.79068 C 30.035804,17.190681 30.035804,15.214679 30.03296,12.61468 C 30.032288,12.09144 30.322052,11.641764 29.87696,11.36668 C 29.279804,10.997616 28.758116,10.997616 28.16096,11.36668 C 27.270764,11.916846 27.179144,13.312512 26.28896,13.86268 C 24.411668,15.02291 22.325348,14.195954 21.76496,13.935804 L 21.76496,12.960804 C 23.405096,11.924089 24.49496,10.095133 24.49496,8.0126796 C 24.49496,4.7834796 21.87416,2.1626795 18.64496,2.1626795 C 16.155776,2.1626795 14.029412,3.7187916 13.18496,5.911554 C 12.340496,3.7187916 10.214132,2.1626795 7.7249594,2.1626795 z"
-       id="rect3212"
-       sodipodi:nodetypes="csccccccccccccccccccssssssssccsscc" />
-    <rect
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3235"
-       width="0"
-       height="3"
-       x="-25"
-       y="-26" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#ff0000;fill-opacity:1;stroke:none"
-       id="path3595"
-       sodipodi:cx="18.438444"
-       sodipodi:cy="15.612311"
-       sodipodi:rx="3.5615551"
-       sodipodi:ry="3.3876889"
-       d="m 21.999999,15.612311 a 3.5615551,3.3876889 0 1 1 -7.12311,0 3.5615551,3.3876889 0 1 1 7.12311,0 z"
-       transform="translate(8.5615559,12)" />
-  </g>
-</svg>
diff --git a/icons/cam_on32.svg b/icons/cam_on32.svg
deleted file mode 100644
index 9f381fe..0000000
--- a/icons/cam_on32.svg
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="cam32.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   style="display:inline"
-   enable-background="new">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 16 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="32 : 16 : 1"
-       inkscape:persp3d-origin="16 : 10.666667 : 1"
-       id="perspective2476" />
-    <filter
-       inkscape:collect="always"
-       id="filter3249">
-      <feBlend
-         inkscape:collect="always"
-         mode="lighten"
-         in2="BackgroundImage"
-         id="feBlend3251" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.02381"
-     inkscape:cx="10.394302"
-     inkscape:cy="19.913197"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:window-width="1024"
-     inkscape:window-height="710"
-     inkscape:window-x="-4"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2410"
-       visible="true"
-       enabled="true"
-       dotted="false" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Zeichnung"
-     style="display:inline;filter:url(#filter3249)">
-    <path
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.31199998;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 7.7249594,2.1626795 C 4.4957594,2.1626795 1.8749594,4.7834796 1.8749594,8.0126796 C 1.8749594,10.095133 2.9648234,11.924089 4.6049594,12.960804 L 4.6049594,19.32268 C 4.6049594,20.18692 5.3007194,20.88268 6.1649594,20.88268 L 9.2264598,20.88268 L 4.5869594,28.275054 C 4.3708994,28.649282 4.5003554,29.126622 4.8745754,29.34268 L 5.5473314,29.73268 C 5.9215634,29.94874 6.3988994,29.819277 6.6149594,29.445054 L 11.927204,20.88268 L 13.662704,20.88268 L 18.97496,29.445054 C 19.19102,29.819282 19.668356,29.948735 20.042576,29.73268 L 20.715332,29.34268 C 21.089564,29.12662 21.21902,28.649278 21.00296,28.275054 L 16.36346,20.88268 L 20.20496,20.88268 C 21.0692,20.88268 21.76496,20.18692 21.76496,19.32268 L 21.76496,18.46468 C 22.325624,18.204431 24.411872,17.382582 26.28896,18.54268 C 27.179144,19.092846 27.270764,20.488512 28.16096,21.03868 C 28.758116,21.407742 29.279804,21.407742 29.87696,21.03868 C 30.322052,20.763596 30.032288,20.31392 30.03296,19.79068 C 30.035804,17.190681 30.035804,15.214679 30.03296,12.61468 C 30.032288,12.09144 30.322052,11.641764 29.87696,11.36668 C 29.279804,10.997616 28.758116,10.997616 28.16096,11.36668 C 27.270764,11.916846 27.179144,13.312512 26.28896,13.86268 C 24.411668,15.02291 22.325348,14.195954 21.76496,13.935804 L 21.76496,12.960804 C 23.405096,11.924089 24.49496,10.095133 24.49496,8.0126796 C 24.49496,4.7834796 21.87416,2.1626795 18.64496,2.1626795 C 16.155776,2.1626795 14.029412,3.7187916 13.18496,5.911554 C 12.340496,3.7187916 10.214132,2.1626795 7.7249594,2.1626795 z"
-       id="rect3212"
-       sodipodi:nodetypes="csccccccccccccccccccssssssssccsscc" />
-    <rect
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3235"
-       width="0"
-       height="3"
-       x="-25"
-       y="-26" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#00a000;fill-opacity:1;stroke:none"
-       id="path3595"
-       sodipodi:cx="18.438444"
-       sodipodi:cy="15.612311"
-       sodipodi:rx="3.5615551"
-       sodipodi:ry="3.3876889"
-       d="m 21.999999,15.612311 a 3.5615551,3.3876889 0 1 1 -7.12311,0 3.5615551,3.3876889 0 1 1 7.12311,0 z"
-       transform="translate(8.5615559,12)" />
-  </g>
-</svg>
diff --git a/pvsclient.qrc b/pvsclient.qrc
index 3f3a607..226c898 100644
--- a/pvsclient.qrc
+++ b/pvsclient.qrc
@@ -1,49 +1,45 @@
 <RCC>
-	<qresource prefix="/">
-                <file
-                alias="dark-green-check-mark.svg">icons/dark-green-check-mark.svg</file>
-		<file alias="darrow16.svg">icons/darrow16.svg</file>
-		<file alias="ok16.svg">icons/ok16.svg</file>
-			
-		<file alias="cam32.svg">icons/cam32.svg</file>
+    <qresource prefix="/">
+        <file alias="dark-green-check-mark.svg">icons/dark-green-check-mark.svg</file>
+        <file alias="darrow16.svg">icons/darrow16.svg</file>
+        <file alias="ok16.svg">icons/ok16.svg</file>
+        <file alias="cam32.svg">icons/cam32.svg</file>
 		<file alias="eye">icons/eye.svg</file>
-		<file alias="cam_on32.svg">icons/cam_on32.svg</file>
-		<file alias="cam_off32.svg">icons/cam_off32.svg</file>
-		<file alias="chat_msg16.svg">icons/chat_msg16.svg</file>
-		<file alias="reset">icons/keyboard_key.svg</file>
-		<file alias="space">icons/space.svg</file>
-		<file alias="help">icons/help.svg</file>
-		<file alias="AUTHORS">AUTHORS</file>
-		<file alias="TRANSLATION">TRANSLATION</file>
-	</qresource>
-	<qresource prefix="/" lang="de_DE">
-		<file alias="pvsclient.qm">build/pvsclient_de_DE.qm</file>
-	</qresource>
-	<qresource prefix="/" lang="de">
-		<file alias="pvsclient.qm">build/pvsclient_de_DE.qm</file>
-	</qresource>
-	<qresource prefix="/" lang="fr_FR">
-		<file alias="pvsclient.qm">build/pvsclient_fr_FR.qm</file>
-	</qresource>
-	<qresource prefix="/" lang="fr">
-		<file alias="pvsclient.qm">build/pvsclient_fr_FR.qm</file>
-	</qresource>
-	<qresource prefix="/" lang="es_MX">
-		<file alias="pvsclient.qm">build/pvsclient_es_MX.qm</file>
-	</qresource>
-	<qresource prefix="/" lang="es">
-		<file alias="pvsclient.qm">build/pvsclient_es_MX.qm</file>
-	</qresource>
-	<qresource prefix="/" lang="ar_JO">
-		<file alias="pvsclient.qm">build/pvsclient_ar_JO.qm</file>
-	</qresource>
-	<qresource prefix="/" lang="ar">
-		<file alias="pvsclient.qm">build/pvsclient_ar_JO.qm</file>
-	</qresource>
-	<qresource prefix="/" lang="pl_PL">
-		<file alias="pvsclient.qm">build/pvsclient_pl_PL.qm</file>
-	</qresource>
-	<qresource prefix="/" lang="pl">
-		<file alias="pvsclient.qm">build/pvsclient_pl_PL.qm</file>
-	</qresource>
+        <file alias="chat_msg16.svg">icons/chat_msg16.svg</file>
+        <file alias="reset">icons/keyboard_key.svg</file>
+        <file alias="space">icons/space.svg</file>
+        <file alias="help">icons/help.svg</file>
+        <file alias="AUTHORS">AUTHORS</file>
+        <file alias="TRANSLATION">TRANSLATION</file>
+    </qresource>
+    <qresource lang="de_DE" prefix="/">
+        <file alias="pvsclient.qm">build/pvsclient_de_DE.qm</file>
+    </qresource>
+    <qresource lang="de" prefix="/">
+        <file alias="pvsclient.qm">build/pvsclient_de_DE.qm</file>
+    </qresource>
+    <qresource lang="fr_FR" prefix="/">
+        <file alias="pvsclient.qm">build/pvsclient_fr_FR.qm</file>
+    </qresource>
+    <qresource lang="fr" prefix="/">
+        <file alias="pvsclient.qm">build/pvsclient_fr_FR.qm</file>
+    </qresource>
+    <qresource lang="es_MX" prefix="/">
+        <file alias="pvsclient.qm">build/pvsclient_es_MX.qm</file>
+    </qresource>
+    <qresource lang="es" prefix="/">
+        <file alias="pvsclient.qm">build/pvsclient_es_MX.qm</file>
+    </qresource>
+    <qresource lang="ar_JO" prefix="/">
+        <file alias="pvsclient.qm">build/pvsclient_ar_JO.qm</file>
+    </qresource>
+    <qresource lang="ar" prefix="/">
+        <file alias="pvsclient.qm">build/pvsclient_ar_JO.qm</file>
+    </qresource>
+    <qresource lang="pl_PL" prefix="/">
+        <file alias="pvsclient.qm">build/pvsclient_pl_PL.qm</file>
+    </qresource>
+    <qresource lang="pl" prefix="/">
+        <file alias="pvsclient.qm">build/pvsclient_pl_PL.qm</file>
+    </qresource>
 </RCC>
diff --git a/pvsmgr.qrc b/pvsmgr.qrc
index 007512a..b5269b0 100644
--- a/pvsmgr.qrc
+++ b/pvsmgr.qrc
@@ -13,8 +13,8 @@
         <file alias="tutor2student">icons/tutor2student.svg</file>
         <file alias="stopprojection">icons/stopprojection.svg</file>
         <file alias="reset">icons/keyboard_key.svg</file>
-	<file alias="student2tutorextension">icons/student2tutor_extension.svg</file>
-	<file alias="helpme">icons/help.svg</file>
+        <file alias="student2tutorextension">icons/student2tutor_extension.svg</file>
+        <file alias="helpme">icons/help.svg</file>
         <file alias="AUTHORS">AUTHORS</file>
         <file alias="TRANSLATION">TRANSLATION</file>
         <file alias="pvsmgr.qm">build/pvsmgr_de_DE.qm</file>
diff --git a/src/client/toolbar/toolbar.cpp b/src/client/toolbar/toolbar.cpp
index 7731eca..bfe4e24 100644
--- a/src/client/toolbar/toolbar.cpp
+++ b/src/client/toolbar/toolbar.cpp
@@ -150,10 +150,10 @@ void Toolbar::cameraBlink()
  */
 void Toolbar::onVncServerIsRunning(int port)
 {
-	if (port > 0){
+	if (port > 0) {
 		_blinkTimer.start();
 		_ui->lblStatus->setStyleSheet("color:red");
-		_ui->lblStatus->setText(tr("Recording"));
+		_ui->lblStatus->setText(tr("Streaming"));
 		showBar();
 	}	else {
 		_blinkTimer.stop();
diff --git a/src/client/vnc/vncserver.cpp b/src/client/vnc/vncserver.cpp
index 56800f4..2b341fb 100644
--- a/src/client/vnc/vncserver.cpp
+++ b/src/client/vnc/vncserver.cpp
@@ -55,13 +55,6 @@ VncServer::~VncServer()
 	// TODO Auto-generated destructor stub
 }
 
-bool VncServer::isVncServerRunning()
-{
-    if (_port > 0)
-        return true;
-    return false;
-}
-
 void VncServer::start()
 {
 	// Keep things clean
@@ -121,9 +114,7 @@ void VncServer::start()
 	args << rect;
 
 	qDebug() << "Arguments are: " << args;
-	_process->start("x11vnc",
-		args,
-		QIODevice::ReadOnly);
+	_process->start("x11vnc", args, QIODevice::ReadOnly);
 }
 
 void VncServer::stop()
diff --git a/src/client/vnc/vncserver.h b/src/client/vnc/vncserver.h
index 790b295..ac45822 100644
--- a/src/client/vnc/vncserver.h
+++ b/src/client/vnc/vncserver.h
@@ -31,7 +31,7 @@ private:
 public:
 	static VncServer *instance();
 
-    bool isVncServerRunning();
+	inline bool isVncServerRunning(){ return _port > 0; }
 	void start();
 	void stop();