3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-23 02:41:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch 'master' of https://github.com/Ultimaker/Cura

Browse source
This commit is contained in:
Tamara Hogenhout 2015-09-02 14:31:21 +02:00
commit de8dbb4856
37 changed files with 843 additions and 1100 deletions
Download patch file Download diff file Expand all files Collapse all files

32
resources/qml/Cura.qml
View file

@ -80,7 +80,7 @@ UM.MainWindow
id: saveAllMenu
title: catalog.i18nc("@title:menu","Save All")
iconName: "document-save";
enabled: devicesModel.count > 0 && UM.Backend.progress > 0.99;
enabled: devicesModel.rowCount() > 0 && UM.Backend.progress > 0.99;
Instantiator
{
@ -131,6 +131,10 @@ UM.MainWindow
onObjectRemoved: top_view_menu.removeItem(object)
}
ExclusiveGroup { id: view_menu_top_group; }
MenuSeparator { }
MenuItem { action: actions.toggleFullScreen; }
}
Menu
{
@ -140,14 +144,14 @@ UM.MainWindow
Instantiator
{
model: UM.Models.machinesModel
model: UM.MachineInstancesModel { }
MenuItem
{
text: model.name;
checkable: true;
checked: model.active;
exclusiveGroup: machineMenuGroup;
onTriggered: UM.Models.machinesModel.setActive(index)
onTriggered: UM.MachineManager.setActiveMachineInstance(model.name)
}
onObjectAdded: machineMenu.insertItem(index, object)
onObjectRemoved: machineMenu.removeItem(object)
@ -157,6 +161,24 @@ UM.MainWindow
MenuSeparator { }
Instantiator
{
model: UM.MachineVariantsModel { }
MenuItem {
text: model.name;
checkable: true;
checked: model.active;
exclusiveGroup: machineVariantsGroup;
onTriggered: UM.MachineManager.setActiveMachineVariant(model.name)
}
onObjectAdded: machineMenu.insertItem(index, object)
onObjectRemoved: machineMenu.removeItem(object)
}
ExclusiveGroup { id: machineVariantsGroup; }
MenuSeparator { visible: UM.MachineManager.hasVariants; }
MenuItem { action: actions.addMachine; }
MenuItem { action: actions.configureMachines; }
}
@ -586,10 +608,10 @@ UM.MainWindow
onRequestAddPrinter:
{
addMachineWizard.visible = true
addMachineWizard.printer = false
addMachineWizard.firstRun = true
}
}
Component.onCompleted: UM.Theme.load(UM.Resources.getPath(UM.Resources.ThemesLocation, "cura"))
Component.onCompleted: UM.Theme.load(UM.Resources.getPath(UM.Resources.Themes, "cura"))
}