QT/Serial-Studio
1
0
Fork 0
mirror of https://github.com/Serial-Studio/Serial-Studio.git synced 2025-01-31 17:42:55 +08:00
Code Issues Projects Releases Wiki Activity

Add MQTT button color option to theme manager

Browse Source
This commit is contained in:
Alex Spataru 2021-11-11 22:35:23 -06:00
parent 74354bb8bc
commit 48092003c0
7 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/qml/Panes/SetupPanes/MQTT.qml
View File

@ -284,9 +284,9 @@ Control {
icon.height: 24
font.bold: true
Layout.fillWidth: true
icon.color: Cpp_ThemeManager.highlight
icon.color: Cpp_ThemeManager.mqttButton
checked: Cpp_MQTT_Client.isConnectedToHost
palette.buttonText: Cpp_ThemeManager.highlight
palette.buttonText: Cpp_ThemeManager.mqttButton
onClicked: Cpp_MQTT_Client.toggleConnection()
text: (checked ? qsTr("Disconnect") :
qsTr("Connect to broker")) + " "

4
assets/qml/Windows/MQTTConfiguration.qml
View File

@ -468,10 +468,10 @@ FramelessWindow.CustomWindow {
icon.height: 24
font.bold: true
Layout.fillWidth: true
icon.color: Cpp_ThemeManager.highlight
icon.color: Cpp_ThemeManager.mqttButton
checked: Cpp_MQTT_Client.isConnectedToHost
onClicked: Cpp_MQTT_Client.toggleConnection()
palette.buttonText: Cpp_ThemeManager.highlight
palette.buttonText: Cpp_ThemeManager.mqttButton
text: (checked ? qsTr("Disconnect") : qsTr("Connect")) + " "
icon.source: checked ? "qrc:/icons/disconnect.svg" :
"qrc:/icons/connect.svg"

1
assets/themes/1_Classic.json
View File

@ -40,6 +40,7 @@
"widgetControlBackground":"#bebebe",
"connectButtonChecked":"#d72d60",
"connectButtonUnchecked":"#2eed5c",
"mqttButton":"#2eed5c",
"widgetTextPrimary":"#e6e0b2",
"widgetTextSecondary":"#517497",
"widgetWindowBackground":"#121920",

1
assets/themes/2_Noir.json
View File

@ -39,6 +39,7 @@
"csvCheckbox":"#2e895c",
"connectButtonChecked":"#d72d60",
"connectButtonUnchecked":"#2eed5c",
"mqttButton":"#1e7cf3",
"widgetTextPrimary":"#24476a",
"widgetTextSecondary":"#666666",
"widgetWindowBackground":"#f2f2f2",

1
assets/themes/3_MathWorks.json
View File

@ -39,6 +39,7 @@
"csvCheckbox":"#2e895c",
"connectButtonChecked":"#fe696e",
"connectButtonUnchecked":"#26cd40",
"mqttButton":"#53ab27",
"widgetTextPrimary":"#24476a",
"widgetTextSecondary":"#666666",
"widgetWindowBackground":"#e8e8e8",

1
src/Misc/ThemeManager.cpp
View File

@ -172,6 +172,7 @@ void ThemeManager::loadTheme(const int id)
m_widgetControlBackground = QColor(colors.value("widgetControlBackground").toString());
m_connectButtonChecked = QColor(colors.value("connectButtonChecked").toString());
m_connectButtonUnchecked = QColor(colors.value("connectButtonUnchecked").toString());
m_mqttButton = QColor(colors.value("mqttButton").toString());
// clang-format on
// Read bar widget colors

5
src/Misc/ThemeManager.h
View File

@ -181,6 +181,9 @@ class ThemeManager : public QObject
Q_PROPERTY(QColor connectButtonUnchecked
READ connectButtonUnchecked
NOTIFY themeChanged)
Q_PROPERTY(QColor mqttButton
READ mqttButton
NOTIFY themeChanged)
Q_PROPERTY(StringList widgetColors
READ widgetColors
NOTIFY themeChanged)
@ -243,6 +246,7 @@ public:
QColor widgetControlBackground() const;
QColor connectButtonChecked() const;
QColor connectButtonUnchecked() const;
QColor mqttButton() const;
StringList widgetColors() const;
StringList availableThemes() const;
@ -308,6 +312,7 @@ private:
QColor m_widgetControlBackground;
QColor m_connectButtonChecked;
QColor m_connectButtonUnchecked;
QColor m_mqttButton;
StringList m_widgetColors;
};
}