Merge branch 'fix/bugs' into 'main'

Fix: Fixed issue when renaming resulted in wrong order.

See merge request CodeByMrFinchum/OptimaLab35!9

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
 

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):

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)