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

Fix menubar themes

Browse Source
This commit is contained in:
Alex Spataru 2021-10-05 14:42:22 -05:00
parent 7a7f4171b3
commit 4d027135df
8 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/qml/Panes/Console.qml
View File

@ -169,12 +169,12 @@ Item {
}
MenuSeparator {
visible: mainWindow.menuBar != null
visible: mainWindow.menuBar !== null
}
MenuItem {
enabled: visible
visible: mainWindow.menuBar != null
visible: mainWindow.menuBar !== null
height: visible ? implicitHeight : 0
onTriggered: mainWindow.menubarEnabled = !mainWindow.menubarEnabled
text: visible && mainWindow.menuBar.visible ? qsTr("Hide menubar") :

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

@ -274,10 +274,6 @@ Control {
qsTr("Connect")) + " "
icon.source: checked ? "qrc:/icons/disconnect.svg" :
"qrc:/icons/connect.svg"
icon.color: checked ? Cpp_ThemeManager.connectButtonChecked :
Cpp_ThemeManager.connectButtonUnchecked
palette.buttonText: checked ? Cpp_ThemeManager.connectButtonChecked :
Cpp_ThemeManager.connectButtonUnchecked
}
//

18
assets/qml/Panes/Toolbar.qml
View File

@ -76,15 +76,25 @@ Control {
//
Rectangle {
id: bg
border.width: 1
border.color: Cpp_ThemeManager.toolbarGradient1
Rectangle {
height: parent.border.width
visible: Qt.platform.os === "osx"
height: 1
color: Cpp_ThemeManager.toolbarGradient1
anchors {
left: parent.left
right: parent.right
bottom: parent.bottom
}
}
Rectangle {
height: 1
visible: mainWindow.menuBar !== null
color: Cpp_ThemeManager.toolbarGradient2
anchors {
topMargin: -1
top: parent.top
left: parent.left
right: parent.right

4
assets/qml/PlatformDependent/DecentMenuItem.qml
View File

@ -51,7 +51,7 @@ MenuItem {
Layout.fillWidth: true
elide: Label.ElideRight
verticalAlignment: Qt.AlignVCenter
color: root.highlighted ? Cpp_ThemeManager.highlightedText : Cpp_ThemeManager.menubarText
color: root.highlighted ? Cpp_ThemeManager.highlightedText : palette.text
}
Item {
@ -63,7 +63,7 @@ MenuItem {
opacity: 0.8
text: _shortcut.nativeText
verticalAlignment: Qt.AlignVCenter
color: root.highlighted ? Cpp_ThemeManager.highlightedText : Cpp_ThemeManager.menubarText
color: root.highlighted ? Cpp_ThemeManager.highlightedText : palette.text
}
}
}

8
assets/qml/PlatformDependent/Menubar.qml
View File

@ -44,6 +44,14 @@ MenuBar {
}
}
//
// Palette
//
palette.text: Cpp_ThemeManager.menubarText
palette.base: Cpp_ThemeManager.menubarGradient2
palette.window: Cpp_ThemeManager.menubarGradient1
palette.highlightedText: Cpp_ThemeManager.highlightedText
//
// File menu
//

2
assets/themes/0_Dark.json
View File

@ -1,5 +1,5 @@
{
"name":"Dark",
"name":"Classic",
"author":"Alex Spataru",
"colors":{
"base":"#21373f",

2
assets/themes/1_Light.json
View File

@ -1,5 +1,5 @@
{
"name":"Light",
"name":"MathWorks",
"author":"Alex Spataru",
"colors":{
"base":"#fafafa",

8
assets/themes/2_Noir.json
View File

@ -17,14 +17,14 @@
"highlightedText":"#ffffff",
"highlightedTextAlternative":"#666666",
"placeholderText":"#666666",
"toolbarGradient2":"#323030",
"toolbarGradient1":"#292929",
"toolbarGradient1":"#323030",
"toolbarGradient2":"#292929",
"menubarGradient1":"#323030",
"menubarGradient2":"#323030",
"menubarText":"#ffffff",
"dialogBackground":"#f2f2f2",
"consoleText":"#657a83",
"consoleBase":"#fdf6e3",
"consoleText":"#424242",
"consoleBase":"#f2f2f2",
"consoleButton":"#fafafa",
"consoleWindow":"#1c1c1c",
"consoleHighlight":"#1e7cf3",