shinestacker 0.4.0__tar.gz → 0.5.0__tar.gz

{shinestacker-0.4.0 → shinestacker-0.5.0}/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 This page reports the main releases only and the main changes therein.
 
+## [v0.5.0] - 2025-08-20
+**GUI and robustness improvements**
+
+### Changes
+
+* layer selection highlightted with a blue border
+* improved font rendering in brush preview
+* fixed thumbnail spacing
+* fixed and improved save strategy for retouched images
+* added checks for updated version in about dialog
+* disable "Save" and "Save As..." menus if do not apply to current status
+
 ---
 
 ## [v0.4.0] - 2025-08-19

{shinestacker-0.4.0/src/shinestacker.egg-info → shinestacker-0.5.0}/PKG-INFO

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

shinestacker-0.5.0/scripts/git-rev-list.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+git rev-list --objects --all |
+  git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' |
+  awk '/^blob/ {print $3,$4}' |
+  sort -n -k1 |
+  tail -50

shinestacker-0.5.0/src/shinestacker/_version.py

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

shinestacker-0.5.0/src/shinestacker/app/about_dialog.py

@@ -0,0 +1,96 @@
+# pylint: disable=C0114, C0116, E0611, W0718
+import json
+from urllib.request import urlopen, Request
+from urllib.error import URLError
+from PySide6.QtWidgets import QMessageBox
+from PySide6.QtCore import Qt
+from .. import __version__
+from .. config.constants import constants
+
+
+def compare_versions(current, latest):
+    def parse_version(v):
+        v = v.lstrip('v')
+        parts = v.split('.')
+        result = []
+        for part in parts:
+            try:
+                result.append(int(part))
+            except ValueError:
+                result.append(part)
+        return result
+    current_parts = parse_version(current)
+    latest_parts = parse_version(latest)
+    for i in range(max(len(current_parts), len(latest_parts))):
+        c = current_parts[i] if i < len(current_parts) else 0
+        l = latest_parts[i] if i < len(latest_parts) else 0  # noqa: E741
+        if isinstance(c, int) and isinstance(l, int):
+            if c < l:
+                return -1
+            if c > l:
+                return 1
+        else:
+            if str(c) < str(l):
+                return -1
+            if str(c) > str(l):
+                return 1
+    return 0
+
+
+def get_latest_version():
+    try:
+        url = "https://api.github.com/repos/lucalista/shinestacker/releases/latest"
+        headers = {'User-Agent': 'ShineStacker'}
+        req = Request(url, headers=headers)
+        with urlopen(req, timeout=5) as response:
+            data = json.loads(response.read().decode())
+            return data['tag_name']
+    except (URLError, ValueError, KeyError, TimeoutError):
+        return None
+
+
+def show_about_dialog():
+    version_clean = __version__.split("+", maxsplit=1)[0]
+    latest_version = None
+    try:
+        latest_version = get_latest_version()
+    except Exception:
+        pass
+    update_text = ""
+    # pyling: disable=XXX
+    if latest_version:
+        latest_clean = latest_version.lstrip('v')
+        if compare_versions(version_clean, latest_clean) < 0:
+            update_text = f"""
+            <p style="color: red; font-weight: bold;">
+                Update available! Latest version: {latest_version}
+                <br><a href="https://github.com/lucalista/shinestacker/releases/latest">Download here</a>
+            </p>
+            """ # noqa E501
+        else:
+            update_text = f"""
+            <p style="color: green; font-weight: bold;">
+                You are using the lastet version: {latest_version}.
+            </p>
+            """
+    about_text = f"""
+    <h3>{constants.APP_TITLE}</h3>
+    <h4>version: v{version_clean}</h4>
+    {update_text}
+    <p style='font-weight: normal;'>App and framework to combine multiple images
+    into a single focused image.</p>
+    <p>Author: Luca Lista<br/>
+    Email: <a href="mailto:luka.lista@gmail.com">luka.lista@gmail.com</a></p>
+    <ul>
+    <li><a href="https://shinestacker.wordpress.com/">Website on Wordpress</a></li>
+    <li><a href="https://github.com/lucalista/shinestacker">GitHub project repository</a></li>
+    </ul>
+    """
+    # pyling: enable=XXX
+    msg = QMessageBox()
+    msg.setWindowTitle(f"About {constants.APP_STRING}")
+    msg.setIcon(QMessageBox.Icon.Information)
+    msg.setTextFormat(Qt.TextFormat.RichText)
+    msg.setText(about_text)
+    msg.setIcon(QMessageBox.Icon.NoIcon)
+    msg.exec_()

{shinestacker-0.4.0 → shinestacker-0.5.0}/src/shinestacker/config/gui_constants.py

@@ -36,9 +36,10 @@ class _GuiConstants:
 
     THUMB_WIDTH = 120  # px
     THUMB_HEIGHT = 80  # px
-    IMG_WIDTH = 100  # px
-    IMG_HEIGHT = 80  # px
-    LABEL_HEIGHT = 20  # px
+    THUMB_HI_COLOR = '#0000FF'
+    THUMB_LO_COLOR = '#0000FF'
+    THUMB_MASTER_HI_COLOR = '#0000FF'
+    THUMB_MASTER_LO_COLOR = 'transparent'
 
     MAX_UNDO_STEPS = 50
 
@@ -46,8 +47,9 @@ class _GuiConstants:
 
     UI_SIZES = {
         'brush_preview': (100, 80),
-        'thumbnail': (IMG_WIDTH, IMG_HEIGHT),
-        'master_thumb': (THUMB_WIDTH, THUMB_HEIGHT)
+        'thumbnail_width': 100,
+        'master_thumb': (THUMB_WIDTH, THUMB_HEIGHT),
+        'label_height': 20
     }
 
     DEFAULT_BRUSH_HARDNESS = 50

{shinestacker-0.4.0 → shinestacker-0.5.0}/src/shinestacker/gui/actions_window.py

@@ -30,6 +30,7 @@ class ActionsWindow(ProjectEditor):
     def mark_as_modified(self):
         self._modified_project = True
         self.project_buffer.append(self.project.clone())
+        self.save_actions_set_enabled(True)
         self.update_title()
 
     def close_project(self):
@@ -40,6 +41,7 @@ class ActionsWindow(ProjectEditor):
             self.job_list.clear()
             self.action_list.clear()
             self._modified_project = False
+            self.save_actions_set_enabled(False)
 
     def new_project(self):
         if not self._check_unsaved_changes():
@@ -51,8 +53,10 @@ class ActionsWindow(ProjectEditor):
         self.job_list.clear()
         self.action_list.clear()
         self.set_project(Project())
+        self.save_actions_set_enabled(False)
         dialog = NewProjectDialog(self)
         if dialog.exec() == QDialog.Accepted:
+            self.save_actions_set_enabled(True)
             input_folder = dialog.get_input_folder().split('/')
             working_path = '/'.join(input_folder[:-1])
             input_path = input_folder[-1]
@@ -142,6 +146,7 @@ class ActionsWindow(ProjectEditor):
             if len(self.project.jobs) > 0:
                 self.job_list.setCurrentRow(0)
                 self.activateWindow()
+                self.save_actions_set_enabled(True)
             for job in self.project.jobs:
                 if 'working_path' in job.params.keys():
                     working_path = job.params['working_path']
@@ -256,3 +261,6 @@ class ActionsWindow(ProjectEditor):
         if dialog.exec() == QDialog.Accepted:
             self.on_job_selected(self.job_list.currentRow())
             self.mark_as_modified()
+
+    def save_actions_set_enabled(self, enabled):
+        pass

{shinestacker-0.4.0 → shinestacker-0.5.0}/src/shinestacker/gui/main_window.py

@@ -189,19 +189,24 @@ class MainWindow(ActionsWindow, LogManager):
         open_action.setShortcut("Ctrl+O")
         open_action.triggered.connect(self.open_project)
         menu.addAction(open_action)
-        save_action = QAction("&Save", self)
-        save_action.setShortcut("Ctrl+S")
-        save_action.triggered.connect(self.save_project)
-        menu.addAction(save_action)
-        save_as_action = QAction("Save &As...", self)
-        save_as_action.setShortcut("Ctrl+Shift+S")
-        save_as_action.triggered.connect(self.save_project_as)
-        menu.addAction(save_as_action)
+        self.save_action = QAction("&Save", self)
+        self.save_action.setShortcut("Ctrl+S")
+        self.save_action.triggered.connect(self.save_project)
+        menu.addAction(self.save_action)
+        self.save_as_action = QAction("Save &As...", self)
+        self.save_as_action.setShortcut("Ctrl+Shift+S")
+        self.save_as_action.triggered.connect(self.save_project_as)
+        menu.addAction(self.save_as_action)
+        self.save_actions_set_enabled(False)
         close_action = QAction("&Close", self)
         close_action.setShortcut("Ctrl+W")
         close_action.triggered.connect(self.close_project)
         menu.addAction(close_action)
 
+    def save_actions_set_enabled(self, enabled):
+        self.save_action.setEnabled(enabled)
+        self.save_as_action.setEnabled(enabled)
+
     def add_edit_menu(self, menubar):
         menu = menubar.addMenu("&Edit")
         undo_action = QAction("&Undo", self)

{shinestacker-0.4.0 → shinestacker-0.5.0}/src/shinestacker/retouch/brush_tool.py

@@ -1,6 +1,7 @@
 # pylint: disable=C0114, C0115, C0116, E0611, R0902, R0913, R0917, R0914
 import numpy as np
-from PySide6.QtGui import QPixmap, QPainter, QColor, QPen, QBrush
+from PySide6.QtWidgets import QApplication, QLabel
+from PySide6.QtGui import QPixmap, QPainter, QColor, QPen, QBrush, QFont
 from PySide6.QtCore import Qt, QPoint
 from .brush_gradient import create_default_brush_gradient
 from .. config.gui_constants import gui_constants
@@ -18,11 +19,16 @@ class BrushTool:
         self.opacity_slider = None
         self.flow_slider = None
         self._brush_mask_cache = {}
+        self.brush_text = None
 
     def setup_ui(self, brush, brush_preview, image_viewer, size_slider, hardness_slider,
                  opacity_slider, flow_slider):
         self.brush = brush
         self.brush_preview = brush_preview
+        self.brush_text = QLabel(brush_preview.parent())
+        self.brush_text.setStyleSheet("color: navy; background: transparent;")
+        self.brush_text.setAlignment(Qt.AlignLeft | Qt.AlignTop)
+        self.brush_text.raise_()
         self.image_viewer = image_viewer
         self.size_slider = size_slider
         self.hardness_slider = hardness_slider
@@ -86,7 +92,7 @@ class BrushTool:
         pixmap = QPixmap(width, height)
         pixmap.fill(Qt.transparent)
         painter = QPainter(pixmap)
-        painter.setRenderHint(QPainter.Antialiasing)
+        painter.setRenderHint(QPainter.TextAntialiasing, True)
         preview_size = min(self.brush.size, width + 30, height + 30)
         center_x, center_y = width // 2, height // 2
         radius = preview_size // 2
@@ -109,10 +115,21 @@ class BrushTool:
         painter.drawEllipse(QPoint(center_x, center_y), radius, radius)
         if self.image_viewer.cursor_style == 'preview':
             painter.setPen(QPen(QColor(0, 0, 160)))
-            painter.drawText(0, 10, f"Size: {int(self.brush.size)}px")
-            painter.drawText(0, 25, f"Hardness: {self.brush.hardness}%")
-            painter.drawText(0, 40, f"Opacity: {self.brush.opacity}%")
-            painter.drawText(0, 55, f"Flow: {self.brush.flow}%")
+            font = QApplication.font()
+            painter.setFont(font)
+            font.setHintingPreference(QFont.PreferFullHinting)
+            painter.setFont(font)
+            self.brush_text.setText(
+                f"Size: {int(self.brush.size)}px\n"
+                f"Hardness: {self.brush.hardness}%\n"
+                f"Opacity: {self.brush.opacity}%\n"
+                f"Flow: {self.brush.flow}%"
+            )
+            self.brush_text.adjustSize()
+            self.brush_text.move(10, self.brush_preview.height() // 2 + 125)
+            self.brush_text.show()
+        else:
+            self.brush_text.hide()
         painter.end()
         self.brush_preview.setPixmap(pixmap)
         self.image_viewer.update_brush_cursor()

{shinestacker-0.4.0 → shinestacker-0.5.0}/src/shinestacker/retouch/display_manager.py

@@ -1,6 +1,7 @@
-# pylint: disable=C0114, C0115, C0116, E0611, R0903, R0913, R0917, E1121
+# pylint: disable=C0114, C0115, C0116, E0611, R0903, R0913, R0917, E1121, R0902
 import numpy as np
-from PySide6.QtWidgets import QWidget, QListWidgetItem, QVBoxLayout, QLabel, QInputDialog
+from PySide6.QtWidgets import (QWidget, QListWidgetItem, QVBoxLayout, QLabel, QInputDialog,
+                               QAbstractItemView)
 from PySide6.QtGui import QPixmap, QImage
 from PySide6.QtCore import Qt, QObject, QTimer, QSize, Signal
 from .. config.gui_constants import gui_constants
@@ -39,6 +40,7 @@ class DisplayManager(QObject, LayerCollectionHandler):
         self.update_timer = QTimer()
         self.update_timer.setInterval(gui_constants.PAINT_REFRESH_TIMER)
         self.update_timer.timeout.connect(self.process_pending_updates)
+        self.thumbnail_highlight = gui_constants.THUMB_LO_COLOR
 
     def process_pending_updates(self):
         if self.needs_update:
@@ -64,15 +66,15 @@ class DisplayManager(QObject, LayerCollectionHandler):
             self.display_master_layer()
 
     def create_thumbnail(self, layer):
-        if layer.dtype == np.uint16:
-            layer = (layer // 256).astype(np.uint8)
-        height, width = layer.shape[:2]
-        if layer.ndim == 3 and layer.shape[-1] == 3:
-            qimg = QImage(layer.data, width, height, 3 * width, QImage.Format_RGB888)
+        source_layer = (layer // 256).astype(np.uint8) if layer.dtype == np.uint16 else layer
+        height, width = source_layer.shape[:2]
+        if layer.ndim == 3 and source_layer.shape[-1] == 3:
+            qimg = QImage(source_layer.data, width, height, 3 * width, QImage.Format_RGB888)
         else:
-            qimg = QImage(layer.data, width, height, width, QImage.Format_Grayscale8)
+            qimg = QImage(source_layer.data, width, height, width, QImage.Format_Grayscale8)
         return QPixmap.fromImage(
-            qimg.scaled(*gui_constants.UI_SIZES['thumbnail'], Qt.KeepAspectRatio))
+            qimg.scaledToWidth(
+                gui_constants.UI_SIZES['thumbnail_width'], Qt.SmoothTransformation))
 
     def update_thumbnails(self):
         self.update_master_thumbnail()
@@ -103,17 +105,22 @@ class DisplayManager(QObject, LayerCollectionHandler):
         self.master_thumbnail_label.setPixmap(pixmap)
 
     def add_thumbnail_item(self, thumbnail, label, i, is_current):
-        item_widget = QWidget()
-        layout = QVBoxLayout(item_widget)
-        layout.setContentsMargins(0, 0, 0, 0)
-        layout.setSpacing(0)
-
+        container = QWidget()
+        container.setFixedWidth(gui_constants.UI_SIZES['thumbnail_width'] + 4)
+        container.setObjectName("thumbnailContainer")
+        container_layout = QVBoxLayout(container)
+        container_layout.setContentsMargins(2, 2, 2, 2)
+        container_layout.setSpacing(0)
+        content_widget = QWidget()
+        content_layout = QVBoxLayout(content_widget)
+        content_layout.setContentsMargins(0, 0, 0, 0)
+        content_layout.setSpacing(0)
         thumbnail_label = QLabel()
         thumbnail_label.setPixmap(thumbnail)
         thumbnail_label.setAlignment(Qt.AlignCenter)
-        layout.addWidget(thumbnail_label)
-
+        content_layout.addWidget(thumbnail_label)
         label_widget = ClickableLabel(label)
+        label_widget.setFixedHeight(gui_constants.UI_SIZES['label_height'])
         label_widget.setAlignment(Qt.AlignCenter)
 
         def rename_label(label_widget, old_label, i):
@@ -124,21 +131,45 @@ class DisplayManager(QObject, LayerCollectionHandler):
                 self.set_layer_labels(i, new_label)
 
         label_widget.double_clicked.connect(lambda: rename_label(label_widget, label, i))
-        layout.addWidget(label_widget)
+        content_layout.addWidget(label_widget)
+        container_layout.addWidget(content_widget)
+        if is_current:
+            container.setStyleSheet(
+                f"#thumbnailContainer{{ border: 2px solid {self.thumbnail_highlight}; }}")
+        else:
+            container.setStyleSheet("#thumbnailContainer{ border: 2px solid transparent; }")
         item = QListWidgetItem()
-        item.setSizeHint(QSize(gui_constants.IMG_WIDTH, gui_constants.IMG_HEIGHT))
+        item.setSizeHint(QSize(gui_constants.UI_SIZES['thumbnail_width'] + 4,
+                               thumbnail.height() + label_widget.height() + 4))
         self.thumbnail_list.addItem(item)
-        self.thumbnail_list.setItemWidget(item, item_widget)
-
+        self.thumbnail_list.setItemWidget(item, container)
         if is_current:
             self.thumbnail_list.setCurrentItem(item)
 
+    def highlight_thumbnail(self, index):
+        for i in range(self.thumbnail_list.count()):
+            item = self.thumbnail_list.item(i)
+            widget = self.thumbnail_list.itemWidget(item)
+            if widget:
+                widget.setStyleSheet("#thumbnailContainer{ border: 2px solid transparent; }")
+        current_item = self.thumbnail_list.item(index)
+        if current_item:
+            widget = self.thumbnail_list.itemWidget(current_item)
+            if widget:
+                widget.setStyleSheet(
+                    f"#thumbnailContainer{{ border: 2px solid {self.thumbnail_highlight}; }}")
+        self.thumbnail_list.setCurrentRow(index)
+        self.thumbnail_list.scrollToItem(
+            self.thumbnail_list.item(index), QAbstractItemView.PositionAtCenter)
+
     def set_view_master(self):
         if self.has_no_master_layer():
             return
         self.view_mode = 'master'
         self.temp_view_individual = False
         self.display_master_layer()
+        self.thumbnail_highlight = gui_constants.THUMB_LO_COLOR
+        self.highlight_thumbnail(self.current_layer_idx())
         self.status_message_requested.emit("View mode: Master")
         self.cursor_preview_state_changed.emit(True)  # True = allow preview
 
@@ -148,6 +179,8 @@ class DisplayManager(QObject, LayerCollectionHandler):
         self.view_mode = 'individual'
         self.temp_view_individual = False
         self.display_current_layer()
+        self.thumbnail_highlight = gui_constants.THUMB_HI_COLOR
+        self.highlight_thumbnail(self.current_layer_idx())
         self.status_message_requested.emit("View mode: Individual layers")
         self.cursor_preview_state_changed.emit(False)  # False = no preview
 
@@ -155,6 +188,8 @@ class DisplayManager(QObject, LayerCollectionHandler):
         if not self.temp_view_individual and self.view_mode == 'master':
             self.temp_view_individual = True
             self.image_viewer.update_brush_cursor()
+            self.thumbnail_highlight = gui_constants.THUMB_HI_COLOR
+            self.highlight_thumbnail(self.current_layer_idx())
             self.display_current_layer()
             self.status_message_requested.emit("Temporary view: Individual layer (hold X)")
 
@@ -162,6 +197,8 @@ class DisplayManager(QObject, LayerCollectionHandler):
         if self.temp_view_individual:
             self.temp_view_individual = False
             self.image_viewer.update_brush_cursor()
+            self.thumbnail_highlight = gui_constants.THUMB_LO_COLOR
+            self.highlight_thumbnail(self.current_layer_idx())
             self.display_master_layer()
             self.status_message_requested.emit("View mode: Master")
             self.cursor_preview_state_changed.emit(True)  # Restore preview

{shinestacker-0.4.0 → shinestacker-0.5.0}/src/shinestacker/retouch/image_editor.py

@@ -1,5 +1,5 @@
 # pylint: disable=C0114, C0115, C0116, E0611, R0902
-from PySide6.QtWidgets import QMainWindow, QMessageBox, QAbstractItemView
+from PySide6.QtWidgets import QMainWindow, QMessageBox
 from .. config.constants import constants
 from .undo_manager import UndoManager
 from .layer_collection import LayerCollection
@@ -87,7 +87,7 @@ class ImageEditor(QMainWindow, LayerCollectionHandler):
     def update_title(self):
         title = constants.APP_TITLE
         if self.io_gui_handler is not None:
-            path = self.io_gui_handler.current_file_path
+            path = self.io_gui_handler.current_file_path()
             if path != '':
                 title += f" - {path.split('/')[-1]}"
                 if self.modified:
@@ -96,6 +96,7 @@ class ImageEditor(QMainWindow, LayerCollectionHandler):
 
     def mark_as_modified(self):
         self.modified = True
+        self.save_actions_set_enabled(True)
         self.update_title()
 
     def change_layer(self, layer_idx):
@@ -114,19 +115,14 @@ class ImageEditor(QMainWindow, LayerCollectionHandler):
             new_idx = max(0, self.current_layer_idx() - 1)
             if new_idx != self.current_layer_idx():
                 self.change_layer(new_idx)
-                self.highlight_thumbnail(new_idx)
+                self.display_manager.highlight_thumbnail(new_idx)
 
     def next_layer(self):
         if self.layer_stack() is not None:
             new_idx = min(self.number_of_layers() - 1, self.current_layer_idx() + 1)
             if new_idx != self.current_layer_idx():
                 self.change_layer(new_idx)
-                self.highlight_thumbnail(new_idx)
-
-    def highlight_thumbnail(self, index):
-        self.thumbnail_list.setCurrentRow(index)
-        self.thumbnail_list.scrollToItem(
-            self.thumbnail_list.item(index), QAbstractItemView.PositionAtCenter)
+                self.display_manager.highlight_thumbnail(new_idx)
 
     def copy_layer_to_master(self):
         if self.layer_stack() is None or self.master_layer() is None:

{shinestacker-0.4.0 → shinestacker-0.5.0}/src/shinestacker/retouch/image_editor_ui.py

@@ -23,6 +23,7 @@ def brush_size_to_slider(size):
 
 class ImageEditorUI(ImageFilters):
     def __init__(self):
+        self.thumbnail_highlight = gui_constants.THUMB_MASTER_HI_COLOR
         super().__init__()
         self.brush = Brush()
         self.setup_ui()
@@ -125,16 +126,19 @@ class ImageEditorUI(ImageFilters):
             }
         """)
         master_label.setAlignment(Qt.AlignCenter)
-        master_label.setFixedHeight(gui_constants.LABEL_HEIGHT)
+        master_label.setFixedHeight(gui_constants.UI_SIZES['label_height'])
         side_layout.addWidget(master_label)
         self.master_thumbnail_frame = QFrame()
+        self.master_thumbnail_frame.setObjectName("thumbnailContainer")
+        self.master_thumbnail_frame.setStyleSheet(
+            f"#thumbnailContainer{{ border: 2px solid {self.thumbnail_highlight}; }}")
         self.master_thumbnail_frame.setFrameShape(QFrame.StyledPanel)
         master_thumbnail_layout = QVBoxLayout(self.master_thumbnail_frame)
-        master_thumbnail_layout.setContentsMargins(2, 2, 2, 2)
+        master_thumbnail_layout.setContentsMargins(8, 8, 8, 8)
         self.master_thumbnail_label = QLabel()
         self.master_thumbnail_label.setAlignment(Qt.AlignCenter)
-        self.master_thumbnail_label.setFixedSize(
-            gui_constants.THUMB_WIDTH, gui_constants.THUMB_HEIGHT)
+        self.master_thumbnail_label.setFixedWidth(
+            gui_constants.UI_SIZES['thumbnail_width'])
         self.master_thumbnail_label.mousePressEvent = \
             lambda e: self.display_manager.set_view_master()
         master_thumbnail_layout.addWidget(self.master_thumbnail_label)
@@ -152,7 +156,7 @@ class ImageEditorUI(ImageFilters):
             }
         """)
         layers_label.setAlignment(Qt.AlignCenter)
-        layers_label.setFixedHeight(gui_constants.LABEL_HEIGHT)
+        layers_label.setFixedHeight(gui_constants.UI_SIZES['label_height'])
         side_layout.addWidget(layers_label)
         self.thumbnail_list = QListWidget()
         self.thumbnail_list.setFocusPolicy(Qt.StrongFocus)
@@ -204,18 +208,29 @@ class ImageEditorUI(ImageFilters):
         layout.setSpacing(2)
         super().setup_ui()
 
+    def highlight_master_thumbnail(self):
+        self.master_thumbnail_frame.setStyleSheet(
+            f"#thumbnailContainer{{ border: 2px solid {self.thumbnail_highlight}; }}")
+
     def setup_menu(self):
         menubar = self.menuBar()
         file_menu = menubar.addMenu("&File")
         file_menu.addAction("&Open...", self.io_gui_handler.open_file, "Ctrl+O")
-        file_menu.addAction("&Save", self.io_gui_handler.save_file, "Ctrl+S")
-        file_menu.addAction("Save &As...", self.io_gui_handler.save_file_as, "Ctrl+Shift+S")
-        self.save_master_only = QAction("Save Master &Only", self)
-        self.save_master_only.setCheckable(True)
-        self.save_master_only.setChecked(True)
-        file_menu.addAction(self.save_master_only)
-
-        file_menu.addAction("&Close", self.io_gui_handler.close_file, "Ctrl+W")
+        self.save_action = QAction("&Save", self)
+        self.save_action.setShortcut("Ctrl+S")
+        self.save_action.triggered.connect(self.io_gui_handler.save_file)
+        file_menu.addAction(self.save_action)
+        self.save_as_action = QAction("Save &As...", self)
+        self.save_as_action.setShortcut("Ctrl+Shift+S")
+        self.save_as_action.triggered.connect(self.io_gui_handler.save_file_as)
+        file_menu.addAction(self.save_as_action)
+        self.io_gui_handler.save_master_only = QAction("Save Master &Only", self)
+        self.io_gui_handler.save_master_only.setCheckable(True)
+        self.io_gui_handler.save_master_only.setChecked(True)
+        file_menu.addAction(self.io_gui_handler.save_master_only)
+        self.save_actions_set_enabled(False)
+
+        file_menu.addAction("&Close", self.close_file, "Ctrl+W")
         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)
@@ -271,12 +286,12 @@ class ImageEditorUI(ImageFilters):
 
         view_master_action = QAction("View Master", self)
         view_master_action.setShortcut("M")
-        view_master_action.triggered.connect(self.display_manager.set_view_master)
+        view_master_action.triggered.connect(self.set_view_master)
         view_menu.addAction(view_master_action)
 
         view_individual_action = QAction("View Individual", self)
         view_individual_action.setShortcut("L")
-        view_individual_action.triggered.connect(self.display_manager.set_view_individual)
+        view_individual_action.triggered.connect(self.set_view_individual)
         view_menu.addAction(view_individual_action)
         view_menu.addSeparator()
 
@@ -334,6 +349,25 @@ class ImageEditorUI(ImageFilters):
         shortcuts_help_action.triggered.connect(self.shortcuts_help)
         help_menu.addAction(shortcuts_help_action)
 
+    def save_actions_set_enabled(self, enabled):
+        self.save_action.setEnabled(enabled)
+        self.save_as_action.setEnabled(enabled)
+        self.io_gui_handler.save_master_only.setEnabled(enabled)
+
+    def close_file(self):
+        self.io_gui_handler.close_file()
+        self.save_actions_set_enabled(False)
+
+    def set_view_master(self):
+        self.display_manager.set_view_master()
+        self.thumbnail_highlight = gui_constants.THUMB_MASTER_HI_COLOR
+        self.highlight_master_thumbnail()
+
+    def set_view_individual(self):
+        self.display_manager.set_view_individual()
+        self.thumbnail_highlight = gui_constants.THUMB_MASTER_LO_COLOR
+        self.highlight_master_thumbnail()
+
     def shortcuts_help(self):
         self._dialog = ShortcutsHelp(self)
         self._dialog.exec()
@@ -365,8 +399,12 @@ class ImageEditorUI(ImageFilters):
     def handle_temp_view(self, start):
         if start:
             self.display_manager.start_temp_view()
+            self.thumbnail_highlight = gui_constants.THUMB_MASTER_LO_COLOR
+            self.highlight_master_thumbnail()
         else:
             self.display_manager.end_temp_view()
+            self.thumbnail_highlight = gui_constants.THUMB_MASTER_HI_COLOR
+            self.highlight_master_thumbnail()
 
     def handle_brush_size_change(self, delta):
         if delta > 0: