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

Add check update to FastWQ menu

Browse Source
This commit is contained in:
St.Huang 2018-09-12 12:28:50 +08:00
parent 6ee8915ca9
commit 2d09d13d80
10 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/fastwq/__init__.py
View File

@ -106,6 +106,11 @@ def browser_menu():
if b: if b:
menu.addSeparator() menu.addSeparator()
# check update
action = QAction(_('CHECK_UPDATE'), browser)
action.triggered.connect(lambda: check_updates(background=False, parent=browser))
menu.addAction(action)
# About # About
action = QAction(_('ABOUT'), browser) action = QAction(_('ABOUT'), browser)
action.triggered.connect(lambda: show_about_dialog(browser)) action.triggered.connect(lambda: show_about_dialog(browser))

5
addons/fastwq/gui/common.py
View File

@ -34,10 +34,11 @@ from ..service import service_manager, service_pool
__all__ = ['show_options', 'check_updates', 'show_fm_dialog', 'show_about_dialog'] __all__ = ['show_options', 'check_updates', 'show_fm_dialog', 'show_about_dialog']
def check_updates(background=False): def check_updates(background=False, parent=None):
'''check add-on last version''' '''check add-on last version'''
try: try:
state = ankihub.update([Endpoint.check_version], Endpoint.version, background) parent = mw if parent is None else parent
state = ankihub.update([Endpoint.check_version], Endpoint.version, background, parent)
if not background: if not background:
if state == 0: if state == 0:
showInfo(_('LATEST_VERSION')) showInfo(_('LATEST_VERSION'))

2
addons/fastwq/gui/options.py
View File

@ -192,7 +192,7 @@ class OptionsDialog(Dialog):
def check_updates(self): def check_updates(self):
'''check addon version''' '''check addon version'''
from .common import check_updates from .common import check_updates
check_updates() check_updates(parent=self)
def show_fm_dialog(self): def show_fm_dialog(self):
'''open folder manager dialog''' '''open folder manager dialog'''

1
addons/fastwq/lang.py
View File

@ -59,6 +59,7 @@ _arr = [
['NEW_VERSION', u'检查到新版本:', u'New version available:'], ['NEW_VERSION', u'检查到新版本:', u'New version available:'],
['UPDATE', u'更新', u'Update'], ['UPDATE', u'更新', u'Update'],
['AUTO_UPDATE', u'自动检测新版本', u'Auto check new version'], ['AUTO_UPDATE', u'自动检测新版本', u'Auto check new version'],
['CHECK_UPDATE', u'检测更新', u'Check Update'],
['IGNORE_MDX_WORDCASE', u'忽略本地词典单词大小写', u'Ignore MDX dictionary word case'], ['IGNORE_MDX_WORDCASE', u'忽略本地词典单词大小写', u'Ignore MDX dictionary word case'],
['FORCE_UPDATE', u'强制更新字段', u'Forced Updates of all fields'], ['FORCE_UPDATE', u'强制更新字段', u'Forced Updates of all fields'],
['IGNORE_ACCENTS', u'忽略声调', u'Ignore Accents'], ['IGNORE_ACCENTS', u'忽略声调', u'Ignore Accents'],

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

@ -159,10 +159,11 @@ def updateSingle(repositories, path, data):
return callback return callback
def update(add=[], VERSION='v0.0.0', background=False): def update(add=[], VERSION='v0.0.0', background=False, parent=None):
parent = parent if parent else mw
# progress win # progress win
if not background: if not background:
progresswin = QProgressDialog('Update Checking...', '', 0, 0, mw) progresswin = QProgressDialog('Update Checking...', '', 0, 0, parent)
progresswin.setWindowModality(Qt.ApplicationModal) progresswin.setWindowModality(Qt.ApplicationModal)
progresswin.setCancelButton(None) progresswin.setCancelButton(None)
progresswin.setWindowFlags( progresswin.setWindowFlags(
@ -264,7 +265,7 @@ def update(add=[], VERSION='v0.0.0', background=False):
if progresswin: if progresswin:
progresswin.hide() progresswin.hide()
progresswin.destroy() progresswin.destroy()
dialog = DialogUpdates(None, data, repository, updateSingle(repositories, path, data)) dialog = DialogUpdates(parent, data, repository, updateSingle(repositories, path, data))
dialog.exec_() dialog.exec_()
dialog.destroy() dialog.destroy()
else: else:

5
addons21/fastwq/common.py
View File

@ -106,6 +106,11 @@ def browser_menu():
if b: if b:
menu.addSeparator() menu.addSeparator()
# check update
action = QAction(_('CHECK_UPDATE'), browser)
action.triggered.connect(lambda: check_updates(background=False, parent=browser))
menu.addAction(action)
# About # About
action = QAction(_('ABOUT'), browser) action = QAction(_('ABOUT'), browser)
action.triggered.connect(lambda: show_about_dialog(browser)) action.triggered.connect(lambda: show_about_dialog(browser))

5
addons21/fastwq/gui/common.py
View File

@ -34,10 +34,11 @@ from ..service import service_manager, service_pool
__all__ = ['show_options', 'check_updates', 'show_fm_dialog', 'show_about_dialog'] __all__ = ['show_options', 'check_updates', 'show_fm_dialog', 'show_about_dialog']
def check_updates(background=False): def check_updates(background=False, parent=None):
'''check add-on last version''' '''check add-on last version'''
try: try:
state = ankihub.update([Endpoint.check_version], Endpoint.version, background) parent = mw if parent is None else parent
state = ankihub.update([Endpoint.check_version], Endpoint.version, background, parent)
if not background: if not background:
if state == 0: if state == 0:
showInfo(_('LATEST_VERSION')) showInfo(_('LATEST_VERSION'))

2
addons21/fastwq/gui/options.py
View File

@ -192,7 +192,7 @@ class OptionsDialog(Dialog):
def check_updates(self): def check_updates(self):
'''check addon version''' '''check addon version'''
from .common import check_updates from .common import check_updates
check_updates() check_updates(parent=self)
def show_fm_dialog(self): def show_fm_dialog(self):
'''open folder manager dialog''' '''open folder manager dialog'''

1
addons21/fastwq/lang.py
View File

@ -59,6 +59,7 @@ _arr = [
['NEW_VERSION', u'检查到新版本:', u'New version available:'], ['NEW_VERSION', u'检查到新版本:', u'New version available:'],
['UPDATE', u'更新', u'Update'], ['UPDATE', u'更新', u'Update'],
['AUTO_UPDATE', u'自动检测新版本', u'Auto check new version'], ['AUTO_UPDATE', u'自动检测新版本', u'Auto check new version'],
['CHECK_UPDATE', u'检测更新', u'Check Update'],
['IGNORE_MDX_WORDCASE', u'忽略本地词典单词大小写', u'Ignore MDX dictionary word case'], ['IGNORE_MDX_WORDCASE', u'忽略本地词典单词大小写', u'Ignore MDX dictionary word case'],
['FORCE_UPDATE', u'强制更新字段', u'Forced Updates of all fields'], ['FORCE_UPDATE', u'强制更新字段', u'Forced Updates of all fields'],
['IGNORE_ACCENTS', u'忽略声调', u'Ignore Accents'], ['IGNORE_ACCENTS', u'忽略声调', u'Ignore Accents'],

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

@ -160,10 +160,11 @@ def updateSingle(repositories, path, data):
return callback return callback
def update(add=[], VERSION='v0.0.0', background=False): def update(add=[], VERSION='v0.0.0', background=False, parent=None):
parent = parent if parent else mw
# progress win # progress win
if not background: if not background:
progresswin = QProgressDialog('Update Checking...', '', 0, 0, mw) progresswin = QProgressDialog('Update Checking...', '', 0, 0, parent)
progresswin.setWindowModality(Qt.ApplicationModal) progresswin.setWindowModality(Qt.ApplicationModal)
progresswin.setCancelButton(None) progresswin.setCancelButton(None)
progresswin.setWindowFlags( progresswin.setWindowFlags(
@ -265,7 +266,7 @@ def update(add=[], VERSION='v0.0.0', background=False):
if progresswin: if progresswin:
progresswin.hide() progresswin.hide()
progresswin.destroy() progresswin.destroy()
dialog = DialogUpdates(None, data, repository, updateSingle(repositories, path, data)) dialog = DialogUpdates(parent, data, repository, updateSingle(repositories, path, data))
dialog.exec_() dialog.exec_()
dialog.destroy() dialog.destroy()
else: else: