From 87195130c6cbffc4c727e2a4830547b1e4ac8200 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Sat, 11 Oct 2008 18:29:29 +0900 Subject: [PATCH] show sync errors in popup --- ankiqt/ui/main.py | 6 +++++- ankiqt/ui/sync.py | 3 ++- designer/main.ui | 16 +++++++++++++++- icons.qrc | 3 +++ icons/chronometer.png | Bin 0 -> 7133 bytes icons/kblogger.png | Bin 0 -> 1556 bytes 6 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 icons/chronometer.png create mode 100644 icons/kblogger.png 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 0000000000000000000000000000000000000000..00386b7050861d216dec716a8a134a90b8f53d9f GIT binary patch literal 7133 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 T5L3!r00000NkvXXu0mjfP)g)I literal 0 HcmV?d00001 diff --git a/icons/kblogger.png b/icons/kblogger.png new file mode 100644 index 0000000000000000000000000000000000000000..3d9e249e358b0c2d99620a6bbded8781befe3b1a GIT binary patch literal 1556 zcmV+v2J88WP)zJFq^nK8thI!nMJW{djRHbsZJ|9o zr%B1cA3zh`AKObldGGe!bI2#LM*Flgs6BOi(w@N|xn6(;zxJdfwi>dzo=@aT~c@ zu47VC(kdR0w`eX-8yXr+T3T9c6$(Wp&bqs;tqlxhm&qr#9<48(Vh|D%vMe+-)Mdwx z9juu6Bd4|>l}v;lk?OXmNwmAtZmOdA*GFRc&4;D4LfJC}BO@b|jE;`ZiaN!Bjwe*g8F8r>ih>W70W1D8>`uQ8?2HD8 zNN>JhbuXc7a&RlI84Cjd;h?WvWJaG?<*k4Ye^yLd%z^dnBCy$Z4xDzOh@UEO zS*}09)?_g_N0m%cFIRw4shl&_GKFquhP;-IM{`rgZB1z zXl-qsgo;N;M+bCub-|(Yx5092uAag&DPU!rGeU8L?wb@@>y$#oWHL?N+}!+pe0<^u z1_ty6qo}9|hK7dpdv|PXjJ6O78s~60VX?8XK?e>T2ue&$3`$N;4oXQ$3F7nl-xU-T z@ULCFCa$io?vqF)TB%eD(>X1;sr@uwT>I1#>fzzB_Q8V(I)nu1lSZr6>IKx*)d3Fv z7n{xAG*c~3WfVBDk=u6s;a=i;mooLCi{=7ry9DrxGWZlM8hhTN`~v%9;yX-P@R2yUGzQ6NEKVPUM7 z@=1o-eij{0i9%0L58zSU7#<$}{)-ks`LGVxUGvW`U>$aJ#=9%>F+Oi_aB$dw?^&s-srPDYYqggyT^jN7 z^4d*((8k4pot+)E-Kjr5d!y~f>EOHdByv&!sX-%aa)fs;?BGKkpJD9p?Cks_MkJ8h z#z2#z2u)c63Lgr2hr)(od=J|nkSN536i*jLZS21m-&W=j7u`|VQu>{o|NrOI82$z-fybc=sX(Iu0000