From 81ad21b0052e53b4c6e0916db96bd9a0ebae5ac8 Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Sat, 7 Aug 2021 17:31:06 +0100
Subject: [PATCH] Adjusted the Insight window colour palette to use softer
 colours with a higher temperature (less blue)

---
 .../InsightWindow/Images/BloomIcon.svg        | 25 ++++++-------
 .../InsightWindow/Stylesheets/AboutWindow.qss |  2 +-
 .../Stylesheets/InsightWindow.qss             | 36 ++++++++++---------
 .../Widgets/TargetWidgets/DIP/BodyWidget.cpp  |  2 +-
 .../Widgets/TargetWidgets/DIP/BodyWidget.hpp  |  2 +-
 .../Widgets/TargetWidgets/DIP/PinWidget.hpp   |  2 +-
 .../Widgets/TargetWidgets/QFP/BodyWidget.cpp  |  2 +-
 .../Widgets/TargetWidgets/QFP/BodyWidget.hpp  |  2 +-
 .../Widgets/TargetWidgets/QFP/PinWidget.hpp   |  2 +-
 .../TargetWidgets/TargetPinBodyWidget.hpp     |  8 ++---
 10 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/src/Insight/UserInterfaces/InsightWindow/Images/BloomIcon.svg b/src/Insight/UserInterfaces/InsightWindow/Images/BloomIcon.svg
index 89191219..f5486a8c 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Images/BloomIcon.svg
+++ b/src/Insight/UserInterfaces/InsightWindow/Images/BloomIcon.svg
@@ -299,7 +299,7 @@
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#3c3f41"
+     pagecolor="#343532"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0"
@@ -308,14 +308,14 @@
      inkscape:cx="91.565425"
      inkscape:cy="64.254418"
      inkscape:document-units="px"
-     inkscape:current-layer="layer2"
+     inkscape:current-layer="layer1"
      inkscape:document-rotation="0"
      showgrid="false"
      units="px"
-     inkscape:window-width="2560"
+     inkscape:window-width="3440"
      inkscape:window-height="1353"
-     inkscape:window-x="6000"
-     inkscape:window-y="24"
+     inkscape:window-x="2560"
+     inkscape:window-y="34"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata5">
@@ -325,7 +325,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -333,21 +333,22 @@
      inkscape:groupmode="layer"
      id="layer6"
      inkscape:label="Layer 5"
-     style="display:inline">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <rect
-       style="display:inline;fill:#3c3f41;fill-opacity:1;stroke:none;stroke-width:1.22116;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.611015"
+       style="display:inline;fill:#343532;fill-opacity:1;stroke:none;stroke-width:1.22116;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.611015"
        id="rect1934"
        width="26.458334"
        height="26.458334"
        x="-2.220446e-16"
-       y="-2.220446e-16"
-       sodipodi:insensitive="true" />
+       y="-2.220446e-16" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Layer 2"
-     style="display:inline">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <path
        style="opacity:1;fill:#a8a9a9;fill-opacity:1;stroke:none;stroke-width:0.214532;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 11.688069,17.233636 h -1.287196 v 1.287197 h 1.287196 z"
@@ -485,7 +486,7 @@
      id="layer1"
      style="display:inline">
     <circle
-       style="fill:none;fill-opacity:1;stroke:#3c3f41;stroke-width:1.5875;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:none;fill-opacity:1;stroke:#343532;stroke-width:1.5875;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path900"
        cx="13.229166"
        cy="13.229166"
diff --git a/src/Insight/UserInterfaces/InsightWindow/Stylesheets/AboutWindow.qss b/src/Insight/UserInterfaces/InsightWindow/Stylesheets/AboutWindow.qss
index 0de4a981..3d451d82 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Stylesheets/AboutWindow.qss
+++ b/src/Insight/UserInterfaces/InsightWindow/Stylesheets/AboutWindow.qss
@@ -4,7 +4,7 @@
 }
 
 QMainWindow {
-    background-color: #3C3F41;
+    background-color: #343532;
 }
 
 
diff --git a/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss b/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss
index d21570e2..e4f9cd7b 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss
+++ b/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss
@@ -1,10 +1,10 @@
 * {
-    color: #c2c4c6;
+    color: #afb1b3;
     font-family: 'Ubuntu', sans-serif;
 }
 
 QMainWindow {
-    background-color: #3C3F41;
+    background-color: #343532;
 }
 
 #header {
@@ -12,8 +12,9 @@ QMainWindow {
     background-color: transparent;
     max-height: 25px;
     width: auto;
-    border-top: 1px solid #515151;
-    border-bottom: 1px solid #515151;
+    border-top: 1px solid #41423f;
+    border-top: 1px solid #41423f;
+    border-bottom: 1px solid #312d28;
 }
 
 QMenuBar::item {
@@ -31,7 +32,7 @@ QMenuBar::item {
 }
 
 QMenuBar::item:pressed {
-    background-color: #2F65CA;
+    background-color: #335883;
 }
 
 QMenuBar {
@@ -41,16 +42,16 @@ QMenuBar {
     min-height: 24px;
     background-color: transparent;
     spacing: 0;
-    color: #c2c4c6;
+    color: #afb1b3;
     font-size: 14px;
 }
 
 QMenu {
     margin: 0;
     padding: 0;
-    background-color: #3C3F41;
-    color: #c2c4c6;
-    border: 1px solid #515151;
+    background-color: #343532;
+    color: #afb1b3;
+    border: 1px solid #41423f;
     min-width: 200px;
     font-size: 14px;
 }
@@ -61,7 +62,8 @@ QMenu::item {
 }
 
 QMenu::item:selected {
-    background-color: #2F65CA;
+    background-color: #4d7bba;
+    background-color: #335883;
 }
 
 QMenu::item:disabled {
@@ -69,7 +71,7 @@ QMenu::item:disabled {
 }
 
 QMenu#help-menu::separator {
-    border-top: 1px solid #515151;
+    border-top: 1px solid #41423f;
     height: 1px;
     margin: 1px 0;
 }
@@ -115,7 +117,7 @@ QMenu#help-menu::separator {
 }
 
 #header-tool-bar QToolButton:hover {
-    background-color: #505353;
+    background-color: #454541;
     border: none;
     padding: 0;
 }
@@ -123,7 +125,7 @@ QMenu#help-menu::separator {
 QToolTip {
     background-color: #474949;
     border: 1px solid #616365;
-    color: #c2c4c6;
+    color: #afb1b3;
     padding: 1px 2px;
     font-size: 13px;
 }
@@ -135,7 +137,7 @@ QToolTip {
     padding: 0 3px 0 30px;
     max-height: 25px;
     width: auto;
-    border-top: 1px solid #515151;
+    border-top: 1px solid #41423f;
 
 }
 
@@ -147,12 +149,12 @@ QToolTip {
 
 #target-variant-menu-bar::item {
     padding: 0 10px 0 4px;
-    border-left: 1px solid #515151;
+    border-left: 1px solid #41423f;
     margin-bottom: 0;
 }
 
 #target-variant-menu-bar::item:selected {
-    background-color: #4d4e50;
+    background-color: #454541;
 }
 
 #footer QLabel {
@@ -160,7 +162,7 @@ QToolTip {
 }
 
 #target-program-counter-value {
-    border-color: #515151;
+    border-color: #41423f;
     border-style: solid;
     border-width: 0 1px 0 0;
     padding-right: 5px;
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/BodyWidget.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/BodyWidget.cpp
index d27b2a07..fffe6b26 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/BodyWidget.cpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/BodyWidget.cpp
@@ -23,7 +23,7 @@ void BodyWidget::drawWidget(QPainter& painter) {
 
     // Draw target body
     auto targetBodyColor = this->getBodyColor();
-    auto backgroundColor = QColor("#3C3F41");
+    auto backgroundColor = QColor("#343532");
 
     if (!this->isEnabled()) {
         targetBodyColor.setAlpha(this->getDisableAlphaLevel());
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/BodyWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/BodyWidget.hpp
index 8df66388..09703c21 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/BodyWidget.hpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/BodyWidget.hpp
@@ -12,7 +12,7 @@ namespace Bloom::Widgets::InsightTargetWidgets::Dip
 
     private:
         // These properties can be modified via Qt style sheets (see Stylesheets/DualInlinePackage.qss)
-        QColor bodyColor = QColor("#AFB1B3");
+        QColor bodyColor = QColor("#918E86");
         int disableAlphaLevel = 100;
 
     protected:
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/PinWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/PinWidget.hpp
index 93028b4a..cf39222f 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/PinWidget.hpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/PinWidget.hpp
@@ -55,7 +55,7 @@ namespace Bloom::Widgets::InsightTargetWidgets::Dip
                 this->bodyWidget->setPinState(pinState);
             }
 
-            this->setLabelColor(this->pinStateChanged ? "#6FA0FF" : "#a6a7aa");
+            this->setLabelColor(this->pinStateChanged ? "#4d7bba" : "#a6a7aa");
         }
     };
 }
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/BodyWidget.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/BodyWidget.cpp
index 915687b5..b6d7109f 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/BodyWidget.cpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/BodyWidget.cpp
@@ -14,7 +14,7 @@ void BodyWidget::drawWidget(QPainter& painter) {
     painter.setRenderHints(QPainter::RenderHint::Antialiasing | QPainter::RenderHint::SmoothPixmapTransform, true);
 
     auto targetBodyColor = this->getBodyColor();
-    auto backgroundColor = QColor("#3C3F41");
+    auto backgroundColor = QColor("#343532");
 
     if (!this->isEnabled()) {
         targetBodyColor.setAlpha(this->getDisableAlphaLevel());
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/BodyWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/BodyWidget.hpp
index 47fb5f11..f62ead9a 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/BodyWidget.hpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/BodyWidget.hpp
@@ -12,7 +12,7 @@ namespace Bloom::Widgets::InsightTargetWidgets::Qfp
 
     private:
         // These properties can be modified via Qt style sheets (see Stylesheets/QuadFlatPackage.qss)
-        QColor bodyColor = QColor("#AFB1B3");
+        QColor bodyColor = QColor("#918E86");
         int disableAlphaLevel = 100;
 
     protected:
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinWidget.hpp
index 9c0173d4..ccff0c31 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinWidget.hpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinWidget.hpp
@@ -67,7 +67,7 @@ namespace Bloom::Widgets::InsightTargetWidgets::Qfp
                 this->bodyWidget->setPinState(pinState);
             }
 
-            this->setLabelColor(this->pinStateChanged ? "#6FA0FF" : "#a6a7aa");
+            this->setLabelColor(this->pinStateChanged ? "#4d7bba" : "#a6a7aa");
         }
     };
 }
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPinBodyWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPinBodyWidget.hpp
index d6d82c80..a685173d 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPinBodyWidget.hpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPinBodyWidget.hpp
@@ -29,11 +29,11 @@ namespace Bloom::Widgets::InsightTargetWidgets
 
         bool hoverActive = false;
 
-        QColor defaultBodyColor = QColor("#AFB1B3");
-        QColor vccBodyColor = QColor("#764935");
+        QColor defaultBodyColor = QColor("#918E86");
+        QColor vccBodyColor = QColor("#703736");
         QColor gndBodyColor = QColor("#46484A");
-        QColor outputHighBodyColor = QColor("#237B77");
-        QColor inputHighBodyColor = QColor("#A47E3E");
+        QColor outputHighBodyColor = QColor("#3B6469");
+        QColor inputHighBodyColor = QColor("#806231");
 
         int disableAlphaLevel = 100;