GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-02 08:44:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sort printers by category instead of by manufacturer

Browse Source 
Always show Ultimaker on top. CURA-1593
This commit is contained in:
fieldOfView 2016-07-29 16:38:27 +02:00
parent 2576aaca62
commit 34840d42bd
1 changed files with 53 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
resources/qml/AddMachineDialog.qml
View File

@ -16,12 +16,23 @@ UM.Dialog
{ {
id: base id: base
title: catalog.i18nc("@title:window", "Add Printer") title: catalog.i18nc("@title:window", "Add Printer")
property string activeManufacturer: "Ultimaker"; property string preferredCategory: "Ultimaker"
property string activeCategory: preferredCategory
onVisibilityChanged:
{
// Reset selection and machine name
if (visible) {
activeCategory = preferredCategory;
machineList.currentIndex = 0;
machineName.text = getMachineName();
}
}
signal machineAdded(string id) signal machineAdded(string id)
function getMachineName() function getMachineName()
{ {
var name = machineList.model.getItem(machineList.currentIndex).name var name = machineList.model.get(machineList.currentIndex).name
return name return name
} }
@ -36,16 +47,32 @@ UM.Dialog
right: parent.right; right: parent.right;
bottom: parent.bottom; bottom: parent.bottom;
} }
ListView ListView
{ {
id: machineList id: machineList
model: UM.DefinitionContainersModel model: ListModel
{ {
id: machineDefinitionsModel id: sortedMachineDefinitionsModel
filter: {"visible":true} Component.onCompleted: {
// DefinitionContainersModel is sorted alphabetically, but we want the preferred
// category on top so we create a custom-sorted ListModel from it.
var items = [];
for(var i in machineDefinitionsModel.items) {
var item = machineDefinitionsModel.getItem(i);
if (item["category"] == preferredCategory)
sortedMachineDefinitionsModel.append(item);
else
items.push(item);
} }
section.property: "manufacturer" for(var i in items) {
sortedMachineDefinitionsModel.append(items[i]);
}
}
}
section.property: "category"
section.delegate: Button section.delegate: Button
{ {
text: section text: section
@ -76,16 +103,25 @@ UM.Dialog
sourceSize.width: width sourceSize.width: width
sourceSize.height: width sourceSize.height: width
color: palette.windowText color: palette.windowText
source: base.activeManufacturer == section ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_right") source: base.activeCategory == section ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_right")
} }
} }
} }
onClicked: onClicked:
{ {
base.activeManufacturer = section; base.activeCategory = section;
machineList.currentIndex = machineList.model.find("manufacturer", section) if (machineList.model.get(machineList.currentIndex).category != section) {
machineName.text = getMachineName() // Find the first machine from this category
for(var i = 0; i < sortedMachineDefinitionsModel.count; i++) {
var item = sortedMachineDefinitionsModel.get(i);
if (item.category == section) {
machineList.currentIndex = i;
break;
}
}
}
machineName.text = getMachineName();
} }
} }
@ -114,7 +150,7 @@ UM.Dialog
states: State states: State
{ {
name: "collapsed"; name: "collapsed";
when: base.activeManufacturer != model.manufacturer; when: base.activeCategory != model.category;
PropertyChanges { target: machineButton; opacity: 0; height: 0; } PropertyChanges { target: machineButton; opacity: 0; height: 0; }
} }
@ -161,7 +197,7 @@ UM.Dialog
onClicked: onClicked:
{ {
base.visible = false base.visible = false
var item = machineList.model.getItem(machineList.currentIndex); var item = machineList.model.get(machineList.currentIndex);
Cura.MachineManager.addMachine(machineName.text, item.id) Cura.MachineManager.addMachine(machineName.text, item.id)
base.machineAdded(item.id) // Emit signal that the user added a machine. base.machineAdded(item.id) // Emit signal that the user added a machine.
} }
@ -174,6 +210,11 @@ UM.Dialog
id: catalog; id: catalog;
name: "cura"; name: "cura";
} }
UM.DefinitionContainersModel
{
id: machineDefinitionsModel
filter: { "visible": true }
}
SystemPalette { id: palette } SystemPalette { id: palette }
ExclusiveGroup { id: printerGroup; } ExclusiveGroup { id: printerGroup; }
} }