From 53095f94387ffd27aa9757aa31b6f0f9ec71d296 Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Fri, 12 Jul 2019 11:48:15 -0300 Subject: [PATCH] auto-showing the details when history or downgrading fails --- fpakman/view/qt/thread.py | 6 ++++-- fpakman/view/qt/window.py | 9 +++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/fpakman/view/qt/thread.py b/fpakman/view/qt/thread.py index a54daa6b..be93fd82 100644 --- a/fpakman/view/qt/thread.py +++ b/fpakman/view/qt/thread.py @@ -81,7 +81,7 @@ class UninstallApp(QThread): class DowngradeApp(QThread): - signal_finished = pyqtSignal() + signal_finished = pyqtSignal(bool) signal_output = pyqtSignal(str) def __init__(self, manager: ApplicationManager, locale_keys: dict, app: ApplicationView = None): @@ -94,6 +94,7 @@ class DowngradeApp(QThread): def run(self): if self.app: + success = True try: stream = self.manager.downgrade_app(self.app.model, self.root_password) @@ -106,11 +107,12 @@ class DowngradeApp(QThread): if line: self.signal_output.emit(line) except (requests.exceptions.ConnectionError, NoInternetException): + success = False self.signal_output.emit(self.locale_keys['internet.required']) finally: self.app = None self.root_password = None - self.signal_finished.emit() + self.signal_finished.emit(success) class GetAppInfo(QThread): diff --git a/fpakman/view/qt/window.py b/fpakman/view/qt/window.py index 3fafe5a2..6604d1c3 100755 --- a/fpakman/view/qt/window.py +++ b/fpakman/view/qt/window.py @@ -260,10 +260,14 @@ class ManageWindow(QWidget): self._release_lock() self.refresh() - def _finish_downgrade(self): + def _finish_downgrade(self, success: bool): self.finish_action() self._release_lock() - self.refresh() + + if success: + self.refresh() + else: + self.checkbox_console.setChecked(True) def filter_only_apps(self, only_apps: int): @@ -454,6 +458,7 @@ class ManageWindow(QWidget): if app.get('error'): self._handle_console_option(True) self.textarea_output.appendPlainText(app['error']) + self.checkbox_console.setChecked(True) else: dialog_history = HistoryDialog(app, self.table_apps.get_selected_app_icon(), self.locale_keys) dialog_history.exec_()