diff --git a/Serial-Studio.pro b/Serial-Studio.pro index 8f34c6c6..f3aecd2e 100644 --- a/Serial-Studio.pro +++ b/Serial-Studio.pro @@ -77,6 +77,12 @@ QT += quickcontrols2 include(libs/Libraries.pri) +#----------------------------------------------------------------------------------------- +# Assets +#----------------------------------------------------------------------------------------- + +include(assets/Assets.pri) + #----------------------------------------------------------------------------------------- # Deploy options #----------------------------------------------------------------------------------------- @@ -118,24 +124,6 @@ mingw { INCLUDEPATH += src -RESOURCES += \ - assets/assets.qrc - -DISTFILES += \ - assets/qml/PlatformDependent/*.qml \ - assets/qml/SetupPanes/*.qml \ - assets/qml/Widgets/*.qml \ - assets/qml/Windows/*.qml \ - assets/qml/SetupPanes/*.qml \ - assets/qml/*.qml \ - assets/qml/Config/*.js - -TRANSLATIONS += \ - assets/translations/en.ts \ - assets/translations/es.ts \ - assets/translations/zh.ts \ - assets/translations/de.ts - HEADERS += \ src/AppInfo.h \ src/CSV/Export.h \ @@ -196,22 +184,3 @@ OTHER_FILES += \ deploy/windows/nsis/* \ deploy/windows/resources/* \ .github/workflows/Build.yml - -#------------------------------------------------------------------------------- -# Markdown files -#------------------------------------------------------------------------------- - -OTHER_FILES += \ - src/*.md \ - src/CSV/*.md \ - src/IO/*.md \ - src/JSON/*.md \ - src/Misc/*.md \ - src/MQTT/*.md \ - src/Plugins/*.md \ - src/UI/*.md \ - assets/qml/*.md \ - assets/qml/PlatformDependent/*.md \ - assets/qml/SetupPanes/*.md \ - assets/qml/Widgets/*.md \ - assets/qml/Windows/.md diff --git a/assets/assets.pri b/assets/assets.pri new file mode 100644 index 00000000..4dd61c15 --- /dev/null +++ b/assets/assets.pri @@ -0,0 +1,36 @@ +# +# Copyright (c) 2020-2021 Alex Spataru +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. +# + +TRANSLATIONS += \ + $$PWD/translations/en.ts \ + $$PWD/translations/es.ts \ + $$PWD/translations/zh.ts \ + $$PWD/translations/de.ts + +RESOURCES += \ + $$PWD/icons/rcc_icons.qrc \ + $$PWD/images/rcc_images.qrc \ + $$PWD/instruments/rcc_instruments.qrc \ + $$PWD/messages/rcc_messages.qrc \ + $$PWD/qml/rcc_qml.qrc \ + $$PWD/themes/rcc_themes.qrc \ + $$PWD/translations/rcc_translations.qrc diff --git a/assets/assets.qrc b/assets/assets.qrc deleted file mode 100644 index f17ba088..00000000 --- a/assets/assets.qrc +++ /dev/null @@ -1,114 +0,0 @@ - - - icons/ac-power.svg - icons/arrow-right.svg - icons/backspace.svg - icons/battery.svg - icons/bug.svg - icons/chart.svg - icons/code.svg - icons/connect.svg - icons/copy.svg - icons/delete.svg - icons/developer-board.svg - icons/device-hub.svg - icons/disconnect.svg - icons/drag-drop.svg - icons/equalizer.svg - icons/error.svg - icons/ethernet.svg - icons/fullscreen-exit.svg - icons/fullscreen.svg - icons/group.svg - icons/help.svg - icons/info.svg - icons/link.svg - icons/location-off.svg - icons/location-on.svg - icons/media-next.svg - icons/media-pause.svg - icons/media-play.svg - icons/media-prev.svg - icons/open.svg - icons/power.svg - icons/ram.svg - icons/refresh.svg - icons/right.svg - icons/save.svg - icons/scatter-plot.svg - icons/schedule.svg - icons/send.svg - icons/settings.svg - icons/tab.svg - icons/terminal.svg - icons/update.svg - icons/usb.svg - icons/visibility.svg - icons/warning.svg - images/icon.png - instruments/AttitudeDial.svg - instruments/AttitudePointer.svg - instruments/Crosshair.svg - messages/Acknowledgements.txt - messages/Welcome_DE.txt - messages/Welcome_EN.txt - messages/Welcome_ES.txt - messages/Welcome_ZH.txt - qml/Widgets/AccelerometerDelegate.qml - qml/Widgets/ArtificialHorizonDelegate.qml - qml/Widgets/BarDelegate.qml - qml/Widgets/DataDelegate.qml - qml/Widgets/AccelerometerGaugeDelegate.qml - qml/Widgets/GraphDelegate.qml - qml/Widgets/GroupDelegate.qml - qml/Widgets/GyroDelegate.qml - qml/Widgets/LED.qml - qml/Widgets/MapDelegate.qml - qml/Widgets/Window.qml - qml/Windows/About.qml - qml/Windows/Acknowledgements.qml - qml/Windows/Console.qml - qml/Windows/CsvPlayer.qml - qml/Windows/DataGrid.qml - qml/Windows/Setup.qml - qml/Windows/Toolbar.qml - qml/Windows/Widgets.qml - qml/main.qml - translations/de.qm - translations/de.ts - translations/en.qm - translations/en.ts - translations/es.qm - translations/es.ts - translations/zh.qm - translations/zh.ts - icons/scroll-bottom.svg - icons/scroll-down.svg - icons/scroll-top.svg - icons/scroll-up.svg - qml/Widgets/SimpleDial.qml - qml/SetupPanes/Network.qml - qml/SetupPanes/Serial.qml - qml/SetupPanes/Settings.qml - icons/search.svg - qml/PlatformDependent/MenubarMacOS.qml - qml/PlatformDependent/Menubar.qml - qml/PlatformDependent/DecentMenuItem.qml - qml/SetupPanes/MQTT.qml - qml/Widgets/CompassDelegate.qml - icons/compass.svg - instruments/Compass.svg - instruments/CompassCase.svg - qml/Widgets/GaugeDelegate.qml - qml/Windows/Donate.qml - images/donate-qr.svg - themes/0_Classic.json - themes/1_Light.json - themes/2_SolarizedDark.json - themes/3_SolarizedLight.json - themes/4_macOS_Light.json - themes/5_macOS_Dark.json - qml/Application.qml - themes/6_TVA.json - - diff --git a/assets/icons/rcc_icons.qrc b/assets/icons/rcc_icons.qrc new file mode 100644 index 00000000..05e5f846 --- /dev/null +++ b/assets/icons/rcc_icons.qrc @@ -0,0 +1,55 @@ + + + ac-power.svg + arrow-right.svg + backspace.svg + battery.svg + bug.svg + chart.svg + code.svg + compass.svg + connect.svg + copy.svg + delete.svg + developer-board.svg + device-hub.svg + disconnect.svg + drag-drop.svg + equalizer.svg + error.svg + ethernet.svg + fullscreen-exit.svg + fullscreen.svg + group.svg + help.svg + info.svg + link.svg + location-off.svg + location-on.svg + media-next.svg + media-pause.svg + media-play.svg + media-prev.svg + open.svg + power.svg + ram.svg + refresh.svg + right.svg + save.svg + scatter-plot.svg + schedule.svg + scroll-bottom.svg + scroll-down.svg + scroll-top.svg + scroll-up.svg + search.svg + send.svg + settings.svg + tab.svg + terminal.svg + update.svg + usb.svg + visibility.svg + warning.svg + + diff --git a/assets/images/rcc_images.qrc b/assets/images/rcc_images.qrc new file mode 100644 index 00000000..12815bfe --- /dev/null +++ b/assets/images/rcc_images.qrc @@ -0,0 +1,6 @@ + + + donate-qr.svg + icon.png + + diff --git a/assets/instruments/rcc_instruments.qrc b/assets/instruments/rcc_instruments.qrc new file mode 100644 index 00000000..b264d133 --- /dev/null +++ b/assets/instruments/rcc_instruments.qrc @@ -0,0 +1,9 @@ + + + AttitudeDial.svg + AttitudePointer.svg + Compass.svg + CompassCase.svg + Crosshair.svg + + diff --git a/assets/messages/rcc_messages.qrc b/assets/messages/rcc_messages.qrc new file mode 100644 index 00000000..57e3054c --- /dev/null +++ b/assets/messages/rcc_messages.qrc @@ -0,0 +1,9 @@ + + + Acknowledgements.txt + Welcome_DE.txt + Welcome_EN.txt + Welcome_ES.txt + Welcome_ZH.txt + + diff --git a/assets/qml/SetupPanes/Settings.qml b/assets/qml/SetupPanes/Settings.qml index 9f7e4496..a2bc8d00 100644 --- a/assets/qml/SetupPanes/Settings.qml +++ b/assets/qml/SetupPanes/Settings.qml @@ -137,8 +137,8 @@ Control { opacity: 0.8 font.pixelSize: 12 Layout.fillWidth: true - color: palette.highlightedText wrapMode: Label.WrapAtWordBoundaryOrAnywhere + color: Cpp_ThemeManager.highlightedTextAlternative text: qsTr("Applications/plugins can interact with %1 by " + "establishing a TCP connection on port 7777.").arg(Cpp_AppName) } diff --git a/assets/qml/Widgets/AccelerometerDelegate.qml b/assets/qml/Widgets/AccelerometerDelegate.qml index a01bef4b..3e3569ab 100644 --- a/assets/qml/Widgets/AccelerometerDelegate.qml +++ b/assets/qml/Widgets/AccelerometerDelegate.qml @@ -157,8 +157,8 @@ Window { id: gauge lastNumber: 8 firstNumber: 0 - minimumValue: root.min - maximumValue: root.max + minimumValue: root.min * 0.5 + maximumValue: root.max * 2 valueLabelVisible: false currentValue: root.meanGForce Layout.alignment: Qt.AlignHCenter diff --git a/assets/qml/Widgets/GaugeDelegate.qml b/assets/qml/Widgets/GaugeDelegate.qml index 623c243a..2345fd02 100644 --- a/assets/qml/Widgets/GaugeDelegate.qml +++ b/assets/qml/Widgets/GaugeDelegate.qml @@ -117,6 +117,28 @@ Window { minimumValueAngle: -144 labelStepSize: (root.maximumValue - root.minimumValue) / 10 tickmarkStepSize: (root.maximumValue - root.minimumValue) / 20 + + tickmark: Rectangle { + antialiasing: true + implicitWidth: outerRadius * 0.02 + implicitHeight: outerRadius * 0.06 + visible: styleData.value % labelStepSize == 0 + color: Cpp_ThemeManager.widgetForegroundSecondary + } + + minorTickmark: Rectangle { + antialiasing: true + implicitWidth: outerRadius * 0.01 + implicitHeight: outerRadius * 0.03 + color: Cpp_ThemeManager.widgetForegroundSecondary + } + + tickmarkLabel: Text { + antialiasing: true + text: styleData.value + font.pixelSize: Math.max(6, outerRadius * 0.1) + color: Cpp_ThemeManager.widgetForegroundSecondary + } } Behavior on value {NumberAnimation{duration: 200}} diff --git a/assets/qml/Widgets/GraphDelegate.qml b/assets/qml/Widgets/GraphDelegate.qml index c168f5bb..6ece7cbf 100644 --- a/assets/qml/Widgets/GraphDelegate.qml +++ b/assets/qml/Widgets/GraphDelegate.qml @@ -34,7 +34,7 @@ Window { showIcon: false visible: opacity > 0 opacity: enabled ? 1 : 0 - borderColor: root.headerVisible ? Cpp_ThemeManager.datasetTextSecondary : "transparent" + borderColor: root.headerVisible ? Cpp_ThemeManager.datasetWindowBorder : "transparent" title: Cpp_UI_GraphProvider.getTitle(graphId) diff --git a/assets/qml/Widgets/GroupDelegate.qml b/assets/qml/Widgets/GroupDelegate.qml index 23108631..ff1b39cb 100644 --- a/assets/qml/Widgets/GroupDelegate.qml +++ b/assets/qml/Widgets/GroupDelegate.qml @@ -34,8 +34,8 @@ Window { showIcon: false visible: opacity > 0 opacity: enabled ? 1 : 0 - borderColor: Cpp_ThemeManager.datasetTextSecondary title: group != null ? group.title : "" + borderColor: root.headerVisible ? Cpp_ThemeManager.datasetWindowBorder : "transparent" property int groupId: 0 property Group group: null diff --git a/assets/qml/Widgets/MapDelegate.qml b/assets/qml/Widgets/MapDelegate.qml index b11ceec8..268ac0f9 100644 --- a/assets/qml/Widgets/MapDelegate.qml +++ b/assets/qml/Widgets/MapDelegate.qml @@ -213,7 +213,7 @@ Window { border.width: 2 radius: width / 2 color: Cpp_ThemeManager.mapDotBackground - border.color: Cpp_ThemeManager.mapDottext + border.color: Cpp_ThemeManager.mapDotForeground } } diff --git a/assets/qml/Widgets/Window.qml b/assets/qml/Widgets/Window.qml index 05117cf2..87921480 100644 --- a/assets/qml/Widgets/Window.qml +++ b/assets/qml/Widgets/Window.qml @@ -40,10 +40,12 @@ Page { property int radius: root.borderWidth + 2 property color titleColor: palette.brightText property color borderColor: palette.highlight - property color backgroundColor: Cpp_ThemeManager.windowBackground property alias headerDoubleClickEnabled: headerMouseArea.enabled - property color gradientColor: root.gradient ? Cpp_ThemeManager.windowGradient : - root.borderColor + property color backgroundColor: Cpp_ThemeManager.datasetWindowBackground + property color gradientColor1: root.gradient ? Cpp_ThemeManager.windowGradient1 : + root.borderColor + property color gradientColor2: root.gradient ? Cpp_ThemeManager.windowGradient2 : + root.borderColor // // Signals @@ -71,7 +73,7 @@ Page { radius: root.radius color: root.backgroundColor border.width: root.borderWidth - border.color: root.gradientColor + border.color: root.gradientColor1 } // @@ -86,18 +88,18 @@ Page { gradient: Gradient { GradientStop { position: 0 - color: root.borderColor + color: root.gradientColor1 } GradientStop { position: 1 - color: root.gradientColor + color: root.gradientColor2 } } Rectangle { z: 5 - color: root.gradientColor + color: root.gradientColor1 height: root.gradient ? 1 : parent.radius anchors { diff --git a/assets/qml/Windows/About.qml b/assets/qml/Windows/About.qml index c614f5ea..e0c8e380 100644 --- a/assets/qml/Windows/About.qml +++ b/assets/qml/Windows/About.qml @@ -106,8 +106,8 @@ Window { font.pixelSize: 12 Layout.fillWidth: true Layout.maximumWidth: 288 - color: palette.highlightedText wrapMode: Label.WrapAtWordBoundaryOrAnywhere + color: Cpp_ThemeManager.highlightedTextAlternative text: qsTr("The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.") } diff --git a/assets/qml/Windows/Console.qml b/assets/qml/Windows/Console.qml index 1f4d90ca..5fed9928 100644 --- a/assets/qml/Windows/Console.qml +++ b/assets/qml/Windows/Console.qml @@ -144,12 +144,12 @@ Control { } MenuSeparator { - visible: app.menuBar !== null + visible: app.menuBar != null } MenuItem { enabled: visible - visible: app.menuBar !== null + visible: app.menuBar != null onTriggered: app.toggleMenubar() height: visible ? implicitHeight : 0 text: visible && app.menuBar.visible ? qsTr("Hide menubar") : @@ -184,6 +184,8 @@ Control { palette.base: Cpp_ThemeManager.consoleBase palette.button: Cpp_ThemeManager.consoleButton palette.window: Cpp_ThemeManager.consoleWindow + palette.highlight: Cpp_ThemeManager.consoleHighlight + palette.highlightedText: Cpp_ThemeManager.consoleHighlightedText autoscroll: Cpp_IO_Console.autoscroll wordWrapMode: Text.WrapAtWordBoundaryOrAnywhere placeholderText: qsTr("No data received so far") + "..." diff --git a/assets/qml/Windows/DataGrid.qml b/assets/qml/Windows/DataGrid.qml index 48429b58..0baeaf68 100644 --- a/assets/qml/Windows/DataGrid.qml +++ b/assets/qml/Windows/DataGrid.qml @@ -111,8 +111,8 @@ Control { Layout.fillHeight: true Layout.minimumWidth: 240 headerDoubleClickEnabled: false - backgroundColor: Cpp_ThemeManager.consoleBase icon.source: "qrc:/icons/visibility.svg" + backgroundColor: Cpp_ThemeManager.datagridBackground property var groups: [] property var graphs: [] @@ -374,8 +374,8 @@ Control { Layout.fillHeight: true Layout.minimumWidth: 240 headerDoubleClickEnabled: false - backgroundColor: Cpp_ThemeManager.consoleBase icon.source: "qrc:/icons/scatter-plot.svg" + backgroundColor: Cpp_ThemeManager.datagridBackground Rectangle { z: 1 @@ -543,12 +543,12 @@ Control { gradient: Gradient { GradientStop { position: 0 - color: palette.highlight + color: Cpp_ThemeManager.windowGradient1 } GradientStop { position: 1 - color: Cpp_ThemeManager.windowGradient + color: Cpp_ThemeManager.windowGradient2 } } diff --git a/assets/qml/Windows/Donate.qml b/assets/qml/Windows/Donate.qml index ef9a6270..f7e99993 100644 --- a/assets/qml/Windows/Donate.qml +++ b/assets/qml/Windows/Donate.qml @@ -135,9 +135,9 @@ Window { opacity: 0.8 font.pixelSize: 12 Layout.fillWidth: true - color: palette.highlightedText Layout.maximumWidth: title.implicitWidth wrapMode: Label.WrapAtWordBoundaryOrAnywhere + color: Cpp_ThemeManager.highlightedTextAlternative text: qsTr("You can also support this project by sharing it, reporting bugs and proposing new features!") } } diff --git a/assets/qml/Windows/Toolbar.qml b/assets/qml/Windows/Toolbar.qml index 9fe4c239..2799f405 100644 --- a/assets/qml/Windows/Toolbar.qml +++ b/assets/qml/Windows/Toolbar.qml @@ -55,6 +55,17 @@ Control { border.width: 1 border.color: palette.midlight + Rectangle { + height: parent.border.width + color: Cpp_ThemeManager.toolbarGradient1 + + anchors { + top: parent.top + left: parent.left + right: parent.right + } + } + gradient: Gradient { GradientStop { position: 0; color: Cpp_ThemeManager.toolbarGradient1 } GradientStop { position: 1; color: Cpp_ThemeManager.toolbarGradient2 } @@ -82,10 +93,13 @@ Control { icon.width: 24 icon.height: 24 Layout.fillHeight: true - icon.color: palette.text + icon.color: palette.brightText onClicked: root.setupClicked() - icon.source: "qrc:/icons/settings.svg" text: qsTr("Setup") + _btSpacer + palette.buttonText: palette.brightText + icon.source: "qrc:/icons/settings.svg" + palette.button: Cpp_ThemeManager.toolbarGradient1 + palette.window: Cpp_ThemeManager.toolbarGradient1 } Button { @@ -95,11 +109,14 @@ Control { icon.width: 24 icon.height: 24 Layout.fillHeight: true - icon.color: palette.text + icon.color: palette.brightText onClicked: root.consoleClicked() icon.source: "qrc:/icons/code.svg" - enabled: dataBt.enabled || widgetsBt.enabled text: qsTr("Console") + _btSpacer + palette.buttonText: palette.brightText + enabled: dataBt.enabled || widgetsBt.enabled + palette.button: Cpp_ThemeManager.toolbarGradient1 + palette.window: Cpp_ThemeManager.toolbarGradient1 } Button { @@ -109,11 +126,14 @@ Control { icon.width: 24 icon.height: 24 Layout.fillHeight: true - icon.color: palette.text onClicked: root.dataClicked() + icon.color: palette.brightText enabled: app.dashboardAvailable - icon.source: "qrc:/icons/equalizer.svg" text: qsTr("Dashboard") + _btSpacer + icon.source: "qrc:/icons/equalizer.svg" + palette.buttonText: palette.brightText + palette.button: Cpp_ThemeManager.toolbarGradient1 + palette.window: Cpp_ThemeManager.toolbarGradient1 opacity: enabled ? 1 : 0.5 Behavior on opacity {NumberAnimation{}} @@ -126,11 +146,14 @@ Control { icon.width: 24 icon.height: 24 Layout.fillHeight: true - icon.color: palette.text enabled: app.widgetsAvailable + icon.color: palette.brightText onClicked: root.widgetsClicked() icon.source: "qrc:/icons/chart.svg" text: qsTr("Widgets") + _btSpacer + palette.buttonText: palette.brightText + palette.button: Cpp_ThemeManager.toolbarGradient1 + palette.window: Cpp_ThemeManager.toolbarGradient1 opacity: enabled ? 1 : 0.5 Behavior on opacity {NumberAnimation{}} @@ -145,11 +168,14 @@ Control { icon.width: 24 icon.height: 24 Layout.fillHeight: true - icon.color: palette.text + icon.color: palette.brightText opacity: enabled ? 1 : 0.5 enabled: !Cpp_CSV_Player.isOpen icon.source: "qrc:/icons/open.svg" text: qsTr("Open CSV") + _btSpacer + palette.buttonText: palette.brightText + palette.button: Cpp_ThemeManager.toolbarGradient1 + palette.window: Cpp_ThemeManager.toolbarGradient1 onClicked: { if (Cpp_CSV_Export.isOpen) @@ -182,6 +208,8 @@ Control { qsTr("Connect")) + _btSpacer icon.source: checked ? "qrc:/icons/disconnect.svg" : "qrc:/icons/connect.svg" + palette.button: Cpp_ThemeManager.toolbarGradient1 + palette.window: Cpp_ThemeManager.toolbarGradient1 palette.buttonText: checked ? Cpp_ThemeManager.connectButtonChecked : Cpp_ThemeManager.connectButtonUnchecked diff --git a/assets/qml/rcc_qml.qrc b/assets/qml/rcc_qml.qrc new file mode 100644 index 00000000..bff9727e --- /dev/null +++ b/assets/qml/rcc_qml.qrc @@ -0,0 +1,36 @@ + + + Application.qml + main.qml + PlatformDependent/DecentMenuItem.qml + PlatformDependent/Menubar.qml + PlatformDependent/MenubarMacOS.qml + SetupPanes/MQTT.qml + SetupPanes/Network.qml + SetupPanes/Serial.qml + SetupPanes/Settings.qml + Widgets/AccelerometerDelegate.qml + Widgets/AccelerometerGaugeDelegate.qml + Widgets/ArtificialHorizonDelegate.qml + Widgets/BarDelegate.qml + Widgets/CompassDelegate.qml + Widgets/DataDelegate.qml + Widgets/GaugeDelegate.qml + Widgets/GraphDelegate.qml + Widgets/GroupDelegate.qml + Widgets/GyroDelegate.qml + Widgets/LED.qml + Widgets/MapDelegate.qml + Widgets/SimpleDial.qml + Widgets/Window.qml + Windows/About.qml + Windows/Acknowledgements.qml + Windows/Console.qml + Windows/CsvPlayer.qml + Windows/DataGrid.qml + Windows/Donate.qml + Windows/Setup.qml + Windows/Toolbar.qml + Windows/Widgets.qml + + diff --git a/assets/themes/0_Classic.json b/assets/themes/0_Classic.json deleted file mode 100644 index c5553e8c..00000000 --- a/assets/themes/0_Classic.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "name":"Classic", - "author":"Alex Spataru", - "colors":{ - "base":"#21373f", - "link":"#409da0", - "button":"#21373f", - "window":"#21373f", - "text":"#ffffff", - "midlight":"#0e1419", - "highlight":"#409da0", - "brightText":"#ffffff", - "buttonText":"#ffffff", - "windowText":"#ffffff", - "toolTipBase":"#e6e0b2", - "toolTipText":"#e6e0b2", - "highlightedText":"#e6e0b2", - "toolbarGradient1":"#21373f", - "toolbarGradient2":"#11272f", - "consoleText":"#8ecd9d", - "consoleBase":"#121218", - "consoleButton":"#16232a", - "consoleWindow":"#0d1217", - "windowBackground":"#121920", - "windowGradient":"#058ca7", - "alternativeHighlight":"#d72d60", - "setupPanelBackground":"#16232a", - "graphDialBorder":"#eeeeee", - "datasetTextPrimary":"#e6e0b2", - "datasetTextSecondary":"#517497", - "ledEnabled":"#d72d60", - "ledDisabled":"#2d6073", - "csvHighlight":"#2e895c", - "widgetBackground":"#09090c", - "widgetForegroundPrimary":"#8ecd9d", - "widgetForegroundSecondary":"#517497", - "widgetIndicator1":"#e6e0b2", - "widgetIndicator2":"#d72d60", - "widgetIndicator3":"#2d6073", - "widgetAlternativeBackground":"#121218", - "widgetControlBackground":"#111111", - "gyroSky":"#5c93c5", - "gyroText":"#ffffff", - "gyroGround":"#7d5233", - "mapDotBackground":"#ff0000", - "mapDotForeground":"#ffffff", - "mapBorder":"#646464", - "mapHorizon":"#dedede", - "mapSkyLowAltitude":"#6ba9d1", - "mapSkyHighAltitude":"#283e51", - "connectButtonChecked":"#d72d60", - "connectButtonUnchecked":"#2eed5c", - "barWidgetColors":[ - "#f94144", - "#f3722c", - "#f8961e", - "#f9844a", - "#f9c74f", - "#90be6d", - "#43aa8b", - "#4d908e", - "#577590", - "#277da1" - ] - } -} diff --git a/assets/themes/4_macOS_Light.json b/assets/themes/0_Dark.json similarity index 84% rename from assets/themes/4_macOS_Light.json rename to assets/themes/0_Dark.json index 04f298ec..c1c009a3 100644 --- a/assets/themes/4_macOS_Light.json +++ b/assets/themes/0_Dark.json @@ -1,5 +1,5 @@ { - "name":"macOS Light", + "name":"Dark", "author":"Alex Spataru", "colors":{ "base":"#21373f", @@ -15,19 +15,26 @@ "toolTipBase":"#e6e0b2", "toolTipText":"#e6e0b2", "highlightedText":"#e6e0b2", + "highlightedTextAlternative":"#e6e0b2", "toolbarGradient1":"#21373f", "toolbarGradient2":"#11272f", "consoleText":"#8ecd9d", "consoleBase":"#121218", "consoleButton":"#16232a", "consoleWindow":"#0d1217", + "consoleHighlight":"#409da0", + "consoleHighlightedText":"#e6e0b2", "windowBackground":"#121920", - "windowGradient":"#058ca7", + "windowGradient1":"#409da0", + "windowGradient2":"#058ca7", "alternativeHighlight":"#d72d60", "setupPanelBackground":"#16232a", "graphDialBorder":"#eeeeee", "datasetTextPrimary":"#e6e0b2", "datasetTextSecondary":"#517497", + "datasetWindowBackground":"#121920", + "datasetWindowBorder":"#517497", + "datagridBackground":"#121218", "ledEnabled":"#d72d60", "ledDisabled":"#2d6073", "csvHighlight":"#2e895c", diff --git a/assets/themes/1_Light.json b/assets/themes/1_Light.json index e9543cda..5650baaa 100644 --- a/assets/themes/1_Light.json +++ b/assets/themes/1_Light.json @@ -2,43 +2,50 @@ "name":"Light", "author":"Alex Spataru", "colors":{ - "base":"#dec8c0", - "link":"#bf625f", - "button":"#dec8c0", - "window":"#dec8c0", + "base":"#fafafa", + "link":"#105087", + "button":"#eaeaea", + "window":"#eaeaea", "text":"#000000", - "midlight":"#f1ebe6", - "highlight":"#fa7358", + "midlight":"#d9d9d9", + "highlight":"#004077", "brightText":"#ffffff", "buttonText":"#000000", "windowText":"#000000", - "toolTipBase":"#191f4d", - "toolTipText":"#e6e0b2", - "highlightedText":"#191f4d", - "toolbarGradient1":"#dec8c0", - "toolbarGradient2":"#eed8d0", - "consoleText":"#713262", - "consoleBase":"#edede7", - "consoleButton":"#e9dcd5", - "consoleWindow":"#f2ede8", - "windowBackground":"#ede6df", - "windowGradient":"#df424f", - "alternativeHighlight":"#bf625f", - "setupPanelBackground":"#e9dcd5", - "graphDialBorder":"#111111", - "datasetTextPrimary":"#191f4d", - "datasetTextSecondary":"#ae8b68", - "ledEnabled":"#28d29f", - "ledDisabled":"#d29f8c", - "csvHighlight":"#d176a3", - "widgetBackground":"#f6f6f3", - "widgetForegroundPrimary":"#713262", - "widgetForegroundSecondary":"#ae8b68", - "widgetIndicator1":"#191f4d", - "widgetIndicator2":"#28d29f", - "widgetIndicator3":"#d29f8c", - "widgetAlternativeBackground":"#edede7", - "widgetControlBackground":"#eeeeee", + "toolTipBase":"#FEFFC6", + "toolTipText":"#000000", + "highlightedText":"#ffffff", + "highlightedTextAlternative":"#444444", + "toolbarGradient1":"#105087", + "toolbarGradient2":"#004077", + "consoleText":"#686868", + "consoleBase":"#fafafa", + "consoleButton":"#eaeaea", + "consoleWindow":"#eaeaea", + "consoleHighlight":"#2e895c", + "consoleHighlightedText":"#ffffff", + "windowBackground":"#E6E6E6", + "windowGradient1":"#105087", + "windowGradient2":"#004077", + "alternativeHighlight":"#f8961e", + "setupPanelBackground":"#fafafa", + "graphDialBorder":"#666666", + "datasetTextPrimary":"#0072C3", + "datasetTextSecondary":"#666666", + "datasetWindowBackground":"#fafafa", + "datasetWindowBorder":"#3e996c", + "datagridBackground":"#f4f4f7", + "ledEnabled":"#0072C3", + "ledDisabled":"#686868", + "csvHighlight":"#2e895c", + "widgetBackground":"#f4f4f7", + "widgetForegroundPrimary":"#0072C3", + "widgetForegroundSecondary":"#666666", + "widgetIndicator1":"#444444", + "widgetIndicator2":"#f94144", + "widgetIndicator3":"#90be6d", + "widgetAlternativeBackground":"#ededed", + "widgetControlBackground":"#666666", "gyroSky":"#5c93c5", "gyroText":"#ffffff", "gyroGround":"#7d5233", @@ -48,8 +55,8 @@ "mapHorizon":"#dedede", "mapSkyLowAltitude":"#6ba9d1", "mapSkyHighAltitude":"#283e51", - "connectButtonChecked":"#bf625f", - "connectButtonUnchecked":"#bf625f", + "connectButtonChecked":"#FE392E", + "connectButtonUnchecked":"#26CD40", "barWidgetColors":[ "#f94144", "#f3722c", diff --git a/assets/themes/2_SolarizedDark.json b/assets/themes/2_SolarizedDark.json deleted file mode 100644 index 5e0fc2c7..00000000 --- a/assets/themes/2_SolarizedDark.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "name":"Solarized Dark", - "author":"Alex Spataru", - "colors":{ - "base":"#21373f", - "link":"#409da0", - "button":"#21373f", - "window":"#21373f", - "text":"#ffffff", - "midlight":"#0e1419", - "highlight":"#409da0", - "brightText":"#ffffff", - "buttonText":"#ffffff", - "windowText":"#ffffff", - "toolTipBase":"#e6e0b2", - "toolTipText":"#e6e0b2", - "highlightedText":"#e6e0b2", - "toolbarGradient1":"#21373f", - "toolbarGradient2":"#11272f", - "consoleText":"#8ecd9d", - "consoleBase":"#121218", - "consoleButton":"#16232a", - "consoleWindow":"#0d1217", - "windowBackground":"#121920", - "windowGradient":"#058ca7", - "alternativeHighlight":"#d72d60", - "setupPanelBackground":"#16232a", - "graphDialBorder":"#eeeeee", - "datasetTextPrimary":"#e6e0b2", - "datasetTextSecondary":"#517497", - "ledEnabled":"#d72d60", - "ledDisabled":"#2d6073", - "csvHighlight":"#2e895c", - "widgetBackground":"#09090c", - "widgetForegroundPrimary":"#8ecd9d", - "widgetForegroundSecondary":"#517497", - "widgetIndicator1":"#e6e0b2", - "widgetIndicator2":"#d72d60", - "widgetIndicator3":"#2d6073", - "widgetAlternativeBackground":"#121218", - "widgetControlBackground":"#111111", - "gyroSky":"#5c93c5", - "gyroText":"#ffffff", - "gyroGround":"#7d5233", - "mapDotBackground":"#ff0000", - "mapDotForeground":"#ffffff", - "mapBorder":"#646464", - "mapHorizon":"#dedede", - "mapSkyLowAltitude":"#6ba9d1", - "mapSkyHighAltitude":"#283e51", - "connectButtonChecked":"#d72d60", - "connectButtonUnchecked":"#2eed5c", - "barWidgetColors":[ - "#f94144", - "#f3722c", - "#f8961e", - "#f9844a", - "#f9c74f", - "#90be6d", - "#43aa8b", - "#4d908e", - "#577590", - "#277da1" - ] - } -} diff --git a/assets/themes/3_SolarizedLight.json b/assets/themes/3_SolarizedLight.json deleted file mode 100644 index 511b17a2..00000000 --- a/assets/themes/3_SolarizedLight.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "name":"Solarized Light", - "author":"Alex Spataru", - "colors":{ - "base":"#21373f", - "link":"#409da0", - "button":"#21373f", - "window":"#21373f", - "text":"#ffffff", - "midlight":"#0e1419", - "highlight":"#409da0", - "brightText":"#ffffff", - "buttonText":"#ffffff", - "windowText":"#ffffff", - "toolTipBase":"#e6e0b2", - "toolTipText":"#e6e0b2", - "highlightedText":"#e6e0b2", - "toolbarGradient1":"#21373f", - "toolbarGradient2":"#11272f", - "consoleText":"#8ecd9d", - "consoleBase":"#121218", - "consoleButton":"#16232a", - "consoleWindow":"#0d1217", - "windowBackground":"#121920", - "windowGradient":"#058ca7", - "alternativeHighlight":"#d72d60", - "setupPanelBackground":"#16232a", - "graphDialBorder":"#eeeeee", - "datasetTextPrimary":"#e6e0b2", - "datasetTextSecondary":"#517497", - "ledEnabled":"#d72d60", - "ledDisabled":"#2d6073", - "csvHighlight":"#2e895c", - "widgetBackground":"#09090c", - "widgetForegroundPrimary":"#8ecd9d", - "widgetForegroundSecondary":"#517497", - "widgetIndicator1":"#e6e0b2", - "widgetIndicator2":"#d72d60", - "widgetIndicator3":"#2d6073", - "widgetAlternativeBackground":"#121218", - "widgetControlBackground":"#111111", - "gyroSky":"#5c93c5", - "gyroText":"#ffffff", - "gyroGround":"#7d5233", - "mapDotBackground":"#ff0000", - "mapDotForeground":"#ffffff", - "mapBorder":"#646464", - "mapHorizon":"#dedede", - "mapSkyLowAltitude":"#6ba9d1", - "mapSkyHighAltitude":"#283e51", - "connectButtonChecked":"#d72d60", - "connectButtonUnchecked":"#2eed5c", - "barWidgetColors":[ - "#f94144", - "#f3722c", - "#f8961e", - "#f9844a", - "#f9c74f", - "#90be6d", - "#43aa8b", - "#4d908e", - "#577590", - "#277da1" - ] - } -} diff --git a/assets/themes/5_macOS_Dark.json b/assets/themes/5_macOS_Dark.json deleted file mode 100644 index 8fa3cc5e..00000000 --- a/assets/themes/5_macOS_Dark.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "name":"macOS Dark", - "author":"Alex Spataru", - "colors":{ - "base":"#21373f", - "link":"#409da0", - "button":"#21373f", - "window":"#21373f", - "text":"#ffffff", - "midlight":"#0e1419", - "highlight":"#409da0", - "brightText":"#ffffff", - "buttonText":"#ffffff", - "windowText":"#ffffff", - "toolTipBase":"#e6e0b2", - "toolTipText":"#e6e0b2", - "highlightedText":"#e6e0b2", - "toolbarGradient1":"#21373f", - "toolbarGradient2":"#11272f", - "consoleText":"#8ecd9d", - "consoleBase":"#121218", - "consoleButton":"#16232a", - "consoleWindow":"#0d1217", - "windowBackground":"#121920", - "windowGradient":"#058ca7", - "alternativeHighlight":"#d72d60", - "setupPanelBackground":"#16232a", - "graphDialBorder":"#eeeeee", - "datasetTextPrimary":"#e6e0b2", - "datasetTextSecondary":"#517497", - "ledEnabled":"#d72d60", - "ledDisabled":"#2d6073", - "csvHighlight":"#2e895c", - "widgetBackground":"#09090c", - "widgetForegroundPrimary":"#8ecd9d", - "widgetForegroundSecondary":"#517497", - "widgetIndicator1":"#e6e0b2", - "widgetIndicator2":"#d72d60", - "widgetIndicator3":"#2d6073", - "widgetAlternativeBackground":"#121218", - "widgetControlBackground":"#111111", - "gyroSky":"#5c93c5", - "gyroText":"#ffffff", - "gyroGround":"#7d5233", - "mapDotBackground":"#ff0000", - "mapDotForeground":"#ffffff", - "mapBorder":"#646464", - "mapHorizon":"#dedede", - "mapSkyLowAltitude":"#6ba9d1", - "mapSkyHighAltitude":"#283e51", - "connectButtonChecked":"#d72d60", - "connectButtonUnchecked":"#2eed5c", - "barWidgetColors":[ - "#f94144", - "#f3722c", - "#f8961e", - "#f9844a", - "#f9c74f", - "#90be6d", - "#43aa8b", - "#4d908e", - "#577590", - "#277da1" - ] - } -} diff --git a/assets/themes/6_TVA.json b/assets/themes/6_TVA.json deleted file mode 100644 index 4445e184..00000000 --- a/assets/themes/6_TVA.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "name":"TVA", - "author":"Alex Spataru", - "colors":{ - "base":"#21373f", - "link":"#409da0", - "button":"#21373f", - "window":"#21373f", - "text":"#ffffff", - "midlight":"#0e1419", - "highlight":"#409da0", - "brightText":"#ffffff", - "buttonText":"#ffffff", - "windowText":"#ffffff", - "toolTipBase":"#e6e0b2", - "toolTipText":"#e6e0b2", - "highlightedText":"#e6e0b2", - "toolbarGradient1":"#21373f", - "toolbarGradient2":"#11272f", - "consoleText":"#8ecd9d", - "consoleBase":"#121218", - "consoleButton":"#16232a", - "consoleWindow":"#0d1217", - "windowBackground":"#121920", - "windowGradient":"#058ca7", - "alternativeHighlight":"#d72d60", - "setupPanelBackground":"#16232a", - "graphDialBorder":"#eeeeee", - "datasetTextPrimary":"#e6e0b2", - "datasetTextSecondary":"#517497", - "ledEnabled":"#d72d60", - "ledDisabled":"#2d6073", - "csvHighlight":"#2e895c", - "widgetBackground":"#09090c", - "widgetForegroundPrimary":"#8ecd9d", - "widgetForegroundSecondary":"#517497", - "widgetIndicator1":"#e6e0b2", - "widgetIndicator2":"#d72d60", - "widgetIndicator3":"#2d6073", - "widgetAlternativeBackground":"#121218", - "widgetControlBackground":"#111111", - "gyroSky":"#5c93c5", - "gyroText":"#ffffff", - "gyroGround":"#7d5233", - "mapDotBackground":"#ff0000", - "mapDotForeground":"#ffffff", - "mapBorder":"#646464", - "mapHorizon":"#dedede", - "mapSkyLowAltitude":"#6ba9d1", - "mapSkyHighAltitude":"#283e51", - "connectButtonChecked":"#d72d60", - "connectButtonUnchecked":"#2eed5c", - "barWidgetColors":[ - "#f94144", - "#f3722c", - "#f8961e", - "#f9844a", - "#f9c74f", - "#90be6d", - "#43aa8b", - "#4d908e", - "#577590", - "#277da1" - ] - } -} diff --git a/assets/themes/rcc_themes.qrc b/assets/themes/rcc_themes.qrc new file mode 100644 index 00000000..de722d86 --- /dev/null +++ b/assets/themes/rcc_themes.qrc @@ -0,0 +1,6 @@ + + + 1_Light.json + 0_Dark.json + + diff --git a/assets/translations/rcc_translations.qrc b/assets/translations/rcc_translations.qrc new file mode 100644 index 00000000..f975ba47 --- /dev/null +++ b/assets/translations/rcc_translations.qrc @@ -0,0 +1,8 @@ + + + de.qm + en.qm + es.qm + zh.qm + + diff --git a/src/Misc/ThemeManager.cpp b/src/Misc/ThemeManager.cpp index 2a6e969d..0bde0717 100644 --- a/src/Misc/ThemeManager.cpp +++ b/src/Misc/ThemeManager.cpp @@ -114,19 +114,26 @@ void ThemeManager::loadTheme(const int id) m_tooltipText = QColor(colors.value("tooltipText").toString()); m_tooltipBase = QColor(colors.value("tooltipBase").toString()); m_highlightedText = QColor(colors.value("highlightedText").toString()); + m_highlightedTextAlternative = QColor(colors.value("highlightedTextAlternative").toString()); m_toolbarGradient1 = QColor(colors.value("toolbarGradient1").toString()); m_toolbarGradient2 = QColor(colors.value("toolbarGradient2").toString()); m_consoleText = QColor(colors.value("consoleText").toString()); m_consoleBase = QColor(colors.value("consoleBase").toString()); m_consoleButton = QColor(colors.value("consoleButton").toString()); m_consoleWindow = QColor(colors.value("consoleWindow").toString()); + m_consoleHighlight = QColor(colors.value("consoleHighlight").toString()); + m_consoleHighlightedText = QColor(colors.value("consoleHighlightedText").toString()); m_windowBackground = QColor(colors.value("windowBackground").toString()); - m_windowGradient = QColor(colors.value("windowGradient").toString()); + m_windowGradient1 = QColor(colors.value("windowGradient1").toString()); + m_windowGradient2 = QColor(colors.value("windowGradient2").toString()); m_alternativeHighlight = QColor(colors.value("alternativeHighlight").toString()); m_setupPanelBackground = QColor(colors.value("setupPanelBackground").toString()); m_graphDialBorder = QColor(colors.value("graphDialBorder").toString()); m_datasetTextPrimary = QColor(colors.value("datasetTextPrimary").toString()); m_datasetTextSecondary = QColor(colors.value("datasetTextSecondary").toString()); + m_datasetWindowBackground = QColor(colors.value("datasetWindowBackground").toString()); + m_datasetWindowBorder = QColor(colors.value("datasetWindowBorder").toString()); + m_datagridBackground = QColor(colors.value("datagridBackground").toString()); m_ledEnabled = QColor(colors.value("ledEnabled").toString()); m_ledDisabled = QColor(colors.value("ledDisabled").toString()); m_csvHighlight = QColor(colors.value("csvHighlight").toString()); @@ -280,6 +287,11 @@ QColor ThemeManager::highlightedText() const return m_highlightedText; } +QColor ThemeManager::highlightedTextAlternative() const +{ + return m_highlightedTextAlternative; +} + QColor ThemeManager::toolbarGradient1() const { return m_toolbarGradient1; @@ -310,14 +322,29 @@ QColor ThemeManager::consoleWindow() const return m_consoleWindow; } +QColor ThemeManager::consoleHighlight() const +{ + return m_consoleHighlight; +} + +QColor ThemeManager::consoleHighlightedText() const +{ + return m_consoleHighlightedText; +} + QColor ThemeManager::windowBackground() const { return m_windowBackground; } -QColor ThemeManager::windowGradient() const +QColor ThemeManager::windowGradient1() const { - return m_windowGradient; + return m_windowGradient1; +} + +QColor ThemeManager::windowGradient2() const +{ + return m_windowGradient2; } QColor ThemeManager::alternativeHighlight() const @@ -345,6 +372,21 @@ QColor ThemeManager::datasetTextSecondary() const return m_datasetTextSecondary; } +QColor ThemeManager::datasetWindowBackground() const +{ + return m_datasetWindowBackground; +} + +QColor ThemeManager::datasetWindowBorder() const +{ + return m_datasetWindowBorder; +} + +QColor ThemeManager::datagridBackground() const +{ + return m_datagridBackground; +} + QColor ThemeManager::ledEnabled() const { return m_ledEnabled; diff --git a/src/Misc/ThemeManager.h b/src/Misc/ThemeManager.h index 6d56df8b..3d70ba3c 100644 --- a/src/Misc/ThemeManager.h +++ b/src/Misc/ThemeManager.h @@ -75,6 +75,9 @@ class ThemeManager : public QObject Q_PROPERTY(QColor highlightedText READ highlightedText NOTIFY themeChanged) + Q_PROPERTY(QColor highlightedTextAlternative + READ highlightedTextAlternative + NOTIFY themeChanged) Q_PROPERTY(QColor toolbarGradient1 READ toolbarGradient1 NOTIFY themeChanged) @@ -93,11 +96,20 @@ class ThemeManager : public QObject Q_PROPERTY(QColor consoleWindow READ consoleWindow NOTIFY themeChanged) + Q_PROPERTY(QColor consoleHighlight + READ consoleHighlight + NOTIFY themeChanged) + Q_PROPERTY(QColor consoleHighlightedText + READ consoleHighlightedText + NOTIFY themeChanged) Q_PROPERTY(QColor windowBackground READ windowBackground NOTIFY themeChanged) - Q_PROPERTY(QColor windowGradient - READ windowGradient + Q_PROPERTY(QColor windowGradient1 + READ windowGradient1 + NOTIFY themeChanged) + Q_PROPERTY(QColor windowGradient2 + READ windowGradient2 NOTIFY themeChanged) Q_PROPERTY(QColor alternativeHighlight READ alternativeHighlight @@ -114,6 +126,15 @@ class ThemeManager : public QObject Q_PROPERTY(QColor datasetTextSecondary READ datasetTextSecondary NOTIFY themeChanged) + Q_PROPERTY(QColor datasetWindowBackground + READ datasetWindowBackground + NOTIFY themeChanged) + Q_PROPERTY(QColor datasetWindowBorder + READ datasetWindowBorder + NOTIFY themeChanged) + Q_PROPERTY(QColor datagridBackground + READ datagridBackground + NOTIFY themeChanged) Q_PROPERTY(QColor ledEnabled READ ledEnabled NOTIFY themeChanged) @@ -210,19 +231,26 @@ public: QColor tooltipText() const; QColor tooltipBase() const; QColor highlightedText() const; + QColor highlightedTextAlternative() const; QColor toolbarGradient1() const; QColor toolbarGradient2() const; QColor consoleText() const; QColor consoleBase() const; QColor consoleButton() const; QColor consoleWindow() const; + QColor consoleHighlight() const; + QColor consoleHighlightedText() const; QColor windowBackground() const; - QColor windowGradient() const; + QColor windowGradient1() const; + QColor windowGradient2() const; QColor alternativeHighlight() const; QColor setupPanelBackground() const; QColor graphDialBorder() const; QColor datasetTextPrimary() const; QColor datasetTextSecondary() const; + QColor datasetWindowBackground() const; + QColor datasetWindowBorder() const; + QColor datagridBackground() const; QColor ledEnabled() const; QColor ledDisabled() const; QColor csvHighlight() const; @@ -278,19 +306,26 @@ private: QColor m_tooltipText; QColor m_tooltipBase; QColor m_highlightedText; + QColor m_highlightedTextAlternative; QColor m_toolbarGradient1; QColor m_toolbarGradient2; QColor m_consoleText; QColor m_consoleBase; QColor m_consoleButton; QColor m_consoleWindow; + QColor m_consoleHighlight; + QColor m_consoleHighlightedText; QColor m_windowBackground; - QColor m_windowGradient; + QColor m_windowGradient1; + QColor m_windowGradient2; QColor m_alternativeHighlight; QColor m_setupPanelBackground; QColor m_graphDialBorder; QColor m_datasetTextPrimary; QColor m_datasetTextSecondary; + QColor m_datasetWindowBackground; + QColor m_datasetWindowBorder; + QColor m_datagridBackground; QColor m_ledEnabled; QColor m_ledDisabled; QColor m_csvHighlight;