ouczbs/anki-word-query
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updater ui & message

Browse Source
This commit is contained in:
St.Huang 2018-07-31 11:01:56 +08:00
parent ef662527fa
commit 49599cd368
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/fastwq/libs/AnkiHub/updates.py
View File

@ -59,7 +59,7 @@ class Ui_DialogUpdates(object):
QtCore.QMetaObject.connectSlotsByName(DialogUpdates) QtCore.QMetaObject.connectSlotsByName(DialogUpdates)
def retranslateUi(self, DialogUpdates): def retranslateUi(self, DialogUpdates):
DialogUpdates.setWindowTitle(_translate("DialogUpdates", "FastWQ - Update Checker", None)) DialogUpdates.setWindowTitle(_translate("DialogUpdates", "FastWQ - Updater", None))
self.labelUpdates.setText(_translate("DialogUpdates", "<html><head/><body><p>A new version of {0} is available for download! </p><p>Do you want to update {1}to version {2}?</p><p>Changes from your version are listed below:</p></body></html>", None)) self.labelUpdates.setText(_translate("DialogUpdates", "<html><head/><body><p>A new version of {0} is available for download! </p><p>Do you want to update {1}to version {2}?</p><p>Changes from your version are listed below:</p></body></html>", None))
#self.always.setText(_translate("DialogUpdates", "Always update", None)) #self.always.setText(_translate("DialogUpdates", "Always update", None))
self.update.setText(_translate("DialogUpdates", "Update", None)) self.update.setText(_translate("DialogUpdates", "Update", None))

10
addons/fastwq/libs/ankihub.py
View File

@ -15,13 +15,13 @@ import io
import aqt import aqt
from aqt import mw from aqt import mw
from aqt.qt import * from aqt.qt import *
from aqt.utils import showInfo
from anki.hooks import addHook from anki.hooks import addHook
from anki.utils import isMac, isWin from anki.utils import isMac, isWin
from ..context import APP_ICON from ..context import APP_ICON
from .AnkiHub.updates import Ui_DialogUpdates from .AnkiHub.updates import Ui_DialogUpdates
from .AnkiHub.markdown2 import markdown from .AnkiHub.markdown2 import markdown
# taken from Anki's aqt/profiles.py # taken from Anki's aqt/profiles.py
def defaultBase(): def defaultBase():
path = mw.pm.addonFolder() path = mw.pm.addonFolder()
@ -69,6 +69,9 @@ class DialogUpdates(QDialog, Ui_DialogUpdates):
self.textBrowser.scrollToAnchor('text_bottom') self.textBrowser.scrollToAnchor('text_bottom')
def finish(self): def finish(self):
self.hide()
self.destroy()
showInfo('Updated. Please restart Anki.')
pass pass
@ -138,7 +141,7 @@ def updateSingle(repositories, path, data):
with open(dataPath,'w') as f: with open(dataPath,'w') as f:
json.dump(repositories,f,indent=2) json.dump(repositories,f,indent=2)
f.close() f.close()
appendHtml('Done.<br/>Please restart Anki.<br/>') appendHtml('Done.<br/>')
onReady() # close the AnkiHub update window onReady() # close the AnkiHub update window
return callback return callback
@ -146,7 +149,7 @@ def updateSingle(repositories, path, data):
def update(add=[], install=False, VERSION='v0.0.0'): def update(add=[], install=False, VERSION='v0.0.0'):
# progress win # progress win
progresswin = QProgressDialog('Update Checking...', 'FastWQ - Updater', 0, 0, mw) progresswin = QProgressDialog('Update Checking...', '', 0, 0, mw)
progresswin.setWindowModality(Qt.ApplicationModal) progresswin.setWindowModality(Qt.ApplicationModal)
progresswin.setCancelButton(None) progresswin.setCancelButton(None)
progresswin.setWindowFlags( progresswin.setWindowFlags(
@ -154,6 +157,7 @@ def update(add=[], install=False, VERSION='v0.0.0'):
~Qt.WindowContextHelpButtonHint ~Qt.WindowContextHelpButtonHint
) )
progresswin.setWindowIcon(APP_ICON) progresswin.setWindowIcon(APP_ICON)
progresswin.setWindowTitle('FastWQ - Updater')
progresswin.resize(280, 60) progresswin.resize(280, 60)
progresswin.show() progresswin.show()
# #

2
addons21/fastwq/libs/AnkiHub/updates.py
View File

@ -53,7 +53,7 @@ class Ui_DialogUpdates(object):
QMetaObject.connectSlotsByName(DialogUpdates) QMetaObject.connectSlotsByName(DialogUpdates)
def retranslateUi(self, DialogUpdates): def retranslateUi(self, DialogUpdates):
DialogUpdates.setWindowTitle(_translate("DialogUpdates", "FastWQ - Update Checker", None)) DialogUpdates.setWindowTitle(_translate("DialogUpdates", "FastWQ - Updater", None))
self.labelUpdates.setText(_translate("DialogUpdates", "<html><head/><body><p>A new version of {0} is available for download! </p><p>Do you want to update {1}to version {2}?</p><p>Changes from your version are listed below:</p></body></html>", None)) self.labelUpdates.setText(_translate("DialogUpdates", "<html><head/><body><p>A new version of {0} is available for download! </p><p>Do you want to update {1}to version {2}?</p><p>Changes from your version are listed below:</p></body></html>", None))
#self.always.setText(_translate("DialogUpdates", "Always update", None)) #self.always.setText(_translate("DialogUpdates", "Always update", None))
self.update.setText(_translate("DialogUpdates", "Update", None)) self.update.setText(_translate("DialogUpdates", "Update", None))

9
addons21/fastwq/libs/ankihub.py
View File

@ -15,6 +15,7 @@ import io
import aqt import aqt
from aqt import mw from aqt import mw
from aqt.qt import * from aqt.qt import *
from aqt.utils import showInfo
from anki.hooks import addHook from anki.hooks import addHook
from anki.utils import isMac, isWin from anki.utils import isMac, isWin
from ..context import APP_ICON from ..context import APP_ICON
@ -69,6 +70,9 @@ class DialogUpdates(QDialog, Ui_DialogUpdates):
self.textBrowser.scrollToAnchor('text_bottom') self.textBrowser.scrollToAnchor('text_bottom')
def finish(self): def finish(self):
self.hide()
self.destroy()
showInfo('Updated. Please restart Anki.')
pass pass
@ -138,7 +142,7 @@ def updateSingle(repositories, path, data):
with open(dataPath,'w') as f: with open(dataPath,'w') as f:
json.dump(repositories,f,indent=2) json.dump(repositories,f,indent=2)
f.close() f.close()
appendHtml('Done.<br/>Please restart Anki.<br/>') appendHtml('Done.<br/>')
onReady() # close the AnkiHub update window onReady() # close the AnkiHub update window
return callback return callback
@ -146,13 +150,14 @@ def updateSingle(repositories, path, data):
def update(add=[], install=False, VERSION='v0.0.0'): def update(add=[], install=False, VERSION='v0.0.0'):
# progress win # progress win
progresswin = QProgressDialog('Update Checking...', 'FastWQ - Updater', 0, 0, mw) progresswin = QProgressDialog('Update Checking...', '', 0, 0, mw)
progresswin.setWindowModality(Qt.ApplicationModal) progresswin.setWindowModality(Qt.ApplicationModal)
progresswin.setCancelButton(None) progresswin.setCancelButton(None)
progresswin.setWindowFlags( progresswin.setWindowFlags(
progresswin.windowFlags() & progresswin.windowFlags() &
~Qt.WindowContextHelpButtonHint ~Qt.WindowContextHelpButtonHint
) )
progresswin.setWindowTitle('FastWQ - Updater')
progresswin.setWindowIcon(APP_ICON) progresswin.setWindowIcon(APP_ICON)
progresswin.resize(280, 60) progresswin.resize(280, 60)
progresswin.show() progresswin.show()