GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-28 03:51:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use Cura.Menu instead of UM.Menu

Browse Source 
Same as the previous commit. Use the specialised variant provided by Cura instead
of the generic one of UM

CURA-8683
This commit is contained in:
Jaime van Kessel 2022-01-14 13:50:44 +01:00
parent 3130ea0f74
commit babf3043f8
6 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/qml/Menus/ExtensionMenu.qml
View File

@ -27,7 +27,7 @@ Menu
{ {
id: extensionsMenuSeparator id: extensionsMenuSeparator
MenuSeparator {} Cura.MenuSeparator {}
} }
Instantiator Instantiator
@ -35,7 +35,7 @@ Menu
id: extensions id: extensions
model: extensionModel model: extensionModel
UM.Menu Cura.Menu
{ {
id: sub_menu id: sub_menu
title: model.name title: model.name

2
resources/qml/Menus/MaterialMenu.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
UM.Menu Cura.Menu
{ {
id: materialMenu id: materialMenu
title: catalog.i18nc("@label:category menu label", "Material") title: catalog.i18nc("@label:category menu label", "Material")

2
resources/qml/Menus/NozzleMenu.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
UM.Menu Cura.Menu
{ {
id: nozzleMenu id: nozzleMenu
title: "Nozzle" title: "Nozzle"

2
resources/qml/Menus/OpenFilesMenu.qml
View File

@ -9,7 +9,7 @@ import Cura 1.0 as Cura
import "../Dialogs" import "../Dialogs"
UM.Menu Cura.Menu
{ {
id: openFilesMenu id: openFilesMenu
title: catalog.i18nc("@title:menu menubar:file", "Open File(s)...") title: catalog.i18nc("@title:menu menubar:file", "Open File(s)...")

2
resources/qml/Menus/SaveProjectMenu.qml
View File

@ -9,7 +9,7 @@ import Cura 1.1 as Cura
import "../Dialogs" import "../Dialogs"
UM.Menu Cura.Menu
{ {
id: saveProjectMenu id: saveProjectMenu
title: catalog.i18nc("@title:menu menubar:file", "Save Project...") title: catalog.i18nc("@title:menu menubar:file", "Save Project...")

6
resources/qml/Widgets/Menu.qml
View File

@ -2,20 +2,18 @@
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls 2.3
import UM 1.1 as UM import UM 1.5 as UM
// //
// Menu with Cura styling. // Menu with Cura styling.
// //
Menu UM.Menu
{ {
id: menu id: menu
padding: 0 padding: 0
implicitWidth: UM.Theme.getSize("setting_control").width implicitWidth: UM.Theme.getSize("setting_control").width
width: Math.max.apply(Math, Object.values(contentChildren).map(function(c) { return c.width }))
background: Rectangle { background: Rectangle {
color: UM.Theme.getColor("setting_control") color: UM.Theme.getColor("setting_control")