tweak browser layout

This commit is contained in:
Damien Elmes 2011-11-29 10:18:55 +09:00
parent b0bfed6ac2
commit 0c104af809
3 changed files with 104 additions and 119 deletions

View file

@ -229,10 +229,8 @@ class DataModel(QAbstractTableModel):
if c.type == 0: if c.type == 0:
return _("(new)") return _("(new)")
return "%d%%" % (c.factor/10) return "%d%%" % (c.factor/10)
elif type == "cardGroup": elif type == "deck":
return self.browser.mw.col.groups.name(c.gid) return self.browser.mw.col.decks.name(c.did)
elif type == "noteGroup":
return self.browser.mw.col.groups.name(c.note().gid)
def question(self, c): def question(self, c):
return self.formatQA(c.a()) return self.formatQA(c.a())
@ -310,9 +308,9 @@ class Browser(QMainWindow):
restoreGeom(self, "editor", 38) restoreGeom(self, "editor", 38)
restoreState(self, "editor") restoreState(self, "editor")
restoreSplitter(self.form.splitter_2, "editor2") restoreSplitter(self.form.splitter_2, "editor2")
restoreSplitter(self.form.splitter_3, "editor3") restoreSplitter(self.form.splitter, "editor3")
self.form.splitter_2.setChildrenCollapsible(False) self.form.splitter_2.setChildrenCollapsible(False)
self.form.splitter_3.setChildrenCollapsible(False) self.form.splitter.setChildrenCollapsible(False)
self.setupColumns() self.setupColumns()
self.setupToolbar() self.setupToolbar()
self.setupTable() self.setupTable()
@ -377,7 +375,7 @@ class Browser(QMainWindow):
def closeEvent(self, evt): def closeEvent(self, evt):
saveSplitter(self.form.splitter_2, "editor2") saveSplitter(self.form.splitter_2, "editor2")
saveSplitter(self.form.splitter_3, "editor3") saveSplitter(self.form.splitter, "editor3")
self.editor.saveNow() self.editor.saveNow()
self.editor.setNote(None) self.editor.setNote(None)
saveGeom(self, "editor") saveGeom(self, "editor")
@ -404,8 +402,7 @@ class Browser(QMainWindow):
('question', _("Question")), ('question', _("Question")),
('answer', _("Answer")), ('answer', _("Answer")),
('template', _("Card")), ('template', _("Card")),
('cardGroup', _("C.Group")), ('deck', _("Deck")),
('noteGroup', _("I.Group")),
('noteFld', _("Sort Field")), ('noteFld', _("Sort Field")),
('noteCrt', _("Created")), ('noteCrt', _("Created")),
('noteMod', _("Edited")), ('noteMod', _("Edited")),
@ -647,8 +644,8 @@ class Browser(QMainWindow):
def _systemTagTree(self, root): def _systemTagTree(self, root):
tags = ( tags = (
(_("All cards"), "stock_new_template", ""), (_("Whole Collection"), "anki", ""),
(_("Current Deck"), "stock_new_template", "deck:current"), (_("Current Deck"), "stock_group", "deck:current"),
(_("New"), "plus-circle.png", "is:new"), (_("New"), "plus-circle.png", "is:new"),
(_("Learning"), "stock_new_template_red.png", "is:learn"), (_("Learning"), "stock_new_template_red.png", "is:learn"),
(_("Review"), "clock-icon.png", "is:review"), (_("Review"), "clock-icon.png", "is:review"),

View file

@ -23,7 +23,7 @@ class CardStats(object):
def show(self): def show(self):
if not self.shown: if not self.shown:
self.web = AnkiWebView(self.mw) self.web = AnkiWebView()
self.web.setMaximumWidth(400) self.web.setMaximumWidth(400)
self.shown = self.mw.addDockable(_("Card Info"), self.web) self.shown = self.mw.addDockable(_("Card Info"), self.web)
self.shown.connect(self.shown, SIGNAL("visibilityChanged(bool)"), self.shown.connect(self.shown, SIGNAL("visibilityChanged(bool)"),

View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>612</width> <width>717</width>
<height>455</height> <height>474</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -18,21 +18,19 @@
<normaloff>:/icons/find.png</normaloff>:/icons/find.png</iconset> <normaloff>:/icons/find.png</normaloff>:/icons/find.png</iconset>
</property> </property>
<widget class="QWidget" name="centralwidget"> <widget class="QWidget" name="centralwidget">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QSplitter" name="splitter_3"> <widget class="QSplitter" name="splitter_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<widget class="QSplitter" name="splitter">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="handleWidth">
<number>3</number>
</property>
<widget class="QTreeWidget" name="tree"> <widget class="QTreeWidget" name="tree">
<attribute name="headerVisible"> <attribute name="headerVisible">
<bool>false</bool> <bool>false</bool>
@ -44,35 +42,29 @@
</column> </column>
</widget> </widget>
<widget class="QWidget" name="widget" native="true"> <widget class="QWidget" name="widget" native="true">
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<property name="leftMargin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>3</number>
</property>
<item> <item>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="leftMargin"> <property name="horizontalSpacing">
<number>6</number> <number>6</number>
</property> </property>
<property name="verticalSpacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin"> <property name="topMargin">
<number>6</number> <number>0</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>6</number> <number>0</number>
</property>
<property name="spacing">
<number>6</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLineEdit" name="searchEdit"> <widget class="QLineEdit" name="searchEdit">
@ -91,10 +83,6 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QSplitter" name="splitter_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<widget class="QTableView" name="tableView"> <widget class="QTableView" name="tableView">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@ -139,6 +127,10 @@
<bool>true</bool> <bool>true</bool>
</attribute> </attribute>
</widget> </widget>
</item>
</layout>
</widget>
</widget>
<widget class="QWidget" name="lowerWidget"> <widget class="QWidget" name="lowerWidget">
<layout class="QHBoxLayout" name="horizontalLayout2"> <layout class="QHBoxLayout" name="horizontalLayout2">
<property name="spacing"> <property name="spacing">
@ -176,16 +168,12 @@
</item> </item>
</layout> </layout>
</widget> </widget>
</widget>
</item>
</layout>
</widget>
<widget class="QMenuBar" name="menubar"> <widget class="QMenuBar" name="menubar">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>612</width> <width>717</width>
<height>22</height> <height>22</height>
</rect> </rect>
</property> </property>