From d33f05f0282fd279a781fd0a739fb264393b00c8 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Thu, 15 Dec 2011 16:17:48 +0900
Subject: [PATCH] browser toolbar tweaks

---
 aqt/browser.py            |  37 +++++++++++++++++--------------------
 designer/icons.qrc        |   1 +
 designer/icons/deck16.png | Bin 0 -> 3168 bytes
 3 files changed, 18 insertions(+), 20 deletions(-)
 create mode 100644 designer/icons/deck16.png

diff --git a/aqt/browser.py b/aqt/browser.py
index f12b44f08..5bc687861 100644
--- a/aqt/browser.py
+++ b/aqt/browser.py
@@ -339,7 +339,7 @@ class Browser(QMainWindow):
 
     def setupToolbar(self):
         self.toolbarWeb = AnkiWebView()
-        self.toolbarWeb.setFixedHeight(34)
+        self.toolbarWeb.setFixedHeight(32)
         self.toolbar = BrowserToolbar(self.mw, self.toolbarWeb, self)
         self.form.verticalLayout_3.insertWidget(0, self.toolbarWeb)
         self.toolbar.draw()
@@ -713,7 +713,7 @@ class Browser(QMainWindow):
         rep = "<style>table * { font-size: 12px; }</style>" + rep
         m = self.card.model()
         rep = """
-<div style='width: 300px; margin: 0 auto 0;
+<div style='width: 400px; margin: 0 auto 0;
 border: 1px solid #000; padding: 3px; '>%s</div>""" % rep
         return rep, cs
 
@@ -1411,14 +1411,6 @@ class BrowserToolbar(Toolbar):
         self.browser = browser
         Toolbar.__init__(self, mw, web)
 
-    def _centerLinks(self):
-        links = [
-            ["add", _("Add Notes"), ""],
-            ["delete", _("Delete Notes"), ""],
-            ["setDeck", _("Change Deck"), ""],
-        ]
-        return self._linkHTML(links)
-
     def draw(self):
         mark = self.browser.isMarked()
         pause = self.browser.isSuspended()
@@ -1429,18 +1421,23 @@ class BrowserToolbar(Toolbar):
 <img style='background: #000;' src="qrc:/icons/%s.png"></a>'''
             else:
                 fmt = '''\
-<a class=hitem title="%s" href="%s"><img src="qrc:/icons/%s.png"></a>'''
-            return fmt % (title, link, icon)
+<a class=hitem title="%s" href="%s"><img valign=bottom src="qrc:/icons/%s.png"> %s</a>'''
+            return fmt % (title, link, icon, title)
         right = ""
-        right += borderImg("info", "info", False, _("Card Info"))
-        right += borderImg("mark", "star16", mark, _("Mark Note"))
-        right += borderImg("pause", "pause16", pause, _("Suspend Cards"))
-        right += borderImg("addtag", "addtag16", False, _("Bulk Tag Add"))
-        right += borderImg("deletetag", "deletetag16", False, _("Bulk Tag Delete"))
+        right += borderImg("info", "info", False, _("Info"))
+        right += borderImg("mark", "star16", mark, _("Mark"))
+        right += borderImg("pause", "pause16", pause, _("Suspend"))
+        right += borderImg("setDeck", "deck16", pause, _("Change Deck"))
+        right += borderImg("addtag", "addtag16", False, _("Tags"))
+        right += borderImg("deletetag", "deletetag16", False, _("Remove Tags"))
+        right += borderImg("delete", "delete16", False, _("Delete"))
         self.web.stdHtml(self._body % (
-            "<span style='display:inline-block; width: 100px;'></span>",
-            self._centerLinks(),
-            right), self._css)
+            "", #<span style='display:inline-block; width: 100px;'></span>",
+            #self._centerLinks(),
+            right, ""), self._css + """
+#header { font-weight: normal; }
+a { margin-right: 1em; }
+""")
 
     # Link handling
     ######################################################################
diff --git a/designer/icons.qrc b/designer/icons.qrc
index cf38585d2..00de91816 100644
--- a/designer/icons.qrc
+++ b/designer/icons.qrc
@@ -107,5 +107,6 @@
     <file>icons/addtag16.png</file>
     <file>icons/deletetag16.png</file>
     <file>icons/mail-attachment.png</file>
+    <file>icons/deck16.png</file>
   </qresource>
 </RCC>
diff --git a/designer/icons/deck16.png b/designer/icons/deck16.png
new file mode 100644
index 0000000000000000000000000000000000000000..91768bfc59d8b791e95f7585bfd6cd3a0077003a
GIT binary patch
literal 3168
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
GLSTYuO%sR!

literal 0
HcmV?d00001