From f8c3ecb8629805b800c49ceeb219578f1d550a5f Mon Sep 17 00:00:00 2001 From: purpletennisball <212221402+purpletennisball@users.noreply.github.com> Date: Fri, 23 May 2025 22:59:44 -0400 Subject: [PATCH 1/3] feat: add increase/decrease zoom menu items --- src/tagstudio/qt/ts_qt.py | 50 ++++++++++++++++++-- src/tagstudio/resources/translations/en.json | 2 + 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/src/tagstudio/qt/ts_qt.py b/src/tagstudio/qt/ts_qt.py index 804f50988..7b6f74229 100644 --- a/src/tagstudio/qt/ts_qt.py +++ b/src/tagstudio/qt/ts_qt.py @@ -590,6 +590,46 @@ def on_show_filenames_action(checked: bool): show_filenames_action.triggered.connect(on_show_filenames_action) view_menu.addAction(show_filenames_action) + view_menu.addSeparator() + + def on_decrease_thumbnail_size_action(): + new_val = self.thumb_size_combobox.currentIndex() + 1 + if not (new_val + 1) > len(self.thumb_sizes): + self.thumb_size_combobox.setCurrentIndex(new_val) + + decrease_thumbnail_size_action = QAction( + Translations["menu.view.decrease_thumbnail_size"], menu_bar + ) + decrease_thumbnail_size_action.setShortcut( + QtCore.QKeyCombination( + QtCore.Qt.KeyboardModifier(QtCore.Qt.KeyboardModifier.ControlModifier), + QtCore.Qt.Key.Key_Minus, + ) + ) + decrease_thumbnail_size_action.setToolTip("Ctrl+-") + decrease_thumbnail_size_action.triggered.connect(on_decrease_thumbnail_size_action) + view_menu.addAction(decrease_thumbnail_size_action) + + def on_increase_thumbnail_size_action(): + new_val = self.thumb_size_combobox.currentIndex() - 1 + if not new_val < 0: + self.thumb_size_combobox.setCurrentIndex(new_val) + + increase_thumbnail_size_action = QAction( + Translations["menu.view.increase_thumbnail_size"], menu_bar + ) + increase_thumbnail_size_action.setShortcut( + QtCore.QKeyCombination( + QtCore.Qt.KeyboardModifier(QtCore.Qt.KeyboardModifier.ControlModifier), + QtCore.Qt.Key.Key_Plus, + ) + ) + increase_thumbnail_size_action.setToolTip("Ctrl+=") + increase_thumbnail_size_action.triggered.connect(on_increase_thumbnail_size_action) + view_menu.addAction(increase_thumbnail_size_action) + + view_menu.addSeparator() + # Tools Menu =========================================================== def create_fix_unlinked_entries_modal(): if not hasattr(self, "unlinked_modal"): @@ -784,12 +824,12 @@ def _filter_items(): sort_dir_dropdown.currentIndexChanged.connect(self.sorting_direction_callback) # Thumbnail Size ComboBox - thumb_size_combobox: QComboBox = self.main_window.thumb_size_combobox + self.thumb_size_combobox: QComboBox = self.main_window.thumb_size_combobox for size in self.thumb_sizes: - thumb_size_combobox.addItem(size[0]) - thumb_size_combobox.setCurrentIndex(2) # Default: Medium - thumb_size_combobox.currentIndexChanged.connect( - lambda: self.thumb_size_callback(thumb_size_combobox.currentIndex()) + self.thumb_size_combobox.addItem(size[0]) + self.thumb_size_combobox.setCurrentIndex(2) # Default: Medium + self.thumb_size_combobox.currentIndexChanged.connect( + lambda: self.thumb_size_callback(self.thumb_size_combobox.currentIndex()) ) self._init_thumb_grid() diff --git a/src/tagstudio/resources/translations/en.json b/src/tagstudio/resources/translations/en.json index 2d0b029b7..43ea10b2c 100644 --- a/src/tagstudio/resources/translations/en.json +++ b/src/tagstudio/resources/translations/en.json @@ -217,6 +217,8 @@ "menu.tools.fix_duplicate_files": "Fix Duplicate &Files", "menu.tools.fix_unlinked_entries": "Fix &Unlinked Entries", "menu.tools": "&Tools", + "menu.view.decrease_thumbnail_size": "Decrease Thumbnail Size", + "menu.view.increase_thumbnail_size": "Increase Thumbnail Size", "menu.view": "&View", "menu.window": "Window", "namespace.create.description_color": "Tag colors use namespaces as color palette groups. All custom colors must be under a namespace group first.", From ce7542e97c099347d565dbbd036e85a53c3b0e8c Mon Sep 17 00:00:00 2001 From: purpletennisball <212221402+purpletennisball@users.noreply.github.com> Date: Thu, 12 Jun 2025 13:46:01 -0400 Subject: [PATCH 2/3] fix: increase thumbnail size not working on windows --- src/tagstudio/qt/ts_qt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tagstudio/qt/ts_qt.py b/src/tagstudio/qt/ts_qt.py index 7b6f74229..3a18423de 100644 --- a/src/tagstudio/qt/ts_qt.py +++ b/src/tagstudio/qt/ts_qt.py @@ -621,7 +621,7 @@ def on_increase_thumbnail_size_action(): increase_thumbnail_size_action.setShortcut( QtCore.QKeyCombination( QtCore.Qt.KeyboardModifier(QtCore.Qt.KeyboardModifier.ControlModifier), - QtCore.Qt.Key.Key_Plus, + QtCore.Qt.Key.Key_Equal, ) ) increase_thumbnail_size_action.setToolTip("Ctrl+=") From b2c8ab6e65718567e5a426ad7a6adb141dbf6081 Mon Sep 17 00:00:00 2001 From: purpletennisball <212221402+purpletennisball@users.noreply.github.com> Date: Fri, 13 Jun 2025 03:20:21 -0400 Subject: [PATCH 3/3] fix: duplicated menu items --- src/tagstudio/qt/ts_qt.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/tagstudio/qt/ts_qt.py b/src/tagstudio/qt/ts_qt.py index 93ec78aed..2c48a6275 100644 --- a/src/tagstudio/qt/ts_qt.py +++ b/src/tagstudio/qt/ts_qt.py @@ -650,8 +650,6 @@ def _update_browsing_state(): ) # Thumbnail Size ComboBox - for size in self.main_window.THUMB_SIZES: - self.main_window.thumb_size_combobox.addItem(size[0]) self.main_window.thumb_size_combobox.setCurrentIndex(2) # Default: Medium self.main_window.thumb_size_combobox.currentIndexChanged.connect( lambda: self.thumb_size_callback(self.main_window.thumb_size_combobox.currentIndex())