raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanups

This commit is contained in:
Tim Bentley 2011-01-01 12:49:38 +00:00
parent c667ed5cc9
commit fd5e173d21
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openlp.pyw
View File

@ -205,22 +205,20 @@ class OpenLP(QtGui.QApplication):
self.exceptionForm = ExceptionForm(self.mainWindow) self.exceptionForm = ExceptionForm(self.mainWindow)
self.exceptionForm.exceptionTextEdit.setPlainText( self.exceptionForm.exceptionTextEdit.setPlainText(
''.join(format_exception(exctype, value, traceback))) ''.join(format_exception(exctype, value, traceback)))
self.setNormalCursor()
self.exceptionForm.exec_() self.exceptionForm.exec_()
def setBusyCursor(self): def setBusyCursor(self):
""" """
Sets the Busy Cursor on the Main Window Sets the Busy Cursor for the Application
""" """
#a=c
self.setOverrideCursor(QtCore.Qt.BusyCursor) self.setOverrideCursor(QtCore.Qt.BusyCursor)
#self.processEvents()
def setNormalCursor(self): def setNormalCursor(self):
""" """
Sets the Normal Cursor on the Main Window Sets the Normal Cursor forthe Application
""" """
self.restoreOverrideCursor() self.restoreOverrideCursor()
#self.processEvents()
def main(): def main():
""" """

2
openlp/core/lib/mediamanageritem.py
View File

@ -349,11 +349,13 @@ class MediaManagerItem(QtGui.QWidget):
self.OnNewFileMasks) self.OnNewFileMasks)
log.info(u'New files(s) %s', unicode(files)) log.info(u'New files(s) %s', unicode(files))
if files: if files:
Receiver.send_message(u'cursor_busy')
self.loadList(files) self.loadList(files)
lastDir = os.path.split(unicode(files[0]))[0] lastDir = os.path.split(unicode(files[0]))[0]
SettingsManager.set_last_dir(self.settingsSection, lastDir) SettingsManager.set_last_dir(self.settingsSection, lastDir)
SettingsManager.set_list(self.settingsSection, SettingsManager.set_list(self.settingsSection,
self.settingsSection, self.getFileList()) self.settingsSection, self.getFileList())
Receiver.send_message(u'cursor_normal')
def getFileList(self): def getFileList(self):
""" """

2
openlp/plugins/images/lib/mediaitem.py
View File

@ -139,7 +139,6 @@ class ImageMediaItem(MediaManagerItem):
self.settingsSection, self.getFileList()) self.settingsSection, self.getFileList())
def loadList(self, list): def loadList(self, list):
Receiver.send_message(u'cursor_busy')
for file in list: for file in list:
filename = os.path.split(unicode(file))[1] filename = os.path.split(unicode(file))[1]
thumb = os.path.join(self.servicePath, filename) thumb = os.path.join(self.servicePath, filename)
@ -154,7 +153,6 @@ class ImageMediaItem(MediaManagerItem):
item_name.setIcon(icon) item_name.setIcon(icon)
item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file)) item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file))
self.listView.addItem(item_name) self.listView.addItem(item_name)
Receiver.send_message(u'cursor_normal')
def generateSlideData(self, service_item, item=None, xmlVersion=False): def generateSlideData(self, service_item, item=None, xmlVersion=False):
items = self.listView.selectedIndexes() items = self.listView.selectedIndexes()

2
openlp/plugins/presentations/lib/mediaitem.py
View File

@ -171,7 +171,6 @@ class PresentationMediaItem(MediaManagerItem):
This is called both on initial load of the plugin to populate with This is called both on initial load of the plugin to populate with
existing files, and when the user adds new files via the media manager existing files, and when the user adds new files via the media manager
""" """
Receiver.send_message(u'cursor_busy')
currlist = self.getFileList() currlist = self.getFileList()
titles = [] titles = []
for file in currlist: for file in currlist:
@ -216,7 +215,6 @@ class PresentationMediaItem(MediaManagerItem):
item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file)) item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file))
item_name.setIcon(icon) item_name.setIcon(icon)
self.listView.addItem(item_name) self.listView.addItem(item_name)
Receiver.send_message(u'cursor_normal')
def onDeleteClick(self): def onDeleteClick(self):
""" """