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

CURA-4606 fix profiles page Active button

Browse source
This commit is contained in:
Jack Ha 2018-02-19 15:24:58 +01:00
parent 3ff9cb6b1e
commit 8efe13a55a
3 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/Settings/MachineManager.py
View file

@ -1148,6 +1148,7 @@ class MachineManager(QObject):
def _setEmptyQuality(self): def _setEmptyQuality(self):
self._current_quality_group = None self._current_quality_group = None
self._current_quality_changes_group = None
self._global_container_stack.quality = self._empty_quality_container self._global_container_stack.quality = self._empty_quality_container
self._global_container_stack.qualityChanges = self._empty_quality_changes_container self._global_container_stack.qualityChanges = self._empty_quality_changes_container
for extruder in self._global_container_stack.extruders.values(): for extruder in self._global_container_stack.extruders.values():
@ -1158,6 +1159,7 @@ class MachineManager(QObject):
def _setQualityGroup(self, quality_group, empty_quality_changes = True): def _setQualityGroup(self, quality_group, empty_quality_changes = True):
self._current_quality_group = quality_group self._current_quality_group = quality_group
self._current_quality_changes_group = None
# Set quality and quality_changes for the GlobalStack # Set quality and quality_changes for the GlobalStack
self._global_container_stack.quality = quality_group.node_for_global.getContainer() self._global_container_stack.quality = quality_group.node_for_global.getContainer()

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

@ -19,7 +19,7 @@ Menu
{ {
text: (model.layer_height != "") ? model.name + " - " + model.layer_height : model.name text: (model.layer_height != "") ? model.name + " - " + model.layer_height : model.name
checkable: true checkable: true
checked: Cura.MachineManager.activeQualityGroup && (Cura.MachineManager.activeQualityGroup.getName() == model.name) checked: Cura.MachineManager.activeQualityOrQualityChangesName == model.name
exclusiveGroup: group exclusiveGroup: group
onTriggered: { onTriggered: {
Cura.MachineManager.setQualityGroup(model.quality_group) Cura.MachineManager.setQualityGroup(model.quality_group)
@ -52,9 +52,9 @@ Menu
{ {
text: model.name text: model.name
checkable: model.available checkable: model.available
checked: Cura.MachineManager.activeQualityChangesId == model.id // TODO: fix for new checked: Cura.MachineManager.activeQualityOrQualityChangesName == model.name
exclusiveGroup: group exclusiveGroup: group
onTriggered: Cura.MachineManager.setActiveQuality(model.id) // TODO: fix for new onTriggered: Cura.MachineManager.setQualityChangesGroup(model.quality_changes_group)
} }
onObjectAdded: onObjectAdded:

13
resources/qml/Preferences/ProfilesPage.qml
View file

@ -44,7 +44,10 @@ Item
} }
property var isCurrentItemActivated: { property var isCurrentItemActivated: {
// TODO if (!base.currentItem) {
return false;
}
return base.currentItem.name == Cura.MachineManager.activeQualityOrQualityChangesName;
} }
Row // Button Row Row // Button Row
@ -62,9 +65,13 @@ Item
{ {
text: catalog.i18nc("@action:button", "Activate") text: catalog.i18nc("@action:button", "Activate")
iconName: "list-activate" iconName: "list-activate"
enabled: base.currentItem != null ? base.currentItem.name != Cura.MachineManager.activeQualityOrQualityChangesName : false; enabled: !isCurrentItemActivated
onClicked: { onClicked: {
// TODO if (base.currentItem.is_read_only) {
Cura.MachineManager.setQualityGroup(base.currentItem.quality_group);
} else {
Cura.MachineManager.setQualityChangesGroup(base.currentItem.quality_changes_group);
}
} }
} }