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

Adjusted ui

Browse Source
This commit is contained in:
St.Huang 2018-07-31 14:33:24 +08:00
parent 2fc6de3af0
commit 87753491a1
6 changed files with 65 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
addons/fastwq/gui/progress.py
View File

@ -23,17 +23,19 @@ from collections import defaultdict
from aqt.qt import * from aqt.qt import *
from ..lang import _ from ..lang import _
from ..context import APP_ICON
__all__ = ['ProgressWindow'] __all__ = ['ProgressWindow']
_INFO_TEMPLATE = u''.join([ _INFO_TEMPLATE = u''.join([
_('QUERIED') + u'<br>' + 45 * u'-' + u'<br>', u'<strong>' + _('QUERIED') + u'</strong>',
_('SUCCESS') + u' {} ' + _('WORDS') + u'<br>', u'<p>' + 45 * u'-' + u'</p>',
_('SKIPED') + u' {} ' + _('WORDS') + u'<br>', u'<p>' + _('SUCCESS') + u' <b>{}</b> ' + _('WORDS') + u'</p>',
_('UPDATE') + u' {} ' + _('FIELDS') + u'<br>', u'<p>' + _('SKIPED') + u' <b>{}</b> ' + _('WORDS') + u'</p>',
_('FAILURE') + u' {} ' + _('WORDS') + u'' u'<p>' + _('UPDATE') + u' <b>{}</b> ' + _('FIELDS') + u'</p>',
u'<p>' + _('FAILURE') + u' <b>{}</b> ' + _('WORDS') + u'</p>',
]) ])
@ -72,7 +74,6 @@ class ProgressWindow(object):
fields_number, fields_number,
fails_number fails_number
) )
self._update(label=number_info, value=words_number+skips_number+fails_number) self._update(label=number_info, value=words_number+skips_number+fails_number)
self._win.adjustSize() self._win.adjustSize()
@ -90,7 +91,13 @@ class ProgressWindow(object):
self._win.setWindowModality(Qt.ApplicationModal) self._win.setWindowModality(Qt.ApplicationModal)
self._win.setCancelButton(None) self._win.setCancelButton(None)
self._win.canceled.connect(self.finish) self._win.canceled.connect(self.finish)
self._win.setWindowTitle("Querying...") self._win.setWindowTitle("FastWQ - Querying...")
self._win.setModal(True)
self._win.setWindowFlags(
self._win.windowFlags() &
~Qt.WindowContextHelpButtonHint
)
self._win.setWindowIcon(APP_ICON)
self._win.setAutoReset(True) self._win.setAutoReset(True)
self._win.setAutoClose(True) self._win.setAutoClose(True)
self._win.setMinimum(0) self._win.setMinimum(0)

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

@ -1,68 +1,48 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'updates.ui' from aqt.qt import *
#
# Created: Sat Sep 10 10:16:01 2016
# by: PyQt4 UI code generator 4.11.2
#
# WARNING! All changes made in this file will be lost!
from PyQt4 import QtCore, QtGui
try: try:
_fromUtf8 = QtCore.QString.fromUtf8 _encoding = QApplication.UnicodeUTF8
except AttributeError:
def _fromUtf8(s):
return s
try:
_encoding = QtGui.QApplication.UnicodeUTF8
def _translate(context, text, disambig): def _translate(context, text, disambig):
return QtGui.QApplication.translate(context, text, disambig, _encoding) return QApplication.translate(context, text, disambig, _encoding)
except AttributeError: except AttributeError:
def _translate(context, text, disambig): def _translate(context, text, disambig):
return QtGui.QApplication.translate(context, text, disambig) return QApplication.translate(context, text, disambig)
class Ui_DialogUpdates(object): class Ui_DialogUpdates(object):
def setupUi(self, DialogUpdates): def setupUi(self, DialogUpdates):
DialogUpdates.setObjectName(_fromUtf8("DialogUpdates")) DialogUpdates.setObjectName(u"DialogUpdates")
DialogUpdates.resize(500, 400) DialogUpdates.resize(500, 400)
self.verticalLayout = QtGui.QVBoxLayout(DialogUpdates) self.verticalLayout = QVBoxLayout(DialogUpdates)
self.verticalLayout.setObjectName(_fromUtf8("verticalLayout")) self.verticalLayout.setObjectName(u"verticalLayout")
self.labelUpdates = QtGui.QLabel(DialogUpdates) self.labelUpdates = QLabel(DialogUpdates)
self.labelUpdates.setWordWrap(True) self.labelUpdates.setWordWrap(True)
self.labelUpdates.setOpenExternalLinks(True) self.labelUpdates.setOpenExternalLinks(True)
self.labelUpdates.setObjectName(_fromUtf8("labelUpdates")) self.labelUpdates.setObjectName(u"labelUpdates")
self.verticalLayout.addWidget(self.labelUpdates) self.verticalLayout.addWidget(self.labelUpdates)
self.textBrowser = QtGui.QTextBrowser(DialogUpdates) self.textBrowser = QTextBrowser(DialogUpdates)
self.textBrowser.setObjectName(_fromUtf8("textBrowser")) self.textBrowser.setObjectName(u"textBrowser")
self.verticalLayout.addWidget(self.textBrowser) self.verticalLayout.addWidget(self.textBrowser)
self.horizontalLayout = QtGui.QHBoxLayout() self.horizontalLayout = QHBoxLayout()
self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout")) self.horizontalLayout.setObjectName(u"horizontalLayout")
#spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) self.update = QPushButton(DialogUpdates)
#self.horizontalLayout.addItem(spacerItem) self.update.setObjectName(u"update")
#self.always = QtGui.QPushButton(DialogUpdates) self.horizontalLayout.addWidget(self.update, 0, Qt.AlignCenter)
#self.always.setObjectName(_fromUtf8("always"))
#self.horizontalLayout.addWidget(self.always)
self.update = QtGui.QPushButton(DialogUpdates)
self.update.setObjectName(_fromUtf8("update"))
self.horizontalLayout.addWidget(self.update, 0, QtCore.Qt.AlignCenter)
#self.dont = QtGui.QPushButton(DialogUpdates)
#self.dont.setObjectName(_fromUtf8("dont"))
#self.horizontalLayout.addWidget(self.dont)
#self.never = QtGui.QPushButton(DialogUpdates)
#self.never.setObjectName(_fromUtf8("never"))
#self.horizontalLayout.addWidget(self.never)
self.verticalLayout.addLayout(self.horizontalLayout) self.verticalLayout.addLayout(self.horizontalLayout)
self.retranslateUi(DialogUpdates) self.retranslateUi(DialogUpdates)
QtCore.QMetaObject.connectSlotsByName(DialogUpdates) QMetaObject.connectSlotsByName(DialogUpdates)
def retranslateUi(self, DialogUpdates): def retranslateUi(self, DialogUpdates):
DialogUpdates.setWindowTitle(_translate("DialogUpdates", "FastWQ - Updater", 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(
#self.always.setText(_translate("DialogUpdates", "Always update", None)) "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.update.setText(_translate("DialogUpdates", "Update", None)) self.update.setText(_translate("DialogUpdates", "Update", None))
#self.dont.setText(_translate("DialogUpdates", "Don\'t update", None))
#self.never.setText(_translate("DialogUpdates", "Never", None))

2
addons/fastwq/query/worker.py
View File

@ -149,7 +149,7 @@ class QueryWorkerManager(object):
else: else:
self.update_progress() self.update_progress()
mw.app.processEvents() mw.app.processEvents()
worker.wait(100) worker.wait(30)
self.progress.finish() self.progress.finish()
@QtCore.pyqtSlot(object) @QtCore.pyqtSlot(object)

21
addons21/fastwq/gui/progress.py
View File

@ -23,17 +23,19 @@ from collections import defaultdict
from aqt.qt import * from aqt.qt import *
from ..lang import _ from ..lang import _
from ..context import APP_ICON
__all__ = ['ProgressWindow'] __all__ = ['ProgressWindow']
_INFO_TEMPLATE = u''.join([ _INFO_TEMPLATE = u''.join([
_('QUERIED') + u'<br>' + 45 * u'-' + u'<br>', u'<strong>' + _('QUERIED') + u'</strong>',
_('SUCCESS') + u' {} ' + _('WORDS') + u'<br>', u'<p>' + 45 * u'-' + u'</p>',
_('SKIPED') + u' {} ' + _('WORDS') + u'<br>', u'<p>' + _('SUCCESS') + u' <b>{}</b> ' + _('WORDS') + u'</p>',
_('UPDATE') + u' {} ' + _('FIELDS') + u'<br>', u'<p>' + _('SKIPED') + u' <b>{}</b> ' + _('WORDS') + u'</p>',
_('FAILURE') + u' {} ' + _('WORDS') + u'' u'<p>' + _('UPDATE') + u' <b>{}</b> ' + _('FIELDS') + u'</p>',
u'<p>' + _('FAILURE') + u' <b>{}</b> ' + _('WORDS') + u'</p>',
]) ])
@ -72,7 +74,6 @@ class ProgressWindow(object):
fields_number, fields_number,
fails_number fails_number
) )
self._update(label=number_info, value=words_number+skips_number+fails_number) self._update(label=number_info, value=words_number+skips_number+fails_number)
self._win.adjustSize() self._win.adjustSize()
@ -90,7 +91,13 @@ class ProgressWindow(object):
self._win.setWindowModality(Qt.ApplicationModal) self._win.setWindowModality(Qt.ApplicationModal)
self._win.setCancelButton(None) self._win.setCancelButton(None)
self._win.canceled.connect(self.finish) self._win.canceled.connect(self.finish)
self._win.setWindowTitle("Querying...") self._win.setWindowTitle("FastWQ - Querying...")
self._win.setModal(True)
self._win.setWindowFlags(
self._win.windowFlags() &
~Qt.WindowContextHelpButtonHint
)
self._win.setWindowIcon(APP_ICON)
self._win.setAutoReset(True) self._win.setAutoReset(True)
self._win.setAutoClose(True) self._win.setAutoClose(True)
self._win.setMinimum(0) self._win.setMinimum(0)

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

@ -1,12 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'updates.ui'
#
# Created: Sat Sep 10 10:16:01 2016
# by: PyQt4 UI code generator 4.11.2
#
# WARNING! All changes made in this file will be lost!
from aqt.qt import * from aqt.qt import *
try: try:
@ -33,20 +26,9 @@ class Ui_DialogUpdates(object):
self.verticalLayout.addWidget(self.textBrowser) self.verticalLayout.addWidget(self.textBrowser)
self.horizontalLayout = QHBoxLayout() self.horizontalLayout = QHBoxLayout()
self.horizontalLayout.setObjectName(u"horizontalLayout") self.horizontalLayout.setObjectName(u"horizontalLayout")
#spacerItem = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
#self.horizontalLayout.addItem(spacerItem)
#self.always = QPushButton(DialogUpdates)
#self.always.setObjectName(u"always"))
#self.horizontalLayout.addWidget(self.always)
self.update = QPushButton(DialogUpdates) self.update = QPushButton(DialogUpdates)
self.update.setObjectName(u"update") self.update.setObjectName(u"update")
self.horizontalLayout.addWidget(self.update, 0, Qt.AlignCenter) self.horizontalLayout.addWidget(self.update, 0, Qt.AlignCenter)
#self.dont = QPushButton(DialogUpdates)
#self.dont.setObjectName(u"dont"))
#self.horizontalLayout.addWidget(self.dont)
#self.never = QPushButton(DialogUpdates)
#self.never.setObjectName(u"never"))
#self.horizontalLayout.addWidget(self.never)
self.verticalLayout.addLayout(self.horizontalLayout) self.verticalLayout.addLayout(self.horizontalLayout)
self.retranslateUi(DialogUpdates) self.retranslateUi(DialogUpdates)
@ -54,9 +36,13 @@ class Ui_DialogUpdates(object):
def retranslateUi(self, DialogUpdates): def retranslateUi(self, DialogUpdates):
DialogUpdates.setWindowTitle(_translate("DialogUpdates", "FastWQ - Updater", 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(
#self.always.setText(_translate("DialogUpdates", "Always update", None)) "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.update.setText(_translate("DialogUpdates", "Update", None)) self.update.setText(_translate("DialogUpdates", "Update", None))
#self.dont.setText(_translate("DialogUpdates", "Don\'t update", None))
#self.never.setText(_translate("DialogUpdates", "Never", None))

2
addons21/fastwq/query/worker.py
View File

@ -150,7 +150,7 @@ class QueryWorkerManager(object):
else: else:
self.update_progress() self.update_progress()
mw.app.processEvents() mw.app.processEvents()
worker.wait(100) worker.wait(30)
self.progress.finish() self.progress.finish()
def handle_flush(self, note): def handle_flush(self, note):