diff --git a/resources/qml/MainWindow/ApplicationMenu.qml b/resources/qml/MainWindow/ApplicationMenu.qml index 707111309c..44094521ce 100644 --- a/resources/qml/MainWindow/ApplicationMenu.qml +++ b/resources/qml/MainWindow/ApplicationMenu.qml @@ -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 {} - } diff --git a/resources/qml/Menus/EditMenu.qml b/resources/qml/Menus/EditMenu.qml index c2ec9903f2..5bcedea415 100644 --- a/resources/qml/Menus/EditMenu.qml +++ b/resources/qml/Menus/EditMenu.qml @@ -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") diff --git a/resources/qml/Menus/HelpMenu.qml b/resources/qml/Menus/HelpMenu.qml index e8a80eeced..4be25fdffe 100644 --- a/resources/qml/Menus/HelpMenu.qml +++ b/resources/qml/Menus/HelpMenu.qml @@ -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") diff --git a/resources/qml/Menus/MaterialMenu.qml b/resources/qml/Menus/MaterialMenu.qml index 0834d7b250..e6d7fbc3e9 100644 --- a/resources/qml/Menus/MaterialMenu.qml +++ b/resources/qml/Menus/MaterialMenu.qml @@ -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 diff --git a/resources/qml/Menus/PreferencesMenu.qml b/resources/qml/Menus/PreferencesMenu.qml index fd0b5d82c1..3a6dd4b2ce 100644 --- a/resources/qml/Menus/PreferencesMenu.qml +++ b/resources/qml/Menus/PreferencesMenu.qml @@ -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 diff --git a/resources/qml/Menus/PrinterTypeMenu.qml b/resources/qml/Menus/PrinterTypeMenu.qml index c959b97c5b..17986ac1b8 100644 --- a/resources/qml/Menus/PrinterTypeMenu.qml +++ b/resources/qml/Menus/PrinterTypeMenu.qml @@ -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"