shinestacker 1.5.4__tar.gz → 1.6.1__tar.gz

{shinestacker-1.5.4 → shinestacker-1.6.1}/.github/workflows/release.yml

@@ -29,6 +29,10 @@ jobs:
         with:
           python-version: "3.12"
 
+      - name: Install Inno Setup
+        if: runner.os == 'Windows'
+        run: choco install innosetup -y --no-progress --accept-license
+
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
@@ -40,12 +44,14 @@ jobs:
         run: |
           python build_release.py
 
-      - name: Upload artifact
+      - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           name: shinestacker-${{ matrix.os }}
           path: |
             ${{ matrix.os == 'windows-latest' && 'dist/shinestacker-release.zip' || 'dist/shinestacker-release.tar.gz' }}
+            ${{ matrix.os == 'windows-latest' && 'dist/*.exe' || '' }}
+          if-no-files-found: ignore
   create-release:
     needs: publish-release
     runs-on: ubuntu-latest
@@ -61,6 +67,9 @@ jobs:
           cp artifacts/shinestacker-ubuntu-latest/shinestacker-release.tar.gz release_assets/shinestacker-ubuntu.tar.gz
           cp artifacts/shinestacker-macos-latest/shinestacker-release.tar.gz release_assets/shinestacker-macos.tar.gz
           cp artifacts/shinestacker-windows-latest/shinestacker-release.zip release_assets/shinestacker-windows.zip
+          if ls artifacts/shinestacker-windows-latest/shinestacker-setup.exe 1> /dev/null 2>&1; then
+            cp artifacts/shinestacker-windows-latest/shinestacker-setup.exe release_assets/
+          fi
           ls -la release_assets/
 
       - name: Create release
@@ -71,3 +80,4 @@ jobs:
             release_assets/shinestacker-ubuntu.tar.gz
             release_assets/shinestacker-macos.tar.gz
             release_assets/shinestacker-windows.zip
+            release_assets/shinestacker-setup.exe

{shinestacker-1.5.4 → shinestacker-1.6.1}/CHANGELOG.md

@@ -2,6 +2,40 @@
 
 This page reports the main releases only and the main changes therein.
 
+## [v1.6.1] - 2025-10-01
+** Unreleased updates **
+
+### Changed
+- improved display update performance by refreshing only the painted area
+- multiple frame import now runs in a separate thread, avoiding UI freezes
+- reduced dependencies and code refactored for more robust architecture
+- added windows installer
+- dropped examples and test images reduces distribution file size
+
+-----
+
+## [v1.6.0] -  2025-09-27
+**Few more features and several fixes**
+
+### Added
+- persistent settings dialog to configure app startup options
+- command-line option ```-n``` to prevent opening the "new project" dialog
+- zoom factor display in the status bar
+
+### Fixed
+- ghost brush gradient no longer appears at cursor transitions
+- action and job names are now correctly set in the input dialog
+- image centering fixed in viewport for double-view modes
+- frame highlight works correctly when clicking on a thumbnail
+- exif data is now correctly inserted into stacked output files
+- bug in the retouch undo has been fixed
+
+### Changed
+- cursor updates are now throttled (~60 fps) to improve responsiveness
+- new projects created via dialog save exif data by default
+
+----
+
 ## [v1.5.4] - 2025-09-23
 **Bug fixes**
 

{shinestacker-1.5.4/src/shinestacker.egg-info → shinestacker-1.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shinestacker
-Version: 1.5.4
+Version: 1.6.1
 Summary: ShineStacker
 Author-email: Luca Lista <luka.lista@gmail.com>
 License-Expression: LGPL-3.0

shinestacker-1.6.1/scripts/build_release.py

@@ -0,0 +1,112 @@
+import os
+import shutil
+import tarfile
+import subprocess
+from pathlib import Path
+import platform
+
+#
+# assume the scripts runs under its directory, "scripts", as defined in release.yml
+#
+os.chdir("../")
+project_root = Path(__file__).resolve().parent.parent
+dist_dir = project_root / "dist"
+project_name = "shinestacker"
+app_name = "shinestacker"
+package_dir = "shinestacker"
+
+sys_name = platform.system().lower()
+
+hooks_dir = "scripts/hooks"
+
+print("=== USING HOOKS ===")
+hook_files = list(Path(hooks_dir).glob("hook-*.py"))
+for hook in hook_files:
+    print(f"  - {hook.name}")
+
+pyinstaller_cmd = [
+    "pyinstaller", "--onedir", f"--name={app_name}", "--paths=src",
+    f"--distpath=dist/{package_dir}", f"--collect-all={project_name}",
+    "--collect-data=imagecodecs", "--collect-submodules=imagecodecs",
+    "--copy-metadata=imagecodecs", f"--additional-hooks-dir={hooks_dir}"
+]
+if sys_name == 'darwin':
+    pyinstaller_cmd += ["--windowed", "--icon=src/shinestacker/gui/ico/shinestacker.icns"]
+elif sys_name == 'windows':
+    pyinstaller_cmd += ["--windowed", "--icon=src/shinestacker/gui/ico/shinestacker.ico"]
+pyinstaller_cmd += ["src/shinestacker/app/main.py"]
+
+print(" ".join(pyinstaller_cmd))
+subprocess.run(pyinstaller_cmd, check=True)
+
+# examples_dir = project_root / "examples"
+# target_examples = dist_dir / package_dir / "examples"
+# target_examples.mkdir(exist_ok=True)
+# for project_file in ["complete-project.fsp", "stack-from-frames.fsp"]:
+#     shutil.copy(examples_dir / project_file, target_examples)
+#    shutil.copytree(examples_dir / 'input', target_examples / 'input', dirs_exist_ok=True)
+
+if sys_name == 'windows':
+    shutil.make_archive(
+        base_name=str(dist_dir / "shinestacker-release"),
+        format="zip",
+        root_dir=dist_dir,
+        base_dir=package_dir
+    )
+else:
+    archive_path = dist_dir / "shinestacker-release.tar.gz"
+    with tarfile.open(archive_path, "w:gz") as tar:
+        tar.add(
+            dist_dir / package_dir,
+            arcname=package_dir,
+            recursive=True,
+            filter=lambda info: info
+        )
+
+if sys_name == 'windows':
+    print("=== CREATING WINDOWS INSTALLER ===")
+    inno_paths = [
+        r"C:\Program Files (x86)\Inno Setup 6\ISCC.exe",
+        r"C:\Program Files (x86)\Inno Setup 5\ISCC.exe",
+        r"C:\Program Files\Inno Setup 6\ISCC.exe",
+        r"C:\Program Files\Inno Setup 5\ISCC.exe"
+    ]
+    iscc_exe = None
+    for path in inno_paths:
+        if os.path.exists(path):
+            iscc_exe = path
+            print(f"Found Inno Setup at: {path}")
+            break
+    if not iscc_exe:
+        print("Inno Setup not found in standard locations. Checking for Chocolatey...")
+        try:
+            subprocess.run(["choco", "--version"], check=True, capture_output=True)
+            print("Installing Inno Setup via Chocolatey...")
+            subprocess.run(["choco", "install", "innosetup", "-y", "--no-progress", "--accept-license"], check=True)
+            for path in inno_paths:
+                if os.path.exists(path):
+                    iscc_exe = path
+                    print(f"Found Inno Setup at: {path}")
+                    break
+        except (subprocess.CalledProcessError, FileNotFoundError):
+            print("Chocolatey not available or installation failed.")
+    if iscc_exe:
+        iss_script_source = project_root / "scripts" / "shinestacker-inno-setup.iss"
+        iss_script_temp = project_root / "shinestacker-inno-setup.iss"
+        if iss_script_source.exists():
+            print(f"Copying ISS script to project root: {iss_script_temp}")
+            shutil.copy2(iss_script_source, iss_script_temp)
+            print(f"Compiling installer with: {iscc_exe}")
+            subprocess.run([iscc_exe, str(iss_script_temp)], check=True)            
+            print("Removing temporary ISS script")
+            iss_script_temp.unlink()            
+            if dist_dir.exists():
+                installer_files = list(dist_dir.glob("*.exe"))
+                if installer_files:
+                    print(f"Installer created: {installer_files[0].name}")
+        else:
+            print(f"ISS script not found at: {iss_script_source}")
+    else:
+        print("WARNING: Could not find or install Inno Setup. Skipping installer creation.")
+        print("You can manually install Inno Setup from: https://jrsoftware.org/isdl.php")
+        print("Or install Chocolatey and run: choco install innosetup -y")

shinestacker-1.6.1/scripts/hooks/hook-IPython.py

@@ -0,0 +1,10 @@
+excludedimports = [
+    'IPython',
+    'ipywidgets',
+    'jedi',
+    'parso',
+    'prompt_toolkit',
+    'tornado',
+    'zmq',
+    'nbformat',
+]

shinestacker-1.6.1/scripts/hooks/hook-PySide6.py

@@ -0,0 +1,53 @@
+excludedimports = [
+    # Keep only these 5 modules actually used:
+    # PySide6.QtCore
+    # PySide6.QtGui  
+    # PySide6.QtPdf
+    # PySide6.QtPdfWidgets
+    # PySide6.QtWidgets
+    
+    # Exclude everything else:
+    'PySide6.Qt3DAnimation',
+    'PySide6.Qt3DCore',
+    'PySide6.Qt3DExtras', 
+    'PySide6.Qt3DInput',
+    'PySide6.Qt3DLogic',
+    'PySide6.Qt3DRender',
+    'PySide6.QtBluetooth',
+    'PySide6.QtCharts',
+    'PySide6.QtConcurrent',
+    'PySide6.QtDataVisualization',
+    'PySide6.QtDBus',
+    'PySide6.QtDesigner',
+    'PySide6.QtGamepad',
+    'PySide6.QtHelp',
+    'PySide6.QtLocation',
+    'PySide6.QtMultimedia',
+    'PySide6.QtMultimediaWidgets',
+    'PySide6.QtNetwork',
+    'PySide6.QtNfc',
+    'PySide6.QtOpenGL',
+    'PySide6.QtOpenGLWidgets',
+    'PySide6.QtPositioning',
+    'PySide6.QtPrintSupport',
+    'PySide6.QtQml',
+    'PySide6.QtQuick',
+    'PySide6.QtQuick3D',
+    'PySide6.QtQuickWidgets',
+    'PySide6.QtRemoteObjects',
+    'PySide6.QtScxml',
+    'PySide6.QtSensors',
+    'PySide6.QtSerialPort',
+    'PySide6.QtSql',
+    'PySide6.QtSvg',
+    'PySide6.QtTest',
+    'PySide6.QtTextToSpeech',
+    'PySide6.QtUiTools',
+    'PySide6.QtWebChannel',
+    'PySide6.QtWebEngine',
+    'PySide6.QtWebEngineCore',
+    'PySide6.QtWebEngineWidgets',
+    'PySide6.QtWebSockets',
+    'PySide6.QtXml',
+    'PySide6.QtXmlPatterns',
+]

shinestacker-1.6.1/scripts/hooks/hook-opencv.py

@@ -0,0 +1,24 @@
+excludedimports = [
+    'cv2.videoio',
+    'cv2.videostab',
+    'cv2.face', 
+    'cv2.bgsegm',
+    'cv2.optflow',
+    'cv2.saliency',
+    'cv2.text',
+    'cv2.tracking',
+    'cv2.mcc',
+    'cv2.rapid',
+    'cv2.stereo',
+    'cv2.dnn',
+    'cv2.freetype',
+    'cv2.hdf',
+    'cv2.img_hash',
+    'cv2.line_descriptor',
+    'cv2.reg',
+    'cv2.rgbd',
+    'cv2.surface_matching',
+    'cv2.xfeatures2d',
+    'cv2.ximgproc',
+    'cv2.xphoto',
+]

shinestacker-1.6.1/scripts/hooks/hook-tests.py

@@ -0,0 +1,7 @@
+excludedimports = [
+    'matplotlib.tests',
+    'numpy.random._examples', 
+    'scipy.tests',
+    'PIL.tests',
+    'jsonpickle.tests',
+]

shinestacker-1.6.1/scripts/scan_imports.py

@@ -0,0 +1,47 @@
+import ast
+from pathlib import Path
+
+def scan_imports():
+    project_root = Path("../src/shinestacker")
+    imports = {
+        'PySide6': set(),
+        'scipy': set(),
+        'matplotlib': set(),
+        'cv2': set(),
+        'numpy': set(),
+        'PIL': set()
+    }
+    
+    for py_file in project_root.rglob("*.py"):
+        with open(py_file, 'r', encoding='utf-8') as f:
+            try:
+                tree = ast.parse(f.read())
+            except:
+                continue
+        
+        for node in ast.walk(tree):
+            if isinstance(node, ast.Import):
+                for alias in node.names:
+                    for lib in imports.keys():
+                        if lib in alias.name:
+                            imports[lib].add(alias.name)            
+            elif isinstance(node, ast.ImportFrom):
+                if node.module:
+                    for lib in imports.keys():
+                        if lib in node.module:
+                            imports[lib].add(node.module)
+                            if node.names:
+                                for alias in node.names:
+                                    imports[lib].add(f"{node.module}.{alias.name}")
+    return imports
+
+def print_imports(imports):
+    for lib, modules in imports.items():
+        if modules:
+            print(f"\n=== {lib.upper()} IMPORTS ===")
+            for imp in sorted(modules):
+                print(f"  {imp}")
+
+if __name__ == "__main__":
+    found_imports = scan_imports()
+    print_imports(found_imports)

shinestacker-1.6.1/scripts/shinestacker-inno-setup.iss

@@ -0,0 +1,68 @@
+#define MyAppName "ShineStacker"
+#define MyAppVersion "1.6.1"
+#define MyAppPublisher "Luca Lista"
+#define MyAppURL "https://shinestacker.wordpress.com/"
+#define MyAppExeName "shinestacker.exe"
+#define MyAppAssocName MyAppName + " focus stacking project"
+#define MyAppAssocExt ".fsp"
+#define MyAppAssocKey StringChange(MyAppAssocName, " ", "") + MyAppAssocExt
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{A2B55EAF-932F-4D5A-8D80-B7DF79D5AE7B}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={autopf}\{#MyAppName}
+UninstallDisplayIcon={app}\{#MyAppExeName}
+; "ArchitecturesAllowed=x64compatible" specifies that Setup cannot run
+; on anything but x64 and Windows 11 on Arm.
+ArchitecturesAllowed=x64compatible
+; "ArchitecturesInstallIn64BitMode=x64compatible" requests that the
+; install be done in "64-bit mode" on x64 or Windows 11 on Arm,
+; meaning it should use the native 64-bit Program Files directory and
+; the 64-bit view of the registry.
+ArchitecturesInstallIn64BitMode=x64compatible
+ChangesAssociations=yes
+DisableProgramGroupPage=yes
+LicenseFile=.\LICENSE
+; Uncomment the following line to run in non administrative install mode (install for current user only).
+;PrivilegesRequired=lowest
+OutputBaseFilename=shinestacker-setup
+OutputDir=.\dist
+VersionInfoVersion={#MyAppVersion}
+VersionInfoCompany={#MyAppPublisher}
+SetupIconFile=.\src\shinestacker\gui\ico\shinestacker.ico
+SolidCompression=yes
+WizardStyle=modern
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+; Copy the entire shinestacker folder structure that contains both the exe and _internal
+Source: ".\dist\shinestacker\shinestacker\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: ".\examples\*"; DestDir: "{app}\examples"; Flags: ignoreversion recursesubdirs
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Registry]
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocExt}\OpenWithProgids"; ValueType: string; ValueName: "{#MyAppAssocKey}"; ValueData: ""; Flags: uninsdeletevalue
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}"; ValueType: string; ValueName: ""; ValueData: "{#MyAppAssocName}"; Flags: uninsdeletekey
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#MyAppExeName},0"
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""
+
+[Icons]
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+

shinestacker-1.6.1/shinestacker-inno-setup.iss

@@ -0,0 +1,68 @@
+#define MyAppName "ShineStacker"
+#define MyAppVersion "1.6.1"
+#define MyAppPublisher "Luca Lista"
+#define MyAppURL "https://shinestacker.wordpress.com/"
+#define MyAppExeName "shinestacker.exe"
+#define MyAppAssocName MyAppName + " focus stacking project"
+#define MyAppAssocExt ".fsp"
+#define MyAppAssocKey StringChange(MyAppAssocName, " ", "") + MyAppAssocExt
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{A2B55EAF-932F-4D5A-8D80-B7DF79D5AE7B}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={autopf}\{#MyAppName}
+UninstallDisplayIcon={app}\{#MyAppExeName}
+; "ArchitecturesAllowed=x64compatible" specifies that Setup cannot run
+; on anything but x64 and Windows 11 on Arm.
+ArchitecturesAllowed=x64compatible
+; "ArchitecturesInstallIn64BitMode=x64compatible" requests that the
+; install be done in "64-bit mode" on x64 or Windows 11 on Arm,
+; meaning it should use the native 64-bit Program Files directory and
+; the 64-bit view of the registry.
+ArchitecturesInstallIn64BitMode=x64compatible
+ChangesAssociations=yes
+DisableProgramGroupPage=yes
+LicenseFile=.\LICENSE
+; Uncomment the following line to run in non administrative install mode (install for current user only).
+;PrivilegesRequired=lowest
+OutputBaseFilename=shinestacker-setup
+OutputDir=.\dist
+VersionInfoVersion={#MyAppVersion}
+VersionInfoCompany={#MyAppPublisher}
+SetupIconFile=.\src\shinestacker\gui\ico\shinestacker.ico
+SolidCompression=yes
+WizardStyle=modern
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+; Copy the entire shinestacker folder structure that contains both the exe and _internal
+Source: ".\dist\shinestacker\shinestacker\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: ".\examples\*"; DestDir: "{app}\examples"; Flags: ignoreversion recursesubdirs
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Registry]
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocExt}\OpenWithProgids"; ValueType: string; ValueName: "{#MyAppAssocKey}"; ValueData: ""; Flags: uninsdeletevalue
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}"; ValueType: string; ValueName: ""; ValueData: "{#MyAppAssocName}"; Flags: uninsdeletekey
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#MyAppExeName},0"
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""
+
+[Icons]
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+

shinestacker-1.6.1/src/shinestacker/_version.py

@@ -0,0 +1 @@
+__version__ = '1.6.1'

{shinestacker-1.5.4 → shinestacker-1.6.1}/src/shinestacker/algorithms/multilayer.py

@@ -174,7 +174,7 @@ class MultiLayer(TaskBase, ImageSequenceManager):
         if self.exif_path == '':
             self.exif_path = job.action_path(0)
         if self.exif_path != '':
-            self.exif_path = self.working_path + "/" + self.exif_path
+            self.exif_path = os.path.join(self.working_path, self.exif_path)
 
     def run_core(self):
         if isinstance(self.input_full_path(), str):

{shinestacker-1.5.4 → shinestacker-1.6.1}/src/shinestacker/algorithms/stack.py

@@ -1,6 +1,6 @@
 # pylint: disable=C0114, C0115, C0116, R0913, R0917
 import os
-import numpy as np
+import traceback
 from .. config.constants import constants
 from .. core.framework import TaskBase
 from .. core.colors import color_str
@@ -34,13 +34,19 @@ class FocusStackBase(TaskBase, ImageSequenceManager):
             self.sub_message_r(': denoise image')
             stacked_img = denoise(stacked_img, self.denoise_amount, self.denoise_amount)
         write_img(out_filename, stacked_img)
-        if self.exif_path != '' and stacked_img.dtype == np.uint8:
-            self.sub_message_r(': copy exif data')
-            _dirpath, _, fnames = next(os.walk(self.exif_path))
-            fnames = [name for name in fnames if extension_tif_jpg(name)]
-            exif_filename = f"{self.exif_path}/{fnames[0]}"
-            copy_exif_from_file_to_file(exif_filename, out_filename)
-            self.sub_message_r(' ' * 60)
+        if self.exif_path != '':
+            self.sub_message_r(color_str(': copy exif data', constants.LOG_COLOR_LEVEL_3))
+            if not os.path.exists(self.exif_path):
+                raise RuntimeError(f"Path {self.exif_path} does not exist.")
+            try:
+                _dirpath, _, fnames = next(os.walk(self.exif_path))
+                fnames = [name for name in fnames if extension_tif_jpg(name)]
+                exif_filename = os.path.join(self.exif_path, fnames[0])
+                copy_exif_from_file_to_file(exif_filename, out_filename)
+                self.sub_message_r(' ' * 60)
+            except Exception as e:
+                traceback.print_tb(e.__traceback__)
+                raise RuntimeError("Can't copy EXIF data") from e
         if self.plot_stack:
             idx_str = f"{self.frame_count + 1:04d}" if self.frame_count >= 0 else ''
             name = f"{self.name}: {self.stack_algo.name()}"
@@ -51,11 +57,13 @@ class FocusStackBase(TaskBase, ImageSequenceManager):
             self.frame_count += 1
 
     def init(self, job, working_path=''):
+        if working_path == '':
+            working_path = job.working_path
         ImageSequenceManager.init(self, job)
         if self.exif_path is None:
             self.exif_path = job.action_path(0)
         if self.exif_path != '':
-            self.exif_path = working_path + "/" + self.exif_path
+            self.exif_path = os.path.join(working_path, self.exif_path)
 
 
 def get_bunches(collection, n_frames, n_overlap):

{shinestacker-1.5.4 → shinestacker-1.6.1}/src/shinestacker/app/args_parser_opts.py

@@ -3,6 +3,10 @@
 def add_project_arguments(parser):
     parser.add_argument('-x', '--expert', action='store_true', help='''
 expert options are visible by default.
+''')
+    parser.add_argument('-n', '--no-new-project', dest='new-project',
+                        action='store_false', default=True, help='''
+Do not open new project dialog at startup (default: open).
 ''')
 
 

{shinestacker-1.5.4 → shinestacker-1.6.1}/src/shinestacker/app/gui_utils.py

@@ -1,4 +1,4 @@
-# pylint: disable=C0114, C0116, E0611
+# pylint: disable=C0114, C0116, E0611, R0913, R0917
 import os
 import sys
 from PySide6.QtCore import QCoreApplication, QProcess
@@ -6,6 +6,7 @@ from PySide6.QtGui import QAction
 from shinestacker.config.constants import constants
 from shinestacker.config.config import config
 from shinestacker.app.about_dialog import show_about_dialog
+from shinestacker.app.settings_dialog import show_settings_dialog
 
 
 def disable_macos_special_menu_items():
@@ -40,11 +41,18 @@ def disable_macos_special_menu_items():
         QProcess.startDetached("pkill", ["-u", user, "-f", "SystemUIServer"])
 
 
-def fill_app_menu(app, app_menu):
+def fill_app_menu(app, app_menu, project_settings, retouch_settings,
+                  handle_project_config, handle_retouch_config):
     about_action = QAction(f"About {constants.APP_STRING}", app)
     about_action.triggered.connect(lambda: show_about_dialog(app))
     app_menu.addAction(about_action)
     app_menu.addSeparator()
+    settings_action = QAction("Settings", app)
+    settings_action.triggered.connect(lambda: show_settings_dialog(
+        app, project_settings, retouch_settings,
+        handle_project_config, handle_retouch_config))
+    app_menu.addAction(settings_action)
+    app_menu.addSeparator()
     if config.DONT_USE_NATIVE_MENU:
         quit_txt, quit_short = "&Quit", "Ctrl+Q"
     else:

{shinestacker-1.5.4 → shinestacker-1.6.1}/src/shinestacker/app/main.py

@@ -13,6 +13,7 @@ from PySide6.QtCore import Qt, QEvent, QTimer, Signal
 from shinestacker.config.config import config
 config.init(DISABLE_TQDM=True, COMBINED_APP=True, DONT_USE_NATIVE_MENU=True)
 from shinestacker.config.constants import constants
+from shinestacker.config.settings import StdPathFile
 from shinestacker.core.logging import setup_logging
 from shinestacker.gui.main_window import MainWindow
 from shinestacker.retouch.image_editor_ui import ImageEditorUI
@@ -140,7 +141,9 @@ class MainApp(QMainWindow):
         app_menu.addAction(self.switch_to_project_action)
         app_menu.addAction(self.switch_to_retouch_action)
         app_menu.addSeparator()
-        fill_app_menu(self, app_menu)
+        fill_app_menu(self, app_menu, True, True,
+                      self.project_window.handle_config,
+                      self.retouch_window.handle_config)
         return app_menu
 
     def quit(self):
@@ -227,7 +230,8 @@ open retouch window at startup instead of project windows.
     if filename and path:
         print("can't specify both arguments --filename and --path", file=sys.stderr)
         sys.exit(1)
-    setup_logging(console_level=logging.DEBUG, file_level=logging.DEBUG, disable_console=True)
+    setup_logging(console_level=logging.DEBUG, file_level=logging.DEBUG, disable_console=True,
+                  log_file=StdPathFile('shinestacker.log').get_file_path())
     app = Application(sys.argv)
     if config.DONT_USE_NATIVE_MENU:
         app.setAttribute(Qt.AA_DontUseNativeMenuBar)
@@ -264,7 +268,8 @@ open retouch window at startup instead of project windows.
             main_app.switch_to_retouch()
         else:
             main_app.switch_to_project()
-            QTimer.singleShot(100, main_app.project_window.project_controller.new_project)
+            if args['new-project']:
+                QTimer.singleShot(100, main_app.project_window.project_controller.new_project)
     QTimer.singleShot(100, main_app.setFocus)
     sys.exit(app.exec())