Skip to content

Commit 1222ec5

Browse files
committed
[ui] NodeActions: Fix status of compute and submit in deletable state
1 parent 5c468f4 commit 1222ec5

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

meshroom/ui/qml/Controls/NodeActions.qml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ Item {
235235
ToolTip.text: actionHeader.computeButtonTooltip
236236
ToolTip.visible: hovered
237237
ToolTip.delay: 1000
238-
visible: actionHeader.computeButtonState != NodeActions.ButtonState.DELETABLE
239-
enabled: actionHeader.computeButtonState % 2 == 1 && !actionHeader.nodeSubmitted // Launchable & Stoppable, local
238+
visible: actionHeader.computeButtonState != NodeActions.ButtonState.DISABLED
239+
enabled: visible && !actionHeader.nodeSubmitted // Launchable & Stoppable, local
240240
// Icon color
241241
textColor: checked ? palette.highlight : palette.text
242242
// Background color
@@ -255,12 +255,18 @@ Item {
255255
}
256256
onClicked: {
257257
switch (actionHeader.computeButtonState) {
258-
case NodeActions.ButtonState.STOPPABLE:
258+
case NodeActions.ButtonState.STOPPABLE:
259259
root.stopComputeRequest(actionHeader.selectedNode)
260260
break
261-
case NodeActions.ButtonState.LAUNCHABLE:
261+
case NodeActions.ButtonState.LAUNCHABLE:
262+
root.computeRequest(actionHeader.selectedNode)
263+
break
264+
case NodeActions.ButtonState.DELETABLE:
265+
root.deleteDataRequest(actionHeader.selectedNode)
262266
root.computeRequest(actionHeader.selectedNode)
263267
break
268+
default:
269+
break
264270
}
265271
}
266272
}
@@ -297,8 +303,8 @@ Item {
297303
ToolTip.text: actionHeader.submitButtonTooltip
298304
ToolTip.visible: hovered
299305
ToolTip.delay: 1000
300-
visible: actionHeader.submitButtonState != NodeActions.ButtonState.DELETABLE
301-
enabled: actionHeader.submitButtonState % 2 == 1 && (actionHeader.nodeSubmitted || !actionHeader.nodeIsLocked) // Launchable & Stoppable, external
306+
visible: actionHeader.submitButtonState != NodeActions.ButtonState.DISABLED
307+
enabled: visible && (actionHeader.nodeSubmitted || !actionHeader.nodeIsLocked) // Launchable & Stoppable, external
302308
// Icon color
303309
textColor: checked ? palette.highlight : palette.text
304310
// Background color
@@ -325,6 +331,10 @@ Item {
325331
root.submitRequest(actionHeader.selectedNode)
326332
actionHeader.updateProperties(actionHeader.selectedNode)
327333
break
334+
case NodeActions.ButtonState.DELETABLE:
335+
root.deleteDataRequest(actionHeader.selectedNode)
336+
root.submitRequest(actionHeader.selectedNode)
337+
break
328338
default:
329339
break
330340
}

0 commit comments

Comments
 (0)