From b592feb464f6cad373ae9c5829445d883ed79d06 Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Mon, 5 Oct 2015 09:51:01 +0200 Subject: [PATCH 1/2] Remove debugging parameter --- src/calibre/gui2/tag_browser/ui.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/calibre/gui2/tag_browser/ui.py b/src/calibre/gui2/tag_browser/ui.py index 7fab6f0626..f62294b7ba 100644 --- a/src/calibre/gui2/tag_browser/ui.py +++ b/src/calibre/gui2/tag_browser/ui.py @@ -452,7 +452,6 @@ class TagBrowserWidget(QWidget): # {{{ parent.addAction(ac) parent.keyboard.register_shortcut('tag browser toggle item', _("'Click' found item"), default_keys=(), - description="foobar", action=ac, group=_('Tag Browser')) ac.triggered.connect(self.toggle_item) From b574e4c9778b3c252a955e05c35d95ed84f9e222 Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Mon, 5 Oct 2015 09:54:45 +0200 Subject: [PATCH 2/2] Remove default keyboard shortcuts for the new general Tag Browser items. Rationale: before they could not conflict with a user-defined shortcut, but now they can. The conflict will be very mysterious for people. On the other hand, if people used the previous shortcuts then they will stop working, which gives them the indication that they need to do something, and in any event the shortcut could be different from what it was in languages other than English. This second case will be easier to support than the first. --- src/calibre/gui2/tag_browser/ui.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/tag_browser/ui.py b/src/calibre/gui2/tag_browser/ui.py index f62294b7ba..2c8c4ecede 100644 --- a/src/calibre/gui2/tag_browser/ui.py +++ b/src/calibre/gui2/tag_browser/ui.py @@ -337,7 +337,7 @@ class TagBrowserWidget(QWidget): # {{{ ac = QAction(parent) parent.addAction(ac) parent.keyboard.register_shortcut('tag browser find box', - _('Find item'), default_keys=("Alt+f",), + _('Find item'), default_keys=(), action=ac, group=_('Tag Browser')) ac.triggered.connect(self.set_focus_to_find_box) @@ -348,7 +348,7 @@ class TagBrowserWidget(QWidget): # {{{ ac = QAction(parent) parent.addAction(ac) parent.keyboard.register_shortcut('tag browser find button', - _('Find button'), default_keys=("Alt+i",), + _('Find button'), default_keys=(), action=ac, group=_('Tag Browser')) ac.triggered.connect(self.search_button.click)