Merge /home/resolve/tmpankiqt

This commit is contained in:
Damien Elmes 2009-03-12 08:24:54 +09:00
commit 29278af8d9
2 changed files with 31 additions and 3 deletions

View file

@ -132,7 +132,7 @@ class ImportDialog(QDialog):
self.parent.deck.finishProgress()
self.parent.deck.setUndoEnd(n)
txt = (
_("Importing complete. %(num)d cards imported from %(file)s.\n") %
_("Importing complete. %(num)d facts imported from %(file)s.\n") %
{"num": self.importer.total, "file": os.path.basename(self.file)})
txt += _("Click the close button or import another file.\n\n")
if self.importer.log:

View file

@ -300,8 +300,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>960</width>
<height>480</height>
<width>348</width>
<height>317</height>
</rect>
</property>
<attribute name="title" >
@ -556,6 +556,9 @@
<property name="text" >
<string>Close</string>
</property>
<property name="autoDefault" >
<bool>false</bool>
</property>
</widget>
</item>
</layout>
@ -613,6 +616,31 @@
</layout>
</widget>
<tabstops>
<tabstop>tabWidget</tabstop>
<tabstop>cardList</tabstop>
<tabstop>questionFont</tabstop>
<tabstop>questionSize</tabstop>
<tabstop>questionColour</tabstop>
<tabstop>questionAlign</tabstop>
<tabstop>answerFont</tabstop>
<tabstop>answerSize</tabstop>
<tabstop>answerColour</tabstop>
<tabstop>answerAlign</tabstop>
<tabstop>backgroundColour</tabstop>
<tabstop>fieldList</tabstop>
<tabstop>useFamily</tabstop>
<tabstop>fontFamily</tabstop>
<tabstop>useSize</tabstop>
<tabstop>fontSize</tabstop>
<tabstop>useColour</tabstop>
<tabstop>fontColour</tabstop>
<tabstop>useFamilyEdit</tabstop>
<tabstop>fontFamilyEdit</tabstop>
<tabstop>useSizeEdit</tabstop>
<tabstop>fontSizeEdit</tabstop>
<tabstop>helpButton</tabstop>
<tabstop>preview</tabstop>
<tabstop>closeButton</tabstop>
<tabstop>question</tabstop>
<tabstop>answer</tabstop>
</tabstops>