3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Consistently use Cura.Menu and Cura.MenuItem

Browse source 
Some of these were using the built-in Menu and MenuItem, causing the menus to appear in different sizes.

Contributes to issue CURA-8688.
This commit is contained in:
Ghostkeeper 2022-02-15 16:19:39 +01:00
parent 52ff67c1eb
commit e552383863
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
6 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
resources/qml/MainWindow/ApplicationMenu.qml
View file

@ -20,13 +20,12 @@ Item
{ {
id: applicationMenu id: applicationMenu
width: parent.width width: parent.width
FileMenu {} height: UM.Theme.getSize("context_menu").height
background: Item {}
FileMenu {}
EditMenu {} EditMenu {}
ViewMenu {} ViewMenu {}
background: Rectangle {}
SettingsMenu SettingsMenu
{ {
//On MacOS, don't translate the "Settings" word. //On MacOS, don't translate the "Settings" word.
@ -38,13 +37,9 @@ Item
//- https://doc.qt.io/qt-5/qmenubar.html#qmenubar-as-a-global-menu-bar //- https://doc.qt.io/qt-5/qmenubar.html#qmenubar-as-a-global-menu-bar
title: (Qt.platform.os == "osx") ? "&Settings" : catalog.i18nc("@title:menu menubar:toplevel", "&Settings") title: (Qt.platform.os == "osx") ? "&Settings" : catalog.i18nc("@title:menu menubar:toplevel", "&Settings")
} }
ExtensionMenu { id: extensionMenu } ExtensionMenu { id: extensionMenu }
PreferencesMenu {} PreferencesMenu {}
HelpMenu {} HelpMenu {}
} }

2
resources/qml/Menus/EditMenu.qml
View file

@ -7,7 +7,7 @@ import QtQuick.Controls 2.1
import UM 1.6 as UM import UM 1.6 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura
Menu Cura.Menu
{ {
title: catalog.i18nc("@title:menu menubar:toplevel", "&Edit") title: catalog.i18nc("@title:menu menubar:toplevel", "&Edit")

2
resources/qml/Menus/HelpMenu.qml
View file

@ -8,7 +8,7 @@ import UM 1.5 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura
Menu Cura.Menu
{ {
id: helpMenu id: helpMenu
title: catalog.i18nc("@title:menu menubar:toplevel", "&Help") title: catalog.i18nc("@title:menu menubar:toplevel", "&Help")

4
resources/qml/Menus/MaterialMenu.qml
View file

@ -72,7 +72,7 @@ Cura.Menu
Cura.MenuSeparator { visible: favoriteMaterialsModel.items.length > 0} Cura.MenuSeparator { visible: favoriteMaterialsModel.items.length > 0}
Menu Cura.Menu
{ {
id: genericMenu id: genericMenu
title: catalog.i18nc("@label:category menu label", "Generic") title: catalog.i18nc("@label:category menu label", "Generic")
@ -108,7 +108,7 @@ Cura.Menu
Instantiator Instantiator
{ {
model: brandMaterials model: brandMaterials
delegate: Menu delegate: Cura.Menu
{ {
id: brandMaterialsMenu id: brandMaterialsMenu
title: materialName title: materialName

2
resources/qml/Menus/PreferencesMenu.qml
View file

@ -7,7 +7,7 @@ import QtQuick.Controls 2.4
import UM 1.5 as UM import UM 1.5 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura
Menu Cura.Menu
{ {
id: preferencesMenu id: preferencesMenu

2
resources/qml/Menus/PrinterTypeMenu.qml
View file

@ -7,7 +7,7 @@ import QtQuick.Controls 2.4
import UM 1.5 as UM import UM 1.5 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura
Menu Cura.Menu
{ {
id: menu id: menu
title: "Printer type" title: "Printer type"