shinestacker 1.9.0__py3-none-any.whl → 1.9.2__py3-none-any.whl

shinestacker/algorithms/stack.py

@@ -1,4 +1,4 @@
-# pylint: disable=C0114, C0115, C0116, R0913, R0917
+# pylint: disable=C0114, C0115, C0116, R0913, R0917, W0718
 import os
 import traceback
 import logging
@@ -82,6 +82,10 @@ class FocusStackBase(TaskBase, ImageSequenceManager):
 
 
 def get_bunches(collection, n_frames, n_overlap):
+    if n_frames == n_overlap:
+        raise RuntimeError(
+            f"Can't get bunch collection, total number of frames ({n_frames}) "
+            "is equal to the number of overlapping grames")
     bunches = [collection[x:x + n_frames]
                for x in range(0, len(collection) - n_overlap, n_frames - n_overlap)]
     return bunches
@@ -109,7 +113,7 @@ class FocusStackBunch(SequentialTask, FocusStackBase):
 
     def begin(self):
         SequentialTask.begin(self)
-        self._chunks = get_bunches(self.input_filepaths(), self.frames, self.overlap)
+        self._chunks = get_bunches(sorted(self.input_filepaths()), self.frames, self.overlap)
         self.set_counts(len(self._chunks))
 
     def end(self):
@@ -122,9 +126,9 @@ class FocusStackBunch(SequentialTask, FocusStackBase):
         self.print_message(
             color_str(f"fusing bunch: {action_count + 1}/{self.total_action_counts}",
                       constants.LOG_COLOR_LEVEL_2))
-        img_files = self._chunks[action_count - 1]
+        img_files = self._chunks[action_count]
         self.stack_algo.init(img_files)
-        self.focus_stack(self._chunks[action_count - 1])
+        self.focus_stack(self._chunks[action_count])
         return True
 
 

shinestacker/app/main.py

@@ -199,7 +199,7 @@ class MainApp(QMainWindow):
 class Application(QApplication):
     def event(self, event):
         if event.type() == QEvent.Quit and event.spontaneous():
-            if not self.quit():
+            if not self.main_app.quit():
                 return True
         return super().event(event)
 

shinestacker/gui/action_config_dialog.py

@@ -372,10 +372,6 @@ class FocusStackBunchConfigurator(FocusStackBaseConfigurator):
         self.add_field_to_layout(
             self.general_tab_layout, 'overlap', FIELD_INT, 'Overlapping frames', required=False,
             default=constants.DEFAULT_OVERLAP, min_val=0, max_val=100)
-        self.add_field_to_layout(
-            self.general_tab_layout, 'scratch_output_dir', FIELD_BOOL,
-            'Scratch output folder before run',
-            required=False, default=True)
         self.add_field_to_layout(
             self.general_tab_layout, 'delete_output_at_end', FIELD_BOOL,
             'Delete output at end of job',

shinestacker/gui/config_dialog.py

@@ -12,6 +12,7 @@ class ConfigDialog(QDialog):
         self.form_layout = create_form_layout(self)
         scroll_area = QScrollArea()
         scroll_area.setWidgetResizable(True)
+        scroll_area.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
         container_widget = QWidget()
         self.container_layout = QFormLayout(container_widget)
         self.container_layout.setFieldGrowthPolicy(QFormLayout.AllNonFixedFieldsGrow)
@@ -19,19 +20,19 @@ class ConfigDialog(QDialog):
         self.container_layout.setFormAlignment(Qt.AlignLeft | Qt.AlignTop)
         self.container_layout.setLabelAlignment(Qt.AlignLeft)
         scroll_area.setWidget(container_widget)
-        button_box = QHBoxLayout()
+        self.button_box = QHBoxLayout()
         self.ok_button = QPushButton("OK")
         self.ok_button.setFocus()
         self.cancel_button = QPushButton("Cancel")
         self.reset_button = QPushButton("Reset")
-        button_box.addWidget(self.ok_button)
-        button_box.addWidget(self.cancel_button)
-        button_box.addWidget(self.reset_button)
+        self.button_box.addWidget(self.ok_button)
+        self.button_box.addWidget(self.cancel_button)
+        self.button_box.addWidget(self.reset_button)
         self.reset_button.clicked.connect(self.reset_to_defaults)
         self.ok_button.clicked.connect(self.accept)
         self.cancel_button.clicked.connect(self.reject)
         self.form_layout.addRow(scroll_area)
-        self.form_layout.addRow(button_box)
+        self.form_layout.addRow(self.button_box)
         QTimer.singleShot(0, self.adjust_dialog_size)
         self.create_form_content()
 

shinestacker/gui/main_window.py

@@ -318,6 +318,12 @@ class MainWindow(QMainWindow, LogManager):
             edit_config_action.triggered.connect(self.edit_current_action)
             menu.addAction(edit_config_action)
             menu.addSeparator()
+            menu.addAction(self.menu_manager.cut_action)
+            menu.addAction(self.menu_manager.copy_action)
+            menu.addAction(self.menu_manager.paste_action)
+            menu.addAction(self.menu_manager.duplicate_action)
+            menu.addAction(self.menu_manager.delete_element_action)
+            menu.addSeparator()
             menu.addAction(self.menu_manager.run_job_action)
             menu.addAction(self.menu_manager.run_all_jobs_action)
             menu.addSeparator()

shinestacker/gui/menu_manager.py

@@ -123,8 +123,14 @@ class MenuManager(QObject):
         self.undo_action = self.action("&Undo")
         self.undo_action.setEnabled(False)
         menu.addAction(self.undo_action)
-        for name in ["&Cut", "Cop&y", "&Paste", "Duplicate"]:
-            menu.addAction(self.action(name, requires_file=True))
+        self.cut_action = self.action("&Cut", requires_file=True)
+        menu.addAction(self.cut_action)
+        self.copy_action = self.action("Cop&y", requires_file=True)
+        menu.addAction(self.copy_action)
+        self.paste_action = self.action("&Paste", requires_file=True)
+        menu.addAction(self.paste_action)
+        self.duplicate_action = self.action("Duplicate", requires_file=True)
+        menu.addAction(self.duplicate_action)
         self.delete_element_action = self.action("Delete", requires_file=True)
         self.delete_element_action.setEnabled(False)
         menu.addAction(self.delete_element_action)

shinestacker/retouch/brush_tool.py

@@ -75,6 +75,26 @@ class BrushTool:
         self.hardness_slider.setValue(val)
         self.update_brush_hardness(val)
 
+    def increase_brush_opacity(self, amount=2):
+        val = min(self.opacity_slider.value() + amount, self.opacity_slider.maximum())
+        self.opacity_slider.setValue(val)
+        self.update_brush_opacity(val)
+
+    def decrease_brush_opacity(self, amount=2):
+        val = max(self.opacity_slider.value() - amount, self.opacity_slider.minimum())
+        self.opacity_slider.setValue(val)
+        self.update_brush_opacity(val)
+
+    def increase_brush_flow(self, amount=2):
+        val = min(self.flow_slider.value() + amount, self.flow_slider.maximum())
+        self.flow_slider.setValue(val)
+        self.update_brush_flow(val)
+
+    def decrease_brush_flow(self, amount=2):
+        val = max(self.flow_slider.value() - amount, self.flow_slider.minimum())
+        self.flow_slider.setValue(val)
+        self.update_brush_flow(val)
+
     def update_brush_hardness(self, hardness):
         self.brush.hardness = hardness
         self.update_brush_thumb()

shinestacker/retouch/exif_data.py

@@ -1,55 +1,75 @@
-# pylint: disable=C0114, C0115, C0116, E0611
+# pylint: disable=C0114, C0115, C0116, E0611, W0718
+from xml.dom import minidom
 from PIL.TiffImagePlugin import IFDRational
-from PySide6.QtWidgets import QWidget, QHBoxLayout, QPushButton, QLabel
+from PySide6.QtWidgets import QLabel, QTextEdit
 from PySide6.QtCore import Qt
+from PySide6.QtGui import QFontDatabase
 from .. algorithms.exif import exif_dict
-from .icon_container import icon_container
-from .. gui.base_form_dialog import BaseFormDialog
+from .. gui.config_dialog import ConfigDialog
 
 
-class ExifData(BaseFormDialog):
-    def __init__(self, exif, parent=None):
-        super().__init__("EXIF data", parent=parent)
+class ExifData(ConfigDialog):
+    def __init__(self, exif, title="EXIF Data", parent=None, show_buttons=True):
         self.exif = exif
-        self.create_form()
-        button_container = QWidget()
-        button_layout = QHBoxLayout(button_container)
-        button_layout.setAlignment(Qt.AlignCenter)
-        ok_button = QPushButton("OK")
-        ok_button.setFixedWidth(100)
-        ok_button.setFocus()
-        button_layout.addWidget(ok_button)
-        self.add_row_to_layout(button_container)
-        ok_button.clicked.connect(self.accept)
+        super().__init__(title, parent)
+        self.reset_button.setVisible(False)
+        self.cancel_button.setVisible(show_buttons)
+        if not show_buttons:
+            self.ok_button.setFixedWidth(100)
+            self.button_box.setAlignment(Qt.AlignCenter)
 
-    def add_bold_label(self, label):
-        label = QLabel(label)
-        label.setStyleSheet("font-weight: bold")
-        self.form_layout.addRow(label)
+    def is_likely_xml(self, text):
+        if not isinstance(text, str):
+            return False
+        text = text.strip()
+        return (text.startswith('<?xml') or
+                text.startswith('<x:xmpmeta') or
+                text.startswith('<rdf:RDF') or
+                text.startswith('<?xpacket') or
+                (text.startswith('<') and text.endswith('>') and
+                 any(tag in text for tag in ['<rdf:', '<xmp:', '<dc:', '<tiff:'])))
 
-    def create_form(self):
-        self.form_layout.addRow(icon_container())
+    def prettify_xml(self, xml_string):
+        try:
+            parsed = minidom.parseString(xml_string)
+            pretty_xml = parsed.toprettyxml(indent="  ")
+            lines = [line for line in pretty_xml.split('\n') if line.strip()]
+            if lines and lines[0].startswith('<?xml version="1.0" ?>'):
+                lines = lines[1:]
+            return '\n'.join(lines)
+        except Exception:
+            return xml_string
 
-        spacer = QLabel("")
-        spacer.setFixedHeight(10)
-        self.form_layout.addRow(spacer)
-        self.add_bold_label("EXIF data")
-        shortcuts = {}
+    def create_form_content(self):
         if self.exif is None:
-            shortcuts['Warning:'] = 'no EXIF data found'
             data = {}
         else:
             data = exif_dict(self.exif)
         if len(data) > 0:
             for k, (_, d) in data.items():
-                print(k, type(d))
                 if isinstance(d, IFDRational):
                     d = f"{d.numerator}/{d.denominator}"
-                elif len(str(d)) > 40:
-                    d = f"{str(d):.40}..."
-                else:
-                    d = f"{d}"
-                if "<<<" not in d and k != 'IPTCNAA':
-                    self.form_layout.addRow(f"<b>{k}:</b>", QLabel(d))
+                d_str = str(d)
+                if "<<<" not in d_str and k != 'IPTCNAA':
+                    if len(d_str) <= 40:
+                        self.container_layout.addRow(f"<b>{k}:</b>", QLabel(d_str))
+                    else:
+                        if self.is_likely_xml(d_str):
+                            d_str = self.prettify_xml(d_str)
+                        text_edit = QTextEdit()
+                        text_edit.setPlainText(d_str)
+                        text_edit.setReadOnly(True)
+                        text_edit.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
+                        text_edit.setLineWrapMode(QTextEdit.WidgetWidth)
+                        text_edit.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
+                        text_edit.setFixedWidth(400)
+                        font = QFontDatabase.systemFont(QFontDatabase.FixedFont)
+                        font.setPointSize(10)
+                        text_edit.setFont(font)
+                        font.setPointSize(11)
+                        text_edit.setFont(font)
+                        text_edit.setFixedHeight(200)
+                        text_edit.setFixedHeight(100)
+                        self.container_layout.addRow(f"<b>{k}:</b>", text_edit)
         else:
-            self.form_layout.addRow("-", QLabel("Empty EXIF dictionary"))
+            self.container_layout.addRow("No EXIF Data", QLabel(''))

shinestacker/retouch/image_editor_ui.py

@@ -1,7 +1,8 @@
-# pylint: disable=C0114, C0115, C0116, E0611, R0902, R0914, R0915, R0904, W0108
+# pylint: disable=C0114, C0115, C0116, E0611, R0902, R0914, R0915, R0904, W0108, R0911
 from functools import partial
 from PySide6.QtWidgets import (QWidget, QVBoxLayout, QHBoxLayout, QFrame, QLabel, QMenu,
-                               QListWidget, QSlider, QMainWindow, QMessageBox)
+                               QFileDialog, QListWidget, QSlider, QMainWindow, QMessageBox,
+                               QDialog)
 from PySide6.QtGui import QShortcut, QKeySequence, QAction, QActionGroup
 from PySide6.QtCore import Qt
 from PySide6.QtGui import QGuiApplication
@@ -9,6 +10,7 @@ from .. config.constants import constants
 from .. config.app_config import AppConfig
 from .. config.gui_constants import gui_constants
 from .. gui.recent_file_manager import RecentFileManager
+from .. algorithms.exif import get_exif
 from .image_viewer import ImageViewer
 from .shortcuts_help import ShortcutsHelp
 from .brush import Brush
@@ -26,6 +28,7 @@ from .white_balance_filter import WhiteBalanceFilter
 from .vignetting_filter import VignettingFilter
 from .adjustments import LumiContrastFilter, SaturationVibranceFilter
 from .transformation_manager import TransfromationManager
+from .exif_data import ExifData
 
 
 class ImageEditorUI(QMainWindow, LayerCollectionHandler):
@@ -57,6 +60,9 @@ class ImageEditorUI(QMainWindow, LayerCollectionHandler):
             self.handle_temp_view,
             self.end_copy_brush_area,
             self.handle_brush_size_change,
+            self.handle_brush_hardness_change,
+            self.handle_brush_opacity_change,
+            self.handle_brush_flow_change,
             self.handle_needs_update)
         side_panel = QWidget()
         side_layout = QVBoxLayout(side_panel)
@@ -183,6 +189,7 @@ class ImageEditorUI(QMainWindow, LayerCollectionHandler):
         self.thumbnail_list.setFixedWidth(gui_constants.THUMB_WIDTH)
         self.thumbnail_list.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
         self.thumbnail_list.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
+        self.exif_dialog = None
 
         def change_layer_item(item):
             layer_idx = self.thumbnail_list.row(item)
@@ -266,8 +273,17 @@ class ImageEditorUI(QMainWindow, LayerCollectionHandler):
 
         file_menu.addAction("&Close", self.close_file, "Ctrl+W")
         file_menu.addSeparator()
+        show_exif_action = QAction("Show EXIF Data", self)
+        show_exif_action.triggered.connect(self.show_exif_data)
+        show_exif_action.setProperty("requires_file", True)
+        file_menu.addAction(show_exif_action)
+        delete_exif_action = QAction("Delete EXIF Data", self)
+        delete_exif_action.triggered.connect(self.delete_exif_data)
+        delete_exif_action.setProperty("requires_file", True)
+        file_menu.addAction(delete_exif_action)
+        file_menu.addSeparator()
         file_menu.addAction("&Import Frames", self.io_gui_handler.import_frames)
-        file_menu.addAction("Import &EXIF Data", self.io_gui_handler.select_exif_path)
+        file_menu.addAction("Import &EXIF Data", self.select_exif_path)
 
         edit_menu = menubar.addMenu("&Edit")
         self.undo_action = QAction("Undo", self)
@@ -595,6 +611,18 @@ class ImageEditorUI(QMainWindow, LayerCollectionHandler):
         if event.text() == '}':
             self.brush_tool.increase_brush_hardness()
             return
+        if event.text() == ',':
+            self.brush_tool.decrease_brush_opacity()
+            return
+        if event.text() == '.':
+            self.brush_tool.increase_brush_opacity()
+            return
+        if event.text() == ';':
+            self.brush_tool.decrease_brush_flow()
+            return
+        if event.text() == ':':
+            self.brush_tool.increase_brush_flow()
+            return
         super().keyPressEvent(event)
     # pylint: enable=C0103
 
@@ -676,6 +704,36 @@ class ImageEditorUI(QMainWindow, LayerCollectionHandler):
                 self.redo_action.setText("Redo")
                 self.redo_action.setEnabled(False)
 
+    def select_exif_path(self):
+        path, _ = QFileDialog.getOpenFileName(None, "Select file with exif data")
+        if path:
+            temp_exif_data = get_exif(path)
+            self.exif_dialog = ExifData(temp_exif_data, "Import Selected EXIF Data",
+                                        self.parent(), show_buttons=True)
+            result = self.exif_dialog.exec()
+            if result == QDialog.Accepted:
+                self.io_gui_handler.set_exif_data(temp_exif_data, path)
+                self.show_status_message(f"EXIF data loaded from {path}.")
+            else:
+                self.show_status_message("EXIF data loading cancelled.")
+
+    def show_exif_data(self):
+        self.exif_dialog = ExifData(self.io_gui_handler.exif_data, "EXIF Data",
+                                    self.parent(), show_buttons=False)
+        self.exif_dialog.exec()
+
+    def delete_exif_data(self):
+        reply = QMessageBox.question(
+            self,
+            "Confirm Delete",
+            "Warning: the current EXIF data will be erased.\n\nDo you want to continue?",
+            QMessageBox.Yes | QMessageBox.No,
+            QMessageBox.No
+        )
+        if reply == QMessageBox.Yes:
+            self.io_gui_handler.exif_data = None
+            self.io_gui_handler.exif_path = ''
+
     def luminosity_filter(self):
         self.filter_manager.apply("Luminosity, Contrast")
 
@@ -763,5 +821,23 @@ class ImageEditorUI(QMainWindow, LayerCollectionHandler):
         else:
             self.brush_tool.decrease_brush_size()
 
+    def handle_brush_hardness_change(self, delta):
+        if delta > 0:
+            self.brush_tool.increase_brush_hardness()
+        else:
+            self.brush_tool.decrease_brush_hardness()
+
+    def handle_brush_opacity_change(self, delta):
+        if delta > 0:
+            self.brush_tool.increase_brush_opacity()
+        else:
+            self.brush_tool.decrease_brush_opacity()
+
+    def handle_brush_flow_change(self, delta):
+        if delta > 0:
+            self.brush_tool.increase_brush_flow()
+        else:
+            self.brush_tool.decrease_brush_flow()
+
     def handle_set_zoom_factor(self, zoom_factor):
         self.zoom_factor_label.setText(f"zoom: {zoom_factor:.1%}")

shinestacker/retouch/image_viewer.py

@@ -132,10 +132,15 @@ class ImageViewer(QWidget):
 
     def connect_signals(
             self, handle_temp_view, end_copy_brush_area,
-            handle_brush_size_change, handle_needs_update):
+            handle_brush_size_change, handle_brush_hardness_change,
+            handle_brush_opacity_change, handle_brush_flow_change,
+            handle_needs_update):
         for st in self._strategies.values():
             st.temp_view_requested.connect(handle_temp_view)
             st.end_copy_brush_area_requested.connect(end_copy_brush_area)
             st.brush_size_change_requested.connect(handle_brush_size_change)
+            st.brush_hardness_change_requested.connect(handle_brush_hardness_change)
+            st.brush_opacity_change_requested.connect(handle_brush_opacity_change)
+            st.brush_flow_change_requested.connect(handle_brush_flow_change)
             st.needs_update_requested.connect(handle_needs_update)
             st.setFocusPolicy(Qt.StrongFocus)

shinestacker/retouch/io_gui_handler.py

@@ -10,7 +10,6 @@ from PySide6.QtCore import Qt, QObject, QTimer, Signal
 from .. algorithms.utils import EXTENSIONS_GUI_STR, EXTENSIONS_GUI_SAVE_STR
 from .. algorithms.exif import get_exif, write_image_with_exif_data
 from .file_loader import FileLoader
-from .exif_data import ExifData
 from .io_threads import FileMultilayerSaver, FrameImporter
 from .layer_collection import LayerCollectionHandler
 
@@ -33,7 +32,6 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
         self.image_viewer = None
         self.loading_dialog = None
         self.loading_timer = None
-        self.exif_dialog = None
         self.saver_thread = None
         self.saving_dialog = None
         self.saving_timer = None
@@ -47,6 +45,10 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
         self.exif_data = None
         self.exif_path = ''
 
+    def set_exif_data(self, data, path):
+        self.exif_data = data
+        self.exif_path = path
+
     def current_file_path(self):
         return self.current_file_path_master if self.save_master_only.isChecked() \
             else self.current_file_path_multi
@@ -164,6 +166,8 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
         self.loader_thread.finished.connect(self.on_file_loaded)
         self.loader_thread.error.connect(self.on_file_error)
         self.loader_thread.start()
+        self.exif_path = self.current_file_path_master
+        self.exif_data = get_exif(self.exif_path)
 
     def import_frames(self):
         file_paths, _ = QFileDialog.getOpenFileNames(
@@ -196,6 +200,9 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
         self.frame_importer_thread.error.connect(self.on_frames_import_error)
         self.frame_importer_thread.progress.connect(self.update_import_progress)
         self.frame_importer_thread.start()
+        if self.exif_data is None:
+            self.exif_path = file_paths[0]
+            self.exif_data = get_exif(self.exif_path)
 
     def update_import_progress(self, percent, filename):
         if hasattr(self, 'progress_bar'):
@@ -296,7 +303,6 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
             img = cv2.cvtColor(self.master_layer(), cv2.COLOR_RGB2BGR)
             write_image_with_exif_data(self.exif_data, img, path)
             self.current_file_path_master = os.path.abspath(path)
-            # self.mark_as_modified_requested.emit(False)
             self.update_title_requested.emit()
             self.add_recent_file_requested.emit(self.current_file_path_master)
             self.status_message_requested.emit(f"Saved master layer to: {path}")
@@ -304,15 +310,6 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
             traceback.print_tb(e.__traceback__)
             QMessageBox.critical(self.parent(), "Save Error", f"Could not save file: {str(e)}")
 
-    def select_exif_path(self):
-        path, _ = QFileDialog.getOpenFileName(None, "Select file with exif data")
-        if path:
-            self.exif_path = path
-            self.exif_data = get_exif(path)
-            self.status_message_requested.emit(f"EXIF data extracted from {path}.")
-        self.exif_dialog = ExifData(self.exif_data, self.parent())
-        self.exif_dialog.exec()
-
     def close_file(self):
         self.mark_as_modified_requested.emit(False)
         self.layer_collection.reset()

shinestacker/retouch/shortcuts_help.py

@@ -61,7 +61,10 @@ class ShortcutsHelp(QDialog):
             "Ctrl + +": "Zoom in",
             "Ctrl + -": "Zoom out",
             "Ctrl + 0": "Fit to screen",
-            "Ctrl + R": "Actual size"
+            "Ctrl + R": "Actual size",
+            "Ctrl + 1": "View: overlaid",
+            "Ctrl + 2": "View: side by side",
+            "Ctrl + 3": "View: top-bottom",
         }
 
         self.add_bold_label(left_layout, "Keyboard Shortcuts")
@@ -69,13 +72,14 @@ class ShortcutsHelp(QDialog):
             left_layout.addRow(f"<b>{k}</b>", QLabel(v))
 
         shortcuts = {
-            "Ctrl + 1": "View: overlaid",
-            "Ctrl + 2": "View: side by side",
-            "Ctrl + 3": "View: top-bottom",
-            "[": "Increase brush size",
-            "]": "Decrease brush size",
-            "{": "Increase brush hardness",
-            "}": "Decrease brush hardness"
+            "[": "Decrease brush size",
+            "]": "Increase brush size",
+            "{": "Decrease brush hardness",
+            "}": "Increase brush hardness",
+            ",": "Decrease brush opacity",
+            ".": "Increase brush opacity",
+            ";": "Decrease brush flow",
+            ":": "Increase brush flow"
         }
 
         self.add_bold_label(right_layout, "Keyboard Shortcuts")
@@ -86,6 +90,9 @@ class ShortcutsHelp(QDialog):
             "Space + Drag": "Move",
             "Wheel": "Zoom in/out",
             "Ctrl + Wheel": "Adjust brush size",
+            "Shift + Wheel": "Adjust brush hardness",
+            "Alt + Wheel": "Adjust brush opacity",
+            "Ctrl + Shift + Wheel": "Adjust brush flow",
             "Left Click": "Use brush to copy from selected layer to master",
         }
 

shinestacker/retouch/view_strategy.py

@@ -6,7 +6,7 @@ import numpy as np
 from PySide6.QtCore import Qt, QPointF, QTime, QPoint, Signal, QRectF
 from PySide6.QtGui import QImage, QPainter, QColor, QBrush, QPen, QCursor, QPixmap, QPainterPath
 from PySide6.QtWidgets import (
-    QGraphicsEllipseItem, QGraphicsView, QGraphicsScene, QGraphicsPixmapItem,
+    QGraphicsEllipseItem, QGraphicsView, QGraphicsScene, QGraphicsPixmapItem, QApplication,
     QGraphicsItemGroup, QGraphicsPathItem)
 from .. config.gui_constants import gui_constants
 from .. config.app_config import AppConfig
@@ -81,6 +81,9 @@ class ViewSignals:
     temp_view_requested = Signal(bool)
     end_copy_brush_area_requested = Signal()
     brush_size_change_requested = Signal(int)  # +1 or -1
+    brush_hardness_change_requested = Signal(int)
+    brush_opacity_change_requested = Signal(int)
+    brush_flow_change_requested = Signal(int)
     needs_update_requested = Signal()
 
 
@@ -444,8 +447,15 @@ class ViewStrategy(LayerCollectionHandler):
         if self.empty() or self.gesture_active:
             return
         if event.source() == Qt.MouseEventNotSynthesized:  # Physical mouse
-            if self.control_pressed:
+            modifiers = QApplication.keyboardModifiers()
+            if modifiers & Qt.ControlModifier and modifiers & Qt.ShiftModifier:
+                self.brush_flow_change_requested.emit(1 if event.angleDelta().y() > 0 else -1)
+            elif modifiers & Qt.ControlModifier:
                 self.brush_size_change_requested.emit(1 if event.angleDelta().y() > 0 else -1)
+            elif modifiers & Qt.ShiftModifier:
+                self.brush_hardness_change_requested.emit(1 if event.angleDelta().y() > 0 else -1)
+            elif modifiers & Qt.AltModifier:
+                self.brush_opacity_change_requested.emit(1 if event.angleDelta().y() > 0 else -1)
             else:
                 self.handle_zoom_wheel(self.get_view_with_mouse(event), event)
             self.update_brush_cursor()

{shinestacker-1.9.0.dist-info → shinestacker-1.9.2.dist-info}/METADATA

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