diff --git a/resources/qml/Menus/ExtensionMenu.qml b/resources/qml/Menus/ExtensionMenu.qml index fe40658e01..3c2d1a79c7 100644 --- a/resources/qml/Menus/ExtensionMenu.qml +++ b/resources/qml/Menus/ExtensionMenu.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: extensionMenu title: catalog.i18nc("@title:menu menubar:toplevel", "E&xtensions") diff --git a/resources/qml/Menus/FileMenu.qml b/resources/qml/Menus/FileMenu.qml index f457220d96..f247c91726 100644 --- a/resources/qml/Menus/FileMenu.qml +++ b/resources/qml/Menus/FileMenu.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 { id: base title: catalog.i18nc("@title:menu menubar:toplevel", "&File") diff --git a/resources/qml/Menus/PrinterMenu.qml b/resources/qml/Menus/PrinterMenu.qml index 3b14d9134f..9f0e0575b0 100644 --- a/resources/qml/Menus/PrinterMenu.qml +++ b/resources/qml/Menus/PrinterMenu.qml @@ -7,10 +7,10 @@ import QtQuick.Controls 2.4 import UM 1.6 as UM import Cura 1.0 as Cura -Menu +Cura.Menu { id: menu - + title: catalog.i18nc("@title:menu menubar:settings", "&Printer") Cura.MenuItem { id: networkEnabledPrinterItem diff --git a/resources/qml/Menus/RecentFilesMenu.qml b/resources/qml/Menus/RecentFilesMenu.qml index 24874c4365..e0b3bfda0c 100644 --- a/resources/qml/Menus/RecentFilesMenu.qml +++ b/resources/qml/Menus/RecentFilesMenu.qml @@ -9,7 +9,7 @@ import Cura 1.0 as Cura import "../Dialogs" -Menu +Cura.Menu { id: menu title: catalog.i18nc("@title:menu menubar:file", "Open &Recent") @@ -20,7 +20,7 @@ Menu Instantiator { model: CuraApplication.recentFiles - MenuItem + Cura.MenuItem { text: { diff --git a/resources/qml/Menus/SettingsMenu.qml b/resources/qml/Menus/SettingsMenu.qml index 44b329bbdf..e02d146296 100644 --- a/resources/qml/Menus/SettingsMenu.qml +++ b/resources/qml/Menus/SettingsMenu.qml @@ -7,12 +7,12 @@ import QtQuick.Controls 2.4 import UM 1.5 as UM import Cura 1.0 as Cura -Menu +Cura.Menu { id: base title: catalog.i18nc("@title:menu menubar:toplevel", "&Settings") - PrinterMenu { title: catalog.i18nc("@title:menu menubar:settings", "&Printer") } + PrinterMenu { } property var activeMachine: Cura.MachineManager.activeMachine Instantiator diff --git a/resources/qml/Menus/ViewMenu.qml b/resources/qml/Menus/ViewMenu.qml index f9a89cbcb7..059455c72c 100644 --- a/resources/qml/Menus/ViewMenu.qml +++ b/resources/qml/Menus/ViewMenu.qml @@ -7,12 +7,12 @@ import QtQuick.Controls 2.1 import UM 1.5 as UM import Cura 1.0 as Cura -Menu +Cura.Menu { id: base title: catalog.i18nc("@title:menu menubar:toplevel", "&View") - Menu + Cura.Menu { title: catalog.i18nc("@action:inmenu menubar:view", "&Camera position") Cura.MenuItem { action: Cura.Actions.view3DCamera } @@ -23,7 +23,7 @@ Menu Cura.MenuItem { action: Cura.Actions.viewRightSideCamera } } - Menu + Cura.Menu { id: cameraViewMenu diff --git a/resources/qml/Widgets/Menu.qml b/resources/qml/Widgets/Menu.qml index b727adcb3a..1a6aeff602 100644 --- a/resources/qml/Widgets/Menu.qml +++ b/resources/qml/Widgets/Menu.qml @@ -4,6 +4,7 @@ import QtQuick 2.7 import UM 1.5 as UM +import Cura 1.0 as Cura // // Menu with Cura styling. @@ -15,7 +16,9 @@ UM.Menu implicitWidth: UM.Theme.getSize("setting_control").width - background: Rectangle { + delegate: Cura.MenuItem {} + background: Rectangle + { color: UM.Theme.getColor("setting_control") border.color: UM.Theme.getColor("setting_control_border") }