From 5830b45b930752358753ca9fa89a60180a33e593 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Thu, 4 Dec 2008 03:46:18 +0900
Subject: [PATCH] reorganize menus, add icon

---
 designer/main.ui   |  58 ++++++++++++++++++++++++++++++++++-----------
 icons.qrc          |   1 +
 icons/anki-tag.png | Bin 0 -> 1475 bytes
 3 files changed, 45 insertions(+), 14 deletions(-)
 create mode 100644 icons/anki-tag.png

diff --git a/designer/main.ui b/designer/main.ui
index 325761052..e30e2c5c5 100644
--- a/designer/main.ui
+++ b/designer/main.ui
@@ -207,7 +207,7 @@
        <item row="1" column="0" >
         <widget class="QStackedWidget" name="buttonStack" >
          <property name="currentIndex" >
-          <number>0</number>
+          <number>3</number>
          </property>
          <widget class="QWidget" name="page1" >
           <property name="geometry" >
@@ -246,8 +246,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>100</width>
-            <height>30</height>
+            <width>370</width>
+            <height>49</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_3" >
@@ -384,8 +384,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>100</width>
-            <height>30</height>
+            <width>370</width>
+            <height>49</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_4" >
@@ -414,6 +414,16 @@
            </item>
           </layout>
          </widget>
+         <widget class="QWidget" name="page4" >
+          <property name="geometry" >
+           <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>370</width>
+            <height>49</height>
+           </rect>
+          </property>
+         </widget>
         </widget>
        </item>
       </layout>
@@ -633,7 +643,6 @@
     <addaction name="actionRedo" />
     <addaction name="separator" />
     <addaction name="actionAddcards" />
-    <addaction name="actionEditCurrent" />
     <addaction name="actionEditdeck" />
     <addaction name="separator" />
     <addaction name="actionActiveTags" />
@@ -691,10 +700,6 @@
      <addaction name="actionLookup_es" />
      <addaction name="actionLookup_esk" />
     </widget>
-    <addaction name="actionMarkCard" />
-    <addaction name="actionSuspendCard" />
-    <addaction name="separator" />
-    <addaction name="actionRepeatAudio" />
     <addaction name="separator" />
     <addaction name="actionGraphs" />
     <addaction name="actionDstats" />
@@ -732,8 +737,20 @@
     <addaction name="separator" />
     <addaction name="menuStartup" />
    </widget>
+   <widget class="QMenu" name="menu_Current_2" >
+    <property name="title" >
+     <string>&amp;Current</string>
+    </property>
+    <addaction name="actionRepeatAudio" />
+    <addaction name="separator" />
+    <addaction name="actionEditCurrent" />
+    <addaction name="actionMarkCard" />
+    <addaction name="actionSuspendCard" />
+    <addaction name="actionDelete" />
+   </widget>
    <addaction name="menuDeck" />
    <addaction name="menuEdit" />
+   <addaction name="menu_Current_2" />
    <addaction name="menuTools" />
    <addaction name="menuPlugins" />
    <addaction name="menuAdvanced" />
@@ -1072,7 +1089,7 @@
      <normaloff>:/icons/rating.png</normaloff>:/icons/rating.png</iconset>
    </property>
    <property name="text" >
-    <string>&amp;Mark Card</string>
+    <string>&amp;Mark</string>
    </property>
    <property name="shortcut" >
     <string>Ctrl+M</string>
@@ -1084,7 +1101,7 @@
      <normaloff>:/icons/media-playback-pause.png</normaloff>:/icons/media-playback-pause.png</iconset>
    </property>
    <property name="text" >
-    <string>&amp;Suspend fact</string>
+    <string>&amp;Suspend</string>
    </property>
    <property name="statusTip" >
     <string>Stop reviewing this card until it's unsuspended in the editor.</string>
@@ -1121,7 +1138,7 @@
      <normaloff>:/icons/media-playback-start.png</normaloff>:/icons/media-playback-start.png</iconset>
    </property>
    <property name="text" >
-    <string>Repeat Las&amp;t Audio</string>
+    <string>Repeat &amp;Audio</string>
    </property>
    <property name="shortcut" >
     <string>F5</string>
@@ -1249,6 +1266,10 @@
    </property>
   </action>
   <action name="actionActiveTags" >
+   <property name="icon" >
+    <iconset resource="../icons.qrc" >
+     <normaloff>:/icons/anki-tag.png</normaloff>:/icons/anki-tag.png</iconset>
+   </property>
    <property name="text" >
     <string>Active &amp;Tags...</string>
    </property>
@@ -1268,7 +1289,7 @@
      <normaloff>:/icons/edit-rename.png</normaloff>:/icons/edit-rename.png</iconset>
    </property>
    <property name="text" >
-    <string>&amp;Edit Current...</string>
+    <string>&amp;Edit...</string>
    </property>
    <property name="shortcut" >
     <string>Ctrl+E</string>
@@ -1283,6 +1304,15 @@
     <string>&amp;Redo</string>
    </property>
   </action>
+  <action name="actionDelete" >
+   <property name="icon" >
+    <iconset resource="../icons.qrc" >
+     <normaloff>:/icons/editdelete.png</normaloff>:/icons/editdelete.png</iconset>
+   </property>
+   <property name="text" >
+    <string>&amp;Delete</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="../icons.qrc" />
diff --git a/icons.qrc b/icons.qrc
index 24f96c201..d6c0dae44 100644
--- a/icons.qrc
+++ b/icons.qrc
@@ -1,5 +1,6 @@
 <RCC>
   <qresource prefix="/" >
+    <file>icons/anki-tag.png</file>
     <file>icons/edit-redo.png</file>
     <file>icons/text-xml.png</file>
     <file>icons/document-preview.png</file>
diff --git a/icons/anki-tag.png b/icons/anki-tag.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8f744b0bdb6d1a2ca1ad7e87fdca9defb003764
GIT binary patch
literal 1475
zcmV;!1w8tRP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L02Cqs02Cqtj}1r200007bV*G`2iOb)
z5-Snrp4^B400l!yL_t(o!|j*Lj~rJO#((GBs(#MHJ>&MYXFTH>2W-#y5u69X39_Zc
ziLxVRfrKOPB1KAeNGO|tSP&upfJl)Lut97<LShjK2_p!S*@QqGVWT7@&I5bKZN~1N
z8F$Zg-FvdAu6_(gQ9>kde5KN@x>fgn-~G<xo)R<TPB!HZx4Q)HIDzQ%PMlbLxMpTk
z-A5bjgQ<zQbVPLMo#0JXF*6ep<g-M<)Y5|^iRYUgi_ap_qk{^HNCr4OY1?z}yY9PB
zB~Uy3Rp-4u-U;q(u;?j7OCmyf_Ff9L{po@ki0JK!432kO>*^&oK78|ko1k*=_^}Z5
ztV!Y9Kn<X<YaioFkFjv*es+yShzPM0@{#la%nT7B(sZ{f{hh1O8~^S3X*NE3YnZ^~
z(j$@gb|#p97l{ue5RXkUe()sKLnpasXC9~NLQYfg!Fv%Q@u9b#nc=$vI|Wst5T|O0
zi$SzcpmOl|L*C+F0{dLP$k>4sj30WOr9C@{lp)}3hZ(TzZZlZAyFs%KN}mLV2#82Z
zpbP#xjdJ6Y_n&6}1CLTExgpT3ciNXXYhjxkZMS!ifDc@`xkWkekSGrt5lt>VlJ^$>
zO5?)#-02^1c<)YB;KB#1Aj$*#CdfxJL?Q$A!SI>9(kGJLXG&yqGGZH>o+wvH74Six
z6_MHM@u#_Wp~@SV-ecvppVL{ZBO+WKo1*sEbDTOlJ>*nA2?V3(2bs;gNT`7Cnj|wz
z_8lU0ZZ$}5-9!y{TJs~^_u$tsGnW7G3d#EQ2Jn)Z{jjrEzj5{VFB1%MF7;v`tY-=z
zY{&#6La@FXW|k_|y@Elz6X-PS_*Mf&bg5WfV6@=)`#T@w+iO_xKW<z+_hRGXx$gl#
z@*Dr*kN;dHa>{0sE|h`APKNv-1I)rPlijHhIqf-at}@+?0?}Ba7^i*j6?Ole%`C9e
z?DTe@W#8@buEG#0A5!T90%kpo&FdeeJ|JRmx9gW53I<<4GS9EijT1K4U)XWzR2eYy
zo##y>+SlHLd-@KUUD-~}Qh9YC08~J``C-rmE6om}(*{voxjHxNljLNxa+Liu6V%HG
zSbOJup|e&$;Wt)KSO~?@`TK}Rt2E;(dnfZmDv0#$ZI<eh0i@#wq<!d;jGY2Tv*lTj
zCb@CpRovLr^xqPTpIyKF*WxlYwr>2Jd}W5HT%lO|GCPhuNq%A$G@{+8Gf}Nk%sE7c
z<3Cjbq!+6F&`a$vSl4jPmgmN;gqs&$MVH??-$<HQ&bF@nWAnq`e4n*<{{k9O+`UL~
z_aYkQKqEvQqK?a}TSK5(cn!w-_C%B^mCd=nk<eawclb0c)xLDfkY6A=<?>}pdyZ0?
zSt1_a-2)eOXnut0**WGXa^xcIIox0#*q)BFDA-JlOUo_l*H&oPFLUkBKN~)dM`rdH
zytijW-FFaOfb=jb?>Rzg?khy)i9VSqCO5W=15-st3$B-tf<d#Du)LPwgE5+S6ysEZ
zD~&B$9V2$a>c8G#<+Y#Qz8)ygEJ_IBVG%ilM&AN<iU|3g3zYXBqda#ER~$uLjK+oZ
zWCKe12p^2rdV{ca3(b`n-%(+$)xnZYG%heX5;K~2TzvC&R{r#pPcKMDW)DZfcmg;h
z>YhThEFu(lFH)$^r#V72%^lsoSELM%i}dahrM>bt>+iq**-Em}xg(`ud_!FPH1GtX
z@omeo+f_yb71Cf8C7<`tXl(vyMUb>8)ks7<pkiq;Dj5OMu9r#{mnz*-QdIvB0(XB*
d?h^Q-+9!p&Bcu9AlJEck002ovPDHLkV1n$3!0G@1

literal 0
HcmV?d00001