Compare commits

...

7 commits
1.6.0 ... main

Author SHA1 Message Date
08b6937142
Patch: changed year to include 2026
All checks were successful
ci/woodpecker/pr/woodpecker_ci Pipeline was successful
ci/woodpecker/pull_request_closed/woodpecker_ci Pipeline was successful
ci/woodpecker/push/woodpecker_ci Pipeline was successful
ci/woodpecker/tag/woodpecker_ci Pipeline was successful
2026-01-04 11:13:54 +01:00
547dec03a7
Fix: fixed wrong link to changelog
All checks were successful
ci/woodpecker/push/woodpecker_ci Pipeline was successful
ci/woodpecker/tag/woodpecker_ci Pipeline was successful
2026-01-04 10:47:58 +01:00
f93e4cfc6b
Patch: moving changelog file from source to wiki
All checks were successful
ci/woodpecker/pr/woodpecker_ci Pipeline was successful
ci/woodpecker/pull_request_closed/woodpecker_ci Pipeline was successful
ci/woodpecker/push/woodpecker_ci Pipeline was successful
ci/woodpecker/tag/woodpecker_ci Pipeline was successful
2025-11-03 14:13:30 +01:00
42e7a473ec
Fix: fixing python version to satisfy dependencies
All checks were successful
ci/woodpecker/push/woodpecker_ci Pipeline was successful
ci/woodpecker/tag/woodpecker_ci Pipeline was successful
2025-11-03 12:55:36 +01:00
21378f2f5b
feat: fixing version...
All checks were successful
ci/woodpecker/pr/woodpecker_ci Pipeline was successful
ci/woodpecker/pull_request_closed/woodpecker_ci Pipeline was successful
ci/woodpecker/push/woodpecker_ci Pipeline was successful
ci/woodpecker/tag/woodpecker_ci Pipeline was successful
2025-09-29 12:38:40 +02:00
b6f25690ae
Moving some readme parts to new wiki.
All checks were successful
ci/woodpecker/pr/woodpecker_ci Pipeline was successful
ci/woodpecker/pull_request_closed/woodpecker_ci Pipeline was successful
ci/woodpecker/push/woodpecker_ci Pipeline was successful
ci/woodpecker/tag/woodpecker_ci Pipeline was successful
2025-09-29 12:29:28 +02:00
7f11a29c63
feat: Automatically add missing exif fields
All checks were successful
ci/woodpecker/pr/woodpecker_ci Pipeline was successful
ci/woodpecker/pull_request_closed/woodpecker_ci Pipeline was successful
ci/woodpecker/push/woodpecker_ci Pipeline was successful
ci/woodpecker/tag/woodpecker_ci Pipeline was successful
2025-08-13 13:43:02 +02:00
8 changed files with 264 additions and 495 deletions

View file

@ -1,313 +0,0 @@
# Changelog
## 1.6.x
### 1.6.0: Feature - Add Information from Developing Process
- Added two new combo boxes: one for **film developer** and one for **development time** (how long the film was developed).
- The film developer field accepts all characters, while the time field only accepts `NA` or `mm:ss`.
- **Improved EXIF Edit Window**: Pressing **Enter** (Return) now adds the new item to the list, just like pressing the **Add** button.
---
## 1.5.x
### 1.5.0: Feature - Time of dateEdit now today
- Changes that instead of the dateEdit elements being always set to a last day of 2024 it is the current day.
---
## 1.4.x
### 1.4.2: Fix links
- Fixed that changelog was linked to GitLab, not it is to code.boxyfoxy.net
- Fixed Changelog
### 1.4.1: Fix CI
- Fixed pipline
### 1.4.0: New CI
- Migrated repo from GitLab to my forgejo instance, therefore switching to woodpecker CI
---
## 1.3.x
### 1.3.4: Fix - Spelling (25.04.01)
- Fixed misspelling in preview window.
### 1.3.3: Patch - Increased Preview Performance x2 (25.04.01)
- Reduced preview stutter: Previously, the image was updated twice when changing brightness or contrast. Now, it updates only once, improving performance by 100%.
- There is still room for improvement. Analysis shows that image processing takes the most time, while displaying in Qt is relatively fast. Reducing the image size impacts performance, so resizing to 50% is a good idea.
- There is an issue where `QRunner` does not always finish in the correct order when brightness or contrast values are changed rapidly. ATM I do not know how to fix this easly.
- The "Preview" watermark now displays the brightness and contrast levels of the shown image.
### 1.3.2: Fix - Fixed problem with app folders (25.03.30)
- Fixed a problem that the app folder path was not generated correctly.
### 1.3.1: Fix - Fixed insert exif not working (25.03.27)
- Fixed the feature that inserted exif into images without modifying them.
### 1.3.0: Feature - Write Adjustments into EXIF (25.03.24)
- Changes to contrast and brightness are now recorded in the EXIF comment section (labeled *Scanner* in the program).
- This allows users to track what adjustments were made to an image.
---
## 1.2.x
### 1.2.2: Patch - Pyproject file (25.03.23)
- Fixed `Development Status` Classifier
- Added <4.0 python version
### 1.2.1: Patch - Changelog file (25.03.23)
- Patches formation in changelog file.
### 1.2.0: Refactor - Splitting Classes into Separate Files (25.03.23)
- Refactored `gui.py`, which previously contained almost all the code, into multiple files.
- Each window's logic is now in its own file, improving code organization.
- Window layouts remain in `.ui` folder, while their logic is now properly separated.
## 1.1.x
### 1.1.0: Feature - New Function in Preview Window (25.03.23)
- Added a new feature to the preview window: **Hold a button to temporarily view the original (unedited) image.** This makes it easier to compare changes.
- Minor UI adjustments.
---
## 1.0.x (25.03.06)
### 1.0.1: Fixed spelling
- Fixes spelling some places
### 1.0.0: Fix version bump
- Version was not bumped correctly
---
## 0.15.1: Final Polish (25.03.06)
- Fixed a bug where the GPS field being empty but selected caused issues.
- EXIF insertion is now canceled if any image in the folder does not end with a number.
- Minor GUI adjustments for a more polished experience.
- Disabled preview adjustment controls until an image is loaded to prevent errors.
## 0.15.0: Preview Image Resizing Update (25.02.12)
- Added the ability to change the preview image size dynamically.
- Previously, the image was processed and displayed at its original size, causing lag or unresponsiveness when adjusting the slider.
- Reducing the processed image size should help improve performance.
- Default preview image size is now **25%**, but users can adjust it between **10% and 100%**.
---
## 0.14.x
### 0.14.1: Patch changelog (25.02.12)
- Updated the changelog to include missing entries.
### 0.14.0: Code refactor (by Mr. Finch) (25.02.11)
- Introduced constants and optimized the code.
## 0.13.x (25.02.11)
### 0.13.1: Fixed image processing
- Fixed a bug that made it impossible to process images.
### 0.13.0: Requirements file (by Mr. Finch)
- Added a requirements file.
---
## 0.12.x
### 0.12.6: Disabled app restart on Windows (25.02.11)
- The app can not restart properly on Windows, so the restart button has been hidden when the OS is `nt`.
- Also updated tool tip to indicate that changing theme requeres are restart.
### 0.12.5: Fixed EXIF File Generation Bug (25.02.10)
- Fixed a bug where the application failed to generate a new default EXIF file if none was available. Now, the file is correctly created when missing.
### 0.12.4: Updated README (25.02.10)
- The README file (project description) now includes updates description and screenshots.
### 0.12.3: UI Adjustments (25.02.10)
- Minor changes to maintain a unified layout across all windows.
- Added option to sync app theme with OS (if supported).
- Set auto theme as the default value.
### 0.12.2: Minor UI Improvements for Theme Compatibility (25.02.10)
- Fixed text clipping issues when using the new theme options.
### 0.12.1: Removed Unnecessary Debug Prints (25.02.09)
- Removed leftover debug statements.
### 0.12.0: New Settings Menu & Patches (25.02.09)
- **New Settings Window:**
- The updater window has been reworked into a settings window.
- **Initial settings (first tab) include:**
1. Option to change the theme (with an optional dependency installation).
2. Reset selectable EXIF data to default.
- The updater UI has been moved to the second tab.
- Added a link to the changelog for easier access to update details.
- **Patches:**
- Fixed an issue where links in labels (About window) did not open a browser.
- Added a changelog link in the About window.
- Minor changes to `utility.py` to handle settings.
---
## 0.11.x (25.02.05)
### 0.11.1: Fixed pipeline
- Fixed pipeline publish error
### 0.11.0: Refactor and Patches
- Fixed an issue with the updater: The updater window wouldn't start if the `updater_log.json` file was missing or lacked a valid last `time.time()` float value.
- Corrected layout issues in the preview window, repositioning elements to their proper places.
- Added an application icon (may not work on all desktop environments).
- Refactored code to reduce the size of the PyPi package by removing unnecessary folders.
---
## 0.10.x (25.02.04)
### 0.10.1: Fixed Updater
- Fixed an issue where the updater was permanently disabled.
### 0.10.0: Multithreading for Preview Window
- The preview window now processes images in a separate thread, and live update preview is enabled by default.
- This improves UI responsiveness.
- The image now resizes dynamically to fit the window when the window size changes.
- Minor UI improvements.
---
## 0.9.x
### 0.9.2: Enhanced updater
- Minor enhancments for the updater
### 0.9.1: Patch for Unsuccessful Successful Update
- Addressed a rare issue where the package did not update correctly using the updater.
- Unable to reproduce, but it may have been related to an older version and the restart process.
- Added developer functions to test the updater without requiring a published release.
### 0.9.0: UI Enhancements and Language Refinements
- Changed text, labels, buttons, and checkboxes for clearer understanding.
- Improved UI language to make the interface easier to navigate.
- Added tooltips for more helpful information and guidance.
- Updates applied across the main window (both tabs) and the preview window.
---
## 0.8.x
### 0.8.5: Patch for New PyPiUpdater Version
- **PyPiUpdater 0.5** introduced breaking changes; adjusted code to ensure compatibility with the new version.
### 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.
### 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.
- Users still need to press the **Update** button to verify the latest version, ensuring an internet connection is available.
### 0.8.1: Fix
- Fixed a misspelling of `PyPiUpdater` in the build file, which prevented v0.8.0 from being installed.
### 0.8.0: Updater Feature
- Added an updater function utilizing my new package [PyPiUpdater](https://gitlab.com/CodeByMrFinchum/PyPiUpdater).
- New updater window displaying the local version and checking for updates online.
- Added an option to update and restart the app from the menu.
---
## 0.7.0: Enhanced Preview
- Images loaded into the preview window are now scaled while maintaining aspect ratio.
- Added live updates: changes to brightness, contrast, or grayscale are applied immediately.
- This may crush the system depending on image size and system specifications.
- Removed Settings from menuBar, and extended the about window.
---
## 0.6.0: Initial Flatpak Support
- Started Flatpak package building.
- Not added to Flathub yet, as only stable software is hosted there.
- Not fully completed, icon, name, and description are included, but the version is missing for some reason.
- Local build and installation work. The Bash script `build_flatpak.sh` in the `flatpak/` directory generates all pip dependencies, then builds and installs the app locally.
- `requirements-parser` has to be installed from pip to finish installing the flatpak (maybe more pypi packages..)
---
## 0.5.0
- Removed all leftover of tui code that was hiding in some classes.
---
## 0.4.0
- Fixed a critical issue that prevented the program from functioning.
- Updated compatibility to align with the **upcoming** optima35 **release**.
**Removal of TUI:**
- The TUI version is no longer compatible with optima35 v1.0.
- Maintaining two UIs has become too time-consuming, as the primary focus is on the GUI, which provides the best user experience. Recently, the TUI version was only receiving patches without any meaningful enhancements.
---
## 0.3.x
### 0.3.7: prepear for optima35 release
- Added a maximum version of dependencies list.
### 0.3.6: Patch
- Added check if any exif options are empty.
- Also made the exif editor aviable without checking the exif box.
### 0.3.5: Fix
- Fixed an issue where renaming images, while converting could result in wrong numbering.
### 0.3.1 - 0.3.4
- Repo only: Fix building pipeline
### 0.3.0
- Repo only: adding pipeline
---
## 0.2.x
### 0.2.3
- Refactored code for improved readability.
### 0.2.2
- Moved processing images into a different thread, making the UI responsiable while processing
### 0.2.1
- Insert exif to image file (i.e. without changing the file).
### 0.2.0
- Now spaces in rename string are replaces with `_`.
- version check of `optima35`, incase pip did not update it.
- Sorting entries from exif file.
### 0.2.0-a1
- Main UI received a facelift.
- Added a new experimental preview window to display an image and show how changing values affects it.
- Programm now warns for potential overwrite of existing files.
---
## 0.1.x
### 0.1.1
- Update metadata, preview, readme, bump in version for pip
### 0.1.0
- Preserved the current working GUI by pinning `optima35` to a specific version for guaranteed compatibility.
---
## 0.0.x
### 0.0.4-a2
- Adding __version__ to `__init__.py` so version is automaticly updated in program as well as pypi.
### 0.0.4-a1
- Refactored project structure, moving all code to the `src` directory.
- Adjusted imports and setup to accommodate the new folder structure.
- Skipped version numbers to `.4` due to PyPI versioning constraints (testing purposes).
### 0.0.1 - Initial UI-Focused Release
- Forked from OPTIMA35.
- Removed core OPTIMA35 files to focus exclusively on UI components.
- Integrated OPTIMA35 functionality via the pip package.
- Ensured both TUI and GUI modes operate seamlessly.
- Revised the README for improved clarity and structure.

View file

@ -1,6 +1,17 @@
# **OptimaLab35**
Developed on my [forgejo instance](https://code.boxyfoxy.net/CodeByMrFinchum), [GitLab](https://gitlab.com/CodeByMrFinchum) is used as backup.
I've decided to move some sections to the [Forgejo wiki](https://code.boxyfoxy.net/CodeByMrFinchum/OptimaLab35/wiki/Home) to keep the README concise. This way, I can update the wiki continuously without requiring a version bump for the program.
The README will now contain:
* A quick overview of the project
* Key features
* Installation instructions
* Disclaimer about GAI usage
For everything else — including images, detailed information, and performance notes — please refer to the [wiki](https://code.boxyfoxy.net/CodeByMrFinchum/OptimaLab35/wiki/Home).
## **Overview**
**OptimaLab35** enhances **OPTIMA35** (**Organizing, Processing, Tweaking Images, and Modifying scanned Analogs from 35mm Film**) by offering a user-friendly graphical interface for efficient image and metadata management.
@ -19,6 +30,7 @@ While there is always room for additional features and optimizations, the core f
### **Image Processing**
- Resize images (upscale or downscale)
- Convert to different image file (jpg, png, webp)
- Convert images to grayscale
- Adjust brightness and contrast
- Add customizable text-based watermarks
@ -47,45 +59,12 @@ Install via **pip** (dependencies are handled automatically):
pip install OptimaLab35
```
---
## GUI Preview
The layout remains consistent with v1.0.0.
The UI is OS-dependent, but a custom theme can be enabled in the settings.
**Main tab**
![main](https://code.boxyfoxy.net/CodeByMrFinchum/OptimaLab35/raw/branch/main/media/mainwindow_light.png){width=40%}
![main](https://code.boxyfoxy.net/CodeByMrFinchum/OptimaLab35/raw/branch/main/media/mainwindow_dark.png){width=40%}
**Exif tab**
![main](https://code.boxyfoxy.net/CodeByMrFinchum/OptimaLab35/raw/branch/main/media/mainwindow_exif_light.png){width=40%}
![main](https://code.boxyfoxy.net/CodeByMrFinchum/OptimaLab35/raw/branch/main/media/mainwindow_exif_dark.png){width=40%}
**Preview window**
![main](https://code.boxyfoxy.net/CodeByMrFinchum/OptimaLab35/raw/branch/main/media/previewwindow_light.png){width=40%}
![main](https://code.boxyfoxy.net/CodeByMrFinchum/OptimaLab35/raw/branch/main/media/previewwindow_dark.png){width=40%}
**Settings**
![main](https://code.boxyfoxy.net/CodeByMrFinchum/OptimaLab35/raw/branch/main/media/settingswindow_light.png){width=40%}
![main](https://code.boxyfoxy.net/CodeByMrFinchum/OptimaLab35/raw/branch/main/media/settingswindow_dark.png){width=40%}
**Updater**
![main](https://code.boxyfoxy.net/CodeByMrFinchum/OptimaLab35/raw/branch/main/media/settingswindow_updater_light.png){width=40%}
![main](https://code.boxyfoxy.net/CodeByMrFinchum/OptimaLab35/raw/branch/main/media/settingswindow_updater_dark.png){width=40%}
---
# Contribution
Thanks to developer [Mr Finch](https://gitlab.com/MrFinchMkV) for contributing to this project.
## Use of LLMs
In the interest of transparency, I disclose that Generative AI (GAI) large language models (LLMs), including OpenAIs ChatGPT and Ollama models (e.g., OpenCoder and Qwen2.5-coder), have been used to assist in this project.
In the interest of transparency, I disclose that Generative AI (GAI) large language models (LLMs), including OpenAI's ChatGPT and Ollama models (e.g., OpenCoder and Qwen2.5-coder), have been used to assist in this project.
### Areas of Assistance:
- Project discussions and planning

View file

@ -9,3 +9,5 @@ Developed on my [forgejo instance](https://code.boxyfoxy.net/CodeByMrFinchum), [
- Preview image adjustments in real time
- Theme selection (light, dark, auto)
- Automatic updates via PyPI
For more details, screenshots, and additional information, please see the [wiki](https://code.boxyfoxy.net/CodeByMrFinchum/OptimaLab35/wiki/Home).

View file

@ -11,7 +11,7 @@ def main():
app_settings = u.load_settings()
app = QtWidgets.QApplication(sys.argv)
try:
try: # Check weather the pkg for theme is installed
import qdarktheme
app_settings["theme"]["theme_pkg"] = True
except ImportError:
@ -20,7 +20,8 @@ def main():
if app_settings["theme"]["use_custom_theme"] and app_settings["theme"]["theme_pkg"]:
qdarktheme.setup_theme(app_settings["theme"]["mode"].lower())
u.save_settings(app_settings)
u.save_settings(app_settings) # Save the settings after check to ensure that everything is present if enabled.
u.adjust_exif_after_update()
window = OptimaLab35()
window.show()

View file

@ -1,42 +1,31 @@
import os
from datetime import datetime
from optima35.core import OptimaManager
from OptimaLab35 import __version__
from .const import (
APPLICATION_NAME,
CONFIG_BASE_PATH
)
from .ui import resources_rc
from .previewWindow import PreviewWindow
from .settingsWindow import SettingsWindow
from .utils.utility import Utilities
from .ui.main_window import Ui_MainWindow
from .ui.exif_handler_window import ExifEditor
from .ui.simple_dialog import SimpleDialog # Import the SimpleDialog class
from PySide6 import QtWidgets, QtCore
from PySide6 import QtCore, QtWidgets
from PySide6.QtCore import (
QRunnable,
QThreadPool,
Signal,
QDate,
QObject,
QRegularExpression,
QRunnable,
Qt,
QDate
QThreadPool,
Signal,
)
from PySide6.QtGui import QIcon, QRegularExpressionValidator
from PySide6.QtWidgets import QApplication, QFileDialog, QMainWindow, QMessageBox
from PySide6.QtWidgets import (
QMessageBox,
QApplication,
QMainWindow,
QFileDialog
)
from OptimaLab35 import __version__
from .const import APPLICATION_NAME, CONFIG_BASE_PATH
from .previewWindow import PreviewWindow
from .settingsWindow import SettingsWindow
from .ui import resources_rc
from .ui.exif_handler_window import ExifEditor
from .ui.main_window import Ui_MainWindow
from .ui.simple_dialog import SimpleDialog # Import the SimpleDialog class
from .utils.utility import Utilities
from PySide6.QtGui import QRegularExpressionValidator, QIcon
class OptimaLab35(QMainWindow, Ui_MainWindow):
def __init__(self):
@ -98,6 +87,7 @@ class OptimaLab35(QMainWindow, Ui_MainWindow):
self.ui.lat_lineEdit.setValidator(validator)
self.ui.long_lineEdit.setValidator(validator)
self.ui.dateEdit.setDate(QDate.currentDate())
# UI related function, changing parts, open, etc.
def open_preview_window(self):
self.preview_window = PreviewWindow()
@ -118,7 +108,7 @@ class OptimaLab35(QMainWindow, Ui_MainWindow):
def info_window(self):
info_text = f"""
<h3>{self.name} v{self.version}</h3>
<p>(C) 2024-2025 Mr Finchum aka CodeByMrFinchum</p>
<p>(C) 2024-2026 Mr Finchum aka CodeByMrFinchum</p>
<p>{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.</p>
<h4>Features:</h4>
@ -131,9 +121,10 @@ class OptimaLab35(QMainWindow, Ui_MainWindow):
<p>For more details, visit:</p>
<ul>
<li><a href="https://code.boxyfoxy.net/CodeByMrFinchum/OptimaLab35/src/branch/main/CHANGELOG.md">Changelog</a></li>
<li><a href="https://gitlab.com/CodeByMrFinchum/OptimaLab35">OptimaLab35 GitLab</a></li>
<li><a href="https://gitlab.com/CodeByMrFinchum/optima35">optima35 GitLab</a></li>
<li><a href="https://code.boxyfoxy.net/CodeByMrFinchum/OptimaLab35/wiki">Wiki</a></li>
<li><a href="https://code.boxyfoxy.net/CodeByMrFinchum/OptimaLab35/wiki/Changelog">Changelog</a></li>
<li><a href="https://code.boxyfoxy.net/CodeByMrFinchum/OptimaLab35">OptimaLab35 Forgejo</a></li>
<li><a href="https://code.boxyfoxy.net/CodeByMrFinchum/optima35">optima35 Forgejo</a></li>
</ul>
"""
@ -184,8 +175,12 @@ class OptimaLab35(QMainWindow, Ui_MainWindow):
filtered.append(stripped)
# ignore anything else
# Sort: NA first, then valid times ascending
return sorted(filtered, key=lambda x: (0, 0) if (x is None or str(x).strip().upper() in {"NA"})
else (1, self.parse_time(x)))
return sorted(
filtered,
key=lambda x: (0, 0)
if (x is None or str(x).strip().upper() in {"NA"})
else (1, self.parse_time(x)),
)
def sort_dict_of_lists(self, input_dict):
# Partily ChatGPT
@ -203,7 +198,9 @@ class OptimaLab35(QMainWindow, Ui_MainWindow):
elif all(isinstance(x, str) for x in lst):
sorted_dict[key] = sorted(
lst,
key=lambda x: (0, x.lower()) if str(x).lower() == "na" else (1, str(x).lower())
key=lambda x: (0, x.lower())
if str(x).lower() == "na"
else (1, str(x).lower()),
)
return sorted_dict
@ -279,7 +276,7 @@ class OptimaLab35(QMainWindow, Ui_MainWindow):
if folder:
self.ui.output_path.setText(folder)
def change_statusbar(self, msg, timeout = 500):
def change_statusbar(self, msg, timeout=500):
self.ui.statusBar.showMessage(msg, timeout)
# Core functions
@ -290,7 +287,9 @@ class OptimaLab35(QMainWindow, Ui_MainWindow):
def image_list_from_folder(self, path):
image_files = [
f for f in os.listdir(path) if f.lower().endswith((".png", ".jpg", ".jpeg", ".webp"))
f
for f in os.listdir(path)
if f.lower().endswith((".png", ".jpg", ".jpeg", ".webp"))
]
image_files.sort()
return image_files
@ -306,11 +305,17 @@ class OptimaLab35(QMainWindow, Ui_MainWindow):
if process == "image":
if not input_folder or not output_folder:
QMessageBox.warning(self, "Warning", "Input or output folder not selected")
QMessageBox.warning(
self, "Warning", "Input or output folder not selected"
)
return False
if not input_folder_valid or not output_folder_valid:
QMessageBox.warning(self, "Warning", f"Input location {input_folder_valid}\nOutput folder {output_folder_valid}...")
QMessageBox.warning(
self,
"Warning",
f"Input location {input_folder_valid}\nOutput folder {output_folder_valid}...",
)
return False
if len(self.image_list_from_folder(output_folder)) != 0:
@ -325,7 +330,6 @@ class OptimaLab35(QMainWindow, Ui_MainWindow):
return False
elif process == "exif":
if not input_folder:
QMessageBox.warning(self, "Warning", "Input not selected")
return False
@ -341,15 +345,19 @@ class OptimaLab35(QMainWindow, Ui_MainWindow):
if reply == QMessageBox.No:
return False
if not input_folder_valid :
QMessageBox.warning(self, "Warning", f"Input location {input_folder_valid}")
if not input_folder_valid:
QMessageBox.warning(
self, "Warning", f"Input location {input_folder_valid}"
)
return False
else:
print("Something went wrong")
if len(image_list) == 0:
QMessageBox.warning(self, "Warning", "Selected folder has no supported files.")
QMessageBox.warning(
self, "Warning", "Selected folder has no supported files."
)
return False
return True
@ -368,7 +376,9 @@ class OptimaLab35(QMainWindow, Ui_MainWindow):
image_list = self.image_list_from_folder(self.settings["input_folder"])
# Create a worker ChatGPT
worker = ImageProcessorRunnable(image_list, self.settings, self.handle_qprogressbar)
worker = ImageProcessorRunnable(
image_list, self.settings, self.handle_qprogressbar
)
worker.signals.finished.connect(self.on_processing_finished)
# Start worker in thread pool ChatGPT
self.thread_pool.start(worker)
@ -386,13 +396,13 @@ class OptimaLab35(QMainWindow, Ui_MainWindow):
i = 1
for image_file in image_files:
input_path = os.path.join(input_folder, image_file)
self.o.insert_exif_to_image(
exif_dict = self.settings["user_selected_exif"],
image_path = input_path,
gps = self.settings["gps"])
exif_dict=self.settings["user_selected_exif"],
image_path=input_path,
gps=self.settings["gps"],
)
self.change_statusbar(image_file, 100)
self.handle_qprogressbar(int((i / len(image_files)) * 100))
i += 1
@ -414,7 +424,11 @@ class OptimaLab35(QMainWindow, Ui_MainWindow):
image_list = self.image_list_from_folder(self.settings["input_folder"])
print(image_list)
if not self.control_ending(image_list):
QMessageBox.warning(self, "Warning", f"Error: one or more filenames do not end on a number.\nCan not adjust time")
QMessageBox.warning(
self,
"Warning",
f"Error: one or more filenames do not end on a number.\nCan not adjust time",
)
self.toggle_buttons(True)
return
@ -423,19 +437,19 @@ class OptimaLab35(QMainWindow, Ui_MainWindow):
self.toggle_buttons(True)
QMessageBox.information(self, "Information", "Finished")
def get_checkbox_value(self, checkbox, default = None):
def get_checkbox_value(self, checkbox, default=None):
"""Helper function to get the value of a checkbox or a default value."""
return checkbox.isChecked() if checkbox else default
def get_spinbox_value(self, spinbox, default = None):
def get_spinbox_value(self, spinbox, default=None):
"""Helper function to get the value of a spinbox and handle empty input."""
return int(spinbox.text()) if spinbox.text() else default
def get_combobox_value(self, combobox, default = None):
def get_combobox_value(self, combobox, default=None):
"""Helper function to get the value of a combobox."""
return combobox.currentIndex() + 1 if combobox.currentIndex() != -1 else default
def get_text_value(self, lineedit, default = None):
def get_text_value(self, lineedit, default=None):
"""Helper function to get the value of a text input field."""
return lineedit.text() if lineedit.text() else default
@ -463,12 +477,21 @@ class OptimaLab35(QMainWindow, Ui_MainWindow):
user_data["lens"] = self.ui.lens_comboBox.currentText()
user_data["iso"] = self.ui.iso_comboBox.currentText()
lab_info = self.add_laboratory_info()
user_data["image_description"] = f"{self.ui.image_description_comboBox.currentText()} {lab_info}"
user_data["image_description"] = (
f"{self.ui.image_description_comboBox.currentText()} {lab_info}"
)
user_data["artist"] = self.ui.artist_comboBox.currentText()
user_data["copyright_info"] = self.ui.copyright_info_comboBox.currentText()
user_data["software"] = f"{self.name} {self.version} with {self.o.name} {self.o.version}"
if int(self.ui.contrast_spinBox.text()) != 0 or int(self.ui.brightness_spinBox.text()) != 0:
user_data["user_comment"] = f"{self.ui.user_comment_comboBox.currentText()}, contrast: {self.ui.contrast_spinBox.text()}, brightness: {self.ui.brightness_spinBox.text()}"
user_data["software"] = (
f"{self.name} {self.version} with {self.o.name} {self.o.version}"
)
if (
int(self.ui.contrast_spinBox.text()) != 0
or int(self.ui.brightness_spinBox.text()) != 0
):
user_data["user_comment"] = (
f"{self.ui.user_comment_comboBox.currentText()}, contrast: {self.ui.contrast_spinBox.text()}, brightness: {self.ui.brightness_spinBox.text()}"
)
else:
user_data["user_comment"] = self.ui.user_comment_comboBox.currentText()
@ -476,13 +499,18 @@ class OptimaLab35(QMainWindow, Ui_MainWindow):
def get_selected_exif(self):
"""Collect selected EXIF data and handle date and GPS if necessary."""
selected_exif = self.collect_selected_exif() if self.ui.exif_checkbox.isChecked() else None
selected_exif = (
self.collect_selected_exif() if self.ui.exif_checkbox.isChecked() else None
)
if selected_exif:
if self.ui.add_date_checkBox.isChecked():
selected_exif["date_time_original"] = self.get_date()
if self.ui.gps_checkBox.isChecked():
try:
self.settings["gps"] = [float(self.ui.lat_lineEdit.text()), float(self.ui.long_lineEdit.text())]
self.settings["gps"] = [
float(self.ui.lat_lineEdit.text()),
float(self.ui.long_lineEdit.text()),
]
except ValueError as e:
self.settings["gps"] = "Wrong gps data"
else:
@ -502,22 +530,47 @@ class OptimaLab35(QMainWindow, Ui_MainWindow):
self.settings["output_folder"] = self.get_text_value(self.ui.output_path)
self.settings["file_format"] = self.ui.image_type.currentText()
# Quality
self.settings["jpg_quality"] = self.get_spinbox_value(self.ui.jpg_quality_spinBox)
self.settings["png_compression"] = self.get_spinbox_value(self.ui.png_quality_spinBox)
self.settings["resize"] = int(self.ui.resize_spinBox.text()) if self.ui.resize_spinBox.text() != "100" else None
self.settings["jpg_quality"] = self.get_spinbox_value(
self.ui.jpg_quality_spinBox
)
self.settings["png_compression"] = self.get_spinbox_value(
self.ui.png_quality_spinBox
)
self.settings["resize"] = (
int(self.ui.resize_spinBox.text())
if self.ui.resize_spinBox.text() != "100"
else None
)
self.settings["optimize"] = self.get_checkbox_value(self.ui.optimize_checkBox)
# Changes for image
self.settings["brightness"] = int(self.ui.brightness_spinBox.text()) if self.ui.brightness_spinBox.text() != "0" else None
self.settings["contrast"] = int(self.ui.contrast_spinBox.text()) if self.ui.contrast_spinBox.text() != "0" else None
self.settings["brightness"] = (
int(self.ui.brightness_spinBox.text())
if self.ui.brightness_spinBox.text() != "0"
else None
)
self.settings["contrast"] = (
int(self.ui.contrast_spinBox.text())
if self.ui.contrast_spinBox.text() != "0"
else None
)
self.settings["grayscale"] = self.get_checkbox_value(self.ui.grayscale_checkBox)
# Watermark
self.settings["font_size"] = self.get_combobox_value(self.ui.font_size_comboBox)
self.settings["watermark"] = self.get_text_value(self.ui.watermark_lineEdit)
# Naming
new_name = self.get_text_value(self.ui.filename, False) if self.ui.rename_checkbox.isChecked() else False
if isinstance(new_name, str): new_name = new_name.replace(" ", "_")
new_name = (
self.get_text_value(self.ui.filename, False)
if self.ui.rename_checkbox.isChecked()
else False
)
if isinstance(new_name, str):
new_name = new_name.replace(" ", "_")
self.settings["new_file_names"] = new_name
self.settings["invert_image_order"] = self.get_checkbox_value(self.ui.revert_checkbox) if new_name is not False else None
self.settings["invert_image_order"] = (
self.get_checkbox_value(self.ui.revert_checkbox)
if new_name is not False
else None
)
# Handle EXIF data selection
self.settings["copy_exif"] = self.get_checkbox_value(self.ui.exif_copy_checkBox)
self.settings["own_exif"] = self.get_checkbox_value(self.ui.exif_checkbox)
@ -549,11 +602,13 @@ class OptimaLab35(QMainWindow, Ui_MainWindow):
QApplication.closeAllWindows()
event.accept()
class WorkerSignals(QObject):
# ChatGPT
progress = Signal(int)
finished = Signal()
class ImageProcessorRunnable(QRunnable):
# ChatGPT gave rough function layout
def __init__(self, image_files, settings, progress_callback):
@ -572,27 +627,32 @@ class ImageProcessorRunnable(QRunnable):
for i, image_file in enumerate(self.image_files, start=1):
input_path = os.path.join(input_folder, image_file)
if self.settings["new_file_names"] != False:
image_name = self.u.append_number_to_name(self.settings["new_file_names"], i, len(self.image_files), self.settings["invert_image_order"])
image_name = self.u.append_number_to_name(
self.settings["new_file_names"],
i,
len(self.image_files),
self.settings["invert_image_order"],
)
else:
image_name = os.path.splitext(image_file)[0]
output_path = os.path.join(output_folder, image_name)
self.o.process_and_save_image(
image_input_file = input_path,
image_output_file = output_path,
file_type = self.settings["file_format"],
quality = self.settings["jpg_quality"],
compressing = self.settings["png_compression"],
optimize = self.settings["optimize"],
resize = self.settings["resize"],
watermark = self.settings["watermark"],
font_size = self.settings["font_size"],
grayscale = self.settings["grayscale"],
brightness = self.settings["brightness"],
contrast = self.settings["contrast"],
dict_for_exif = self.settings["user_selected_exif"],
gps = self.settings["gps"],
copy_exif = self.settings["copy_exif"]
image_input_file=input_path,
image_output_file=output_path,
file_type=self.settings["file_format"],
quality=self.settings["jpg_quality"],
compressing=self.settings["png_compression"],
optimize=self.settings["optimize"],
resize=self.settings["resize"],
watermark=self.settings["watermark"],
font_size=self.settings["font_size"],
grayscale=self.settings["grayscale"],
brightness=self.settings["brightness"],
contrast=self.settings["contrast"],
dict_for_exif=self.settings["user_selected_exif"],
gps=self.settings["gps"],
copy_exif=self.settings["copy_exif"],
)
self.signals.progress.emit(int((i / len(self.image_files)) * 100))

View file

@ -1,32 +1,20 @@
import sys
import os
import sys
from datetime import datetime
from PyPiUpdater import PyPiUpdater
from PySide6 import QtCore, QtWidgets
from PySide6.QtCore import QRegularExpression, Qt, QTimer
from PySide6.QtGui import QIcon
from PySide6.QtWidgets import QApplication, QMainWindow, QMessageBox
from OptimaLab35 import __version__
from .const import (
CONFIG_BASE_PATH
)
from .const import CONFIG_BASE_PATH
from .ui import resources_rc
from .utils.utility import Utilities
from .ui.settings_window import Ui_Settings_Window
from .utils.utility import Utilities
from PySide6 import QtWidgets, QtCore
from PySide6.QtCore import (
QRegularExpression,
Qt,
QTimer
)
from PySide6.QtWidgets import (
QMessageBox,
QApplication,
QMainWindow
)
from PySide6.QtGui import QIcon
class SettingsWindow(QMainWindow, Ui_Settings_Window):
# Mixture of code by me, code/functions refactored by ChatGPT and code directly from ChatGPT
@ -45,8 +33,12 @@ class SettingsWindow(QMainWindow, Ui_Settings_Window):
self.optimalab35_localversion = optimalab35_localversion
self.optima35_localversion = optima35_localversion
# Create PyPiUpdater instances
self.ppu_ol35 = PyPiUpdater("OptimaLab35", self.optimalab35_localversion, self.update_log_file)
self.ppu_o35 = PyPiUpdater("optima35", self.optima35_localversion, self.update_log_file)
self.ppu_ol35 = PyPiUpdater(
"OptimaLab35", self.optimalab35_localversion, self.update_log_file
)
self.ppu_o35 = PyPiUpdater(
"optima35", self.optima35_localversion, self.update_log_file
)
self.ol35_last_state = self.ppu_ol35.get_last_state()
self.o35_last_state = self.ppu_o35.get_last_state()
# Track which packages need an update
@ -68,7 +60,9 @@ class SettingsWindow(QMainWindow, Ui_Settings_Window):
# Connect buttons to functions
self.ui.check_for_update_Button.clicked.connect(self.check_for_updates)
self.ui.update_and_restart_Button.clicked.connect(self.update_and_restart)
self.ui.label_last_check.setText(f"Last check: {self.time_to_string(self.ol35_last_state[0])}")
self.ui.label_last_check.setText(
f"Last check: {self.time_to_string(self.ol35_last_state[0])}"
)
self.ui.dev_widget.setVisible(False)
# Timer for long press detection
@ -79,9 +73,11 @@ class SettingsWindow(QMainWindow, Ui_Settings_Window):
# Connect button press/release
self.ui.check_for_update_Button.pressed.connect(self.start_long_press)
self.ui.check_for_update_Button.released.connect(self.cancel_long_press)
self.ui.label_5.setText('<li><a href="https://code.boxyfoxy.net/CodeByMrFinchum/OptimaLab35/src/branch/main/CHANGELOG.md">Changelog</a></li>')
self.ui.label_5.setText(
'<li><a href="https://code.boxyfoxy.net/CodeByMrFinchum/OptimaLab35/wiki/Changelog">Changelog</a></li>'
)
self.ui.label_5.setOpenExternalLinks(True)
#settings related
# settings related
self.load_settings_into_ui()
self.ui.reset_exif_Button.clicked.connect(self.ask_reset_exif)
self.ui.save_and_close_Button.clicked.connect(self.save_and_close)
@ -92,7 +88,7 @@ class SettingsWindow(QMainWindow, Ui_Settings_Window):
self.ui.restart_checkBox.setChecked(False)
self.ui.restart_checkBox.setVisible(False)
# setting related
# setting related
def load_settings_into_ui(self):
"""Loads the settings into the UI elements."""
settings = self.app_settings
@ -101,7 +97,9 @@ class SettingsWindow(QMainWindow, Ui_Settings_Window):
pkg_available = settings["theme"]["theme_pkg"]
if pkg_available:
index = self.ui.theme_selection_comboBox.findText(theme_mode, QtCore.Qt.MatchFlag.MatchExactly)
index = self.ui.theme_selection_comboBox.findText(
theme_mode, QtCore.Qt.MatchFlag.MatchExactly
)
if index != -1:
self.ui.theme_selection_comboBox.setCurrentIndex(index)
self.ui.enable_theme_checkBox.setChecked(use_custom_theme)
@ -130,8 +128,12 @@ class SettingsWindow(QMainWindow, Ui_Settings_Window):
self.ui.install_pkg_Button.setText("Try again?")
def save_settings(self):
self.app_settings["theme"]["mode"] = self.ui.theme_selection_comboBox.currentText()
self.app_settings["theme"]["use_custom_theme"] = self.ui.enable_theme_checkBox.isChecked()
self.app_settings["theme"]["mode"] = (
self.ui.theme_selection_comboBox.currentText()
)
self.app_settings["theme"]["use_custom_theme"] = (
self.ui.enable_theme_checkBox.isChecked()
)
self.u.save_settings(self.app_settings)
def save_and_close(self):
@ -143,7 +145,9 @@ class SettingsWindow(QMainWindow, Ui_Settings_Window):
msg.setIcon(QMessageBox.Icon.Question)
msg.setWindowTitle("Confirm Reset")
msg.setText("Are you sure you want to restart the app?")
msg.setStandardButtons(QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No)
msg.setStandardButtons(
QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No
)
# Show the message box and wait for the user's response
response = msg.exec()
@ -162,7 +166,9 @@ class SettingsWindow(QMainWindow, Ui_Settings_Window):
msg.setIcon(QMessageBox.Icon.Question)
msg.setWindowTitle("Confirm Reset")
msg.setText("Are you sure you want to reset the EXIF options to default?")
msg.setStandardButtons(QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No)
msg.setStandardButtons(
QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No
)
# Show the message box and wait for the user's response
response = msg.exec()
@ -173,7 +179,7 @@ class SettingsWindow(QMainWindow, Ui_Settings_Window):
else:
pass # Do nothing if "No" is selected
# update related parts
# update related parts
def start_long_press(self):
"""Start the timer when button is pressed."""
# brave AI
@ -214,7 +220,9 @@ class SettingsWindow(QMainWindow, Ui_Settings_Window):
def local_update(self):
dist_folder = os.path.expanduser("~/.config/OptimaLab35/dist/")
packages_to_update = [pkg for pkg, update in self.updates_available.items() if update]
packages_to_update = [
pkg for pkg, update in self.updates_available.items() if update
]
if not packages_to_update:
QMessageBox.information(self, "Update", "No updates available.")
@ -243,7 +251,9 @@ class SettingsWindow(QMainWindow, Ui_Settings_Window):
elif package == "optima35":
pkg_info = self.ppu_o35.update_from_local(dist_folder)
update_results.append(f"{package}: {'Success' if pkg_info[0] else 'Failed'}\n{pkg_info[1]}")
update_results.append(
f"{package}: {'Success' if pkg_info[0] else 'Failed'}\n{pkg_info[1]}"
)
# Show summary of updates
# Show update completion message
@ -302,7 +312,9 @@ class SettingsWindow(QMainWindow, Ui_Settings_Window):
def update_and_restart(self):
"""Update selected packages and restart the application."""
packages_to_update = [pkg for pkg, update in self.updates_available.items() if update]
packages_to_update = [
pkg for pkg, update in self.updates_available.items() if update
]
if not packages_to_update:
QMessageBox.information(self, "Update", "No updates available.")
@ -331,7 +343,9 @@ class SettingsWindow(QMainWindow, Ui_Settings_Window):
elif package == "optima35":
pkg_info = self.ppu_o35.update_package()
update_results.append(f"{package}: {'Success' if pkg_info[0] else 'Failed'}\n{pkg_info[1]}")
update_results.append(
f"{package}: {'Success' if pkg_info[0] else 'Failed'}\n{pkg_info[1]}"
)
# Show summary of updates
# Show update completion message

View file

@ -47,6 +47,23 @@ class Utilities:
if not self.write_yaml(self.settings_path, settings):
print("Error writing file")
def adjust_exif_after_update(self):
"""Adds new info the exif file after an update if needed"""
new_lst = ["developer", "time"] # for update from 1.5 to 1.6
current_lst = []
exif = self.read_yaml(self.exif_path)
for key in exif:
current_lst.append(key)
if all(item in current_lst for item in new_lst):
return
else:
print("Adding new exif data after update from 1.5")
exif["time"] = ["NA", "7:30", "10:00"]
exif["developer"] = ["NA", "Kodac HC-110 1:31", "Kodac HC-110 1:63"]
self.write_yaml(self.exif_path, exif)
def default_exif(self):
"""Makes a default exif file."""
print("Making default")
@ -89,6 +106,15 @@ class Utilities:
"user_comment": [
"Scanner: NORITSU-KOKI",
"Scanner: NA"
],
"developer": [
"Kodak HC-110 1:31",
"Kodak HC-110 1:63"
],
"time": [
"NA",
"7:00",
"10:00"
]
}
self.write_yaml(self.exif_path, def_exif)

View file

@ -8,7 +8,7 @@ dynamic = ["version"]
authors = [{ name = "Mr Finchum" }]
description = "User interface for optima35."
readme = "../pip_README.md"
requires-python = ">=3.8, <4.0"
requires-python = ">=3.9, <3.14"
dependencies = [
"optima35>=1.0.0, <2.0.0",
"PyPiUpdater>=0.7.2, <1.0.0",