From a46390ba82b4817b5d9c21fd91ba69cb674b88d0 Mon Sep 17 00:00:00 2001
From: CodeByMrFinchum <mr.finchum@pm.me>
Date: Thu, 23 Jan 2025 15:34:28 +0100
Subject: [PATCH] Fix: Fixed issue when renaming resulted in wrong order.

---
 CHANGELOG.md                     | 3 +++
 src/OptimaLab35/gui.py           | 4 ++--
 src/OptimaLab35/utils/utility.py | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 016e5b5..f800a48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changelog
 
 ## 0.3.x
+### 0.3.4: Fix
+- Fixed an issue where renaming images, while converting could result in wrong numbering.
+
 ### 0.3.1 - 0.3.3
 - Repo only: Fix building pipeline
 
diff --git a/src/OptimaLab35/gui.py b/src/OptimaLab35/gui.py
index 278812e..df94cfc 100644
--- a/src/OptimaLab35/gui.py
+++ b/src/OptimaLab35/gui.py
@@ -170,7 +170,6 @@ class OptimaLab35(QMainWindow, Ui_MainWindow):
     def populate_exif(self):
         # partly chatGPT
         # Mapping of EXIF fields to comboboxes in the UI
-        print("populate")
         combo_mapping = {
             "make": self.ui.make_comboBox,
             "model": self.ui.model_comboBox,
@@ -232,6 +231,7 @@ class OptimaLab35(QMainWindow, Ui_MainWindow):
         image_files = [
             f for f in os.listdir(path) if f.lower().endswith((".png", ".jpg", ".jpeg", ".webp"))
         ]
+        image_files.sort()
         return image_files
 
     def control_before_start(self, process):
@@ -369,7 +369,7 @@ class OptimaLab35(QMainWindow, Ui_MainWindow):
         user_data["user_comment"] = self.ui.user_comment_comboBox.currentText()
         user_data["artist"] = self.ui.artist_comboBox.currentText()
         user_data["copyright_info"] = self.ui.copyright_info_comboBox.currentText()
-        user_data["software"] = f"{self.name} (v{self.version}) & {self.o.name} (v{self.o.version})"
+        user_data["software"] = f"{self.name} (v{self.version}) with {self.o.name} (v{self.o.version})"
         return user_data
 
     def get_selected_exif(self):
diff --git a/src/OptimaLab35/utils/utility.py b/src/OptimaLab35/utils/utility.py
index 6dfa17d..f604656 100644
--- a/src/OptimaLab35/utils/utility.py
+++ b/src/OptimaLab35/utils/utility.py
@@ -75,8 +75,8 @@ class Utilities:
                 "AE-1"
             ],
             "user_comment": [
-                "Scanner.NORITSU-KOKI",
-                "Scanner.NA"
+                "Scanner: NORITSU-KOKI",
+                "Scanner: NA"
             ]
         }
         self.write_yaml(file, def_exif)