From d3794478a950f353da9ac04478fca1aff4ea8ba4 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Wed, 17 Jun 2020 15:20:44 +0200 Subject: [PATCH 1/4] play, validate buttons are not available on reset but on stop --- pype/tools/pyblish_pype/window.py | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pype/tools/pyblish_pype/window.py b/pype/tools/pyblish_pype/window.py index 5d22e5ac8f..a6e6cd245e 100644 --- a/pype/tools/pyblish_pype/window.py +++ b/pype/tools/pyblish_pype/window.py @@ -726,14 +726,12 @@ class Window(QtWidgets.QDialog): self.on_tab_changed(self.state["current_page"]) self.update_compatibility() - self.footer_button_validate.setEnabled(True) - self.footer_button_reset.setEnabled(True) - self.footer_button_stop.setEnabled(False) - self.footer_button_play.setEnabled(True) - self.footer_button_play.setFocus() + self.footer_button_validate.setEnabled(False) + self.footer_button_reset.setEnabled(False) + self.footer_button_stop.setEnabled(True) + self.footer_button_play.setEnabled(False) def on_passed_group(self, order): - for group_item in self.instance_model.group_items.values(): if self.overview_instance_view.isExpanded(group_item.index()): continue @@ -764,11 +762,17 @@ class Window(QtWidgets.QDialog): ) def on_was_stopped(self): - errored = self.controller.errored - self.footer_button_play.setEnabled(not errored) - self.footer_button_validate.setEnabled( - not errored and not self.controller.validated - ) + if self.controller.collected: + errored = self.controller.errored + self.footer_button_play.setEnabled(not errored) + self.footer_button_validate.setEnabled( + not errored and not self.controller.validated + ) + else: + self.footer_button_play.setEnabled(False) + self.footer_button_validate.setEnabled(False) + self.footer_button_play.setFocus() + self.footer_button_reset.setEnabled(True) self.footer_button_stop.setEnabled(False) if errored: From 0c41983e12d52e30d3a3534930de90814ea10436 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Wed, 17 Jun 2020 15:22:46 +0200 Subject: [PATCH 2/4] fix missing variable --- pype/tools/pyblish_pype/window.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pype/tools/pyblish_pype/window.py b/pype/tools/pyblish_pype/window.py index a6e6cd245e..fc5e8cbef5 100644 --- a/pype/tools/pyblish_pype/window.py +++ b/pype/tools/pyblish_pype/window.py @@ -762,8 +762,8 @@ class Window(QtWidgets.QDialog): ) def on_was_stopped(self): + errored = self.controller.errored if self.controller.collected: - errored = self.controller.errored self.footer_button_play.setEnabled(not errored) self.footer_button_validate.setEnabled( not errored and not self.controller.validated From bcdc7c9634f8b8c907de3b4a11b5c07689096ede Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 18 Jun 2020 15:18:00 +0200 Subject: [PATCH 3/4] reapply suspend logs btn --- pype/tools/pyblish_pype/window.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pype/tools/pyblish_pype/window.py b/pype/tools/pyblish_pype/window.py index c9677f0ffd..c88a7e4fd6 100644 --- a/pype/tools/pyblish_pype/window.py +++ b/pype/tools/pyblish_pype/window.py @@ -754,6 +754,8 @@ class Window(QtWidgets.QDialog): self.on_tab_changed(self.state["current_page"]) self.update_compatibility() + self.button_suspend_logs.setEnabled(False) + self.footer_button_validate.setEnabled(False) self.footer_button_reset.setEnabled(False) self.footer_button_stop.setEnabled(True) From 3063ce29c0ffdf1dd8689876bf09a24a2b394ed8 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 18 Jun 2020 15:22:55 +0200 Subject: [PATCH 4/4] changed removed attribute --- pype/tools/pyblish_pype/window.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pype/tools/pyblish_pype/window.py b/pype/tools/pyblish_pype/window.py index c88a7e4fd6..8d4a80107c 100644 --- a/pype/tools/pyblish_pype/window.py +++ b/pype/tools/pyblish_pype/window.py @@ -793,14 +793,14 @@ class Window(QtWidgets.QDialog): def on_was_stopped(self): errored = self.controller.errored - if self.controller.collected: + if self.controller.collect_state == 0: + self.footer_button_play.setEnabled(False) + self.footer_button_validate.setEnabled(False) + else: self.footer_button_play.setEnabled(not errored) self.footer_button_validate.setEnabled( not errored and not self.controller.validated ) - else: - self.footer_button_play.setEnabled(False) - self.footer_button_validate.setEnabled(False) self.footer_button_play.setFocus() self.footer_button_reset.setEnabled(True)