openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #08427
[Merge] lp:~trb143/openlp/b1 into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/b1 into lp:openlp.
Requested reviews:
Jonathan Corwin (j-corwin)
For more details, see:
https://code.launchpad.net/~trb143/openlp/b1/+merge/59473
Add ProgressBar on the Mainwindow and hide / Show correctly.
Use it for Service Loads and Saves
Use it for Image Imports
Use it for Presentation Imports
--
https://code.launchpad.net/~trb143/openlp/b1/+merge/59473
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py 2011-04-15 21:43:59 +0000
+++ openlp/core/lib/mediamanageritem.py 2011-04-29 09:00:59 +0000
@@ -554,4 +554,4 @@
item_id = remoteItem
else:
item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
- return item_id
\ No newline at end of file
+ return item_id
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2011-04-26 18:52:46 +0000
+++ openlp/core/ui/mainwindow.py 2011-04-29 09:00:59 +0000
@@ -122,12 +122,17 @@
self.HelpMenu = QtGui.QMenu(self.MenuBar)
self.HelpMenu.setObjectName(u'HelpMenu')
mainWindow.setMenuBar(self.MenuBar)
- self.StatusBar = QtGui.QStatusBar(mainWindow)
- self.StatusBar.setObjectName(u'StatusBar')
- mainWindow.setStatusBar(self.StatusBar)
- self.DefaultThemeLabel = QtGui.QLabel(self.StatusBar)
- self.DefaultThemeLabel.setObjectName(u'DefaultThemeLabel')
- self.StatusBar.addPermanentWidget(self.DefaultThemeLabel)
+ self.statusBar = QtGui.QStatusBar(mainWindow)
+ self.statusBar.setObjectName(u'statusBar')
+ mainWindow.setStatusBar(self.statusBar)
+ self.loadProgressBar = QtGui.QProgressBar(self.statusBar)
+ self.loadProgressBar.setObjectName(u'loadProgressBar')
+ self.statusBar.addPermanentWidget(self.loadProgressBar)
+ self.loadProgressBar.hide()
+ self.loadProgressBar.setValue(0)
+ self.defaultThemeLabel = QtGui.QLabel(self.statusBar)
+ self.defaultThemeLabel.setObjectName(u'defaultThemeLabel')
+ self.statusBar.addPermanentWidget(self.defaultThemeLabel)
# Create the MediaManager
self.mediaManagerDock = OpenLPDockWidget(mainWindow,
u'mediaManagerDock', u':/system/system_mediamanager.png')
@@ -544,6 +549,9 @@
QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'openlp_information_message'),
self.onInformationMessage)
+# QtCore.QObject.connect(Receiver.get_receiver(),
+# QtCore.SIGNAL(u'mainwindow_remove_progress'),
+# self.removeProgressBar)
# warning cyclic dependency
# renderer needs to call ThemeManager and
# ThemeManager needs to call Renderer
@@ -880,10 +888,10 @@
self.setWindowTitle(title)
def showStatusMessage(self, message):
- self.StatusBar.showMessage(message)
+ self.statusBar.showMessage(message)
def defaultThemeChanged(self, theme):
- self.DefaultThemeLabel.setText(
+ self.defaultThemeLabel.setText(
unicode(translate('OpenLP.MainWindow', 'Default Theme: %s')) %
theme)
@@ -979,7 +987,7 @@
for fileId, filename in enumerate(recentFilesToDisplay):
log.debug('Recent file name: %s', filename)
action = base_action(self, u'')
- action.setText(u'&%d %s' %
+ action.setText(u'&%d %s' %
(fileId + 1, QtCore.QFileInfo(filename).fileName()))
action.setData(QtCore.QVariant(filename))
self.connect(action, QtCore.SIGNAL(u'triggered()'),
@@ -1008,3 +1016,34 @@
while self.recentFiles.count() > maxRecentFiles:
# Don't care what API says takeLast works, removeLast doesn't!
self.recentFiles.takeLast()
+
+ def displayProgressBar(self, size):
+ """
+ Make Progress bar visible and set size
+ """
+ self.loadProgressBar.show()
+ self.loadProgressBar.setMaximum(size)
+ self.loadProgressBar.setValue(0)
+ Receiver.send_message(u'openlp_process_events')
+
+ def incrementProgressBar(self):
+ """
+ Increase the Progress Bar value by 1
+ """
+ self.loadProgressBar.setValue(self.loadProgressBar.value() + 1)
+ Receiver.send_message(u'openlp_process_events')
+
+ def finishedProgressBar(self):
+ """
+ Trigger it's removal after 2.5 second
+ """
+ self.timer_id = self.startTimer(2500)
+
+ def timerEvent(self, event):
+ """
+ Remove the Progress bar from view.
+ """
+ if event.timerId() == self.timer_id:
+ self.timer_id = 0
+ self.loadProgressBar.hide()
+ Receiver.send_message(u'openlp_process_events')
=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py 2011-04-26 18:52:46 +0000
+++ openlp/core/ui/servicemanager.py 2011-04-29 09:00:59 +0000
@@ -460,7 +460,11 @@
service = []
write_list = []
total_size = 0
+ Receiver.send_message(u'cursor_busy')
+ # Number of items + 1 to zip it
+ self.mainwindow.displayProgressBar(len(self.serviceItems) + 1)
for item in self.serviceItems:
+ self.mainwindow.incrementProgressBar()
service.append({u'serviceitem':
item[u'service_item'].get_service_repr()})
if not item[u'service_item'].uses_file():
@@ -501,6 +505,7 @@
log.debug(u'ServiceManager.saveFile - allowZip64 is %s' % allow_zip_64)
zip = None
success = True
+ self.mainwindow.incrementProgressBar()
try:
zip = zipfile.ZipFile(path_file_name, 'w', zipfile.ZIP_STORED,
allow_zip_64)
@@ -516,6 +521,8 @@
finally:
if zip:
zip.close()
+ self.mainwindow.finishedProgressBar()
+ Receiver.send_message(u'cursor_normal')
if success:
self.mainwindow.addRecentFile(path_file_name)
self.setModified(False)
@@ -576,13 +583,15 @@
items = cPickle.load(fileTo)
fileTo.close()
self.newFile()
+ self.mainwindow.displayProgressBar(len(items))
for item in items:
+ self.mainwindow.incrementProgressBar()
serviceItem = ServiceItem()
serviceItem.from_service = True
serviceItem.renderer = self.mainwindow.renderer
serviceItem.set_from_service(item, self.servicePath)
self.validateItem(serviceItem)
- self.addServiceItem(serviceItem)
+ self.addServiceItem(serviceItem, repaint=False)
if serviceItem.is_capable(ItemCapabilities.OnLoadUpdate):
Receiver.send_message(u'%s_service_load' %
serviceItem.name.lower(), serviceItem)
@@ -592,7 +601,6 @@
self.setModified(False)
QtCore.QSettings().setValue(
'service/last file', QtCore.QVariant(fileName))
- Receiver.send_message(u'cursor_normal')
else:
critical_error_message_box(
message=translate('OpenLP.ServiceManager',
@@ -623,6 +631,9 @@
fileTo.close()
if zip:
zip.close()
+ self.mainwindow.finishedProgressBar()
+ Receiver.send_message(u'cursor_normal')
+ self.repaintServiceList(-1, -1)
def loadLastFile(self):
"""
@@ -1056,7 +1067,8 @@
newItem)
self.setModified()
- def addServiceItem(self, item, rebuild=False, expand=None, replace=False):
+ def addServiceItem(self, item, rebuild=False, expand=None, replace=False,
+ repaint=True):
"""
Add a Service item to the list
@@ -1089,7 +1101,8 @@
self.serviceItems.append({u'service_item': item,
u'order': len(self.serviceItems) + 1,
u'expanded': expand})
- self.repaintServiceList(len(self.serviceItems) - 1, -1)
+ if repaint:
+ self.repaintServiceList(len(self.serviceItems) - 1, -1)
else:
self.serviceItems.insert(self.dropPosition,
{u'service_item': item, u'order': self.dropPosition,
=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py 2011-04-15 21:43:59 +0000
+++ openlp/plugins/images/lib/mediaitem.py 2011-04-29 09:00:59 +0000
@@ -77,7 +77,7 @@
u'thumbnails')
check_directory_exists(self.servicePath)
self.loadList(SettingsManager.load_list(
- self.settingsSection, self.settingsSection))
+ self.settingsSection, self.settingsSection), True)
def addListViewToToolBar(self):
MediaManagerItem.addListViewToToolBar(self)
@@ -107,8 +107,13 @@
SettingsManager.set_list(self.settingsSection,
self.settingsSection, self.getFileList())
- def loadList(self, list):
+ def loadList(self, list, initialLoad=False):
+ Receiver.send_message(u'cursor_busy')
+ if not initialLoad:
+ self.parent.formparent.displayProgressBar(len(list))
for imageFile in list:
+ if not initialLoad:
+ self.parent.formparent.incrementProgressBar()
filename = os.path.split(unicode(imageFile))[1]
thumb = os.path.join(self.servicePath, filename)
if os.path.exists(thumb):
@@ -122,6 +127,9 @@
item_name.setIcon(icon)
item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(imageFile))
self.listView.addItem(item_name)
+ Receiver.send_message(u'cursor_normal')
+ if not initialLoad:
+ self.parent.formparent.finishedProgressBar()
def generateSlideData(self, service_item, item=None, xmlVersion=False):
items = self.listView.selectedIndexes()
@@ -201,4 +209,4 @@
critical_error_message_box(UiStrings().LiveBGError,
unicode(translate('ImagePlugin.MediaItem',
'There was a problem replacing your background, '
- 'the image file "%s" no longer exists.')) % filename)
\ No newline at end of file
+ 'the image file "%s" no longer exists.')) % filename)
=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
--- openlp/plugins/presentations/lib/mediaitem.py 2011-04-15 21:43:59 +0000
+++ openlp/plugins/presentations/lib/mediaitem.py 2011-04-29 09:00:59 +0000
@@ -158,7 +158,12 @@
titles = []
for file in currlist:
titles.append(os.path.split(file)[1])
+ Receiver.send_message(u'cursor_busy')
+ if not initialLoad:
+ self.parent.formparent.displayProgressBar(len(list))
for file in list:
+ if not initialLoad:
+ self.parent.formparent.incrementProgressBar()
if currlist.count(file) > 0:
continue
filename = os.path.split(unicode(file))[1]
@@ -198,6 +203,9 @@
item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file))
item_name.setIcon(icon)
self.listView.addItem(item_name)
+ Receiver.send_message(u'cursor_normal')
+ if not initialLoad:
+ self.parent.formparent.finishedProgressBar()
def onDeleteClick(self):
"""
@@ -296,4 +304,4 @@
if self.controllers[controller].enabled():
if filetype in self.controllers[controller].alsosupports:
return controller
- return None
\ No newline at end of file
+ return None
Follow ups
