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

Merge branch 'CURA-6016_Improve_UI_Speed' into 4.0

Browse source
This commit is contained in:
Remco Burema 2018-12-12 10:54:36 +01:00
commit 1b2ef91c13
13 changed files with 80 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

3
resources/qml/Dialogs/WorkspaceSummaryDialog.qml
View file

@ -11,6 +11,7 @@ import Cura 1.0 as Cura
UM.Dialog
{
id: base
title: catalog.i18nc("@title:window", "Save Project")
minimumWidth: 500 * screenScaleFactor
@ -49,7 +50,7 @@ UM.Dialog
UM.SettingDefinitionsModel
{
id: definitionsModel
containerId: Cura.MachineManager.activeDefinitionId
containerId: base.visible ? Cura.MachineManager.activeDefinitionId: ""
showAll: true
exclude: ["command_line_settings"]
showAncestors: true

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

@ -16,10 +16,11 @@ Menu
Instantiator
{
model: Cura.ExtrudersModel { simpleNames: true }
model: Cura.MachineManager.activeMachine.extruderList
Menu
{
title: model.name
title: modelData.name
NozzleMenu { title: Cura.MachineManager.activeDefinitionVariantsName; visible: Cura.MachineManager.hasVariants; extruderIndex: index }
MaterialMenu { title: catalog.i18nc("@title:menu", "&Material"); visible: Cura.MachineManager.hasMaterials; extruderIndex: index }