diff --git a/Components/Input.qml b/Components/Input.qml index 79e7857..fdbf865 100644 --- a/Components/Input.qml +++ b/Components/Input.qml @@ -375,6 +375,7 @@ Column { Item { id: login // important + // try 4 or 9 ... height: root.font.pointSize * 9 width: parent.width / 2 anchors.horizontalCenter: parent.horizontalCenter diff --git a/Components/SessionButton.qml b/Components/SessionButton.qml index 002832b..856f3d8 100644 --- a/Components/SessionButton.qml +++ b/Components/SessionButton.qml @@ -120,11 +120,11 @@ Item { when: selectSession.down PropertyChanges { target: displayedItem - color: Qt.darker(root.palette.highlight, 1.1) + color: Qt.darker(root.palette.toolTipBase, 1.1) } PropertyChanges { target: selectSession.background - border.color: Qt.darker(root.palette.highlight, 1.1) + border.color: Qt.darker(root.palette.toolTipBase, 1.1) } }, State { @@ -132,11 +132,11 @@ Item { when: selectSession.hovered PropertyChanges { target: displayedItem - color: Qt.lighter(root.palette.highlight, 1.1) + color: Qt.lighter(root.palette.toolTipBase, 1.1) } PropertyChanges { target: selectSession.background - border.color: Qt.lighter(root.palette.highlight, 1.1) + border.color: Qt.lighter(root.palette.toolTipBase, 1.1) } }, State { @@ -144,11 +144,11 @@ Item { when: selectSession.visualFocus PropertyChanges { target: displayedItem - color: root.palette.highlight + color: root.palette.toolTipBase } PropertyChanges { target: selectSession.background - border.color: root.palette.highlight + border.color: root.palette.toolTipBase } } ] diff --git a/Main.qml b/Main.qml index 0ea338d..1d21053 100644 --- a/Main.qml +++ b/Main.qml @@ -15,11 +15,11 @@ Pane { height: config.ScreenHeight || Screen.height width: config.ScreenWidth || Screen.ScreenWidth + padding: config.ScreenPadding LayoutMirroring.enabled: config.RightToLeftLayout == "true" ? true : Qt.application.layoutDirection === Qt.RightToLeft LayoutMirroring.childrenInherit: true - padding: config.ScreenPadding palette.button: "transparent" palette.highlight: config.HighlightColor palette.window: config.BackgroundColor @@ -30,7 +30,8 @@ Pane { palette.link: config.LoginButtonBackgroundColor == "" ? config.HighlightColor : config.LoginButtonBackgroundColor palette.mid: config.LoginButtonTextColor == "" ? config.TextColor : config.LoginButtonTextColor palette.alternateBase: config.BackgroundListColor == "" ? config.BackgroundColor: config.BackgroundListColor - + palette.toolTipBase: config.HoverSessionAndVirtualKeyboard == "" ? config.HighlightColor : config.HoverSessionAndVirtualKeyboard + font.family: config.Font font.pointSize: config.FontSize !== "" ? config.FontSize : parseInt(height / 80) focus: true @@ -95,7 +96,7 @@ Pane { SessionButton { id: sessionSelect anchors.bottom: parent.bottom - anchors.bottomMargin: 70 + anchors.bottomMargin: parent.height/16 } } @@ -128,6 +129,15 @@ Pane { color: "transparent" } states: [ + State { + name: "HoveredAndChecked" + when: vkb.checked && vkb.hovered + PropertyChanges { + target: buttonVirtualKeyboard + text: config.TranslateVirtualKeyboardButtonOn || "Virtual Keyboard (on)" + color: root.palette.toolTipBase + } + }, State { name: "checked" when: vkb.checked @@ -135,6 +145,15 @@ Pane { target: buttonVirtualKeyboard text: config.TranslateVirtualKeyboardButtonOn || "Virtual Keyboard (on)" } + }, + State { + name: "hovered" + when: vkb.hovered + PropertyChanges { + target: buttonVirtualKeyboard + text: config.TranslateVirtualKeyboardButtonOff || "Virtual Keyboard (off)" + color: root.palette.toolTipBase + } } ] } diff --git a/Themes/theme1.conf b/Themes/theme1.conf index c20c01e..3e1054b 100644 --- a/Themes/theme1.conf +++ b/Themes/theme1.conf @@ -57,7 +57,7 @@ PlaceholderColor="#bbbbbb" SystemButtonsIconColor="#F8F8F2" # System icon colors. -HighlightTextColor="" +HighlightTextColor="#b7cef1" # Overrides HighlightColor. LoginButtonTextColor="" # Overrides TextColor. @@ -65,6 +65,8 @@ LoginButtonBackgroundColor="" # Overrides HighlightColor. BackgroundListColor="" # Overrides BackgroundColor. +HoverSessionAndVirtualKeyboard="#b7cef1" +# Overrides HighlightColor. #################### Form ####################