From ee0e88e4f8ecf5d3591e7a96d8af9f73380805d9 Mon Sep 17 00:00:00 2001
From: Christian Klinger
Date: Fri, 29 Apr 2016 11:24:47 +0200
Subject: Tinted some Icons to differentiate between selected and non-selected
 students.

---
 icons/student2tutor.svg                        | 36 ++++++++++----------------
 icons/student2tutor_extension.svg              | 36 ++++++++++----------------
 icons/tutor2student.svg                        | 36 ++++++++++----------------
 src/server/connectionframe/connectionframe.cpp |  4 +--
 src/server/mainwindow/mainwindow.cpp           | 11 ++++++++
 5 files changed, 52 insertions(+), 71 deletions(-)

diff --git a/icons/student2tutor.svg b/icons/student2tutor.svg
index 94a3ff4..c40c478 100644
--- a/icons/student2tutor.svg
+++ b/icons/student2tutor.svg
@@ -15,7 +15,7 @@
    height="114.30188"
    id="svg2"
    xml:space="preserve"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="student2tutor.svg"><sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -25,16 +25,16 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="1000"
+     inkscape:window-width="1680"
+     inkscape:window-height="1050"
      id="namedview10864"
      showgrid="true"
-     inkscape:zoom="7.2404276"
-     inkscape:cx="48.912296"
-     inkscape:cy="73.569865"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
+     inkscape:zoom="3.6202138"
+     inkscape:cx="17.731481"
+     inkscape:cy="93.418843"
+     inkscape:window-x="1280"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
      inkscape:current-layer="g10"><inkscape:grid
        type="xygrid"
        id="grid3812" /></sodipodi:namedview><metadata
@@ -2355,18 +2355,7 @@
        x1="17.246094"
        y1="6.375"
        x2="39.90625"
-       y2="38.875" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#radialGradient133"
-       id="radialGradient3963"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.247759,0,0,-0.787943,-5.653165,89.260693)"
-       spreadMethod="pad"
-       cx="24.007812"
-       cy="32.996094"
-       fx="24.007812"
-       fy="32.996094"
-       r="19" /><linearGradient
+       y2="38.875" /><linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient6240"
        id="linearGradient3965"
@@ -2431,11 +2420,12 @@
            id="path129"
            style="fill:url(#linearGradient3961);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></g><g
        id="g131"
-       transform="matrix(0.75665623,0,0,0.75665623,-0.28088188,23.812796)"><path
+       transform="matrix(0.75665623,0,0,0.75665623,-0.28088188,23.812796)"
+       style="fill:#2de9ff;fill-opacity:1"><path
          inkscape:connector-curvature="0"
          d="m 5.574,83.848 37.453,0 0,-23.277 -37.453,0 0,23.277 z"
          id="path139"
-         style="fill:url(#radialGradient3963);fill-opacity:1;fill-rule:evenodd;stroke:none" /></g><g
+         style="fill:#2de9ff;fill-opacity:1;fill-rule:evenodd;stroke:none" /></g><g
        transform="matrix(0.75665623,0,0,-0.75665623,-0.28088188,93.00258)"
        id="g141"><path
          inkscape:connector-curvature="0"
diff --git a/icons/student2tutor_extension.svg b/icons/student2tutor_extension.svg
index 0526a46..5a8cf5e 100644
--- a/icons/student2tutor_extension.svg
+++ b/icons/student2tutor_extension.svg
@@ -15,7 +15,7 @@
    height="114.30188"
    id="svg2"
    xml:space="preserve"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="student2tutor_extension.svg"><sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -25,16 +25,16 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="1000"
+     inkscape:window-width="1680"
+     inkscape:window-height="1050"
      id="namedview10864"
      showgrid="true"
-     inkscape:zoom="7.2404276"
-     inkscape:cx="48.912296"
-     inkscape:cy="54.524883"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
+     inkscape:zoom="3.6202138"
+     inkscape:cx="-1.3332188"
+     inkscape:cy="56.946978"
+     inkscape:window-x="1280"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
      inkscape:current-layer="g10"><inkscape:grid
        type="xygrid"
        id="grid3812" /></sodipodi:namedview><metadata
@@ -2355,18 +2355,7 @@
        x1="17.246094"
        y1="6.375"
        x2="39.90625"
-       y2="38.875" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#radialGradient133"
-       id="radialGradient3963"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.247759,0,0,-0.787943,-5.653165,89.260693)"
-       spreadMethod="pad"
-       cx="24.007812"
-       cy="32.996094"
-       fx="24.007812"
-       fy="32.996094"
-       r="19" /><linearGradient
+       y2="38.875" /><linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient6240"
        id="linearGradient3965"
@@ -3331,11 +3320,12 @@
            id="path129"
            style="fill:url(#linearGradient3961);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></g><g
        id="g131"
-       transform="matrix(0.62915854,0,0,0.62915854,-0.35957587,30.985427)"><path
+       transform="matrix(0.62915854,0,0,0.62915854,-0.35957587,30.985427)"
+       style="fill:#2de9ff;fill-opacity:1"><path
          inkscape:connector-curvature="0"
          d="m 5.574,83.848 37.453,0 0,-23.277 -37.453,0 0,23.277 z"
          id="path139"
-         style="fill:url(#radialGradient3963);fill-opacity:1;fill-rule:evenodd;stroke:none" /></g><g
+         style="fill:#2de9ff;fill-opacity:1;fill-rule:evenodd;stroke:none" /></g><g
        transform="matrix(0.62915854,0,0,-0.62915854,-0.35957587,88.51663)"
        id="g141"><path
          inkscape:connector-curvature="0"
diff --git a/icons/tutor2student.svg b/icons/tutor2student.svg
index 58fb373..2f88720 100644
--- a/icons/tutor2student.svg
+++ b/icons/tutor2student.svg
@@ -15,7 +15,7 @@
    height="114.30188"
    id="svg2"
    xml:space="preserve"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="tutor2student.svg"><sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -25,16 +25,16 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="1000"
+     inkscape:window-width="836"
+     inkscape:window-height="1007"
      id="namedview10864"
      showgrid="false"
-     inkscape:zoom="7.2404276"
-     inkscape:cx="48.912296"
-     inkscape:cy="57.052098"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
+     inkscape:zoom="3.6202138"
+     inkscape:cx="89.670015"
+     inkscape:cy="28.852729"
+     inkscape:window-x="2120"
+     inkscape:window-y="41"
+     inkscape:window-maximized="0"
      inkscape:current-layer="g10" /><metadata
      id="metadata8"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
@@ -2313,18 +2313,7 @@
        x1="17.246094"
        y1="6.375"
        x2="39.90625"
-       y2="38.875" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#radialGradient791"
-       id="radialGradient3936"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.755238,0,0,-0.476923,49.378279,38.321513)"
-       spreadMethod="pad"
-       cx="24.007812"
-       cy="32.996094"
-       fx="24.007812"
-       fy="32.996094"
-       r="19" /><linearGradient
+       y2="38.875" /><linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient6240-0"
        id="linearGradient3938"
@@ -2469,10 +2458,11 @@
            style="fill:url(#linearGradient3934);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
            inkscape:connector-curvature="0" /></g></g><g
        id="g789"
-       transform="matrix(1.4724722,0,0,1.4724722,-28.957646,-17.138696)"><path
+       transform="matrix(1.4724722,0,0,1.4724722,-28.957646,-17.138696)"
+       style="fill:#2de9ff;fill-opacity:1"><path
          d="m 56.172,35.047 22.672,0 0,-14.094 -22.672,0 0,14.094 z"
          id="path797"
-         style="fill:url(#radialGradient3936);fill-opacity:1;fill-rule:evenodd;stroke:none"
+         style="fill:#2de9ff;fill-opacity:1;fill-rule:evenodd;stroke:none"
          inkscape:connector-curvature="0" /></g><g
        transform="matrix(1.4724722,0,0,-1.4724722,-28.957646,117.50638)"
        id="g799"><path
diff --git a/src/server/connectionframe/connectionframe.cpp b/src/server/connectionframe/connectionframe.cpp
index 82e949a..d979798 100644
--- a/src/server/connectionframe/connectionframe.cpp
+++ b/src/server/connectionframe/connectionframe.cpp
@@ -30,11 +30,11 @@ static QString style_tutor(
 );
 static QString style_selectedStudent(
 		"QLabel{ background-color: #FFF; border-radius: 2px; color: black; } \
-		QGroupBox { background-color: #AAA; margin: 0px; border-radius: 4px; border: 2px solid #6C8CD5;}"
+		QGroupBox { background-color: #ccebff; margin: 0px; border-radius: 4px; border: 4px solid #6C8CF0;}"
 );
 static QString style_selectedTutor(
 		"QLabel{ background-color: #FFF; border-radius: 2px; color: black;} \
-		QGroupBox { background-color: #70C670; margin: 0px;  border-radius: 4px; border: 2px solid #6C8CD5;}"
+		QGroupBox { background-color: #99ff99; margin: 0px;  border-radius: 4px; border: 4px solid #6C8CF0;}"
 );
 static QString style_disconnected(
 		"QLabel{ background-color: #919191; color: black; } \
diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp
index 3becb23..48e9b18 100644
--- a/src/server/mainwindow/mainwindow.cpp
+++ b/src/server/mainwindow/mainwindow.cpp
@@ -579,6 +579,17 @@ void MainWindow::unlockContextButtons() {
     for (auto it = _contextButtons.begin(); it != _contextButtons.end(); ++it) {
         (*it)->setEnabled(true);
     }
+    /* and disable some again based on special rules */
+    if (getSelectedFrame()->client() != NULL) {
+        ui->action_DeleteClient->setEnabled(false);
+    }
+    if (getSelectedFrame()->client() == NULL) {
+        ui->action_SetAsTutor->setEnabled(false);
+        ui->action_StudentToTutorExclusive->setEnabled(false);
+        ui->action_StudentToTutor->setEnabled(false);
+    }
+
+
 }
 /***************************************************************************//**
  * Handle Mouse Release Event.
-- 
cgit v1.2.3-55-g7522