Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update shortcut in tooltips of layout buttons

Browse Source
This commit is contained in:
Kovid Goyal 2017-06-19 17:13:52 +05:30
parent 8ccdd923b9
commit 0dc431952d
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/gui2/init.py
View File

@ -338,6 +338,7 @@ class GridViewButton(LayoutButton): # {{{
gui.keyboard.register_shortcut('grid view toggle' + self.label, unicode(self.action_toggle.text()), gui.keyboard.register_shortcut('grid view toggle' + self.label, unicode(self.action_toggle.text()),
default_keys=(sc,), action=self.action_toggle) default_keys=(sc,), action=self.action_toggle)
self.action_toggle.triggered.connect(self.toggle) self.action_toggle.triggered.connect(self.toggle)
self.action_toggle.changed.connect(self.update_shortcut)
self.toggled.connect(self.update_state) self.toggled.connect(self.update_state)
def update_state(self, checked): def update_state(self, checked):
@ -367,6 +368,7 @@ class SearchBarButton(LayoutButton): # {{{
gui.keyboard.register_shortcut('search bar toggle' + self.label, unicode(self.action_toggle.text()), gui.keyboard.register_shortcut('search bar toggle' + self.label, unicode(self.action_toggle.text()),
default_keys=(sc,), action=self.action_toggle) default_keys=(sc,), action=self.action_toggle)
self.action_toggle.triggered.connect(self.toggle) self.action_toggle.triggered.connect(self.toggle)
self.action_toggle.changed.connect(self.update_shortcut)
self.toggled.connect(self.update_state) self.toggled.connect(self.update_state)
def update_state(self, checked): def update_state(self, checked):

16
src/calibre/gui2/widgets.py
View File

@ -965,9 +965,15 @@ class LayoutButton(QToolButton):
if splitter is not None: if splitter is not None:
splitter.state_changed.connect(self.update_state) splitter.state_changed.connect(self.update_state)
self.setCursor(Qt.PointingHandCursor) self.setCursor(Qt.PointingHandCursor)
self.shortcut = '' self.shortcut = shortcut or ''
if shortcut:
self.shortcut = shortcut def update_shortcut(self, action_toggle=None):
action_toggle = action_toggle or getattr(self, 'action_toggle', None)
if action_toggle:
sc = action_toggle.shortcut()
if sc:
sc = sc.toString(sc.NativeText)
self.shortcut = sc or ''
def set_state_to_show(self, *args): def set_state_to_show(self, *args):
self.setChecked(False) self.setChecked(False)
@ -1036,6 +1042,7 @@ class Splitter(QSplitter):
if shortcut is not None: if shortcut is not None:
self.action_toggle = QAction(QIcon(icon), _('Toggle') + ' ' + label, self.action_toggle = QAction(QIcon(icon), _('Toggle') + ' ' + label,
self) self)
self.action_toggle.changed.connect(self.update_shortcut)
self.action_toggle.triggered.connect(self.toggle_triggered) self.action_toggle.triggered.connect(self.toggle_triggered)
if parent is not None: if parent is not None:
parent.addAction(self.action_toggle) parent.addAction(self.action_toggle)
@ -1048,6 +1055,9 @@ class Splitter(QSplitter):
else: else:
self.action_toggle.setShortcut(shortcut) self.action_toggle.setShortcut(shortcut)
def update_shortcut(self):
self.button.update_shortcut(self.action_toggle)
def toggle_triggered(self, *args): def toggle_triggered(self, *args):
self.toggle_side_pane() self.toggle_side_pane()