From 402459d8fa29ec2e532de22c817c23cf6269e515 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 5 Jan 2024 17:17:37 +0530 Subject: [PATCH] Move main window layout shortcuts into their own group --- src/calibre/gui2/central.py | 6 ++++-- src/calibre/gui2/init.py | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/calibre/gui2/central.py b/src/calibre/gui2/central.py index 210ab34898..f0f56a75aa 100644 --- a/src/calibre/gui2/central.py +++ b/src/calibre/gui2/central.py @@ -123,7 +123,8 @@ class LayoutButton(QToolButton): self.action_toggle.triggered.connect(self.toggle) gui.addAction(self.action_toggle) gui.keyboard.register_shortcut( - f'toggle_central_panel_{self.name}', self.action_toggle.text(), default_keys=(self.shortcut,), action=self.action_toggle) + f'toggle_central_panel_{self.name}', self.action_toggle.text(), group=_('Main window layout'), + default_keys=(self.shortcut,), action=self.action_toggle) @property def is_visible(self): @@ -381,7 +382,8 @@ class CentralContainer(QWidget): self.set_widget('tag_browser', gui.tb_widget) self.set_widget('book_list', book_list_widget) gui.keyboard.register_shortcut( - 'toggle_layout_type', _('Toggle layout between wide and narrow'), default_keys=('Alt+Shift+L',), action=self.action_toggle_layout) + 'toggle_layout_type', _('Toggle layout between wide and narrow'), group=_('Main window layout'), + default_keys=('Alt+Shift+L',), action=self.action_toggle_layout) gui.addAction(self.action_toggle_layout) # cover browser is set in CoverFlowMixin # Quickview is set in quickview.py code diff --git a/src/calibre/gui2/init.py b/src/calibre/gui2/init.py index 271d1b2074..272ce00971 100644 --- a/src/calibre/gui2/init.py +++ b/src/calibre/gui2/init.py @@ -233,7 +233,7 @@ class GridViewButton(LayoutButton): # {{{ self.action_toggle = QAction(self.icon(), _('Toggle') + ' ' + self.label, self) gui.addAction(self.action_toggle) gui.keyboard.register_shortcut('grid view toggle' + self.label, str(self.action_toggle.text()), - default_keys=(sc,), action=self.action_toggle) + default_keys=(sc,), action=self.action_toggle, group=_('Main window layout')) self.action_toggle.triggered.connect(self.toggle) self.action_toggle.changed.connect(self.update_shortcut) self.toggled.connect(self.update_state) @@ -267,7 +267,7 @@ class SearchBarButton(LayoutButton): # {{{ self.action_toggle = QAction(self.icon(), _('Toggle') + ' ' + self.label, self) gui.addAction(self.action_toggle) gui.keyboard.register_shortcut('search bar toggle' + self.label, str(self.action_toggle.text()), - default_keys=(sc,), action=self.action_toggle) + default_keys=(sc,), action=self.action_toggle, group=_('Main window layout')) self.action_toggle.triggered.connect(self.toggle) self.action_toggle.changed.connect(self.update_shortcut) self.toggled.connect(self.update_state)