3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-11 08:47:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use CuraMenu so that custom styling is used

Browse source 
CURA-8683
This commit is contained in:
Jaime van Kessel 2022-01-14 15:01:48 +01:00
parent 4db8878317
commit d7d6918ab7
7 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Menus/ExtensionMenu.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: extensionMenu id: extensionMenu
title: catalog.i18nc("@title:menu menubar:toplevel", "E&xtensions") title: catalog.i18nc("@title:menu menubar:toplevel", "E&xtensions")

2
resources/qml/Menus/FileMenu.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
{ {
id: base id: base
title: catalog.i18nc("@title:menu menubar:toplevel", "&File") title: catalog.i18nc("@title:menu menubar:toplevel", "&File")

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

@ -7,10 +7,10 @@ import QtQuick.Controls 2.4
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
{ {
id: menu id: menu
title: catalog.i18nc("@title:menu menubar:settings", "&Printer")
Cura.MenuItem Cura.MenuItem
{ {
id: networkEnabledPrinterItem id: networkEnabledPrinterItem

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

@ -9,7 +9,7 @@ import Cura 1.0 as Cura
import "../Dialogs" import "../Dialogs"
Menu Cura.Menu
{ {
id: menu id: menu
title: catalog.i18nc("@title:menu menubar:file", "Open &Recent") title: catalog.i18nc("@title:menu menubar:file", "Open &Recent")
@ -20,7 +20,7 @@ Menu
Instantiator Instantiator
{ {
model: CuraApplication.recentFiles model: CuraApplication.recentFiles
MenuItem Cura.MenuItem
{ {
text: text:
{ {

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

@ -7,12 +7,12 @@ 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: base id: base
title: catalog.i18nc("@title:menu menubar:toplevel", "&Settings") title: catalog.i18nc("@title:menu menubar:toplevel", "&Settings")
PrinterMenu { title: catalog.i18nc("@title:menu menubar:settings", "&Printer") } PrinterMenu { }
property var activeMachine: Cura.MachineManager.activeMachine property var activeMachine: Cura.MachineManager.activeMachine
Instantiator Instantiator

6
resources/qml/Menus/ViewMenu.qml
View file

@ -7,12 +7,12 @@ import QtQuick.Controls 2.1
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: base id: base
title: catalog.i18nc("@title:menu menubar:toplevel", "&View") title: catalog.i18nc("@title:menu menubar:toplevel", "&View")
Menu Cura.Menu
{ {
title: catalog.i18nc("@action:inmenu menubar:view", "&Camera position") title: catalog.i18nc("@action:inmenu menubar:view", "&Camera position")
Cura.MenuItem { action: Cura.Actions.view3DCamera } Cura.MenuItem { action: Cura.Actions.view3DCamera }
@ -23,7 +23,7 @@ Menu
Cura.MenuItem { action: Cura.Actions.viewRightSideCamera } Cura.MenuItem { action: Cura.Actions.viewRightSideCamera }
} }
Menu Cura.Menu
{ {
id: cameraViewMenu id: cameraViewMenu

5
resources/qml/Widgets/Menu.qml
View file

@ -4,6 +4,7 @@
import QtQuick 2.7 import QtQuick 2.7
import UM 1.5 as UM import UM 1.5 as UM
import Cura 1.0 as Cura
// //
// Menu with Cura styling. // Menu with Cura styling.
@ -15,7 +16,9 @@ UM.Menu
implicitWidth: UM.Theme.getSize("setting_control").width implicitWidth: UM.Theme.getSize("setting_control").width
background: Rectangle { delegate: Cura.MenuItem {}
background: Rectangle
{
color: UM.Theme.getColor("setting_control") color: UM.Theme.getColor("setting_control")
border.color: UM.Theme.getColor("setting_control_border") border.color: UM.Theme.getColor("setting_control_border")
} }