mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-07 15:07:28 -06:00
Fix 'DiscoverUM3Action' required attention from user in flow. [CURA-6057]
This commit is contained in:
parent
d8f89d8330
commit
dc8524b90d
3 changed files with 12 additions and 1 deletions
|
@ -33,6 +33,12 @@ class MachineAction(QObject, PluginObject):
|
||||||
def getKey(self) -> str:
|
def getKey(self) -> str:
|
||||||
return self._key
|
return self._key
|
||||||
|
|
||||||
|
## Whether this action needs to ask the user anything.
|
||||||
|
# If not, we shouldn't present the user with certain screens which otherwise show up.
|
||||||
|
# Defaults to true to be in line with the old behaviour.
|
||||||
|
def needsUserInteraction(self) -> bool:
|
||||||
|
return True
|
||||||
|
|
||||||
@pyqtProperty(str, notify = labelChanged)
|
@pyqtProperty(str, notify = labelChanged)
|
||||||
def label(self) -> str:
|
def label(self) -> str:
|
||||||
return self._label
|
return self._label
|
||||||
|
|
|
@ -221,7 +221,7 @@ class WelcomePagesModel(ListModel):
|
||||||
|
|
||||||
definition_id = global_stack.definition.getId()
|
definition_id = global_stack.definition.getId()
|
||||||
first_start_actions = self._application.getMachineActionManager().getFirstStartActions(definition_id)
|
first_start_actions = self._application.getMachineActionManager().getFirstStartActions(definition_id)
|
||||||
return len(first_start_actions) > 0
|
return len([action for action in first_start_actions if action.needsUserInteraction()]) > 0
|
||||||
|
|
||||||
def addPage(self) -> None:
|
def addPage(self) -> None:
|
||||||
pass
|
pass
|
||||||
|
|
|
@ -41,6 +41,11 @@ class DiscoverUM3Action(MachineAction):
|
||||||
# Time to wait after a zero-conf service change before allowing a zeroconf reset
|
# Time to wait after a zero-conf service change before allowing a zeroconf reset
|
||||||
self._zero_conf_change_grace_period = 0.25 #type: float
|
self._zero_conf_change_grace_period = 0.25 #type: float
|
||||||
|
|
||||||
|
# Overrides the one in MachineAction.
|
||||||
|
# This requires not attention from the user (any more), so we don't need to show any 'upgrade screens'.
|
||||||
|
def needsUserInteraction(self) -> bool:
|
||||||
|
return False
|
||||||
|
|
||||||
@pyqtSlot()
|
@pyqtSlot()
|
||||||
def startDiscovery(self):
|
def startDiscovery(self):
|
||||||
if not self._network_plugin:
|
if not self._network_plugin:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue