show sync errors in popup

ankiqt/ui/main.py

@@ -1090,7 +1090,7 @@ class AnkiQt(QMainWindow):
         self.syncThread = ui.sync.Sync(self, u, p, interactive, create,
                                        onlyMerge, self.sourcesToCheck)
         self.connect(self.syncThread, SIGNAL("setStatus"), self.setSyncStatus)
-        self.connect(self.syncThread, SIGNAL("showWarning"), ui.utils.showWarning)
+        self.connect(self.syncThread, SIGNAL("showWarning"), self.showSyncWarning)
         self.connect(self.syncThread, SIGNAL("moveToState"), self.moveToState)
         self.connect(self.syncThread, SIGNAL("noMatchingDeck"), self.selectSyncDeck)
         self.connect(self.syncThread, SIGNAL("syncClockOff"), self.syncClockOff)
@@ -1148,6 +1148,10 @@ class AnkiQt(QMainWindow):
             % diff)
         self.syncFinished()
 
+    def showSyncWarning(self, text):
+        ui.utils.showWarning(text, self)
+        self.setStatus("")
+
     # Menu, title bar & status
     ##########################################################################
 

ankiqt/ui/sync.py

@@ -35,7 +35,8 @@ class Sync(QThread):
         self.syncDeck()
 
     def error(self, error):
-        self.setStatus(self.getErrorMessage(error))
+        error = self.getErrorMessage(error)
+        self.emit(SIGNAL("showWarning"), error)
         if self.onlyMerge:
             # new file needs cleaning up
             self.emit(SIGNAL("cleanNewDeck"))

designer/main.ui

@@ -369,6 +369,7 @@
     <addaction name="separator" />
     <addaction name="actionReportbug" />
     <addaction name="actionForum" />
+    <addaction name="actionRelease_Notes" />
     <addaction name="separator" />
     <addaction name="actionAbout" />
     <addaction name="separator" />
@@ -923,14 +924,27 @@
      <normaloff>:/icons/document-open-remote.png</normaloff>:/icons/document-open-remote.png</iconset>
    </property>
    <property name="text" >
-    <string>Open Online..</string>
+    <string>Open On&amp;line..</string>
    </property>
   </action>
   <action name="actionCram" >
+   <property name="icon" >
+    <iconset resource="../icons.qrc" >
+     <normaloff>:/icons/chronometer.png</normaloff>:/icons/chronometer.png</iconset>
+   </property>
    <property name="text" >
     <string>C&amp;ram..</string>
    </property>
   </action>
+  <action name="actionRelease_Notes" >
+   <property name="icon" >
+    <iconset resource="../icons.qrc" >
+     <normaloff>:/icons/kblogger.png</normaloff>:/icons/kblogger.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Release Notes..</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="../icons.qrc" />

icons.qrc

@@ -1,5 +1,8 @@
 <RCC>
   <qresource prefix="/" >
+    <file>icons/kblogger.png</file>
+    <file>icons/chronometer.png</file>
+    <file>icons/Anki_Card.png</file>
     <file>icons/document-open-remote.png</file>
     <file>icons/document-open-recent.png</file>
     <file>icons/khtml_kget.png</file>