Merge branch 'master' of git://ichi2.net/ankiqt

ankiqt/__init__.py

@@ -29,6 +29,26 @@ sys.path.append(os.path.dirname(__file__))
 # App initialisation
 ##########################################################################
 
+class SplashScreen(object):
+
+    def __init__(self, max=100):
+        self.pixmap = QPixmap(":/icons/anki-logo.png")
+        self.splash = QSplashScreen(self.pixmap)
+        self.prog = QProgressBar(self.splash)
+        self.prog.setMaximum(max)
+        self.prog.setGeometry(self.splash.width()/10, 8*self.splash.height()/10,
+                                8*self.splash.width()/10, self.splash.height()/10)
+        self.splash.show()
+        self.val = 1
+
+    def update(self):
+        self.prog.setValue(self.val)
+        self.val += 1
+        QApplication.instance().processEvents()
+
+    def finish(self, obj):
+        self.splash.finish(obj)
+
 def run():
     import config
 
@@ -54,14 +74,10 @@ def run():
 
     app = QApplication(sys.argv)
 
-    # Create a pixmap - not needed if you have your own.
     import forms
     import ui
-    pixmap = QPixmap(":/icons/anki-logo.png")
-    ui.splash = QSplashScreen(pixmap)
-    ui.splash.show()
-    app.processEvents()
 
+    ui.splash = SplashScreen(5)
 
     # setup paths for forms, icons
     sys.path.append(modDir)
@@ -118,8 +134,9 @@ def run():
 
     # load main window
     ui.importAll()
-
     ui.dialogs.registerDialogs()
+    ui.splash.update()
+
     mw = ui.main.AnkiQt(app, conf, args)
     try:
         styleFile = open(os.path.join(opts.config, "style.css"))

ankiqt/ui/cardlist.py

@@ -354,7 +354,7 @@ class EditDeck(QMainWindow):
         self.dialog.tagList.setFixedWidth(130)
         self.dialog.tagList.clear()
         self.dialog.tagList.addItems(QStringList(
-            [_('<Select Tag>'), _('No tags')] + self.alltags))
+            [_('All cards'), _('No tags')] + self.alltags))
         self.dialog.tagList.view().setFixedWidth(300)
 
     def drawSort(self):

ankiqt/ui/main.py

@@ -48,6 +48,7 @@ class AnkiQt(QMainWindow):
         self.setupSound()
         self.setupTray()
         self.connectMenuActions()
+        ui.splash.update()
         if self.config['mainWindowGeom']:
             self.restoreGeometry(self.config['mainWindowGeom'])
         self.setupViews()
@@ -61,10 +62,12 @@ class AnkiQt(QMainWindow):
             self.setUnifiedTitleAndToolBarOnMac(True)
             pass
         # load deck
+        ui.splash.update()
         if not self.maybeLoadLastDeck(args):
             self.setEnabled(True)
             self.moveToState("auto")
         # check for updates
+        ui.splash.update()
         self.setupAutoUpdate()
         self.setupErrorHandler()
         self.setupMisc()
@@ -76,6 +79,7 @@ class AnkiQt(QMainWindow):
         except:
             ui.utils.showWarning(_("Broken plugin:\n\n%s") %
                                  traceback.format_exc())
+        ui.splash.update()
         ui.splash.finish(self)
         self.show()
 
@@ -2013,7 +2017,7 @@ day = :d""", d=yesterday)
         addHook("dbProgress", self.onDbProgress)
         addHook("dbFinished", self.onDbFinished)
         self.progressParent = None
-        self.progressWin = None
+        self.progressWins = []
         self.busyCursor = False
         self.mainThread = QThread.currentThread()
 
@@ -2025,20 +2029,25 @@ day = :d""", d=yesterday)
             return
         self.setBusy()
         parent = self.progressParent or self.app.activeWindow() or self
-        self.progressWin = ui.utils.ProgressWin(parent, max, min, title)
+        if self.progressWins:
+            parent = self.progressWins[-1].diag
+        p = ui.utils.ProgressWin(parent, max, min, title)
+        self.progressWins.append(p)
 
     def onUpdateProgress(self, label=None, value=None):
         if self.mainThread != QThread.currentThread():
             return
-        if self.progressWin:
+        if self.progressWins:
-            self.progressWin.update(label, value)
+            self.progressWins[-1].update(label, value)
+        self.app.processEvents()
 
     def onFinishProgress(self):
         if self.mainThread != QThread.currentThread():
             return
-        if self.progressWin:
+        if self.progressWins:
-            self.progressWin.finish()
+            p = self.progressWins.pop()
-            self.progressWin = None
+            p.finish()
+        if not self.progressWins:
             self.unsetBusy()
 
     def onDbProgress(self):
@@ -2050,7 +2059,7 @@ day = :d""", d=yesterday)
     def onDbFinished(self):
         if self.mainThread != QThread.currentThread():
             return
-        if not self.progressWin:
+        if not self.progressWins:
             self.unsetBusy()
 
     def setBusy(self):