shinestacker 1.1.0__py3-none-any.whl → 1.2.1__py3-none-any.whl

shinestacker/gui/base_form_dialog.py

@@ -3,16 +3,21 @@ from PySide6.QtWidgets import QFormLayout, QDialog
 from PySide6.QtCore import Qt
 
 
+def create_form_layout(parent):
+    layout = QFormLayout(parent)
+    layout.setFieldGrowthPolicy(QFormLayout.AllNonFixedFieldsGrow)
+    layout.setRowWrapPolicy(QFormLayout.DontWrapRows)
+    layout.setFormAlignment(Qt.AlignLeft | Qt.AlignTop)
+    layout.setLabelAlignment(Qt.AlignLeft)
+    return layout
+
+
 class BaseFormDialog(QDialog):
     def __init__(self, title, parent=None):
         super().__init__(parent)
         self.setWindowTitle(title)
         self.resize(500, self.height())
-        self.layout = QFormLayout(self)
-        self.layout.setFieldGrowthPolicy(QFormLayout.AllNonFixedFieldsGrow)
-        self.layout.setRowWrapPolicy(QFormLayout.DontWrapRows)
-        self.layout.setFormAlignment(Qt.AlignLeft | Qt.AlignTop)
-        self.layout.setLabelAlignment(Qt.AlignLeft)
+        self.form_layout = create_form_layout(self)
 
     def add_row_to_layout(self, item):
-        self.layout.addRow(item)
+        self.form_layout.addRow(item)

shinestacker/gui/gui_images.py

@@ -67,13 +67,13 @@ class GuiImageView(QWidget):
         super().__init__(parent)
         self.file_path = file_path
         self.setFixedWidth(gui_constants.GUI_IMG_WIDTH)
-        self.layout = QVBoxLayout()
-        self.layout.setContentsMargins(0, 0, 0, 0)
-        self.layout.setSpacing(0)
+        self.main_layout = QVBoxLayout()
+        self.main_layout.setContentsMargins(0, 0, 0, 0)
+        self.main_layout.setSpacing(0)
         self.image_label = QLabel()
         self.image_label.setAlignment(Qt.AlignCenter)
-        self.layout.addWidget(self.image_label)
-        self.setLayout(self.layout)
+        self.main_layout.addWidget(self.image_label)
+        self.setLayout(self.main_layout)
         pixmap = QPixmap(file_path)
         if pixmap:
             scaled_pixmap = pixmap.scaledToWidth(
@@ -105,13 +105,13 @@ class GuiOpenApp(QWidget):
         self.file_path = file_path
         self.app = app
         self.setFixedWidth(gui_constants.GUI_IMG_WIDTH)
-        self.layout = QVBoxLayout()
-        self.layout.setContentsMargins(0, 0, 0, 0)
-        self.layout.setSpacing(0)
+        self.main_layout = QVBoxLayout()
+        self.main_layout.setContentsMargins(0, 0, 0, 0)
+        self.main_layout.setSpacing(0)
         self.image_label = QLabel()
         self.image_label.setAlignment(Qt.AlignCenter)
-        self.layout.addWidget(self.image_label)
-        self.setLayout(self.layout)
+        self.main_layout.addWidget(self.image_label)
+        self.setLayout(self.main_layout)
         pixmap = QPixmap(file_path)
         if pixmap:
             scaled_pixmap = pixmap.scaledToWidth(

shinestacker/gui/gui_run.py

@@ -328,7 +328,7 @@ class RunWorker(LogWorker):
         self.status_signal.emit(f"{self.tag} running...", constants.RUN_ONGOING, "", 0)
         self.html_signal.emit(f'''
         <div style="margin: 2px 0; font-family: {constants.LOG_FONTS_STR};">
-        <span style="color: #{ColorPalette.DARK_BLUE.hex()}; font-style: italic; font-weigt: bold;">{self.tag} begins</span>
+        <span style="color: #{ColorPalette.DARK_BLUE.hex()}; font-style: italic; font-weight: bold;">{self.tag} begins</span>
         </div>
         ''') # noqa
         status, error_message = self.do_run()

shinestacker/gui/main_window.py

@@ -135,6 +135,8 @@ class MainWindow(QMainWindow, LogManager):
         self.project_editor.refresh_ui_signal.connect(self.refresh_ui)
         self.project_editor.enable_delete_action_signal.connect(
             self.menu_manager.delete_element_action.setEnabled)
+        self.project_editor.undo_manager.set_enabled_undo_action_requested.connect(
+            self.menu_manager.set_enabled_undo_action)
         self.project_controller.update_title_requested.connect(self.update_title)
         self.project_controller.refresh_ui_requested.connect(self.refresh_ui)
         self.project_controller.activate_window_requested.connect(self.activateWindow)
@@ -146,8 +148,8 @@ class MainWindow(QMainWindow, LogManager):
     def modified(self):
         return self.project_editor.modified()
 
-    def mark_as_modified(self, modified=True):
-        self.project_editor.mark_as_modified(modified)
+    def mark_as_modified(self, modified=True, description=''):
+        self.project_editor.mark_as_modified(modified, description)
 
     def set_project(self, project):
         self.project_editor.set_project(project)
@@ -407,13 +409,12 @@ class MainWindow(QMainWindow, LogManager):
             self.menu_manager.add_action_entry_action.setEnabled(False)
             self.menu_manager.action_selector.setEnabled(False)
             self.menu_manager.run_job_action.setEnabled(False)
-            self.menu_manager.run_all_jobs_action.setEnabled(False)
         else:
             self.menu_manager.add_action_entry_action.setEnabled(True)
             self.menu_manager.action_selector.setEnabled(True)
             self.menu_manager.delete_element_action.setEnabled(True)
             self.menu_manager.run_job_action.setEnabled(True)
-            self.menu_manager.run_all_jobs_action.setEnabled(True)
+        self.menu_manager.set_enabled_run_all_jobs(self.job_list_count() > 1)
 
     def quit(self):
         if self.project_controller.check_unsaved_changes():
@@ -425,7 +426,7 @@ class MainWindow(QMainWindow, LogManager):
         self.expert_options = self.menu_manager.expert_options_action.isChecked()
 
     def set_expert_options(self):
-        self.expert_options_action.setChecked(True)
+        self.menu_manager.expert_options_action.setChecked(True)
         self.expert_options = True
 
     def before_thread_begins(self):

shinestacker/gui/menu_manager.py

@@ -82,7 +82,10 @@ class MenuManager:
 
     def add_edit_menu(self):
         menu = self.menubar.addMenu("&Edit")
-        for name in ["&Undo", "&Cut", "Cop&y", "&Paste", "Duplicate"]:
+        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))
         self.delete_element_action = self.action("Delete")
         self.delete_element_action.setEnabled(False)
@@ -113,7 +116,7 @@ class MenuManager:
         self.run_job_action.setEnabled(False)
         menu.addAction(self.run_job_action)
         self.run_all_jobs_action = self.action("Run All Jobs")
-        self.run_all_jobs_action.setEnabled(False)
+        self.set_enabled_run_all_jobs(False)
         menu.addAction(self.run_all_jobs_action)
 
     def add_actions_menu(self):
@@ -234,3 +237,14 @@ class MenuManager:
         self.sub_action_selector.setEnabled(enabled)
         for a in self.sub_action_menu_entries:
             a.setEnabled(enabled)
+
+    def set_enabled_run_all_jobs(self, enabled):
+        tooltip = self.tooltips["Run All Jobs"]
+        self.run_all_jobs_action.setEnabled(enabled)
+        if not enabled:
+            tooltip += " (requires more tha one job)"
+        self.run_all_jobs_action.setToolTip(tooltip)
+
+    def set_enabled_undo_action(self, enabled, description):
+        self.undo_action.setEnabled(enabled)
+        self.undo_action.setText(f"&Undo {description}")

shinestacker/gui/new_project.py

@@ -36,11 +36,11 @@ class NewProjectDialog(BaseFormDialog):
     def add_bold_label(self, label):
         label = QLabel(label)
         label.setStyleSheet("font-weight: bold")
-        self.layout.addRow(label)
+        self.form_layout.addRow(label)
 
     def add_label(self, label):
         label = QLabel(label)
-        self.layout.addRow(label)
+        self.form_layout.addRow(label)
 
     def create_form(self):
         icon_path = f"{os.path.dirname(__file__)}/ico/shinestacker.png"
@@ -49,10 +49,10 @@ class NewProjectDialog(BaseFormDialog):
         icon_label = QLabel()
         icon_label.setPixmap(icon_pixmap)
         icon_label.setAlignment(Qt.AlignCenter)
-        self.layout.addRow(icon_label)
+        self.form_layout.addRow(icon_label)
         spacer = QLabel("")
         spacer.setFixedHeight(10)
-        self.layout.addRow(spacer)
+        self.form_layout.addRow(spacer)
 
         self.input_folder, container = create_select_file_paths_widget(
             '', 'input files folder', 'input files folder')
@@ -92,26 +92,26 @@ class NewProjectDialog(BaseFormDialog):
         self.multi_layer.setChecked(gui_constants.NEW_PROJECT_MULTI_LAYER)
 
         self.add_bold_label("1️⃣ Select input folder, all images therein will be merged. ")
-        self.layout.addRow("Input folder:", container)
-        self.layout.addRow("Number of frames: ", self.frames_label)
+        self.form_layout.addRow("Input folder:", container)
+        self.form_layout.addRow("Number of frames: ", self.frames_label)
         self.add_label("")
         self.add_bold_label("2️⃣ Select basic options.")
         if self.expert():
-            self.layout.addRow("Automatic noise detection:", self.noise_detection)
-            self.layout.addRow("Vignetting correction:", self.vignetting_correction)
-        self.layout.addRow("Align layers:", self.align_frames)
-        self.layout.addRow("Balance layers:", self.balance_frames)
-        self.layout.addRow("Bunch stack:", self.bunch_stack)
-        self.layout.addRow("Bunch frames:", self.bunch_frames)
-        self.layout.addRow("Bunch overlap:", self.bunch_overlap)
-        self.layout.addRow("Number of bunches: ", self.bunches_label)
+            self.form_layout.addRow("Automatic noise detection:", self.noise_detection)
+            self.form_layout.addRow("Vignetting correction:", self.vignetting_correction)
+        self.form_layout.addRow("Align layers:", self.align_frames)
+        self.form_layout.addRow("Balance layers:", self.balance_frames)
+        self.form_layout.addRow("Bunch stack:", self.bunch_stack)
+        self.form_layout.addRow("Bunch frames:", self.bunch_frames)
+        self.form_layout.addRow("Bunch overlap:", self.bunch_overlap)
+        self.form_layout.addRow("Number of bunches: ", self.bunches_label)
         if self.expert():
-            self.layout.addRow("Focus stack (pyramid):", self.focus_stack_pyramid)
-            self.layout.addRow("Focus stack (depth map):", self.focus_stack_depth_map)
+            self.form_layout.addRow("Focus stack (pyramid):", self.focus_stack_pyramid)
+            self.form_layout.addRow("Focus stack (depth map):", self.focus_stack_depth_map)
         else:
-            self.layout.addRow("Focus stack:", self.focus_stack_pyramid)
+            self.form_layout.addRow("Focus stack:", self.focus_stack_pyramid)
         if self.expert():
-            self.layout.addRow("Save multi layer TIFF:", self.multi_layer)
+            self.form_layout.addRow("Save multi layer TIFF:", self.multi_layer)
         self.add_label("")
         self.add_bold_label("3️⃣ Push 🆗 for further options, then press ▶️ to run.")
         self.add_label("")
@@ -182,8 +182,8 @@ class NewProjectDialog(BaseFormDialog):
             height, width = img.shape[:2]
             n_bytes = 1 if img.dtype == np.uint8 else 2
             n_bits = 8 if img.dtype == np.uint8 else 16
-            n_mbytes = float(n_bytes * height * width * self.n_image_files) / 10**6
-            if n_mbytes > 500 and not self.bunch_stack.isChecked():
+            n_gbytes = float(n_bytes * height * width * self.n_image_files) / constants.ONE_GIGA
+            if n_gbytes > 1 and not self.bunch_stack.isChecked():
                 msg = QMessageBox()
                 msg.setStyleSheet("""
                     QMessageBox {
@@ -201,11 +201,15 @@ class NewProjectDialog(BaseFormDialog):
                 msg.setWindowTitle("Too many frames")
                 msg.setText(f"You selected {self.n_image_files} images "
                             f"with resolution {width}×{height} pixels, {n_bits} bits depth. "
-                            "Processing may require a significant amount of memory.\n\n"
+                            "Processing may require a significant amount "
+                            "of memory or I/O buffering.\n\n"
                             "Continue anyway?")
                 msg.setInformativeText("You may consider to split the processing "
                                        " using a bunch stack to reduce memory usage.\n\n"
-                                       '✅ Check the option "Bunch stack".')
+                                       '✅ Check the option "Bunch stack".\n\n'
+                                       "➡️ Check expert options for the stacking algorithm."
+                                       'Go to "View" > "Expert Options".'
+                                       )
                 msg.setStandardButtons(QMessageBox.Ok | QMessageBox.Cancel)
                 msg.setDefaultButton(QMessageBox.Cancel)
                 if msg.exec_() != QMessageBox.Ok:

shinestacker/gui/project_controller.py

@@ -29,8 +29,8 @@ class ProjectController(QObject):
     def refresh_ui(self, job_row=-1, action_row=-1):
         self.refresh_ui_requested.emit(job_row, action_row)
 
-    def mark_as_modified(self, modified=True):
-        self.project_editor.mark_as_modified(modified)
+    def mark_as_modified(self, modified=True, description=''):
+        self.project_editor.mark_as_modified(modified, description)
 
     def modified(self):
         return self.project_editor.modified()
@@ -136,6 +136,7 @@ class ProjectController(QObject):
             self.clear_job_list()
             self.clear_action_list()
             self.mark_as_modified(False)
+            self.project_editor.reset_undo()
 
     def new_project(self):
         if not self.check_unsaved_changes():
@@ -151,68 +152,82 @@ class ProjectController(QObject):
         dialog = NewProjectDialog(self.parent)
         if dialog.exec() == QDialog.Accepted:
             self.save_actions_set_enabled(True)
+            self.project_editor.reset_undo()
             input_folder = dialog.get_input_folder().split('/')
             working_path = '/'.join(input_folder[:-1])
             input_path = input_folder[-1]
             if dialog.get_noise_detection():
-                job_noise = ActionConfig(constants.ACTION_JOB,
-                                         {'name': 'detect-noise', 'working_path': working_path,
-                                          'input_path': input_path})
+                job_noise = ActionConfig(
+                    constants.ACTION_JOB,
+                    {'name': f'{input_path}-detect-noise', 'working_path': working_path,
+                     'input_path': input_path})
                 noise_detection = ActionConfig(constants.ACTION_NOISEDETECTION,
-                                               {'name': 'detect-noise'})
+                                               {'name': f'{input_path}-detect-noise'})
                 job_noise.add_sub_action(noise_detection)
                 self.add_job_to_project(job_noise)
             job = ActionConfig(constants.ACTION_JOB,
-                               {'name': 'focus-stack', 'working_path': working_path,
+                               {'name': f'{input_path}-focus-stack',
+                                'working_path': working_path,
                                 'input_path': input_path})
+            preprocess_name = ''
             if dialog.get_noise_detection() or dialog.get_vignetting_correction() or \
                dialog.get_align_frames() or dialog.get_balance_frames():
-                combo_action = ActionConfig(constants.ACTION_COMBO, {'name': 'align'})
+                preprocess_name = f'{input_path}-preprocess'
+                combo_action = ActionConfig(
+                    constants.ACTION_COMBO, {'name': preprocess_name})
                 if dialog.get_noise_detection():
-                    mask_noise = ActionConfig(constants.ACTION_MASKNOISE, {'name': 'mask-noise'})
+                    mask_noise = ActionConfig(
+                        constants.ACTION_MASKNOISE, {'name': 'mask-noise'})
                     combo_action.add_sub_action(mask_noise)
                 if dialog.get_vignetting_correction():
-                    vignetting = ActionConfig(constants.ACTION_VIGNETTING, {'name': 'vignetting'})
+                    vignetting = ActionConfig(
+                        constants.ACTION_VIGNETTING, {'name': 'vignetting'})
                     combo_action.add_sub_action(vignetting)
                 if dialog.get_align_frames():
-                    align = ActionConfig(constants.ACTION_ALIGNFRAMES, {'name': 'align'})
+                    align = ActionConfig(
+                        constants.ACTION_ALIGNFRAMES, {'name': 'align'})
                     combo_action.add_sub_action(align)
                 if dialog.get_balance_frames():
-                    balance = ActionConfig(constants.ACTION_BALANCEFRAMES, {'name': 'balance'})
+                    balance = ActionConfig(
+                        constants.ACTION_BALANCEFRAMES, {'name': 'balance'})
                     combo_action.add_sub_action(balance)
                 job.add_sub_action(combo_action)
             if dialog.get_bunch_stack():
-                bunch_stack = ActionConfig(constants.ACTION_FOCUSSTACKBUNCH,
-                                           {'name': 'bunches', 'frames': dialog.get_bunch_frames(),
-                                            'overlap': dialog.get_bunch_overlap()})
+                bunch_stack_name = f'{input_path}-bunches'
+                bunch_stack = ActionConfig(
+                    constants.ACTION_FOCUSSTACKBUNCH,
+                    {'name': bunch_stack_name, 'frames': dialog.get_bunch_frames(),
+                     'overlap': dialog.get_bunch_overlap()})
                 job.add_sub_action(bunch_stack)
             if dialog.get_focus_stack_pyramid():
+                focus_pyramid_name = f'{input_path}-focus-stack-pyramid'
                 focus_pyramid = ActionConfig(constants.ACTION_FOCUSSTACK,
-                                             {'name': 'focus-stack-pyramid',
+                                             {'name': focus_pyramid_name,
                                               'stacker': constants.STACK_ALGO_PYRAMID})
                 job.add_sub_action(focus_pyramid)
             if dialog.get_focus_stack_depth_map():
+                focus_depth_map_name = f'{input_path}-focus-stack-depth-map'
                 focus_depth_map = ActionConfig(constants.ACTION_FOCUSSTACK,
-                                               {'name': 'focus-stack-depth-map',
+                                               {'name': focus_depth_map_name,
                                                 'stacker': constants.STACK_ALGO_DEPTH_MAP})
                 job.add_sub_action(focus_depth_map)
             if dialog.get_multi_layer():
-                input_path = []
+                multi_input_path = []
                 if dialog.get_focus_stack_pyramid():
-                    input_path.append("focus-stack-pyramid")
+                    multi_input_path.append(focus_pyramid_name)
                 if dialog.get_focus_stack_depth_map():
-                    input_path.append("focus-stack-depth-map")
+                    multi_input_path.append(focus_depth_map_name)
                 if dialog.get_bunch_stack():
-                    input_path.append("bunches")
+                    multi_input_path.append(bunch_stack_name)
+                elif preprocess_name:
+                    multi_input_path.append(preprocess_name)
                 multi_layer = ActionConfig(
                     constants.ACTION_MULTILAYER,
-                    {
-                        'name': 'multi-layer',
-                        'input_path': constants.PATH_SEPARATOR.join(input_path)
-                    })
+                    {'name': f'{input_path}-multi-layer',
+                        'input_path': constants.PATH_SEPARATOR.join(multi_input_path)})
                 job.add_sub_action(multi_layer)
             self.add_job_to_project(job)
-            self.mark_as_modified(True)
+            self.mark_as_modified(True, "New Project")
             self.refresh_ui(0, -1)
 
     def open_project(self, file_path=False):
@@ -231,6 +246,7 @@ class ProjectController(QObject):
                     raise RuntimeError(f"Project from file {file_path} produced a null project.")
                 self.set_project(project)
                 self.mark_as_modified(False)
+                self.project_editor.reset_undo()
                 self.refresh_ui(0, -1)
                 if self.job_list_count() > 0:
                     self.set_current_job(0)
@@ -353,4 +369,4 @@ class ProjectController(QObject):
         dialog = self.action_config_dialog(action)
         if dialog.exec() == QDialog.Accepted:
             self.on_job_selected(self.current_job_index())
-            self.mark_as_modified()
+            # self.mark_as_modified(True. "Edit Action") <-- done by dialog

shinestacker/gui/project_converter.py

@@ -9,8 +9,7 @@ from .. algorithms.vignetting import Vignetting
 from .. algorithms.align import AlignFrames
 from .. algorithms.balance import BalanceFrames
 from .. algorithms.stack import FocusStack, FocusStackBunch
-from .. algorithms.pyramid import PyramidStack
-from .. algorithms.pyramid_tiles import PyramidTilesStack
+from .. algorithms.pyramid_auto import PyramidAutoStack
 from .. algorithms.depth_map import DepthMapStack
 from .. algorithms.multilayer import MultiLayer
 from .project_model import Project, ActionConfig
@@ -107,11 +106,7 @@ class ProjectConverter:
             if stacker == constants.STACK_ALGO_PYRAMID:
                 algo_dict, module_dict = self.filter_dict_keys(
                     action_config.params, 'pyramid_')
-                stack_algo = PyramidStack(**algo_dict)
-            elif stacker == constants.STACK_ALGO_PYRAMID_TILES:
-                algo_dict, module_dict = self.filter_dict_keys(
-                    action_config.params, 'tiles_pyramid_')
-                stack_algo = PyramidTilesStack(**algo_dict)
+                stack_algo = PyramidAutoStack(**algo_dict)
             elif stacker == constants.STACK_ALGO_DEPTH_MAP:
                 algo_dict, module_dict = self.filter_dict_keys(
                     action_config.params, 'depthmap_')
@@ -119,7 +114,6 @@ class ProjectConverter:
             else:
                 raise InvalidOptionError('stacker', stacker, f"valid options are: "
                                          f"{constants.STACK_ALGO_PYRAMID}, "
-                                         f"{constants.STACK_ALGO_PYRAMID_TILES}, "
                                          f"{constants.STACK_ALGO_DEPTH_MAP}")
             if action_config.type_name == constants.ACTION_FOCUSSTACK:
                 return FocusStack(**module_dict, stack_algo=stack_algo)

shinestacker/gui/project_editor.py

@@ -74,19 +74,32 @@ def new_row_after_clone(job, action_row, is_sub_action, cloned):
             for action in job.sub_actions[:job.sub_actions.index(cloned)])
 
 
-class ProjectUndoManager:
-    def __init__(self):
+class ProjectUndoManager(QObject):
+    set_enabled_undo_action_requested = Signal(bool, str)
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
         self._undo_buffer = []
 
-    def add(self, item):
-        self._undo_buffer.append(item)
+    def add(self, item, description):
+        self._undo_buffer.append((item, description))
+        self.set_enabled_undo_action_requested.emit(True, description)
 
     def pop(self):
-        return self._undo_buffer.pop()
+        last = self._undo_buffer.pop()
+        if len(self._undo_buffer) == 0:
+            self.set_enabled_undo_action_requested.emit(False, '')
+        else:
+            self.set_enabled_undo_action_requested.emit(True, self._undo_buffer[-1][1])
+        return last[0]
 
     def filled(self):
         return len(self._undo_buffer) != 0
 
+    def reset(self):
+        self._undo_buffer = []
+        self.set_enabled_undo_action_requested.emit(False, '')
+
 
 class ProjectEditor(QObject):
     INDENT_SPACE = "   ↪   "
@@ -99,7 +112,7 @@ class ProjectEditor(QObject):
 
     def __init__(self, parent=None):
         super().__init__(parent)
-        self._undo_manager = ProjectUndoManager()
+        self.undo_manager = ProjectUndoManager()
         self._modified = False
         self._project = None
         self._copy_buffer = None
@@ -108,19 +121,25 @@ class ProjectEditor(QObject):
         self._action_list = QListWidget()
         self.dialog = None
 
-    def add_undo(self, item):
-        self._undo_manager.add(item)
+    def reset_undo(self):
+        self.undo_manager.reset()
+
+    def add_undo(self, item, description=''):
+        self.undo_manager.add(item, description)
 
     def pop_undo(self):
-        return self._undo_manager.pop()
+        return self.undo_manager.pop()
 
     def filled_undo(self):
-        return self._undo_manager.filled()
+        return self.undo_manager.filled()
 
-    def mark_as_modified(self, modified=True):
+    def set_modified(self, modified):
+        self._modified = modified
+
+    def mark_as_modified(self, modified=True, description=''):
         self._modified = modified
         if modified:
-            self.add_undo(self._project.clone())
+            self.add_undo(self._project.clone(), description)
         self.modified_signal.emit(modified)
 
     def modified(self):
@@ -306,7 +325,7 @@ class ProjectEditor(QObject):
         new_index = job_index + delta
         if 0 <= new_index < self.num_project_jobs():
             jobs = self.project_jobs()
-            self.mark_as_modified()
+            self.mark_as_modified(True, "Shift Job")
             jobs.insert(new_index, jobs.pop(job_index))
             self.refresh_ui_signal.emit(new_index, -1)
 
@@ -316,12 +335,12 @@ class ProjectEditor(QObject):
             if not pos.is_sub_action:
                 new_index = pos.action_index + delta
                 if 0 <= new_index < len(pos.actions):
-                    self.mark_as_modified()
+                    self.mark_as_modified(True, "Shift Action")
                     pos.actions.insert(new_index, pos.actions.pop(pos.action_index))
             else:
                 new_index = pos.sub_action_index + delta
                 if 0 <= new_index < len(pos.sub_actions):
-                    self.mark_as_modified()
+                    self.mark_as_modified(True, "Shift Sub-action")
                     pos.sub_actions.insert(new_index, pos.sub_actions.pop(pos.sub_action_index))
             new_row = new_row_after_insert(action_row, pos, delta)
             self.refresh_ui_signal.emit(job_row, new_row)
@@ -343,7 +362,7 @@ class ProjectEditor(QObject):
         if 0 <= job_index < self.num_project_jobs():
             job_clone = self.project_job(job_index).clone(self.CLONE_POSTFIX)
             new_job_index = job_index + 1
-            self.mark_as_modified()
+            self.mark_as_modified(True, "Duplicate Job")
             self.project_jobs().insert(new_job_index, job_clone)
             self.set_current_job(new_job_index)
             self.set_current_action(new_job_index)
@@ -353,7 +372,7 @@ class ProjectEditor(QObject):
         job_row, action_row, pos = self.get_current_action()
         if not pos.actions:
             return
-        self.mark_as_modified()
+        self.mark_as_modified(True, "Duplicate Action")
         job = self.project_job(job_row)
         if pos.is_sub_action:
             cloned = pos.sub_action.clone(self.CLONE_POSTFIX)
@@ -384,7 +403,7 @@ class ProjectEditor(QObject):
                 reply = None
             if not confirm or reply == QMessageBox.Yes:
                 self.take_job(current_index)
-                self.mark_as_modified()
+                self.mark_as_modified(True, "Delete Job")
                 current_job = self.project_jobs().pop(current_index)
                 self.clear_action_list()
                 self.refresh_ui_signal.emit(-1, -1)
@@ -406,10 +425,11 @@ class ProjectEditor(QObject):
             else:
                 reply = None
             if not confirm or reply == QMessageBox.Yes:
-                self.mark_as_modified()
                 if pos.is_sub_action:
+                    self.mark_as_modified(True, "Delete Action")
                     pos.action.pop_sub_action(pos.sub_action_index)
                 else:
+                    self.mark_as_modified(True, "Delete Sub-action")
                     self.project_job(job_row).pop_sub_action(pos.action_index)
                 new_row = new_row_after_delete(action_row, pos)
                 self.refresh_ui_signal.emit(job_row, new_row)
@@ -432,7 +452,7 @@ class ProjectEditor(QObject):
         job_action = ActionConfig("Job")
         self.dialog = self.action_config_dialog(job_action)
         if self.dialog.exec() == QDialog.Accepted:
-            self.mark_as_modified()
+            self.mark_as_modified(True, "Add Job")
             self.project_jobs().append(job_action)
             self.add_list_item(self.job_list(), job_action, False)
             self.set_current_job(self.job_list_count() - 1)
@@ -453,7 +473,7 @@ class ProjectEditor(QObject):
         action.parent = self.get_current_job()
         self.dialog = self.action_config_dialog(action)
         if self.dialog.exec() == QDialog.Accepted:
-            self.mark_as_modified()
+            self.mark_as_modified("Add Action")
             self.project_job(current_index).add_sub_action(action)
             self.add_list_item(self.action_list(), action, False)
             self.enable_delete_action_signal.emit(False)
@@ -493,7 +513,7 @@ class ProjectEditor(QObject):
         sub_action = ActionConfig(type_name)
         self.dialog = self.action_config_dialog(sub_action)
         if self.dialog.exec() == QDialog.Accepted:
-            self.mark_as_modified()
+            self.mark_as_modified("Add Sub-action")
             action.add_sub_action(sub_action)
             self.on_job_selected(current_job_index)
             self.set_current_action(current_action_index)
@@ -521,7 +541,7 @@ class ProjectEditor(QObject):
         job_index = self.current_job_index()
         if 0 <= job_index < self.num_project_jobs():
             new_job_index = job_index
-            self.mark_as_modified()
+            self.mark_as_modified(True, "Paste Job")
             self.project_jobs().insert(new_job_index, self.copy_buffer())
             self.set_current_job(new_job_index)
             self.set_current_action(new_job_index)
@@ -533,13 +553,13 @@ class ProjectEditor(QObject):
             if not pos.is_sub_action:
                 if self.copy_buffer().type_name not in constants.ACTION_TYPES:
                     return
-                self.mark_as_modified()
+                self.mark_as_modified(True, "Paste Action")
                 pos.actions.insert(pos.action_index, self.copy_buffer())
             else:
                 if pos.action.type_name != constants.ACTION_COMBO or \
                    self.copy_buffer().type_name not in constants.SUB_ACTION_TYPES:
                     return
-                self.mark_as_modified()
+                self.mark_as_modified(True, "Paste Sub-action")
                 pos.sub_actions.insert(pos.sub_action_index, self.copy_buffer())
             new_row = new_row_after_paste(action_row, pos)
             self.refresh_ui_signal.emit(job_row, new_row)
@@ -583,7 +603,10 @@ class ProjectEditor(QObject):
             action_row = -1
         if current_action:
             if current_action.enabled() != enabled:
-                self.mark_as_modified()
+                if enabled:
+                    self.mark_as_modified(True, "Enable")
+                else:
+                    self.mark_as_modified(True, "Disable")
                 current_action.set_enabled(enabled)
                 self.refresh_ui_signal.emit(job_row, action_row)
 
@@ -594,7 +617,7 @@ class ProjectEditor(QObject):
         self.set_enabled(False)
 
     def set_enabled_all(self, enable=True):
-        self.mark_as_modified()
+        self.mark_as_modified(True, "Enable All")
         job_row = self.current_job_index()
         action_row = self.current_action_index()
         for j in self.project_jobs():

shinestacker/gui/tab_widget.py

@@ -12,10 +12,10 @@ class TabWidgetWithPlaceholder(QWidget):
 
     def __init__(self, parent=None):
         super().__init__(parent)
-        self.layout = QVBoxLayout(self)
-        self.layout.setContentsMargins(0, 0, 0, 0)
+        self.main_layout = QVBoxLayout(self)
+        self.main_layout.setContentsMargins(0, 0, 0, 0)
         self.stacked_widget = QStackedWidget()
-        self.layout.addWidget(self.stacked_widget)
+        self.main_layout.addWidget(self.stacked_widget)
         self.tab_widget = QTabWidget()
         self.stacked_widget.addWidget(self.tab_widget)
         self.placeholder = QLabel()