Improve logic of auto-print/auto-select/turn on combinations

fieldOfView · Jun 13, 2022 · 1d2b410 · 1d2b410
1 parent f859e09
commit 1d2b410
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/qml/DiscoverOctoPrintAction.qml b/qml/DiscoverOctoPrintAction.qml
@@ -441,7 +441,7 @@ Cura.MachineAction
  id: autoSelectCheckBox
  text: catalog.i18nc("@label", "Select print job after uploading")
  enabled: manager.instanceApiKeyAccepted && !autoPrintCheckBox.checked
- checked: Cura.ContainerManager.getContainerMetaDataEntry(activeMachineId, "octoprint_auto_select") == "true"
+ checked: Cura.ContainerManager.getContainerMetaDataEntry(activeMachineId, "octoprint_auto_select") == "true" || (!enabled && autoPrintCheckBox.checked)
  onClicked:
  {
  manager.setContainerMetaDataEntry(activeMachineId, "octoprint_auto_select", String(checked))
@@ -456,7 +456,7 @@ Cura.MachineAction
  id: autoPowerControlCheckBox
  text: catalog.i18nc("@label", "Turn on printer with")
  visible: autoPowerControlPlugs.visible
- enabled: autoPrintCheckBox.checked
+ enabled: autoPrintCheckBox.checked || autoSelectCheckBox.checked
  anchors.verticalCenter: autoPowerControlPlugs.verticalCenter
  checked: manager.instanceApiKeyAccepted && Cura.ContainerManager.getContainerMetaDataEntry(activeMachineId, "octoprint_power_control") == "true"
  onClicked:

diff --git a/qml_qt5/DiscoverOctoPrintAction.qml b/qml_qt5/DiscoverOctoPrintAction.qml
@@ -455,7 +455,7 @@ Cura.MachineAction
  id: autoSelectCheckBox
  text: catalog.i18nc("@label", "Select print job after uploading")
  enabled: manager.instanceApiKeyAccepted && !autoPrintCheckBox.checked
- checked: Cura.ContainerManager.getContainerMetaDataEntry(activeMachineId, "octoprint_auto_select") == "true"
+ checked: Cura.ContainerManager.getContainerMetaDataEntry(activeMachineId, "octoprint_auto_select") == "true" || (!enabled && autoPrintCheckBox.checked)
  onClicked:
  {
  manager.setContainerMetaDataEntry(activeMachineId, "octoprint_auto_select", String(checked))
@@ -470,7 +470,7 @@ Cura.MachineAction
  id: autoPowerControlCheckBox
  text: catalog.i18nc("@label", "Turn on printer with")
  visible: autoPowerControlPlugs.visible
- enabled: autoPrintCheckBox.checked
+ enabled: autoPrintCheckBox.checked || autoSelectCheckBox.checked
  anchors.verticalCenter: autoPowerControlPlugs.verticalCenter
  checked: manager.instanceApiKeyAccepted && Cura.ContainerManager.getContainerMetaDataEntry(activeMachineId, "octoprint_power_control") == "true"
  onClicked: