From 867f6eb946365f47470080bbee503d295311bfd2 Mon Sep 17 00:00:00 2001
From: Manuel Schneider
Date: Wed, 7 May 2014 14:15:21 +0200
Subject: Hide bar if the menu is left

---
 src/client/toolbar/toolbar.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/client/toolbar/toolbar.cpp b/src/client/toolbar/toolbar.cpp
index 8de9e31..b0ded44 100644
--- a/src/client/toolbar/toolbar.cpp
+++ b/src/client/toolbar/toolbar.cpp
@@ -32,6 +32,9 @@ Toolbar::Toolbar(QWidget *parent) :
 
 	/* Create the connect window */
 	_connectWindow = new ConnectWindow(NULL);
+	// Connect the signals
+	connect(_connectWindow, SIGNAL(disconnect()), this, SLOT(onDoDisconnect()));
+	connect(_connectWindow, SIGNAL(connected(ServerConnection*)), this, SLOT(onConnected(ServerConnection*)));
 
 	/* Setup menu */
 	_menu = new QMenu(this);
@@ -41,15 +44,15 @@ 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()));
+	connect(_acnQuit, SIGNAL(triggered()), qApp, SLOT(quit()));
 
-	/* Connect the signals */
-	connect(_connectWindow, SIGNAL(disconnect()), this, SLOT(onDoDisconnect()));
-	connect(_connectWindow, SIGNAL(connected(ServerConnection*)), this, SLOT(onConnected(ServerConnection*)));
+	/* Connect the signals from vnc server */
 	connect(VncServer::instance(), SIGNAL(started(int, QString&, QString&)), this, SLOT(onVncServerIsRunning(int, QString&, QString&)));
-	connect(_acnQuit, SIGNAL(triggered()), qApp, SLOT(quit()));
-	connect(_acnDisconnect, SIGNAL(triggered()), _connectWindow, SLOT(show()));
 
-	/* Set location */
+	/* Set position */
 	const QDesktopWidget desktop;
 	const QRect primaryScreen = desktop.screenGeometry();
 	move(primaryScreen.left() + (primaryScreen.width() - this->width())/2 , primaryScreen.top());
-- 
cgit v1.2.3-55-g7522


From 95ed0908b3eb65f8f662080e81b549b428571b35 Mon Sep 17 00:00:00 2001
From: Manuel Schneider
Date: Wed, 7 May 2014 16:30:53 +0200
Subject: Made cam32.svg look like cam_off32.svg

---
 icons/cam32.svg | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/icons/cam32.svg b/icons/cam32.svg
index 9a4c1c7..c3f085c 100644
--- a/icons/cam32.svg
+++ b/icons/cam32.svg
@@ -13,7 +13,7 @@
    height="32"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.4 r9939"
    sodipodi:docname="cam32.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.0"
@@ -45,20 +45,20 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.4"
-     inkscape:cx="2.3730814"
-     inkscape:cy="13.178208"
+     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="1920"
-     inkscape:window-height="1150"
-     inkscape:window-x="-4"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0">
+     inkscape:window-width="1280"
+     inkscape:window-height="981"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="1">
     <inkscape:grid
        type="xygrid"
        id="grid2410"
@@ -74,6 +74,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -83,7 +84,7 @@
      inkscape:label="Zeichnung"
      style="display:inline;filter:url(#filter3249)">
     <path
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.112;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       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" />
-- 
cgit v1.2.3-55-g7522