From d371e5b4e06c43703b4ce52fa7b2f87b54bb22e6 Mon Sep 17 00:00:00 2001 From: Lianming Du Date: Sun, 5 Nov 2023 21:38:37 +0800 Subject: [PATCH] fixed settings missing on macos --- src/config.py | 4 ++-- src/window.py | 2 +- src/worker.py | 15 ++++++++++++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/config.py b/src/config.py index fd9f419..ae838a9 100644 --- a/src/config.py +++ b/src/config.py @@ -16,9 +16,9 @@ __all__ = ['DOCKEY_VERSION', 'DOCKEY_BUILD', 'DOCKEY_ABOUT', 'DOCKEY_THANKS'] -DOCKEY_VERSION = "0.9.4" +DOCKEY_VERSION = "0.10.0" -DOCKEY_BUILD = "230919" +DOCKEY_BUILD = "231105" DOCKEY_ABOUT = """

Dockey - Molecular Docking and Virtual Screening

diff --git a/src/window.py b/src/window.py index 930933b..1567844 100644 --- a/src/window.py +++ b/src/window.py @@ -525,7 +525,7 @@ def create_actions(self): #preferences actions self.setting_act = QAction("Settings", self) self.setting_act.triggered.connect(self.open_setting_dialog) - self.setting_act.setShortcut(QKeySequence.Preferences) + #self.setting_act.setShortcut(QKeySequence.Preferences) #self.dock_tool_act = QAction("Docking Tools", self) #self.dock_tool_act.triggered.connect(self.docking_tool_settings) diff --git a/src/worker.py b/src/worker.py index 0243319..ef2f83b 100644 --- a/src/worker.py +++ b/src/worker.py @@ -194,6 +194,18 @@ def run(self): self.signals.success.emit() self.signals.progress.emit(100) +class ManagerSignals(QObject): + pass + +class WorkerManager(QRunnable): + def __init__(self): + super().__init__() + self.setAutoDelete(True) + + def run(self): + pass + + class WorkerSignals(QObject): finished = Signal() refresh = Signal(int) @@ -208,6 +220,7 @@ class BaseWorker(QRunnable): def __init__(self, params): super(BaseWorker, self).__init__() + self.setAutoDelete(True) self.jobs = {} self.params = params self.signals = WorkerSignals() @@ -217,7 +230,6 @@ def __init__(self, params): self.job_num = self.settings.value('Job/concurrent', 1, int) self.signals.threads.connect(self.change_job_numbers) self.signals.stopjob.connect(self.stop_job) - self.setAutoDelete(True) self.progress = 0 self.job_total = 0 self.job_finish = 0 @@ -577,6 +589,7 @@ def run(self): self.signals.message.emit(error) print(error) + finally: for job in self.jobs: self.jobs[job].tempdir.remove()