From 1cfad1ab4762c4a04305d1cfef993f896bb60cde Mon Sep 17 00:00:00 2001 From: KatKatKateryna Date: Wed, 6 Sep 2023 23:33:55 +0100 Subject: [PATCH] btn status changed fix --- qt_ui/dockwidget_main.py | 14 ++++++++++---- qt_ui/widget_report.py | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/qt_ui/dockwidget_main.py b/qt_ui/dockwidget_main.py index 4e6ee4a..848663e 100644 --- a/qt_ui/dockwidget_main.py +++ b/qt_ui/dockwidget_main.py @@ -85,6 +85,7 @@ class SpeckleQGISDialog(QtWidgets.QDockWidget, FORM_CLASS): self.saveLayerSelection.setFlat(True) self.reloadButton.setFlat(True) self.closeButton.setFlat(True) + self.commit_web_view.setEnabled(False) # https://stackoverflow.com/questions/67585501/pyqt-how-to-use-hover-in-button-stylesheet backgr_image_del = f"border-image: url({ICON_DELETE_BLUE});" @@ -293,9 +294,9 @@ class SpeckleQGISDialog(QtWidgets.QDockWidget, FORM_CLASS): self.layerSendModeDropdown.currentIndexChanged.connect( lambda: self.layerSendModeChange(plugin) ) self.receiveModeButton.clicked.connect(lambda: self.setReceiveMode(plugin)) - self.streamBranchDropdown.currentIndexChanged.connect( lambda: self.runBtnStatusChanged(plugin) ) - self.commitDropdown.currentIndexChanged.connect( lambda: self.runBtnStatusChanged(plugin) ) + #self.streamBranchDropdown.currentIndexChanged.connect( lambda: self.runBtnStatusChanged(plugin) ) self.commitDropdown.currentIndexChanged.connect( lambda: self.setActiveCommit(plugin) ) + self.commitDropdown.currentIndexChanged.connect( lambda: self.runBtnStatusChanged(plugin) ) self.closingPlugin.connect(plugin.onClosePlugin) return @@ -356,6 +357,7 @@ class SpeckleQGISDialog(QtWidgets.QDockWidget, FORM_CLASS): self.messageInput.setEnabled(True) self.layerSendModeDropdown.setEnabled(True) self.setMapping.setEnabled(True) + self.commit_web_view.setEnabled(False) self.runBtnStatusChanged(plugin) return @@ -386,6 +388,7 @@ class SpeckleQGISDialog(QtWidgets.QDockWidget, FORM_CLASS): self.saveLayerSelection.setEnabled(False) self.layerSendModeDropdown.setEnabled(False) self.setMapping.setEnabled(False) + self.commit_web_view.setEnabled(True) self.runBtnStatusChanged(plugin) return @@ -401,8 +404,8 @@ class SpeckleQGISDialog(QtWidgets.QDockWidget, FORM_CLASS): self.populateLayerSendModeDropdown() self.populateProjectStreams(plugin) - self.runBtnStatusChanged(plugin) - self.runButton.setEnabled(False) + #self.runBtnStatusChanged(plugin) + #self.runButton.setEnabled(False) except Exception as e: logToUser(e, level = 2, func = inspect.stack()[0][3], plugin=self) @@ -449,6 +452,9 @@ class SpeckleQGISDialog(QtWidgets.QDockWidget, FORM_CLASS): try: commitStr = str(self.commitDropdown.currentText()) branchStr = str(self.streamBranchDropdown.currentText()) + + if commitStr == "": # populate commits still in progress + return if plugin.btnAction == 1: # on receive if commitStr == "": diff --git a/qt_ui/widget_report.py b/qt_ui/widget_report.py index f25072e..e18901a 100644 --- a/qt_ui/widget_report.py +++ b/qt_ui/widget_report.py @@ -125,6 +125,7 @@ class ReportDialog(QtWidgets.QWidget, FORM_CLASS): result = self.assembleReport() if result is None: print("no report generated") + return operation, total_layers, total_objects, report = result #self.report_label.setText(f"Operation: {operation}\nTotal: {total_layers} layer{'' if str(total_layers).endswith('1') else 's'}, {total_objects} feature{'' if str(total_objects).endswith('1') else 's'}") self.report_text.setText(report)