From c428cff5a172ea3eea1c1b215c28789bc883d34d Mon Sep 17 00:00:00 2001 From: Nav Date: Tue, 21 Sep 2021 23:13:28 +0100 Subject: [PATCH] Tweaks to Insight's colour palette --- .../InsightWindow/Stylesheets/AboutWindow.qss | 2 +- .../Stylesheets/InsightWindow.qss | 27 +++++++++---------- .../BitsetWidget/BitBodyWidget.cpp | 2 +- .../TargetRegisterInspectorWindow.qss | 14 +++++----- .../Widgets/TargetWidgets/DIP/BodyWidget.cpp | 2 +- .../Widgets/TargetWidgets/DIP/BodyWidget.hpp | 2 +- .../Widgets/TargetWidgets/QFP/BodyWidget.cpp | 2 +- .../Widgets/TargetWidgets/QFP/BodyWidget.hpp | 2 +- .../TargetWidgets/TargetPinBodyWidget.hpp | 10 +++---- 9 files changed, 31 insertions(+), 32 deletions(-) diff --git a/src/Insight/UserInterfaces/InsightWindow/Stylesheets/AboutWindow.qss b/src/Insight/UserInterfaces/InsightWindow/Stylesheets/AboutWindow.qss index 3d451d82..968001af 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Stylesheets/AboutWindow.qss +++ b/src/Insight/UserInterfaces/InsightWindow/Stylesheets/AboutWindow.qss @@ -4,7 +4,7 @@ } QMainWindow { - background-color: #343532; + background-color: #373835; } diff --git a/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss b/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss index 221824a6..b5493e6a 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss +++ b/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss @@ -5,7 +5,7 @@ } QMainWindow { - background-color: #343532; + background-color: #373835; } #header { @@ -15,7 +15,7 @@ QMainWindow { min-height: 25px; width: auto; border-top: 1px solid #41423f; - border-bottom: 1px solid #2b2b2b; + border-bottom: 1px solid #2F2F2D; } QMenuBar::item { @@ -33,7 +33,7 @@ QMenuBar::item { } QMenuBar::item:pressed { - background-color: #335883; + background-color: #355A80; } QMenuBar { @@ -50,7 +50,7 @@ QMenuBar { QMenu { margin: 0; padding: 0; - background-color: #343532; + background-color: #373835; color: #afb1b3; border: 1px solid #41423f; min-width: 200px; @@ -63,7 +63,7 @@ QMenu::item { } QMenu::item:selected { - background-color: #335883; + background-color: #355A80; } QMenu::item:disabled { @@ -204,8 +204,7 @@ QScrollBar::sub-line:vertical { max-width: 22px; background-color: transparent; height: auto; - border-right: 1px solid #313131; - border-right: 1px solid #2b2b2b; + border-right: 1px solid #2F2F2D; text-align: right; } @@ -218,18 +217,18 @@ QScrollBar::sub-line:vertical { #left-side-menu-bar QToolButton:hover, #left-side-menu-bar QToolButton:checked { - background-color: #2B2B29; + background-color: #2F2F2D; border: none; } #left-panel-layout-container { - border-right: 1px solid #2b2b2b; + border-right: 1px solid #2F2F2D; } /* Target Registers Pane */ #target-registers-side-pane #tool-bar { - background-color: #353C41; - border-bottom: 1px solid #2b2b2b; + background-color: #383F43; + border-bottom: 1px solid #2F2F2D; } #target-registers-side-pane #title { @@ -253,8 +252,8 @@ QScrollBar::sub-line:vertical { } #target-registers-side-pane #search-bar { - background-color: #343532; - border-bottom: 1px solid #2b2b2b; + background-color: #373835; + border-bottom: 1px solid #2F2F2D; } #target-registers-side-pane #search-input { @@ -277,7 +276,7 @@ QScrollBar::sub-line:vertical { #target-registers-side-pane #register-group-header[selected=true], #target-registers-side-pane #register-item[selected=true] { - background-color: #335883; + background-color: #355A80; } #target-registers-side-pane #register-item #value { diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/BitsetWidget/BitBodyWidget.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/BitsetWidget/BitBodyWidget.cpp index b97e8dd7..8bbf9efa 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/BitsetWidget/BitBodyWidget.cpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/BitsetWidget/BitBodyWidget.cpp @@ -57,7 +57,7 @@ void BitBodyWidget::paintEvent(QPaintEvent* event) { void BitBodyWidget::drawWidget(QPainter& painter) { painter.setRenderHints(QPainter::RenderHint::Antialiasing | QPainter::RenderHint::SmoothPixmapTransform, true); - auto bodyColor = QColor(this->bit == true ? "#7B5F31" : "#918E86"); + auto bodyColor = QColor(this->bit == true ? "#7B5E38" : "#83817B"); if (!this->isEnabled()) { bodyColor.setAlpha(100); diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/Stylesheets/TargetRegisterInspectorWindow.qss b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/Stylesheets/TargetRegisterInspectorWindow.qss index 849feb2f..773e05af 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/Stylesheets/TargetRegisterInspectorWindow.qss +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/Stylesheets/TargetRegisterInspectorWindow.qss @@ -5,7 +5,7 @@ } #target-register-inspector-window { - background-color: #343532; + background-color: #373835; } #register-name { @@ -14,7 +14,7 @@ #register-value-container, #register-details-container { - border: 1px solid #2b2b2b; + border: 1px solid #2F2F2D; } #register-value-text-input-container { @@ -22,7 +22,7 @@ } QLineEdit { - background-color: #2B2B29; + background-color: #2F2F2D; border: 1px solid #41423f; padding: 3px; } @@ -65,12 +65,12 @@ QPushButton:disabled { /* RegisterHistoryWidget */ #target-register-history-widget #container { - border: 1px solid #2b2b2b; + border: 1px solid #2F2F2D; } #target-register-history-widget #title-bar { - background-color: #353C41; - border-bottom: 1px solid #2b2b2b; + background-color: #383F43; + border-bottom: 1px solid #2F2F2D; } #target-register-history-widget #title { @@ -88,7 +88,7 @@ QPushButton:disabled { #target-register-history-widget #current-item[selected=true], #target-register-history-widget #register-history-item[selected=true] { - background-color: #335883; + background-color: #355A80; } #target-register-history-widget #separator-widget { diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/BodyWidget.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/BodyWidget.cpp index fffe6b26..7d7c193b 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("#343532"); + auto backgroundColor = QColor("#373835"); 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 09703c21..06d39458 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("#918E86"); + QColor bodyColor = QColor("#908D85"); int disableAlphaLevel = 100; protected: diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/BodyWidget.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/BodyWidget.cpp index cee8960e..3ceb76c5 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("#343532"); + auto backgroundColor = QColor("#373835"); 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 f62ead9a..ce48ec28 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("#918E86"); + QColor bodyColor = QColor("#908D85"); int disableAlphaLevel = 100; protected: diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPinBodyWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPinBodyWidget.hpp index ea9e3221..8eb099cd 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("#918E86"); - QColor vccBodyColor = QColor("#703736"); - QColor gndBodyColor = QColor("#46484A"); - QColor outputHighBodyColor = QColor("#3B6469"); - QColor inputHighBodyColor = QColor("#7B5F31"); + QColor defaultBodyColor = QColor("#83817B"); + QColor vccBodyColor = QColor("#70383A"); + QColor gndBodyColor = QColor("#484A4B"); + QColor outputHighBodyColor = QColor("#3C5E62"); + QColor inputHighBodyColor = QColor("#7B5E38"); int disableAlphaLevel = 100;