From aa4621c66c6d72846f51142957e691ff4e218d57 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Sat, 9 May 2009 06:35:56 +0900
Subject: [PATCH] add shortcuts for filter/sort, fix bug in hiding separators

---
 ankiqt/ui/cardlist.py         |  10 +++++++++-
 designer/cardlist.ui          |  30 ++++++++++++++++++++++++++++++
 icons.qrc                     |   1 +
 icons/view-sort-ascending.png | Bin 0 -> 1167 bytes
 4 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 icons/view-sort-ascending.png

diff --git a/ankiqt/ui/cardlist.py b/ankiqt/ui/cardlist.py
index 328efdca5..6c8033e08 100644
--- a/ankiqt/ui/cardlist.py
+++ b/ankiqt/ui/cardlist.py
@@ -394,10 +394,10 @@ class EditDeck(QMainWindow):
             icon = QIcon(":/icons/" + icon)
             for t in sortedtags:
                 self.dialog.tagList.addItem(icon, t.replace("_", " "))
-            alltags.append(None)
             if sortedtags:
                 self.dialog.tagList.insertSeparator(
                     self.dialog.tagList.count())
+                alltags.append(None)
         # fact tags
         alluser = sorted(self.deck.allTags())
         for tag in alltags:
@@ -623,6 +623,8 @@ class EditDeck(QMainWindow):
         self.connect(self.dialog.actionNextCard, SIGNAL("triggered()"), self.onNextCard)
         self.connect(self.dialog.actionFind, SIGNAL("triggered()"), self.onFind)
         self.connect(self.dialog.actionFact, SIGNAL("triggered()"), self.onFact)
+        self.connect(self.dialog.actionTags, SIGNAL("triggered()"), self.onTags)
+        self.connect(self.dialog.actionSort, SIGNAL("triggered()"), self.onSort)
         # help
         self.connect(self.dialog.actionGuide, SIGNAL("triggered()"), self.onHelp)
         runHook('editor.setupMenus', self)
@@ -1054,6 +1056,12 @@ where id in %s""" % ids2str(sf))
     def onFact(self):
         self.editor.focusFirst()
 
+    def onTags(self):
+        self.dialog.tagList.setFocus()
+
+    def onSort(self):
+        self.dialog.sortBox.setFocus()
+
     # Help
     ######################################################################
 
diff --git a/designer/cardlist.ui b/designer/cardlist.ui
index b1ec8e25a..9e2522cd4 100644
--- a/designer/cardlist.ui
+++ b/designer/cardlist.ui
@@ -209,12 +209,15 @@
      <string>&amp;Go</string>
     </property>
     <addaction name="actionFind" />
+    <addaction name="actionTags" />
+    <addaction name="actionSort" />
     <addaction name="actionFact" />
     <addaction name="separator" />
     <addaction name="actionFirstCard" />
     <addaction name="actionPreviousCard" />
     <addaction name="actionNextCard" />
     <addaction name="actionLastCard" />
+    <addaction name="separator" />
    </widget>
    <widget class="QMenu" name="menu_Help" >
     <property name="title" >
@@ -391,6 +394,9 @@
    <property name="text" >
     <string>&amp;Guide...</string>
    </property>
+   <property name="shortcut" >
+    <string>F1</string>
+   </property>
   </action>
   <action name="actionChangeModel" >
    <property name="icon" >
@@ -443,6 +449,30 @@
     <string>&amp;Unsuspend</string>
    </property>
   </action>
+  <action name="actionTags" >
+   <property name="icon" >
+    <iconset resource="../icons.qrc" >
+     <normaloff>:/icons/anki-tag.png</normaloff>:/icons/anki-tag.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Fil&amp;ters</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+T</string>
+   </property>
+  </action>
+  <action name="actionSort" >
+   <property name="icon" >
+    <iconset resource="../icons.qrc" >
+     <normaloff>:/icons/view-sort-ascending.png</normaloff>:/icons/view-sort-ascending.png</iconset>
+   </property>
+   <property name="text" >
+    <string>&amp;Sort</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+Shift+S</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="../icons.qrc" />
diff --git a/icons.qrc b/icons.qrc
index 97d9853d1..9fb4a6b86 100644
--- a/icons.qrc
+++ b/icons.qrc
@@ -1,5 +1,6 @@
 <RCC>
   <qresource prefix="/" >
+    <file>icons/view-sort-ascending.png</file>
     <file>icons/media-playback-start2.png</file>
     <file>icons/anki-logo-thin.png</file>
     <file>icons/anki-logo.png</file>
diff --git a/icons/view-sort-ascending.png b/icons/view-sort-ascending.png
new file mode 100644
index 0000000000000000000000000000000000000000..88bc4b333ed046a416b30682e838b5e277e78821
GIT binary patch
literal 1167
zcmV;A1aSL_P)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw00003b3#c}2nYz<
z;ZNWI000SaNLh0L00VXa00VXbebs`@0000PbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}
zWiD@WXPfRk8UO$S3Q$Z`MgRZ*0000000000000000!57jMvnwYkOfJS0W@m>00000
z00000Bx$-3QJDrofeKBP2}_d*N|6amlLkqT9$cUwT%aFap&(wPAYY^)U#1{osUcsZ
zAz!2+U!@^nq#<CYAz-K>VXGoxs3KvhB4Vo|W33`%t|MixBW187WwIk?vm|7&BxbQB
zXS5_|wIpb`C1|%LX}Kn8xh876CTqJVU!5mlpC@a*Cv3eeWS=o<s4;4(Gi<6obFNc>
zuUVAST9ngViMwHv&0?9;Vwu)zpW1Sx*mR}dd#T!dtKoj7(toDYg00(wsMCb0)rG3m
zg|Ov@tJa9C)`+auh_T#_uh)&X>5-F|k(8N{x89PKnv<5Ala`y5mz<To?v}jln!Mnh
z!SbHM@Sei*pTqE^!{nvM^`^-6tE;Q5tgNlAt*yJtuCA`HudlDl=C98Au&}VPv9Yti
z&b!6Zyu{7D#m>IQ&%ejez{t_T$<oBi)5Xiw#>~~n&DO}y*U8V=%Fx%!(Amq;*v!(|
z&C%G-(%H|`+R)V7(be42*4@?F-PYRP*W2IN+~C>W;o9Ef+TiEg-{alj<KE%q-{R%q
z<L2Pz?cwC-;^pY$<mcn&>Ez|;<>u+`?(XmJ@9^;O@$vEU^78ZZ^Yrxe_4W1k_V)Mp
z_xSku`T6<!`uh9(`~3X;{r&wMo8*=N000$qQchC<0tW~c7#J8BA2T#Lwzt5<*Vx$E
z__L+y0005jNkl<Z7#Rh@!D?J(00z+W-T8CV1d0^h6m%iDOcs)YXj0$9Rab&<B-oAM
z-e<7b20<5+=+cE1Dxxb>o0-ha{X8dG9R>gZbh9r;=C8LA5rC>1Pu9gSZP!zhNJwe5
zZ6`27et#W7ps4%rMPR_)93eod^*3)$e!anf<6MR5^cttvPN@Grvik`G<~#~<7J8=C
z{?-D6<iT2q2^OVC%hmz|4(3crB2?QhT{a2>2#7R=blKX$0C|y%=PMpx+Ve5ewZecn
zkH<-Ju5F9%6b3*5kkVzpz(8L98xeu3y1%<?VZeHhh?o{twO)oD3^;aelG9(Lr&mr?
z8ygrfdnDq_v^Z1MPG%VJ;5K3s)1nr2uagZ7IG8gf$rQS@?b7|B!azfVqEMDuVE`|3
zaT%-gOWphA>2FKlKk`A_O;$%wH<^-Ticnp?eCO@O&M^J`-2@7)s@7+J{h6*-&8uhY
z0WWVv1gL)a<LY7M)emnr1J<(;fvWl9`-6A=@%;6jL3^C5Fr8k9lWQj&eR?^0cC#g`
zqpvpqL<m5sgKvMnyTyRFHW31px;MV~{0>GjA0|lzs%={e!*U=If)u4X7LcqC0{{TJ
h*%y%n006Xw{{e$G@ju;%{8j(}002ovPDHLkV1g2TR=5BF

literal 0
HcmV?d00001