From dab67d9b38fdef00cacb36a12f8769b180a89f38 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 9 Mar 2022 13:26:16 +0100 Subject: [PATCH 1/3] Ensure that invisible menu seperators have a height of 0 CURA-9012 --- resources/qml/Widgets/MenuSeparator.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/Widgets/MenuSeparator.qml b/resources/qml/Widgets/MenuSeparator.qml index ad79fccd6d..b39f958c69 100644 --- a/resources/qml/Widgets/MenuSeparator.qml +++ b/resources/qml/Widgets/MenuSeparator.qml @@ -18,4 +18,5 @@ MenuSeparator implicitHeight: UM.Theme.getSize("default_lining").height color: UM.Theme.getColor("setting_control_border") } + height: visible ? implicitHeight: 0 } \ No newline at end of file From d752f34b70ea519675be76d08fed04806587c36b Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 9 Mar 2022 13:30:22 +0100 Subject: [PATCH 2/3] Shorten english string for show troubleshooting Doesn't solve all of the issues here, but at least fixes it for english. I feel that the word guide also doesn't actually add any meaningfull info anyway CURA-9012 --- resources/qml/Actions.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index ec25eb8abb..90d1d549e2 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -79,7 +79,7 @@ Item { id: showTroubleShootingAction onTriggered: Qt.openUrlExternally("https://ultimaker.com/en/troubleshooting?utm_source=cura&utm_medium=software&utm_campaign=dropdown-troubleshooting") - text: catalog.i18nc("@action:inmenu", "Show Online Troubleshooting Guide") + text: catalog.i18nc("@action:inmenu", "Show Online Troubleshooting") } Action From 91b6ceb9512044f6ea4d3a66b03fe2cdf1bd0dec Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 9 Mar 2022 14:01:54 +0100 Subject: [PATCH 3/3] Fix spacing for menu CURA-9012 --- resources/qml/MainWindow/ApplicationMenu.qml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/qml/MainWindow/ApplicationMenu.qml b/resources/qml/MainWindow/ApplicationMenu.qml index bf3781331a..3598447d88 100644 --- a/resources/qml/MainWindow/ApplicationMenu.qml +++ b/resources/qml/MainWindow/ApplicationMenu.qml @@ -34,14 +34,16 @@ Item { text: menuBarItem.text.replace(new RegExp("&([A-Za-z])"), function (match, character) { - return `${character}`; + return `${character}` }) horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } - + leftPadding: UM.Theme.getSize("default_margin").width + rightPadding: UM.Theme.getSize("default_margin").width background: Rectangle { + color: menuBarItem.highlighted ? UM.Theme.getColor("background_2") : "transparent" } }