diff --git a/ankiqt/ui/main.py b/ankiqt/ui/main.py index 5e05d9ae8..c1ad42eff 100644 --- a/ankiqt/ui/main.py +++ b/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 ########################################################################## diff --git a/ankiqt/ui/sync.py b/ankiqt/ui/sync.py index 2466cb376..2897ef5e5 100644 --- a/ankiqt/ui/sync.py +++ b/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")) diff --git a/designer/main.ui b/designer/main.ui index fa78f1793..a96d1100b 100644 --- a/designer/main.ui +++ b/designer/main.ui @@ -369,6 +369,7 @@ + @@ -923,14 +924,27 @@ :/icons/document-open-remote.png:/icons/document-open-remote.png - Open Online.. + Open On&line.. + + + :/icons/chronometer.png:/icons/chronometer.png + C&ram.. + + + + :/icons/kblogger.png:/icons/kblogger.png + + + Release Notes.. + + diff --git a/icons.qrc b/icons.qrc index 1d1399b2f..20017ee5b 100644 --- a/icons.qrc +++ b/icons.qrc @@ -1,5 +1,8 @@ + icons/kblogger.png + icons/chronometer.png + icons/Anki_Card.png icons/document-open-remote.png icons/document-open-recent.png icons/khtml_kget.png diff --git a/icons/chronometer.png b/icons/chronometer.png new file mode 100644 index 000000000..00386b705 Binary files /dev/null and b/icons/chronometer.png differ diff --git a/icons/kblogger.png b/icons/kblogger.png new file mode 100644 index 000000000..3d9e249e3 Binary files /dev/null and b/icons/kblogger.png differ