doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjusted the Insight window colour palette to use softer colours with a higher temperature (less blue)

Browse Source
This commit is contained in:
Nav
2021-08-07 17:31:06 +01:00
parent f4da255b75
commit 81ad21b005
10 changed files with 43 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Insight/UserInterfaces/InsightWindow/Images/BloomIcon.svg
View File

@@ -299,7 +299,7 @@
</defs> </defs>
<sodipodi:namedview <sodipodi:namedview
id="base" id="base"
pagecolor="#3c3f41" pagecolor="#343532"
bordercolor="#666666" bordercolor="#666666"
borderopacity="1.0" borderopacity="1.0"
inkscape:pageopacity="0" inkscape:pageopacity="0"
@@ -308,14 +308,14 @@
inkscape:cx="91.565425" inkscape:cx="91.565425"
inkscape:cy="64.254418" inkscape:cy="64.254418"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:current-layer="layer2" inkscape:current-layer="layer1"
inkscape:document-rotation="0" inkscape:document-rotation="0"
showgrid="false" showgrid="false"
units="px" units="px"
inkscape:window-width="2560" inkscape:window-width="3440"
inkscape:window-height="1353" inkscape:window-height="1353"
inkscape:window-x="6000" inkscape:window-x="2560"
inkscape:window-y="24" inkscape:window-y="34"
inkscape:window-maximized="1" /> inkscape:window-maximized="1" />
<metadata <metadata
id="metadata5"> id="metadata5">
@@ -325,7 +325,7 @@
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type <dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title /> <dc:title></dc:title>
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
@@ -333,21 +333,22 @@
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer6" id="layer6"
inkscape:label="Layer 5" inkscape:label="Layer 5"
style="display:inline"> style="display:inline"
sodipodi:insensitive="true">
<rect <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" id="rect1934"
width="26.458334" width="26.458334"
height="26.458334" height="26.458334"
x="-2.220446e-16" x="-2.220446e-16"
y="-2.220446e-16" y="-2.220446e-16" />
sodipodi:insensitive="true" />
</g> </g>
<g <g
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer2" id="layer2"
inkscape:label="Layer 2" inkscape:label="Layer 2"
style="display:inline"> style="display:inline"
sodipodi:insensitive="true">
<path <path
style="opacity:1;fill:#a8a9a9;fill-opacity:1;stroke:none;stroke-width:0.214532;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 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" d="m 11.688069,17.233636 h -1.287196 v 1.287197 h 1.287196 z"
@@ -485,7 +486,7 @@
id="layer1" id="layer1"
style="display:inline"> style="display:inline">
<circle <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" id="path900"
cx="13.229166" cx="13.229166"
cy="13.229166" cy="13.229166"
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

2
src/Insight/UserInterfaces/InsightWindow/Stylesheets/AboutWindow.qss
View File

@@ -4,7 +4,7 @@
} }
QMainWindow { QMainWindow {
background-color: #3C3F41; background-color: #343532;
} }

36
src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss
View File

@@ -1,10 +1,10 @@
* { * {
color: #c2c4c6; color: #afb1b3;
font-family: 'Ubuntu', sans-serif; font-family: 'Ubuntu', sans-serif;
} }
QMainWindow { QMainWindow {
background-color: #3C3F41; background-color: #343532;
} }
#header { #header {
@@ -12,8 +12,9 @@ QMainWindow {
background-color: transparent; background-color: transparent;
max-height: 25px; max-height: 25px;
width: auto; width: auto;
border-top: 1px solid #515151; border-top: 1px solid #41423f;
border-bottom: 1px solid #515151; border-top: 1px solid #41423f;
border-bottom: 1px solid #312d28;
} }
QMenuBar::item { QMenuBar::item {
@@ -31,7 +32,7 @@ QMenuBar::item {
} }
QMenuBar::item:pressed { QMenuBar::item:pressed {
background-color: #2F65CA; background-color: #335883;
} }
QMenuBar { QMenuBar {
@@ -41,16 +42,16 @@ QMenuBar {
min-height: 24px; min-height: 24px;
background-color: transparent; background-color: transparent;
spacing: 0; spacing: 0;
color: #c2c4c6; color: #afb1b3;
font-size: 14px; font-size: 14px;
} }
QMenu { QMenu {
margin: 0; margin: 0;
padding: 0; padding: 0;
background-color: #3C3F41; background-color: #343532;
color: #c2c4c6; color: #afb1b3;
border: 1px solid #515151; border: 1px solid #41423f;
min-width: 200px; min-width: 200px;
font-size: 14px; font-size: 14px;
} }
@@ -61,7 +62,8 @@ QMenu::item {
} }
QMenu::item:selected { QMenu::item:selected {
background-color: #2F65CA; background-color: #4d7bba;
background-color: #335883;
} }
QMenu::item:disabled { QMenu::item:disabled {
@@ -69,7 +71,7 @@ QMenu::item:disabled {
} }
QMenu#help-menu::separator { QMenu#help-menu::separator {
border-top: 1px solid #515151; border-top: 1px solid #41423f;
height: 1px; height: 1px;
margin: 1px 0; margin: 1px 0;
} }
@@ -115,7 +117,7 @@ QMenu#help-menu::separator {
} }
#header-tool-bar QToolButton:hover { #header-tool-bar QToolButton:hover {
background-color: #505353; background-color: #454541;
border: none; border: none;
padding: 0; padding: 0;
} }
@@ -123,7 +125,7 @@ QMenu#help-menu::separator {
QToolTip { QToolTip {
background-color: #474949; background-color: #474949;
border: 1px solid #616365; border: 1px solid #616365;
color: #c2c4c6; color: #afb1b3;
padding: 1px 2px; padding: 1px 2px;
font-size: 13px; font-size: 13px;
} }
@@ -135,7 +137,7 @@ QToolTip {
padding: 0 3px 0 30px; padding: 0 3px 0 30px;
max-height: 25px; max-height: 25px;
width: auto; width: auto;
border-top: 1px solid #515151; border-top: 1px solid #41423f;
} }
@@ -147,12 +149,12 @@ QToolTip {
#target-variant-menu-bar::item { #target-variant-menu-bar::item {
padding: 0 10px 0 4px; padding: 0 10px 0 4px;
border-left: 1px solid #515151; border-left: 1px solid #41423f;
margin-bottom: 0; margin-bottom: 0;
} }
#target-variant-menu-bar::item:selected { #target-variant-menu-bar::item:selected {
background-color: #4d4e50; background-color: #454541;
} }
#footer QLabel { #footer QLabel {
@@ -160,7 +162,7 @@ QToolTip {
} }
#target-program-counter-value { #target-program-counter-value {
border-color: #515151; border-color: #41423f;
border-style: solid; border-style: solid;
border-width: 0 1px 0 0; border-width: 0 1px 0 0;
padding-right: 5px; padding-right: 5px;

2
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/BodyWidget.cpp
View File

@@ -23,7 +23,7 @@ void BodyWidget::drawWidget(QPainter& painter) {
// Draw target body // Draw target body
auto targetBodyColor = this->getBodyColor(); auto targetBodyColor = this->getBodyColor();
auto backgroundColor = QColor("#3C3F41"); auto backgroundColor = QColor("#343532");
if (!this->isEnabled()) { if (!this->isEnabled()) {
targetBodyColor.setAlpha(this->getDisableAlphaLevel()); targetBodyColor.setAlpha(this->getDisableAlphaLevel());

2
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/BodyWidget.hpp
View File

@@ -12,7 +12,7 @@ namespace Bloom::Widgets::InsightTargetWidgets::Dip
private: private:
// These properties can be modified via Qt style sheets (see Stylesheets/DualInlinePackage.qss) // These properties can be modified via Qt style sheets (see Stylesheets/DualInlinePackage.qss)
QColor bodyColor = QColor("#AFB1B3"); QColor bodyColor = QColor("#918E86");
int disableAlphaLevel = 100; int disableAlphaLevel = 100;
protected: protected:

2
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/PinWidget.hpp
View File

@@ -55,7 +55,7 @@ namespace Bloom::Widgets::InsightTargetWidgets::Dip
this->bodyWidget->setPinState(pinState); this->bodyWidget->setPinState(pinState);
} }
this->setLabelColor(this->pinStateChanged ? "#6FA0FF" : "#a6a7aa"); this->setLabelColor(this->pinStateChanged ? "#4d7bba" : "#a6a7aa");
} }
}; };
} }

2
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/BodyWidget.cpp
View File

@@ -14,7 +14,7 @@ void BodyWidget::drawWidget(QPainter& painter) {
painter.setRenderHints(QPainter::RenderHint::Antialiasing | QPainter::RenderHint::SmoothPixmapTransform, true); painter.setRenderHints(QPainter::RenderHint::Antialiasing | QPainter::RenderHint::SmoothPixmapTransform, true);
auto targetBodyColor = this->getBodyColor(); auto targetBodyColor = this->getBodyColor();
auto backgroundColor = QColor("#3C3F41"); auto backgroundColor = QColor("#343532");
if (!this->isEnabled()) { if (!this->isEnabled()) {
targetBodyColor.setAlpha(this->getDisableAlphaLevel()); targetBodyColor.setAlpha(this->getDisableAlphaLevel());

2
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/BodyWidget.hpp
View File

@@ -12,7 +12,7 @@ namespace Bloom::Widgets::InsightTargetWidgets::Qfp
private: private:
// These properties can be modified via Qt style sheets (see Stylesheets/QuadFlatPackage.qss) // These properties can be modified via Qt style sheets (see Stylesheets/QuadFlatPackage.qss)
QColor bodyColor = QColor("#AFB1B3"); QColor bodyColor = QColor("#918E86");
int disableAlphaLevel = 100; int disableAlphaLevel = 100;
protected: protected:

2
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinWidget.hpp
View File

@@ -67,7 +67,7 @@ namespace Bloom::Widgets::InsightTargetWidgets::Qfp
this->bodyWidget->setPinState(pinState); this->bodyWidget->setPinState(pinState);
} }
this->setLabelColor(this->pinStateChanged ? "#6FA0FF" : "#a6a7aa"); this->setLabelColor(this->pinStateChanged ? "#4d7bba" : "#a6a7aa");
} }
}; };
} }

8
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPinBodyWidget.hpp
View File

@@ -29,11 +29,11 @@ namespace Bloom::Widgets::InsightTargetWidgets
bool hoverActive = false; bool hoverActive = false;
QColor defaultBodyColor = QColor("#AFB1B3"); QColor defaultBodyColor = QColor("#918E86");
QColor vccBodyColor = QColor("#764935"); QColor vccBodyColor = QColor("#703736");
QColor gndBodyColor = QColor("#46484A"); QColor gndBodyColor = QColor("#46484A");
QColor outputHighBodyColor = QColor("#237B77"); QColor outputHighBodyColor = QColor("#3B6469");
QColor inputHighBodyColor = QColor("#A47E3E"); QColor inputHighBodyColor = QColor("#806231");
int disableAlphaLevel = 100; int disableAlphaLevel = 100;