GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 16:05:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11633 from Ultimaker/CURA-9012_application_menu_fixes

Browse Source 
Application menu fixes
This commit is contained in:
Remco Burema 2022-03-10 12:55:54 +01:00 committed by GitHub
commit d2ab7d3d4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/qml/Actions.qml
View File

@ -79,7 +79,7 @@ Item
{ {
id: showTroubleShootingAction id: showTroubleShootingAction
onTriggered: Qt.openUrlExternally("https://ultimaker.com/en/troubleshooting?utm_source=cura&utm_medium=software&utm_campaign=dropdown-troubleshooting") 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 Action

6
resources/qml/MainWindow/ApplicationMenu.qml
View File

@ -34,14 +34,16 @@ Item
{ {
text: menuBarItem.text.replace(new RegExp("&([A-Za-z])"), function (match, character) text: menuBarItem.text.replace(new RegExp("&([A-Za-z])"), function (match, character)
{ {
return `<u>${character}</u>`; return `<u>${character}</u>`
}) })
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
} }
leftPadding: UM.Theme.getSize("default_margin").width
rightPadding: UM.Theme.getSize("default_margin").width
background: Rectangle background: Rectangle
{ {
color: menuBarItem.highlighted ? UM.Theme.getColor("background_2") : "transparent" color: menuBarItem.highlighted ? UM.Theme.getColor("background_2") : "transparent"
} }
} }

1
resources/qml/Widgets/MenuSeparator.qml
View File

@ -18,4 +18,5 @@ MenuSeparator
implicitHeight: UM.Theme.getSize("default_lining").height implicitHeight: UM.Theme.getSize("default_lining").height
color: UM.Theme.getColor("setting_control_border") color: UM.Theme.getColor("setting_control_border")
} }
height: visible ? implicitHeight: 0
} }