GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 04:36:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

CURA-4400 make extruder combobox disabled items grey

Browse Source
This commit is contained in:
Jack Ha 2018-03-01 16:22:40 +01:00
parent ba7b18a88b
commit 2538c689f1
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cura/Settings/ExtrudersModel.py
View File

@ -24,6 +24,8 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel):
## Human-readable name of the extruder. ## Human-readable name of the extruder.
NameRole = Qt.UserRole + 2 NameRole = Qt.UserRole + 2
## Is the extruder enabled?
EnabledRole = Qt.UserRole + 9
## Colour of the material loaded in the extruder. ## Colour of the material loaded in the extruder.
ColorRole = Qt.UserRole + 3 ColorRole = Qt.UserRole + 3
@ -58,6 +60,7 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel):
self.addRoleName(self.IdRole, "id") self.addRoleName(self.IdRole, "id")
self.addRoleName(self.NameRole, "name") self.addRoleName(self.NameRole, "name")
self.addRoleName(self.EnabledRole, "enabled")
self.addRoleName(self.ColorRole, "color") self.addRoleName(self.ColorRole, "color")
self.addRoleName(self.IndexRole, "index") self.addRoleName(self.IndexRole, "index")
self.addRoleName(self.DefinitionRole, "definition") self.addRoleName(self.DefinitionRole, "definition")
@ -185,6 +188,7 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel):
item = { item = {
"id": extruder.getId(), "id": extruder.getId(),
"name": extruder.getName(), "name": extruder.getName(),
"enabled": extruder.isEnabled,
"color": color, "color": color,
"index": position, "index": position,
"definition": extruder.getBottom().getId(), "definition": extruder.getBottom().getId(),

4
cura/Settings/MachineManager.py
View File

@ -811,10 +811,12 @@ class MachineManager(QObject):
def setExtruderEnabled(self, position: int, enabled) -> None: def setExtruderEnabled(self, position: int, enabled) -> None:
extruder = self.getExtruder(position) extruder = self.getExtruder(position)
extruder.setEnabled(enabled) extruder.setEnabled(enabled)
self.updateDefaultExtruder()
if enabled == False: if enabled == False:
self.updateDefaultExtruder()
self.correctExtruderSettings() self.correctExtruderSettings()
self.extruderChanged.emit() self.extruderChanged.emit()
# HACK to update items in SettingExtruder
ExtruderManager.getInstance().extrudersChanged.emit(self._global_container_stack.getId())
def _onMachineNameChanged(self): def _onMachineNameChanged(self):
self.globalContainerChanged.emit() self.globalContainerChanged.emit()

22
resources/qml/Settings/SettingExtruder.qml
View File

@ -17,14 +17,22 @@ SettingItem
id: control id: control
anchors.fill: parent anchors.fill: parent
model: Cura.ExtrudersModel { onModelChanged: control.color = getItem(control.currentIndex).color } model: Cura.ExtrudersModel {
onModelChanged: {
control.color = getItem(control.currentIndex).color;
}
}
textRole: "name" textRole: "name"
onActivated: onActivated:
{ {
forceActiveFocus(); if (model.getItem(index).enabled) {
propertyProvider.setPropertyValue("value", model.getItem(index).index); forceActiveFocus();
propertyProvider.setPropertyValue("value", model.getItem(index).index);
} else {
currentIndex = propertyProvider.properties.value; // keep the old value
}
} }
onActiveFocusChanged: onActiveFocusChanged:
@ -173,7 +181,13 @@ SettingItem
{ {
text: model.name text: model.name
renderType: Text.NativeRendering renderType: Text.NativeRendering
color: UM.Theme.getColor("setting_control_text") color: {
if (model.enabled) {
UM.Theme.getColor("setting_control_text")
} else {
UM.Theme.getColor("action_button_disabled_text");
}
}
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
elide: Text.ElideRight elide: Text.ElideRight
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter