forked from openlp/openlp
Fixes
This commit is contained in:
parent
79dc4948fa
commit
f83d52621a
|
@ -38,7 +38,7 @@ from openlp.core.ui import AboutForm, SettingsForm, ServiceManager, \
|
||||||
ThemeManager, SlideController, PluginForm, MediaDockManager, \
|
ThemeManager, SlideController, PluginForm, MediaDockManager, \
|
||||||
ShortcutListForm, DisplayTagForm
|
ShortcutListForm, DisplayTagForm
|
||||||
from openlp.core.utils import AppLocation, add_actions, LanguageManager, \
|
from openlp.core.utils import AppLocation, add_actions, LanguageManager, \
|
||||||
get_application_version, LoadSleepThread
|
get_application_version
|
||||||
from openlp.core.utils.actions import ActionList, CategoryOrder
|
from openlp.core.utils.actions import ActionList, CategoryOrder
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
@ -128,7 +128,7 @@ class Ui_MainWindow(object):
|
||||||
self.loadProgressBar = QtGui.QProgressBar(self.statusBar)
|
self.loadProgressBar = QtGui.QProgressBar(self.statusBar)
|
||||||
self.loadProgressBar.setObjectName(u'loadProgressBar')
|
self.loadProgressBar.setObjectName(u'loadProgressBar')
|
||||||
self.statusBar.addPermanentWidget(self.loadProgressBar)
|
self.statusBar.addPermanentWidget(self.loadProgressBar)
|
||||||
self.statusBar.removeWidget(self.loadProgressBar)
|
self.loadProgressBar.hide()
|
||||||
self.loadProgressBar.setValue(0)
|
self.loadProgressBar.setValue(0)
|
||||||
self.defaultThemeLabel = QtGui.QLabel(self.statusBar)
|
self.defaultThemeLabel = QtGui.QLabel(self.statusBar)
|
||||||
self.defaultThemeLabel.setObjectName(u'defaultThemeLabel')
|
self.defaultThemeLabel.setObjectName(u'defaultThemeLabel')
|
||||||
|
@ -549,9 +549,9 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
||||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
QtCore.SIGNAL(u'openlp_information_message'),
|
QtCore.SIGNAL(u'openlp_information_message'),
|
||||||
self.onInformationMessage)
|
self.onInformationMessage)
|
||||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
# QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
QtCore.SIGNAL(u'mainwindow_remove_progress'),
|
# QtCore.SIGNAL(u'mainwindow_remove_progress'),
|
||||||
self.removeProgressBar)
|
# self.removeProgressBar)
|
||||||
# warning cyclic dependency
|
# warning cyclic dependency
|
||||||
# renderer needs to call ThemeManager and
|
# renderer needs to call ThemeManager and
|
||||||
# ThemeManager needs to call Renderer
|
# ThemeManager needs to call Renderer
|
||||||
|
@ -1021,7 +1021,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
||||||
"""
|
"""
|
||||||
Make Progress bar visible and set size
|
Make Progress bar visible and set size
|
||||||
"""
|
"""
|
||||||
self.statusBar.addWidget(self.loadProgressBar)
|
|
||||||
self.loadProgressBar.show()
|
self.loadProgressBar.show()
|
||||||
self.loadProgressBar.setMaximum(size)
|
self.loadProgressBar.setMaximum(size)
|
||||||
self.loadProgressBar.setValue(0)
|
self.loadProgressBar.setValue(0)
|
||||||
|
@ -1029,20 +1028,21 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
||||||
|
|
||||||
def incrementProgressBar(self):
|
def incrementProgressBar(self):
|
||||||
"""
|
"""
|
||||||
Increase the Progress Bar Value by 1
|
Increase the Progress Bar value by 1
|
||||||
"""
|
"""
|
||||||
self.loadProgressBar.setValue(self.loadProgressBar.value() + 1)
|
self.loadProgressBar.setValue(self.loadProgressBar.value() + 1)
|
||||||
Receiver.send_message(u'openlp_process_events')
|
Receiver.send_message(u'openlp_process_events')
|
||||||
|
|
||||||
def finishedProgressBar(self):
|
def finishedProgressBar(self):
|
||||||
"""
|
"""
|
||||||
Trigger it's removal after 1 second
|
Trigger it's removal after 2.5 second
|
||||||
"""
|
"""
|
||||||
LoadSleepThread(self).start()
|
self.timer_id = self.startTimer(2500)
|
||||||
|
|
||||||
def removeProgressBar(self):
|
def timerEvent(self, event):
|
||||||
"""
|
"""
|
||||||
Remove the Progress bar from view.
|
Remove the Progress bar from view.
|
||||||
"""
|
"""
|
||||||
self.statusBar.removeWidget(self.loadProgressBar)
|
if event.timerId() == self.timer_id:
|
||||||
Receiver.send_message(u'openlp_process_events')
|
self.loadProgressBar.hide()
|
||||||
|
Receiver.send_message(u'openlp_process_events')
|
||||||
|
|
|
@ -461,7 +461,7 @@ class ServiceManager(QtGui.QWidget):
|
||||||
write_list = []
|
write_list = []
|
||||||
total_size = 0
|
total_size = 0
|
||||||
Receiver.send_message(u'cursor_busy')
|
Receiver.send_message(u'cursor_busy')
|
||||||
# Number if items + 1 to zip it
|
# Number of items + 1 to zip it
|
||||||
self.mainwindow.displayProgressBar(len(self.serviceItems) + 1)
|
self.mainwindow.displayProgressBar(len(self.serviceItems) + 1)
|
||||||
for item in self.serviceItems:
|
for item in self.serviceItems:
|
||||||
self.mainwindow.incrementProgressBar()
|
self.mainwindow.incrementProgressBar()
|
||||||
|
|
|
@ -100,19 +100,6 @@ class VersionThread(QtCore.QThread):
|
||||||
remote_version[u'revision'] > local_version[u'revision']:
|
remote_version[u'revision'] > local_version[u'revision']:
|
||||||
Receiver.send_message(u'openlp_version_check', u'%s' % version)
|
Receiver.send_message(u'openlp_version_check', u'%s' % version)
|
||||||
|
|
||||||
class LoadSleepThread(QtCore.QThread):
|
|
||||||
"""
|
|
||||||
A special Qt thread class sleep then remove the load progress bar
|
|
||||||
"""
|
|
||||||
def __init__(self, parent):
|
|
||||||
QtCore.QThread.__init__(self, parent)
|
|
||||||
|
|
||||||
def run(self):
|
|
||||||
"""
|
|
||||||
Run the thread.
|
|
||||||
"""
|
|
||||||
time.sleep(1)
|
|
||||||
Receiver.send_message(u'mainwindow_remove_progress')
|
|
||||||
|
|
||||||
class AppLocation(object):
|
class AppLocation(object):
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in New Issue