Consistently use Cura.Menu and Cura.MenuItem

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

View file

@ -20,13 +20,12 @@ Item
{
id: applicationMenu
width: parent.width
FileMenu {}
height: UM.Theme.getSize("context_menu").height
background: Item {}
FileMenu {}
EditMenu {}
ViewMenu {}
background: Rectangle {}
SettingsMenu
{
//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
title: (Qt.platform.os == "osx") ? "&Settings" : catalog.i18nc("@title:menu menubar:toplevel", "&Settings")
}
ExtensionMenu { id: extensionMenu }
PreferencesMenu {}
HelpMenu {}
}

View file

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

View file

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

View file

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

View file

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

View file

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