From 0c450328b3d4d710b03ace2b405e8a9d5340956d Mon Sep 17 00:00:00 2001 From: CodeByMrFinchum Date: Fri, 31 Jan 2025 17:42:02 +0100 Subject: [PATCH 01/38] fix: Fixed app not closing after update --- CHANGELOG.md | 3 +++ src/OptimaLab35/gui.py | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a5375a..4505e0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Changelog ## 0.8.x +### 0.8.3: Fix – OptimaLab35 Not Closing After Update +- Fixed an issue where **OptimaLab35** would not close properly when updating, resulting in an unresponsive instance and multiple running processes. + ### 0.8.2: Patch for New PyPiUpdater Version - Updated to support **PyPiUpdater 0.4.0**. - Now stores version information locally, preventing an "unknown" state on the first updater launch. diff --git a/src/OptimaLab35/gui.py b/src/OptimaLab35/gui.py index 6fda769..24c2871 100644 --- a/src/OptimaLab35/gui.py +++ b/src/OptimaLab35/gui.py @@ -490,7 +490,7 @@ class UpdaterWindow(QMainWindow, Ui_Updater_Window): def define_gui_interaction(self): """Setup UI interactions.""" - if self.optimalab35_localversion == "0.0.1": + if self.optimalab35_localversion == "0.0.2": self.dev_mode() return else: @@ -583,7 +583,8 @@ class UpdaterWindow(QMainWindow, Ui_Updater_Window): msg.exec() # Restart the application after user clicks "OK" - self.ppu_ol35.restart_program() + #self.ppu_ol35.restart_program() + self.restart_program() def restart_program(self): """Restart the Python program after an update.""" From 1bba7f8bbce3909f5391a15e753aeb1d9a2a0247 Mon Sep 17 00:00:00 2001 From: Mr Finchum Date: Sat, 1 Feb 2025 14:58:32 +0000 Subject: [PATCH 02/38] patch: Minor Enhancements --- CHANGELOG.md | 5 +++++ src/OptimaLab35/gui.py | 23 ++++++++++++++++------- src/OptimaLab35/ui/updater_window.py | 6 +++--- src/OptimaLab35/ui/updater_window.ui | 6 +++--- 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4505e0d..a6b9068 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Changelog ## 0.8.x +### 0.8.4: Minor Enhancements & Cleanup +- Updated window titles. +- Improved error handling for updater: now displays the specific error message instead of just **"error"** when an issue occurs during update checks. +- Ensured all child windows close when the main window is closed. + ### 0.8.3: Fix – OptimaLab35 Not Closing After Update - Fixed an issue where **OptimaLab35** would not close properly when updating, resulting in an unresponsive instance and multiple running processes. diff --git a/src/OptimaLab35/gui.py b/src/OptimaLab35/gui.py index 24c2871..1f8e5ed 100644 --- a/src/OptimaLab35/gui.py +++ b/src/OptimaLab35/gui.py @@ -53,7 +53,7 @@ class OptimaLab35(QMainWindow, Ui_MainWindow): # Change UI elements self.change_statusbar(f"Using {self.o.name} v{self.o.version}", 5000) - self.setWindowTitle(f"{self.name} v{self.version}") + self.set_title() self.default_ui_layout() self.define_gui_interaction() @@ -63,6 +63,13 @@ class OptimaLab35(QMainWindow, Ui_MainWindow): self.ui.png_quality_Slider.setVisible(False) self.ui.quality_label_2.setVisible(False) + def set_title(self): + if self.version == "0.0.1": + title = f"{self.name} DEV MODE" + else: + title = self.name + self.setWindowTitle(title) + def define_gui_interaction(self): self.ui.input_folder_button.clicked.connect(self.browse_input_folder) self.ui.output_folder_button.clicked.connect(self.browse_output_folder) @@ -108,7 +115,7 @@ class OptimaLab35(QMainWindow, Ui_MainWindow): info_text = f"""

{self.name} v{self.version}

(C) 2024-2025 Mr Finchum aka CodeByMrFinchum

-

{self.name} is a GUI for {self.o.name} (v{self.o.version}), enhancing its functionality with a\nuser-friendly interface for efficient image and metadata management.

+

{self.name} is a GUI for {self.o.name} (v{self.o.version}), enhancing its functionality with a user-friendly interface for efficient image and metadata management.

Features: