diff --git a/aqt/browser.py b/aqt/browser.py index 0ba3a4fc5..7a9f91e89 100644 --- a/aqt/browser.py +++ b/aqt/browser.py @@ -330,7 +330,7 @@ class Browser(QMainWindow): self.onSearch() def setupToolbar(self): - self.form.toolBar.setIconSize(QSize(32, 32)) + self.form.toolBar.setIconSize(QSize(24, 24)) self.form.toolBar.toggleViewAction().setText(_("Toggle Toolbar")) def setupMenus(self): @@ -703,7 +703,7 @@ class Browser(QMainWindow): extra += self.cardStats.makeLine( _("Reviews"), "%d" % self.card.reps) rep = rep.replace("", extra) - self.form.cardLabel.setMaximumWidth(250) + self.form.cardLabel.setMaximumWidth(200) self.form.cardLabel.setWordWrap(True) self.form.cardLabel.setText(rep) @@ -748,9 +748,11 @@ class Browser(QMainWindow): s = "" % _("Date") s += ("" * 5) % ( _("Type"), _("Ease"), _("Interval"), _("Factor"), _("Time")) + cnt = 0 for (date, ease, ivl, factor, taken, type) in self.mw.col.db.execute( "select id/1000.0, ease, ivl, factor, time/1000.0, type " "from revlog where cid = ?", self.card.id): + cnt += 1 s += "" % time.strftime(_("%Y-%m-%d @ %H:%M"), time.localtime(date)) tstr = [_("Learn"), _("Review"), _("Relearn"), _("Cram"), @@ -781,6 +783,12 @@ class Browser(QMainWindow): "%d%%" % (factor/10) if factor else "", self.cardStats.time(taken)) + "" s += "
%s%s
%s
" + if cnt != self.card.reps: + s += "

" + _("""\ +Note: Review count does not match the history. This can happen \ +if your cards were reviewed in early Anki versions, if statistics \ +were lost in a sync conflict, or the deck was imported from \ +another program.""") return s # Menu helpers diff --git a/aqt/editor.py b/aqt/editor.py index a654a3818..040d0fa45 100644 --- a/aqt/editor.py +++ b/aqt/editor.py @@ -212,9 +212,9 @@ class Editor(object): ############################################################ def setupOuter(self): - l = QVBoxLayout()#self.widget) + l = QVBoxLayout() l.setMargin(0) - l.setSpacing(3) + l.setSpacing(0) self.widget.setLayout(l) self.outerLayout = l diff --git a/designer/browser.ui b/designer/browser.ui index 6cc843acd..9f6cdc69a 100644 --- a/designer/browser.ui +++ b/designer/browser.ui @@ -32,6 +32,12 @@ Qt::Horizontal + + + 1 + 0 + + false @@ -42,6 +48,12 @@ + + + 3 + 0 + + 0