Delete connected clients and connectionFrames after sessionName has changed.

Surround camera and eye icon with borderline for better contrast on frames.

5 files changed, 51 insertions, 30 deletions

diff --git a/icons/cf_icon_cam.svg b/icons/cf_icon_cam.svg
index cd1599d..c51ab6d 100644
--- a/icons/cf_icon_cam.svg
+++ b/icons/cf_icon_cam.svg
@@ -22,6 +22,14 @@
   <defs
      id="defs4">
     <linearGradient
+       id="linearGradient5208"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop5210" />
+    </linearGradient>
+    <linearGradient
        id="linearGradient3765">
       <stop
          style="stop-color:#000000;stop-opacity:1;"
@@ -76,20 +84,20 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.7559525"
-     inkscape:cx="-102.56898"
-     inkscape:cy="47.623858"
+     inkscape:zoom="5.511905"
+     inkscape:cx="76.742745"
+     inkscape:cy="65.372119"
      inkscape:document-units="px"
      inkscape:current-layer="layer2"
      showgrid="true"
      objecttolerance="10000"
      gridtolerance="10000"
      guidetolerance="10000"
-     inkscape:window-width="1262"
-     inkscape:window-height="693"
-     inkscape:window-x="583"
-     inkscape:window-y="111"
-     inkscape:window-maximized="0">
+     inkscape:window-width="1280"
+     inkscape:window-height="1000"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
     <inkscape:grid
        type="xygrid"
        id="grid2410"
@@ -118,8 +126,8 @@
      style="display:inline;filter:url(#filter3249)"
      transform="translate(0,96)">
     <path
-       style="fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 26.506119,-95.99996 C 11.874743,-95.99996 0,-83.87831 0,-68.942709 c 0,9.631705 4.9381305,18.090939 12.369524,22.885922 l 0,29.424765 c 0,3.99726 3.15246,7.2152714 7.068296,7.2152714 l 13.871538,0 -21.021393,34.1909936 c -0.978965,1.730866 -0.392394,3.938647 1.303177,4.937954 l 3.04823,1.803817 c 1.695632,0.999312 3.858421,0.400555 4.837381,-1.330322 l 24.069573,-39.6024426 7.863482,0 24.069623,39.6024426 c 0.978954,1.730866 3.141748,2.329613 4.837324,1.330322 l 3.048231,-1.803817 c 1.69563,-0.999318 2.282191,-3.207104 1.303232,-4.937954 l -21.021392,-34.1909936 17.405684,0 c 3.915838,0 7.068298,-3.2180114 7.068298,-7.2152714 l 0,-3.968395 c 2.540348,-1.203699 11.993052,-5.004891 20.498062,0.360752 4.0334,2.544611 4.44853,8.999808 8.48197,11.5444257 2.70567,1.7069772 5.06943,1.7069772 7.77512,0 2.01669,-1.2723054 0.70379,-3.3521357 0.70677,-5.7722107 0.0128,-12.025439 0.0128,-21.164789 0,-33.190229 -0.003,-2.420075 1.30988,-4.499899 -0.70677,-5.772211 -2.70569,-1.706988 -5.06945,-1.706988 -7.77512,0 -4.03344,2.544611 -4.44857,8.999805 -8.48197,11.544427 -8.50593,5.36626 -17.958965,1.541446 -20.498062,0.33818 l 0,-4.509541 C 97.5522,-50.851807 102.49033,-59.311045 102.49033,-68.942749 102.49033,-83.878351 90.615589,-96 75.984214,-96 64.705818,-96 55.071346,-88.802714 51.245167,-78.660813 47.418934,-88.802676 37.784464,-95.99996 26.506119,-95.99996 z"
+       style="fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.06365538;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 27.497854,-94.616806 c -14.315166,0 -25.933274,11.85968 -25.933274,26.472495 0,9.423546 4.8314088,17.699961 12.102197,22.391317 l 0,28.788841 c 0,3.910873 3.084329,7.0593383 6.915538,7.0593383 l 13.571748,0 L 13.58698,23.547251 c -0.957808,1.693458 -0.383914,3.853524 1.275013,4.831235 l 2.982353,1.764834 c 1.658986,0.977715 3.775033,0.391898 4.732836,-1.301572 l 23.549385,-38.7465627 7.693541,0 23.549433,38.7465627 c 0.957797,1.693458 3.073851,2.279266 4.732782,1.301572 l 2.982353,-1.764834 c 1.658984,-0.977721 2.232868,-3.137793 1.275067,-4.831235 l -20.567082,-33.4520657 17.029515,0 c 3.831212,0 6.91554,-3.1484653 6.91554,-7.0593383 l 0,-3.882629 c 2.485446,-1.177684 11.733864,-4.896726 20.055064,0.352956 3.94622,2.489616 4.35239,8.805305 8.29865,11.2949293 2.64719,1.6700861 4.95988,1.6700861 7.60709,0 1.9731,-1.2448093 0.68858,-3.2796903 0.69149,-5.6474633 0.0126,-11.765547 0.0126,-20.70738 0,-32.472929 -0.003,-2.367772 1.28157,-4.402648 -0.69149,-5.647463 -2.64721,-1.670097 -4.9599,-1.670097 -7.60709,0 -3.94626,2.489618 -4.35243,8.805304 -8.29865,11.294931 -8.3221,5.250286 -17.570842,1.508133 -20.055064,0.330872 l 0,-4.412081 c 7.270786,-4.691356 12.102184,-12.967774 12.102184,-22.391321 0,-14.612816 -11.618096,-26.472494 -25.933259,-26.472494 -11.034651,0 -20.460906,7.041739 -24.204393,16.964456 -3.743541,-9.92268 -13.169794,-16.964417 -24.204394,-16.964417 z"
        id="rect3212"
        sodipodi:nodetypes="csccccccccccccccccccssssssssccsscc"
        inkscape:connector-curvature="0" />
diff --git a/icons/cf_icon_eye.svg b/icons/cf_icon_eye.svg
index 06d6f85..6f7f3f8 100644
--- a/icons/cf_icon_eye.svg
+++ b/icons/cf_icon_eye.svg
@@ -36,23 +36,23 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1156"
+     inkscape:window-width="1280"
+     inkscape:window-height="1000"
      id="namedview8"
      showgrid="true"
-     inkscape:zoom="4.2142857"
-     inkscape:cx="-20.387675"
-     inkscape:cy="53.464011"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
+     inkscape:zoom="5.9599"
+     inkscape:cx="42.050215"
+     inkscape:cy="67.037619"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2"
      showguides="false"
      inkscape:snap-page="false"
      inkscape:snap-grids="true" />
   <path
-     style="fill:#cccccc;fill-opacity:1;stroke:none"
+     style="fill:#cccccc;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
      inkscape:connector-curvature="0"
      id="path6"
-     d="m 118.85716,-192 q -10.85723,-16.38893 -27.214316,-24.51387 4.357145,7.22224 4.357145,15.62497 0,12.84723 -9.392852,21.97913 -9.392856,9.13197 -22.607145,9.13197 -13.214287,0 -22.607146,-9.13197 -9.392851,-9.1319 -9.392851,-21.97913 0,-8.40273 4.357146,-15.62497 -16.357142,8.12494 -27.2142853,24.51387 9.5000023,14.23607 23.8214253,22.6736 14.321429,8.4375 31.035711,8.4375 16.714283,0 31.035714,-8.4375 14.321374,-8.43753 23.821454,-22.6736 z m -51.428602,-26.6667 q 0,-1.38887 -0.999996,-2.36103 -0.999992,-0.97224 -2.42857,-0.97224 -8.92857,0 -15.321428,6.21524 -6.392856,6.2153 -6.392856,14.89583 0,1.38887 1,2.36113 1.000001,0.97227 2.428576,0.97227 1.42857,0 2.428566,-0.97227 1,-0.97226 1,-2.36113 0,-5.97213 4.357144,-10.2083 4.357141,-4.23613 10.499998,-4.23613 1.428578,0 2.42857,-0.97227 0.999996,-0.97217 0.999996,-2.3611 z M 128,-192 q 0,2.36107 -1.42855,4.79167 -10.00001,15.9722 -26.892896,25.59033 Q 82.785705,-152 63.999992,-152 45.214281,-152 28.321426,-161.65287 11.428572,-171.3056 1.4285712,-187.20833 0,-189.63893 0,-192 0,-194.3611 1.4285712,-196.7917 11.428572,-212.6944 28.321426,-222.34713 45.214281,-232 63.999992,-232 q 18.785713,0 35.678562,9.65287 16.892886,9.65273 26.892896,25.55543 Q 128,-194.3611 128,-192 z" />
+     d="m 118.02062,-192 q -10.67506,-16.11394 -26.757696,-24.10255 4.284038,7.10106 4.284038,15.3628 0,12.63167 -9.235251,21.61034 -9.235255,8.97875 -22.227825,8.97875 -12.992567,0 -22.227825,-8.97875 -9.23525,-8.97867 -9.23525,-21.61034 0,-8.26174 4.284038,-15.3628 -16.082688,7.98861 -26.757662,24.10255 9.340603,13.9972 23.42173,22.29316 14.081132,8.29593 30.514969,8.29593 16.433837,0 30.514972,-8.29593 Q 108.67994,-178.0028 118.02062,-192 z m -50.565695,-26.21926 q 0,-1.36558 -0.983217,-2.32142 -0.983214,-0.95593 -2.387822,-0.95593 -8.778759,0 -15.064353,6.11096 -6.285591,6.11102 -6.285591,14.6459 0,1.36556 0.983221,2.32151 0.983223,0.95595 2.387828,0.95595 1.4046,0 2.387817,-0.95595 0.983222,-0.95595 0.983222,-2.32151 0,-5.87193 4.284036,-10.03702 4.284033,-4.16506 10.32382,-4.16506 1.404608,0 2.387822,-0.95596 0.983217,-0.95585 0.983217,-2.32147 z M 127.01005,-192 q 0,2.32146 -1.40458,4.71127 -9.83222,15.7042 -26.441665,25.16096 -16.609408,9.45662 -35.079919,9.45662 -18.470509,0 -35.079922,-9.49091 -16.609413,-9.49077 -26.441625,-25.12667 -1.4046014,-2.38981 -1.4046014,-4.71127 0,-2.32149 1.4046014,-4.7113 9.832212,-15.63587 26.441625,-25.12664 16.609413,-9.49091 35.079922,-9.49091 18.470511,0 35.079919,9.49091 16.609445,9.49077 26.441665,25.12664 1.40458,2.38981 1.40458,4.7113 z" />
 </svg>
diff --git a/icons/cf_icon_lock.svg b/icons/cf_icon_lock.svg
index 40eac88..ceff44b 100644
--- a/icons/cf_icon_lock.svg
+++ b/icons/cf_icon_lock.svg
@@ -36,25 +36,25 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1156"
+     inkscape:window-width="1280"
+     inkscape:window-height="1000"
      id="namedview2995"
      showgrid="false"
-     inkscape:zoom="0.26339286"
-     inkscape:cx="1103.7208"
-     inkscape:cy="559.2271"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
+     inkscape:zoom="0.37249375"
+     inkscape:cx="377.5311"
+     inkscape:cy="1119.8752"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2989" />
   <g
      transform="matrix(1.269571,0,0,-1.269571,170.84746,1536)"
      id="g2991"
-     style="fill:#cccccc">
+     style="fill:#cccccc;stroke:none;stroke-opacity:1;stroke-width:7.87667644999999972;stroke-miterlimit:4;stroke-dasharray:none">
     <path
        d="m 704,512 q 0,53 -37.5,90.5 Q 629,640 576,640 523,640 485.5,602.5 448,565 448,512 q 0,-37 19,-67 19,-30 51,-47 L 449,169 q -5,-15 5,-28 10,-13 26,-13 h 192 q 16,0 26,13 10,13 5,28 l -69,229 q 32,17 51,47 19,30 19,67 z M 320,768 h 512 v 192 q 0,106 -75,181 -75,75 -181,75 -106,0 -181,-75 -75,-75 -75,-181 V 768 z m 832,-96 V 96 Q 1152,56 1124,28 1096,0 1056,0 H 96 Q 56,0 28,28 0,56 0,96 v 576 q 0,40 28,68 28,28 68,28 h 32 v 192 q 0,184 132,316 132,132 316,132 184,0 316,-132 132,-132 132,-316 V 768 h 32 q 40,0 68,-28 28,-28 28,-68 z"
        id="path2993"
        inkscape:connector-curvature="0"
-       style="fill:#cccccc" />
+       style="fill:#cccccc;stroke:none;stroke-opacity:1;stroke-width:7.87667644999999972;stroke-miterlimit:4;stroke-dasharray:none" />
   </g>
 </svg>
diff --git a/src/server/connectionframe/connectionframe.cpp b/src/server/connectionframe/connectionframe.cpp
index caf99fc..dbe408c 100644
--- a/src/server/connectionframe/connectionframe.cpp
+++ b/src/server/connectionframe/connectionframe.cpp
@@ -101,7 +101,11 @@ ConnectionFrame::ConnectionFrame(QWidget *parent, int width, int height) :
 
 ConnectionFrame::~ConnectionFrame()
 {
-	//
+	if (_client != NULL)
+	{
+		_client->deleteLater();
+	}
+	_iconLayout->deleteLater();
 }
 
 /**
diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp
index 5063df6..bbabc66 100644
--- a/src/server/mainwindow/mainwindow.cpp
+++ b/src/server/mainwindow/mainwindow.cpp
@@ -498,6 +498,14 @@ void MainWindow::onSessionNameClick()
  */
 void MainWindow::onSessionNameUpdate()
 {
+	// Stop all projections and clear all clients, which where connected to old sessionName.
+	reset();
+	for (QList<ConnectionFrame*>::iterator it(_clientFrames.begin()); it != _clientFrames.end(); ++it)
+	{
+		(*it)->hide();
+		(*it)->deleteLater();
+	}
+	_clientFrames.clear();
 	_sessionNameLabel->setText(tr("Session Name: %1  [click to edit]").arg(Global::sessionName()));
 }
 
@@ -992,7 +1000,8 @@ void MainWindow::onVncClientStateChange(Client* client)
 		// VNC Client stopped -> remove from watchers
 		if (!client->isActiveVncClient()){
 			// _watchers.remove(client->id());
-			getClientFromId(client->id())->setWatcher(false);
+			if (getClientFromId(client->id()) != NULL)
+				getClientFromId(client->id())->setWatcher(false);
 
 			// If noboody is watching the multicast stop VNC server
 			// if (_watchers.isEmpty() && _mode != Mode::Broadcast)