mirror of
https://github.com/ankitects/anki.git
synced 2025-09-24 16:56:36 -04:00
tweak browser layout
This commit is contained in:
Damien Elmes
parent
b0bfed6ac2
commit
0c104af809
3 changed files with 104 additions and 119 deletions
|
|
@ -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"),
|
||||||
|
|
|
||||||
|
|
@ -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)"),
|
||||||
|
|
|
||||||
|
|
@ -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,83 +18,71 @@
|
||||||
<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">
|
<property name="orientation">
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Vertical</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="handleWidth">
|
<widget class="QSplitter" name="splitter">
|
||||||
<number>3</number>
|
<property name="orientation">
|
||||||
</property>
|
<enum>Qt::Horizontal</enum>
|
||||||
<widget class="QTreeWidget" name="tree">
|
</property>
|
||||||
<attribute name="headerVisible">
|
<widget class="QTreeWidget" name="tree">
|
||||||
<bool>false</bool>
|
<attribute name="headerVisible">
|
||||||
</attribute>
|
<bool>false</bool>
|
||||||
<column>
|
</attribute>
|
||||||
<property name="text">
|
<column>
|
||||||
<string notr="true">1</string>
|
<property name="text">
|
||||||
</property>
|
<string notr="true">1</string>
|
||||||
</column>
|
</property>
|
||||||
</widget>
|
</column>
|
||||||
<widget class="QWidget" name="widget" native="true">
|
</widget>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
<widget class="QWidget" name="widget" native="true">
|
||||||
<property name="spacing">
|
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||||
<number>0</number>
|
<property name="spacing">
|
||||||
</property>
|
<number>0</number>
|
||||||
<property name="leftMargin">
|
</property>
|
||||||
<number>0</number>
|
<property name="margin">
|
||||||
</property>
|
<number>0</number>
|
||||||
<property name="topMargin">
|
</property>
|
||||||
<number>0</number>
|
<item>
|
||||||
</property>
|
<layout class="QGridLayout" name="gridLayout">
|
||||||
<property name="rightMargin">
|
<property name="horizontalSpacing">
|
||||||
<number>0</number>
|
<number>6</number>
|
||||||
</property>
|
</property>
|
||||||
<property name="bottomMargin">
|
<property name="verticalSpacing">
|
||||||
<number>3</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
<property name="leftMargin">
|
||||||
<layout class="QGridLayout" name="gridLayout">
|
<number>0</number>
|
||||||
<property name="leftMargin">
|
</property>
|
||||||
<number>6</number>
|
<property name="topMargin">
|
||||||
</property>
|
<number>0</number>
|
||||||
<property name="topMargin">
|
</property>
|
||||||
<number>6</number>
|
<property name="rightMargin">
|
||||||
</property>
|
<number>0</number>
|
||||||
<property name="rightMargin">
|
</property>
|
||||||
<number>6</number>
|
<item row="0" column="0">
|
||||||
</property>
|
<widget class="QLineEdit" name="searchEdit">
|
||||||
<property name="spacing">
|
<property name="text">
|
||||||
<number>6</number>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<item row="0" column="0">
|
</widget>
|
||||||
<widget class="QLineEdit" name="searchEdit">
|
</item>
|
||||||
<property name="text">
|
<item row="0" column="1">
|
||||||
<string/>
|
<widget class="QPushButton" name="searchButton">
|
||||||
</property>
|
<property name="text">
|
||||||
</widget>
|
<string>Search</string>
|
||||||
</item>
|
</property>
|
||||||
<item row="0" column="1">
|
</widget>
|
||||||
<widget class="QPushButton" name="searchButton">
|
</item>
|
||||||
<property name="text">
|
</layout>
|
||||||
<string>Search</string>
|
</item>
|
||||||
</property>
|
<item>
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</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,39 +127,39 @@
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</attribute>
|
</attribute>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QWidget" name="lowerWidget">
|
</item>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout2">
|
</layout>
|
||||||
<property name="spacing">
|
</widget>
|
||||||
<number>0</number>
|
</widget>
|
||||||
</property>
|
<widget class="QWidget" name="lowerWidget">
|
||||||
<item>
|
<layout class="QHBoxLayout" name="horizontalLayout2">
|
||||||
<widget class="QWidget" name="fieldsArea" native="true">
|
<property name="spacing">
|
||||||
<property name="sizePolicy">
|
<number>0</number>
|
||||||
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
|
</property>
|
||||||
<horstretch>7</horstretch>
|
<item>
|
||||||
<verstretch>0</verstretch>
|
<widget class="QWidget" name="fieldsArea" native="true">
|
||||||
</sizepolicy>
|
<property name="sizePolicy">
|
||||||
</property>
|
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
|
||||||
<property name="minimumSize">
|
<horstretch>7</horstretch>
|
||||||
<size>
|
<verstretch>0</verstretch>
|
||||||
<width>50</width>
|
</sizepolicy>
|
||||||
<height>50</height>
|
</property>
|
||||||
</size>
|
<property name="minimumSize">
|
||||||
</property>
|
<size>
|
||||||
</widget>
|
<width>50</width>
|
||||||
</item>
|
<height>50</height>
|
||||||
<item>
|
</size>
|
||||||
<widget class="QLabel" name="cardLabel">
|
</property>
|
||||||
<property name="alignment">
|
</widget>
|
||||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
</item>
|
||||||
</property>
|
<item>
|
||||||
<property name="margin">
|
<widget class="QLabel" name="cardLabel">
|
||||||
<number>6</number>
|
<property name="alignment">
|
||||||
</property>
|
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
||||||
</widget>
|
</property>
|
||||||
</item>
|
<property name="margin">
|
||||||
</layout>
|
<number>6</number>
|
||||||
</widget>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
|
|
@ -185,7 +173,7 @@
|
||||||
<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>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue