QT/Serial-Studio
1
0
Fork 0
mirror of https://github.com/Serial-Studio/Serial-Studio.git synced 2025-01-15 05:22:53 +08:00
Code Issues Projects Releases Wiki Activity

Update themes

Browse Source
This commit is contained in:
Alex Spataru 2021-10-05 04:00:25 -05:00
parent 85da40e7b6
commit 8dbc9783e4
5 changed files with 19 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
assets/themes/0_Dark.json
View File

@ -52,15 +52,6 @@
"widgetIndicator3":"#2d6073", "widgetIndicator3":"#2d6073",
"widgetAlternativeBackground":"#121218", "widgetAlternativeBackground":"#121218",
"widgetControlBackground":"#bebebe", "widgetControlBackground":"#bebebe",
"gyroSky":"#5c93c5",
"gyroText":"#ffffff",
"gyroGround":"#7d5233",
"mapDotBackground":"#ff0000",
"mapDotForeground":"#ffffff",
"mapBorder":"#646464",
"mapHorizon":"#dedede",
"mapSkyLowAltitude":"#6ba9d1",
"mapSkyHighAltitude":"#283e51",
"connectButtonChecked":"#d72d60", "connectButtonChecked":"#d72d60",
"connectButtonUnchecked":"#2eed5c", "connectButtonUnchecked":"#2eed5c",
"widgetColors":[ "widgetColors":[

9
assets/themes/1_Light.json
View File

@ -52,15 +52,6 @@
"widgetIndicator3":"#90be6d", "widgetIndicator3":"#90be6d",
"widgetAlternativeBackground":"#fafafa", "widgetAlternativeBackground":"#fafafa",
"widgetControlBackground":"#666666", "widgetControlBackground":"#666666",
"gyroSky":"#5c93c5",
"gyroText":"#ffffff",
"gyroGround":"#7d5233",
"mapDotBackground":"#ff0000",
"mapDotForeground":"#ffffff",
"mapBorder":"#646464",
"mapHorizon":"#dedede",
"mapSkyLowAltitude":"#6ba9d1",
"mapSkyHighAltitude":"#283e51",
"connectButtonChecked":"#fe696e", "connectButtonChecked":"#fe696e",
"connectButtonUnchecked":"#26cd40", "connectButtonUnchecked":"#26cd40",
"widgetColors":[ "widgetColors":[

47
assets/themes/2_Yaru.json
View File

@ -2,16 +2,16 @@
"name":"Yaru", "name":"Yaru",
"author":"Alex Spataru", "author":"Alex Spataru",
"colors":{ "colors":{
"base":"#323030", "base":"#fafafa",
"link":"#105087", "link":"#105087",
"button":"#373737", "button":"#fafafa",
"window":"#2c2c2c", "window":"#fafafa",
"text":"#ffffff", "text":"#000000",
"midlight":"#2c2c2c", "midlight":"#2c2c2c",
"highlight":"#df4a17", "highlight":"#df4a17",
"brightText":"#ffffff", "brightText":"#ffffff",
"buttonText":"#ffffff", "buttonText":"#000000",
"windowText":"#ffffff", "windowText":"#000000",
"toolTipBase":"#feffc6", "toolTipBase":"#feffc6",
"toolTipText":"#000000", "toolTipText":"#000000",
"highlightedText":"#ffffff", "highlightedText":"#ffffff",
@ -22,27 +22,27 @@
"menubarGradient1":"#323030", "menubarGradient1":"#323030",
"menubarGradient2":"#323030", "menubarGradient2":"#323030",
"menubarText":"#ffffff", "menubarText":"#ffffff",
"dialogBackground":"#2c2c2c", "dialogBackground":"#fafafa",
"consoleText":"#ffffff", "consoleText":"#657a83",
"consoleBase":"#2d0922", "consoleBase":"#fdf6e3",
"consoleButton":"#373737", "consoleButton":"#fafafa",
"consoleWindow":"#1c1c1c", "consoleWindow":"#1c1c1c",
"consoleHighlight":"#df4a17", "consoleHighlight":"#df4a17",
"consoleHighlightedText":"#ffffff", "consoleHighlightedText":"#ffffff",
"consolePlaceholderText":"#bebebe", "consolePlaceholderText":"#bebebe",
"windowBackground":"#6f5c69", "windowBackground":"#fafafa",
"windowGradient1":"#323030", "windowGradient1":"#323030",
"windowGradient2":"#323030", "windowGradient2":"#323030",
"alternativeHighlight":"#8b2782", "alternativeHighlight":"#666666",
"setupPanelBackground":"#272727", "setupPanelBackground":"#ffffff",
"datasetValue":"#dd3224", "datasetValue":"#dd3224",
"graphDialBorder":"#222222", "graphDialBorder":"#222222",
"datasetTextPrimary":"#24476a", "datasetTextPrimary":"#24476a",
"datasetTextSecondary":"#666666", "datasetTextSecondary":"#666666",
"datasetWindowBackground":"#272727", "datasetWindowBackground":"#ffffff",
"datasetWindowBorder":"#8b2782", "datasetWindowBorder":"#62676a",
"embeddedWindowBackground":"#2c2c2c", "embeddedWindowBackground":"#ffffff",
"ledEnabled":"#df4a17", "ledEnabled":"#26cd40",
"ledDisabled":"#686868", "ledDisabled":"#686868",
"csvHighlight":"#2e895c", "csvHighlight":"#2e895c",
"widgetForegroundPrimary":"#f94144", "widgetForegroundPrimary":"#f94144",
@ -52,17 +52,8 @@
"widgetIndicator3":"#90be6d", "widgetIndicator3":"#90be6d",
"widgetAlternativeBackground":"#fafafa", "widgetAlternativeBackground":"#fafafa",
"widgetControlBackground":"#666666", "widgetControlBackground":"#666666",
"gyroSky":"#5c93c5", "connectButtonChecked":"#d72d60",
"gyroText":"#ffffff", "connectButtonUnchecked":"#2eed5c",
"gyroGround":"#7d5233",
"mapDotBackground":"#ff0000",
"mapDotForeground":"#ffffff",
"mapBorder":"#646464",
"mapHorizon":"#dedede",
"mapSkyLowAltitude":"#6ba9d1",
"mapSkyHighAltitude":"#283e51",
"connectButtonChecked":"#fe696e",
"connectButtonUnchecked":"#26cd40",
"widgetColors":[ "widgetColors":[
"#f94144", "#f94144",
"#f3722c", "#f3722c",

54
src/Misc/ThemeManager.cpp
View File

@ -183,15 +183,6 @@ void ThemeManager::loadTheme(const int id)
m_widgetIndicator3 = QColor(colors.value("widgetIndicator3").toString()); m_widgetIndicator3 = QColor(colors.value("widgetIndicator3").toString());
m_widgetAlternativeBackground = QColor(colors.value("widgetAlternativeBackground").toString()); m_widgetAlternativeBackground = QColor(colors.value("widgetAlternativeBackground").toString());
m_widgetControlBackground = QColor(colors.value("widgetControlBackground").toString()); m_widgetControlBackground = QColor(colors.value("widgetControlBackground").toString());
m_gyroSky = QColor(colors.value("gyroSky").toString());
m_gyroText = QColor(colors.value("gyroText").toString());
m_gyroGround = QColor(colors.value("gyroGround").toString());
m_mapDotBackground = QColor(colors.value("mapDotBackground").toString());
m_mapDotForeground = QColor(colors.value("mapDotForeground").toString());
m_mapBorder = QColor(colors.value("mapBorder").toString());
m_mapHorizon = QColor(colors.value("mapHorizon").toString());
m_mapSkyLowAltitude = QColor(colors.value("mapSkyLowAltitude").toString());
m_mapSkyHighAltitude = QColor(colors.value("mapSkyHighAltitude").toString());
m_connectButtonChecked = QColor(colors.value("connectButtonChecked").toString()); m_connectButtonChecked = QColor(colors.value("connectButtonChecked").toString());
m_connectButtonUnchecked = QColor(colors.value("connectButtonUnchecked").toString()); m_connectButtonUnchecked = QColor(colors.value("connectButtonUnchecked").toString());
// clang-format on // clang-format on
@ -518,51 +509,6 @@ QColor ThemeManager::widgetControlBackground() const
return m_widgetControlBackground; return m_widgetControlBackground;
} }
QColor ThemeManager::gyroSky() const
{
return m_gyroSky;
}
QColor ThemeManager::gyroText() const
{
return m_gyroText;
}
QColor ThemeManager::gyroGround() const
{
return m_gyroGround;
}
QColor ThemeManager::mapDotBackground() const
{
return m_mapDotBackground;
}
QColor ThemeManager::mapDotForeground() const
{
return m_mapDotForeground;
}
QColor ThemeManager::mapBorder() const
{
return m_mapBorder;
}
QColor ThemeManager::mapHorizon() const
{
return m_mapHorizon;
}
QColor ThemeManager::mapSkyLowAltitude() const
{
return m_mapSkyLowAltitude;
}
QColor ThemeManager::mapSkyHighAltitude() const
{
return m_mapSkyHighAltitude;
}
QColor ThemeManager::connectButtonChecked() const QColor ThemeManager::connectButtonChecked() const
{ {
return m_connectButtonChecked; return m_connectButtonChecked;

45
src/Misc/ThemeManager.h
View File

@ -186,33 +186,6 @@ class ThemeManager : public QObject
Q_PROPERTY(QColor widgetControlBackground Q_PROPERTY(QColor widgetControlBackground
READ widgetControlBackground READ widgetControlBackground
NOTIFY themeChanged) NOTIFY themeChanged)
Q_PROPERTY(QColor gyroSky
READ gyroSky
NOTIFY themeChanged)
Q_PROPERTY(QColor gyroText
READ gyroText
NOTIFY themeChanged)
Q_PROPERTY(QColor gyroGround
READ gyroGround
NOTIFY themeChanged)
Q_PROPERTY(QColor mapDotBackground
READ mapDotBackground
NOTIFY themeChanged)
Q_PROPERTY(QColor mapDotForeground
READ mapDotForeground
NOTIFY themeChanged)
Q_PROPERTY(QColor mapBorder
READ mapBorder
NOTIFY themeChanged)
Q_PROPERTY(QColor mapHorizon
READ mapHorizon
NOTIFY themeChanged)
Q_PROPERTY(QColor mapSkyLowAltitude
READ mapSkyLowAltitude
NOTIFY themeChanged)
Q_PROPERTY(QColor mapSkyHighAltitude
READ mapSkyHighAltitude
NOTIFY themeChanged)
Q_PROPERTY(QColor connectButtonChecked Q_PROPERTY(QColor connectButtonChecked
READ connectButtonChecked READ connectButtonChecked
NOTIFY themeChanged) NOTIFY themeChanged)
@ -286,15 +259,6 @@ public:
QColor widgetIndicator3() const; QColor widgetIndicator3() const;
QColor widgetAlternativeBackground() const; QColor widgetAlternativeBackground() const;
QColor widgetControlBackground() const; QColor widgetControlBackground() const;
QColor gyroSky() const;
QColor gyroText() const;
QColor gyroGround() const;
QColor mapDotBackground() const;
QColor mapDotForeground() const;
QColor mapBorder() const;
QColor mapHorizon() const;
QColor mapSkyLowAltitude() const;
QColor mapSkyHighAltitude() const;
QColor connectButtonChecked() const; QColor connectButtonChecked() const;
QColor connectButtonUnchecked() const; QColor connectButtonUnchecked() const;
@ -367,15 +331,6 @@ private:
QColor m_widgetIndicator3; QColor m_widgetIndicator3;
QColor m_widgetAlternativeBackground; QColor m_widgetAlternativeBackground;
QColor m_widgetControlBackground; QColor m_widgetControlBackground;
QColor m_gyroSky;
QColor m_gyroText;
QColor m_gyroGround;
QColor m_mapDotBackground;
QColor m_mapDotForeground;
QColor m_mapBorder;
QColor m_mapHorizon;
QColor m_mapSkyLowAltitude;
QColor m_mapSkyHighAltitude;
QColor m_connectButtonChecked; QColor m_connectButtonChecked;
QColor m_connectButtonUnchecked; QColor m_connectButtonUnchecked;
QStringList m_widgetColors; QStringList m_widgetColors;