From d9b5d113124da45855ff1cf7e4468582339a5da4 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Fri, 4 Aug 2017 17:39:40 +1000
Subject: [PATCH] fix conflicting add tags/jump to tags shortcuts

---
 aqt/browser.py      | 8 ++++----
 designer/browser.ui | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/aqt/browser.py b/aqt/browser.py
index 60f3f38c7..d8f813380 100644
--- a/aqt/browser.py
+++ b/aqt/browser.py
@@ -433,9 +433,9 @@ class Browser(QMainWindow):
         self.changeDeckCut = QShortcut(QKeySequence("Ctrl+D"), self)
         self.changeDeckCut.activated.connect(self.setDeck)
         # add/remove tags
-        self.tagCut1 = QShortcut(QKeySequence("Ctrl+Shift+T"), self)
+        self.tagCut1 = QShortcut(QKeySequence("Ctrl+Shift+A"), self)
         self.tagCut1.activated.connect(self.addTags)
-        self.tagCut2 = QShortcut(QKeySequence("Ctrl+Alt+T"), self)
+        self.tagCut2 = QShortcut(QKeySequence("Ctrl+Shift+D"), self)
         self.tagCut2.activated.connect(self.deleteTags)
         self.tagCut3 = QShortcut(QKeySequence("Ctrl+K"), self)
         self.tagCut3.activated.connect(self.onMark)
@@ -1810,9 +1810,9 @@ class BrowserToolbar(Toolbar):
         right += borderImg("setDeck", "deck16", _("Change Deck"),
                            shortcut(_("Move To Deck (Ctrl+D)")))
         right += borderImg("addtag", "addtag16", _("Add Tags"),
-                       shortcut(_("Bulk Add Tags (Ctrl+Shift+T)")))
+                       shortcut(_("Bulk Add Tags (Ctrl+Shift+A)")))
         right += borderImg("deletetag", "deletetag16", _("Remove Tags"), shortcut(_(
-                               "Bulk Remove Tags (Ctrl+Alt+T)")))
+                               "Bulk Remove Tags (Ctrl+Shift+D)")))
         right += borderImg("delete", "delete16", _("Delete"), shortcut(_("Ctrl+Delete")))
         right += "</div>"
         return self._body % right
diff --git a/designer/browser.ui b/designer/browser.ui
index 92592f4cb..a041a4b40 100644
--- a/designer/browser.ui
+++ b/designer/browser.ui
@@ -417,7 +417,7 @@
     <string>Select &amp;Notes</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+Shift+A</string>
+    <string>Ctrl+Shift+N</string>
    </property>
   </action>
   <action name="actionFindReplace">