3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 14:55:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #11521 from Ultimaker/CURA-8928_menu_visual_fixes

Browse source 
Menu visual fixes
This commit is contained in:
Evangelos Trantos 2022-02-24 13:22:56 +01:00 • committed by GitHub
commit a2ce010ec1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Menus/ContextMenu.qml
View file

@ -8,7 +8,7 @@ import QtQuick.Window 2.1
import UM 1.5 as UM
import Cura 1.0 as Cura
Menu
Cura.Menu
{
id: base

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

@ -7,13 +7,13 @@ 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")
Cura.MenuItem { action: Cura.Actions.undo }
Cura.MenuItem { action: Cura.Actions.redo }
MenuSeparator { }
Cura.MenuSeparator { }
Cura.MenuItem { action: Cura.Actions.selectAll }
Cura.MenuItem { action: Cura.Actions.arrangeAll }
Cura.MenuItem { action: Cura.Actions.multiplySelection }
@ -21,7 +21,7 @@ Menu
Cura.MenuItem { action: Cura.Actions.deleteAll }
Cura.MenuItem { action: Cura.Actions.resetAllTranslation }
Cura.MenuItem { action: Cura.Actions.resetAll }
MenuSeparator { }
Cura.MenuSeparator { }
Cura.MenuItem { action: Cura.Actions.groupObjects }
Cura.MenuItem { action: Cura.Actions.mergeObjects }
Cura.MenuItem { action: Cura.Actions.unGroupObjects }

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

@ -69,7 +69,7 @@ Cura.Menu
enabled: UM.WorkspaceFileHandler.enabled
}
MenuSeparator { }
Cura.MenuSeparator { }
Cura.MenuItem
{
@ -91,7 +91,7 @@ Cura.Menu
onTriggered: UM.OutputDeviceManager.requestWriteSelectionToDevice("local_file", PrintInformation.jobName, { "filter_by_machine": false, "preferred_mimetypes": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml"})
}
MenuSeparator { }
Cura.MenuSeparator { }
Cura.MenuItem
{
@ -99,7 +99,7 @@ Cura.Menu
action: Cura.Actions.reloadAll
}
MenuSeparator { }
Cura.MenuSeparator { }
Cura.MenuItem { action: Cura.Actions.quit }
}

2
resources/qml/Menus/HelpMenu.qml
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")

2
resources/qml/Menus/MaterialMenu.qml
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")

2
resources/qml/Menus/PreferencesMenu.qml
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

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

@ -39,7 +39,7 @@ Cura.Menu
onAboutToHide: updateModels = false
}
MenuSeparator
Cura.MenuSeparator
{
visible: Cura.MachineManager.activeMachine.hasVariants || Cura.MachineManager.activeMachine.hasMaterials
}