From f75ef69fbac346b408292212c5b688899b91ad0d Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Sat, 26 Nov 2011 22:07:10 +0900 Subject: [PATCH] experimenting with a new toolbar --- aqt/deckbrowser.py | 6 ++-- aqt/main.py | 2 +- aqt/overview.py | 51 +++++++++++++++++++++++++++-- designer/icons.qrc | 1 + designer/icons/view-refresh.png | Bin 0 -> 3176 bytes designer/icons/view-statistics.png | Bin 1373 -> 3107 bytes 6 files changed, 53 insertions(+), 7 deletions(-) create mode 100644 designer/icons/view-refresh.png diff --git a/aqt/deckbrowser.py b/aqt/deckbrowser.py index 850dbce95..f2246c85e 100644 --- a/aqt/deckbrowser.py +++ b/aqt/deckbrowser.py @@ -50,14 +50,14 @@ class DeckBrowser(object): _css = """ .sub { color: #555; } -a.deck { color: #000; text-decoration: none; font-size: 16px; } +a.deck { color: #000; text-decoration: none; font-size: 12px; } .num { text-align: right; padding: 0 5 0 5; } td.opts { white-space: nowrap; } td.deck { width: 90% } a { font-size: 80%; } .extra { font-size: 90%; } .due { vertical-align: text-bottom; } -table { margin: 1em; } +body { margin: 1em; } """ _body = """ @@ -92,7 +92,7 @@ table { margin: 1em; } buf += " %s"% (did, name) # options buf += "%s" % self.mw.button( - link="opts:%d"%did, name=_("Options")+'▼') + link="opts:%d"%did, name=_("Options")+'▾') # children buf += self._renderDeckTree(children, depth+1) return buf diff --git a/aqt/main.py b/aqt/main.py index fb8e8f4d9..fec4bddfd 100755 --- a/aqt/main.py +++ b/aqt/main.py @@ -286,7 +286,7 @@ Are you sure?"""): sharedCSS = """ body { -background: #eee; +background: #f3f3f3; margin: 2em; } a:hover { background-color: #aaa; } diff --git a/aqt/overview.py b/aqt/overview.py index 5ad9463d9..39e894e02 100644 --- a/aqt/overview.py +++ b/aqt/overview.py @@ -42,14 +42,16 @@ class Overview(object): if url == "study": self.mw.col.reset() self.mw.moveToState("review") + elif url == "anki": + print "anki menu" elif url == "cram": return showInfo("not yet implemented") #self.mw.col.cramGroups() #self.mw.moveToState("review") elif url == "opts": self.mw.onStudyOptions() - elif url == "chgrp": - self.mw.onGroups() + elif url == "decks": + self.mw.moveToState("deckBrowser") # HTML ############################################################ @@ -60,12 +62,30 @@ class Overview(object): tbl = self._overviewTable() but = self.mw.button deck = self.mw.col.decks.current() - dname = deck['name'] sid = deck.get("sharedFrom") if True: # sid: shareLink = 'Reviews and Updates' else: shareLink = "" + header = """ + + + + + +
+""" #% deck['name'] + self.web.stdHtml(self._overviewBody % dict( title=_("Overview"), table=tbl, @@ -73,10 +93,12 @@ class Overview(object): deck=deck['name'], shareLink=shareLink, desc="", + header=header, fcdata=fc, ), css) _overviewBody = """ +%(header)s

%(deck)s

%(shareLink)s @@ -112,6 +134,29 @@ $(function () { .sub { font-size: 80%; color: #555; } .smallLink { font-size: 12px; } h3 { margin-bottom: 0; } +#headerSpace { height: 22px; } +#header { +z-index: 100; +position: fixed; +height: 22px; +font-size: 12px; +margin:0; +background: -webkit-gradient(linear, left top, left bottom, +from(#ddd), to(#fff)); +border-bottom: 1px solid #ccc; +font-weight: bold; +} +body { margin: 0; } +.deck { } +.hitem { display: inline-block; padding: 4px; padding-right: 6px; +text-decoration: none; color: #000; +} +.hborder { border: 1px solid #ddd; } +.hitem:hover { +background: #333; +color: #fff; +} +.icon { padding-top: 2px; } """ def _overviewTable(self): diff --git a/designer/icons.qrc b/designer/icons.qrc index 078c24e3b..afc539d1d 100644 --- a/designer/icons.qrc +++ b/designer/icons.qrc @@ -11,6 +11,7 @@ icons/layout.png icons/generate_07.png icons/view-sort-descending.png + icons/view-refresh.png icons/emblem-important.png icons/view-sort-ascending.png icons/media-playback-start2.png diff --git a/designer/icons/view-refresh.png b/designer/icons/view-refresh.png new file mode 100644 index 0000000000000000000000000000000000000000..f1bce46bf06d3fffe838ba1eeef42a08af550553 GIT binary patch literal 3176 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