mirror of
https://github.com/spalencsar/bearhub.git
synced 2026-07-08 03:54:15 +02:00
Merge branch 'staging' into modules
# Conflicts: # fpakman/view/qt/window.py
This commit is contained in:
@@ -92,7 +92,7 @@ class RefreshApps(QThread):
|
||||
|
||||
|
||||
class UninstallApp(AsyncAction):
|
||||
signal_finished = pyqtSignal(bool)
|
||||
signal_finished = pyqtSignal(ApplicationView)
|
||||
signal_output = pyqtSignal(str)
|
||||
|
||||
def __init__(self, manager: ApplicationManager, icon_cache: Cache, app: ApplicationView = None):
|
||||
@@ -111,7 +111,7 @@ class UninstallApp(AsyncAction):
|
||||
self.icon_cache.delete(self.app.model.base_data.icon_url)
|
||||
self.manager.clean_cache_for(self.app.model)
|
||||
|
||||
self.signal_finished.emit(success)
|
||||
self.signal_finished.emit(self.app if success else None)
|
||||
self.app = None
|
||||
self.root_password = None
|
||||
|
||||
@@ -204,7 +204,7 @@ class SearchApps(QThread):
|
||||
|
||||
class InstallApp(AsyncAction):
|
||||
|
||||
signal_finished = pyqtSignal(bool)
|
||||
signal_finished = pyqtSignal(ApplicationView)
|
||||
signal_output = pyqtSignal(str)
|
||||
|
||||
def __init__(self, manager: ApplicationManager, disk_cache: bool, icon_cache: Cache, locale_keys: dict, app: ApplicationView = None):
|
||||
@@ -237,8 +237,8 @@ class InstallApp(AsyncAction):
|
||||
success = False
|
||||
self.signal_output.emit(self.locale_keys['internet.required'])
|
||||
finally:
|
||||
self.signal_finished.emit(self.app if success else None)
|
||||
self.app = None
|
||||
self.signal_finished.emit(success)
|
||||
|
||||
|
||||
class AnimateProgress(QThread):
|
||||
|
||||
Reference in New Issue
Block a user