forked from openlp/openlp
Head 1181
This commit is contained in:
commit
3190599a76
17
openlp.pyw
17
openlp.pyw
@ -162,6 +162,10 @@ class OpenLP(QtGui.QApplication):
|
|||||||
# provide a listener for widgets to reqest a screen update.
|
# provide a listener for widgets to reqest a screen update.
|
||||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
QtCore.SIGNAL(u'openlp_process_events'), self.processEvents)
|
QtCore.SIGNAL(u'openlp_process_events'), self.processEvents)
|
||||||
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
|
QtCore.SIGNAL(u'cursor_busy'), self.setBusyCursor)
|
||||||
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
|
QtCore.SIGNAL(u'cursor_normal'), self.setNormalCursor)
|
||||||
self.setOrganizationName(u'OpenLP')
|
self.setOrganizationName(u'OpenLP')
|
||||||
self.setOrganizationDomain(u'openlp.org')
|
self.setOrganizationDomain(u'openlp.org')
|
||||||
self.setApplicationName(u'OpenLP')
|
self.setApplicationName(u'OpenLP')
|
||||||
@ -201,8 +205,21 @@ 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):
|
||||||
|
"""
|
||||||
|
Sets the Busy Cursor for the Application
|
||||||
|
"""
|
||||||
|
self.setOverrideCursor(QtCore.Qt.BusyCursor)
|
||||||
|
|
||||||
|
def setNormalCursor(self):
|
||||||
|
"""
|
||||||
|
Sets the Normal Cursor forthe Application
|
||||||
|
"""
|
||||||
|
self.restoreOverrideCursor()
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
"""
|
"""
|
||||||
The main function which parses command line options and then runs
|
The main function which parses command line options and then runs
|
||||||
|
@ -220,6 +220,21 @@ class EventReceiver(QtCore.QObject):
|
|||||||
Waits for openlp to do something "interesting" and sends a
|
Waits for openlp to do something "interesting" and sends a
|
||||||
remotes_poll_response signal when it does
|
remotes_poll_response signal when it does
|
||||||
|
|
||||||
|
``openlp_critical_message``
|
||||||
|
Displays a standalong Critical Message
|
||||||
|
|
||||||
|
``openlp_error_message``
|
||||||
|
Displays a standalong Error Message
|
||||||
|
|
||||||
|
``openlp_information_message``
|
||||||
|
Displays a standalong Information Message
|
||||||
|
|
||||||
|
``cursor_busy``
|
||||||
|
Makes the cursor got to a busy form
|
||||||
|
|
||||||
|
``cursor_normal``
|
||||||
|
Resets the cursor to default
|
||||||
|
|
||||||
"""
|
"""
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
"""
|
"""
|
||||||
|
@ -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):
|
||||||
"""
|
"""
|
||||||
|
@ -582,16 +582,16 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
QtCore.QObject.connect(self.SettingsShortcutsItem,
|
QtCore.QObject.connect(self.SettingsShortcutsItem,
|
||||||
QtCore.SIGNAL(u'triggered()'), self.onSettingsShortcutsItemClicked)
|
QtCore.SIGNAL(u'triggered()'), self.onSettingsShortcutsItemClicked)
|
||||||
QtCore.QObject.connect(self.FileNewItem, QtCore.SIGNAL(u'triggered()'),
|
QtCore.QObject.connect(self.FileNewItem, QtCore.SIGNAL(u'triggered()'),
|
||||||
self.ServiceManagerContents.onNewService)
|
self.ServiceManagerContents.onNewServiceClicked)
|
||||||
QtCore.QObject.connect(self.FileOpenItem,
|
QtCore.QObject.connect(self.FileOpenItem,
|
||||||
QtCore.SIGNAL(u'triggered()'),
|
QtCore.SIGNAL(u'triggered()'),
|
||||||
self.ServiceManagerContents.onLoadService)
|
self.ServiceManagerContents.onLoadServiceClicked)
|
||||||
QtCore.QObject.connect(self.FileSaveItem,
|
QtCore.QObject.connect(self.FileSaveItem,
|
||||||
QtCore.SIGNAL(u'triggered()'),
|
QtCore.SIGNAL(u'triggered()'),
|
||||||
self.ServiceManagerContents.onQuickSaveService)
|
self.ServiceManagerContents.onSaveServiceClicked)
|
||||||
QtCore.QObject.connect(self.FileSaveAsItem,
|
QtCore.QObject.connect(self.FileSaveAsItem,
|
||||||
QtCore.SIGNAL(u'triggered()'),
|
QtCore.SIGNAL(u'triggered()'),
|
||||||
self.ServiceManagerContents.onSaveService)
|
self.ServiceManagerContents.onSaveServiceAsClicked)
|
||||||
# i18n set signals for languages
|
# i18n set signals for languages
|
||||||
QtCore.QObject.connect(self.AutoLanguageItem,
|
QtCore.QObject.connect(self.AutoLanguageItem,
|
||||||
QtCore.SIGNAL(u'toggled(bool)'), self.setAutoLanguage)
|
QtCore.SIGNAL(u'toggled(bool)'), self.setAutoLanguage)
|
||||||
@ -612,6 +612,15 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
QtCore.SIGNAL(u'config_screen_changed'), self.screenChanged)
|
QtCore.SIGNAL(u'config_screen_changed'), self.screenChanged)
|
||||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
QtCore.SIGNAL(u'maindisplay_status_text'), self.showStatusMessage)
|
QtCore.SIGNAL(u'maindisplay_status_text'), self.showStatusMessage)
|
||||||
|
Receiver.send_message(u'cursor_busy')
|
||||||
|
# Simple message boxes
|
||||||
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
|
QtCore.SIGNAL(u'openlp_error_message'), self.onErrorMessage)
|
||||||
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
|
QtCore.SIGNAL(u'openlp_warning_message'), self.onWarningMessage)
|
||||||
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
|
QtCore.SIGNAL(u'openlp_information_message'),
|
||||||
|
self.onInformationMessage)
|
||||||
# warning cyclic dependency
|
# warning cyclic dependency
|
||||||
# RenderManager needs to call ThemeManager and
|
# RenderManager needs to call ThemeManager and
|
||||||
# ThemeManager needs to call RenderManager
|
# ThemeManager needs to call RenderManager
|
||||||
@ -659,6 +668,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
if savedPlugin != -1:
|
if savedPlugin != -1:
|
||||||
self.MediaToolBox.setCurrentIndex(savedPlugin)
|
self.MediaToolBox.setCurrentIndex(savedPlugin)
|
||||||
self.settingsForm.postSetUp()
|
self.settingsForm.postSetUp()
|
||||||
|
Receiver.send_message(u'cursor_normal')
|
||||||
|
|
||||||
def setAutoLanguage(self, value):
|
def setAutoLanguage(self, value):
|
||||||
self.LanguageGroup.setDisabled(value)
|
self.LanguageGroup.setDisabled(value)
|
||||||
@ -691,7 +701,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
if QtCore.QSettings().value(
|
if QtCore.QSettings().value(
|
||||||
self.generalSettingsSection + u'/auto open',
|
self.generalSettingsSection + u'/auto open',
|
||||||
QtCore.QVariant(False)).toBool():
|
QtCore.QVariant(False)).toBool():
|
||||||
self.ServiceManagerContents.onLoadService(True)
|
#self.ServiceManagerContents.onLoadService(True)
|
||||||
|
self.ServiceManagerContents.loadLastFile()
|
||||||
view_mode = QtCore.QSettings().value(u'%s/view mode' % \
|
view_mode = QtCore.QSettings().value(u'%s/view mode' % \
|
||||||
self.generalSettingsSection, u'default')
|
self.generalSettingsSection, u'default')
|
||||||
if view_mode == u'default':
|
if view_mode == u'default':
|
||||||
@ -720,6 +731,15 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
translate('OpenLP.MainWindow',
|
translate('OpenLP.MainWindow',
|
||||||
'The Main Display has been blanked out'))
|
'The Main Display has been blanked out'))
|
||||||
|
|
||||||
|
def onErrorMessage(self, data):
|
||||||
|
QtGui.QMessageBox.critical(self, data[u'title'], data[u'message'])
|
||||||
|
|
||||||
|
def onWarningMessage(self, data):
|
||||||
|
QtGui.QMessageBox.warning(self, data[u'title'], data[u'message'])
|
||||||
|
|
||||||
|
def onInformationMessage(self, data):
|
||||||
|
QtGui.QMessageBox.information(self, data[u'title'], data[u'message'])
|
||||||
|
|
||||||
def onHelpWebSiteClicked(self):
|
def onHelpWebSiteClicked(self):
|
||||||
"""
|
"""
|
||||||
Load the OpenLP website
|
Load the OpenLP website
|
||||||
@ -812,7 +832,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
"""
|
"""
|
||||||
Hook to close the main window and display windows on exit
|
Hook to close the main window and display windows on exit
|
||||||
"""
|
"""
|
||||||
if self.serviceNotSaved:
|
if self.ServiceManagerContents.isModified():
|
||||||
ret = QtGui.QMessageBox.question(self,
|
ret = QtGui.QMessageBox.question(self,
|
||||||
translate('OpenLP.MainWindow', 'Save Changes to Service?'),
|
translate('OpenLP.MainWindow', 'Save Changes to Service?'),
|
||||||
translate('OpenLP.MainWindow', 'Your service has changed. '
|
translate('OpenLP.MainWindow', 'Your service has changed. '
|
||||||
@ -823,9 +843,12 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
QtGui.QMessageBox.Save),
|
QtGui.QMessageBox.Save),
|
||||||
QtGui.QMessageBox.Save)
|
QtGui.QMessageBox.Save)
|
||||||
if ret == QtGui.QMessageBox.Save:
|
if ret == QtGui.QMessageBox.Save:
|
||||||
self.ServiceManagerContents.onSaveService(True)
|
#self.ServiceManagerContents.onSaveService(True)
|
||||||
self.cleanUp()
|
if self.ServiceManagerContents.saveFile():
|
||||||
event.accept()
|
self.cleanUp()
|
||||||
|
event.accept()
|
||||||
|
else:
|
||||||
|
event.ignore()
|
||||||
elif ret == QtGui.QMessageBox.Discard:
|
elif ret == QtGui.QMessageBox.Discard:
|
||||||
self.cleanUp()
|
self.cleanUp()
|
||||||
event.accept()
|
event.accept()
|
||||||
@ -834,7 +857,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
else:
|
else:
|
||||||
ret = QtGui.QMessageBox.question(self,
|
ret = QtGui.QMessageBox.question(self,
|
||||||
translate('OpenLP.MainWindow', 'Close OpenLP'),
|
translate('OpenLP.MainWindow', 'Close OpenLP'),
|
||||||
translate('OpenLP.MainWindow', 'Are you sure you want to Exit?'),
|
translate('OpenLP.MainWindow', 'Are you sure you want to close OpenLP?'),
|
||||||
QtGui.QMessageBox.StandardButtons(
|
QtGui.QMessageBox.StandardButtons(
|
||||||
QtGui.QMessageBox.Yes |
|
QtGui.QMessageBox.Yes |
|
||||||
QtGui.QMessageBox.No),
|
QtGui.QMessageBox.No),
|
||||||
@ -885,6 +908,23 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
title = u'%s - %s*' % (self.mainTitle, service_name)
|
title = u'%s - %s*' % (self.mainTitle, service_name)
|
||||||
self.setWindowTitle(title)
|
self.setWindowTitle(title)
|
||||||
|
|
||||||
|
def setServiceModified(self, modified, fileName):
|
||||||
|
"""
|
||||||
|
This method is called from the ServiceManager to set the title of the
|
||||||
|
main window.
|
||||||
|
|
||||||
|
``modified``
|
||||||
|
Whether or not this service has been modified.
|
||||||
|
|
||||||
|
``fileName``
|
||||||
|
The file name of the service file.
|
||||||
|
"""
|
||||||
|
if modified:
|
||||||
|
title = u'%s - %s*' % (self.mainTitle, fileName)
|
||||||
|
else:
|
||||||
|
title = u'%s - %s' % (self.mainTitle, fileName)
|
||||||
|
self.setWindowTitle(title)
|
||||||
|
|
||||||
def showStatusMessage(self, message):
|
def showStatusMessage(self, message):
|
||||||
self.StatusBar.showMessage(message)
|
self.StatusBar.showMessage(message)
|
||||||
|
|
||||||
@ -986,11 +1026,12 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
if recentFilesToDisplay:
|
if recentFilesToDisplay:
|
||||||
self.FileMenu.addSeparator()
|
self.FileMenu.addSeparator()
|
||||||
for fileId, filename in enumerate(recentFilesToDisplay):
|
for fileId, filename in enumerate(recentFilesToDisplay):
|
||||||
action = QtGui.QAction(u'&%d %s' % (fileId +1,
|
log.debug('Recent file name: %s', filename)
|
||||||
|
action = QtGui.QAction(u'&%d %s' % (fileId + 1,
|
||||||
QtCore.QFileInfo(filename).fileName()), self)
|
QtCore.QFileInfo(filename).fileName()), self)
|
||||||
action.setData(QtCore.QVariant(filename))
|
action.setData(QtCore.QVariant(filename))
|
||||||
self.connect(action, QtCore.SIGNAL(u'triggered()'),
|
self.connect(action, QtCore.SIGNAL(u'triggered()'),
|
||||||
self.ServiceManagerContents.loadService)
|
self.ServiceManagerContents.onRecentServiceClicked)
|
||||||
self.FileMenu.addAction(action)
|
self.FileMenu.addAction(action)
|
||||||
self.FileMenu.addSeparator()
|
self.FileMenu.addSeparator()
|
||||||
self.FileMenu.addAction(self.FileMenuActions[-1])
|
self.FileMenu.addAction(self.FileMenuActions[-1])
|
||||||
|
@ -37,7 +37,7 @@ from openlp.core.lib import OpenLPToolbar, ServiceItem, context_menu_action, \
|
|||||||
Receiver, build_icon, ItemCapabilities, SettingsManager, translate, \
|
Receiver, build_icon, ItemCapabilities, SettingsManager, translate, \
|
||||||
ThemeLevel
|
ThemeLevel
|
||||||
from openlp.core.ui import ServiceNoteForm, ServiceItemEditForm
|
from openlp.core.ui import ServiceNoteForm, ServiceItemEditForm
|
||||||
from openlp.core.utils import AppLocation
|
from openlp.core.utils import AppLocation, split_filename
|
||||||
|
|
||||||
class ServiceManagerList(QtGui.QTreeWidget):
|
class ServiceManagerList(QtGui.QTreeWidget):
|
||||||
"""
|
"""
|
||||||
@ -90,6 +90,7 @@ class ServiceManagerList(QtGui.QTreeWidget):
|
|||||||
mimeData.setText(u'ServiceManager')
|
mimeData.setText(u'ServiceManager')
|
||||||
drag.start(QtCore.Qt.CopyAction)
|
drag.start(QtCore.Qt.CopyAction)
|
||||||
|
|
||||||
|
|
||||||
class ServiceManager(QtGui.QWidget):
|
class ServiceManager(QtGui.QWidget):
|
||||||
"""
|
"""
|
||||||
Manages the services. This involves taking text strings from plugins and
|
Manages the services. This involves taking text strings from plugins and
|
||||||
@ -101,15 +102,16 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
"""
|
"""
|
||||||
Sets up the service manager, toolbars, list view, et al.
|
Sets up the service manager, toolbars, list view, et al.
|
||||||
"""
|
"""
|
||||||
QtGui.QWidget.__init__(self)
|
QtGui.QWidget.__init__(self, parent)
|
||||||
self.parent = parent
|
self.parent = parent
|
||||||
self.serviceItems = []
|
self.serviceItems = []
|
||||||
self.serviceName = u''
|
self.serviceName = u''
|
||||||
self.suffixes = []
|
self.suffixes = []
|
||||||
self.droppos = 0
|
self.dropPosition = 0
|
||||||
self.expandTabs = False
|
self.expandTabs = False
|
||||||
# is a new service and has not been saved
|
# is a new service and has not been saved
|
||||||
self.isNew = True
|
self._modified = False
|
||||||
|
self._fileName = u''
|
||||||
self.serviceNoteForm = ServiceNoteForm(self.parent)
|
self.serviceNoteForm = ServiceNoteForm(self.parent)
|
||||||
self.serviceItemEditForm = ServiceItemEditForm(self.parent)
|
self.serviceItemEditForm = ServiceItemEditForm(self.parent)
|
||||||
# start with the layout
|
# start with the layout
|
||||||
@ -123,17 +125,17 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
translate('OpenLP.ServiceManager', 'New Service'),
|
translate('OpenLP.ServiceManager', 'New Service'),
|
||||||
u':/general/general_new.png',
|
u':/general/general_new.png',
|
||||||
translate('OpenLP.ServiceManager', 'Create a new service'),
|
translate('OpenLP.ServiceManager', 'Create a new service'),
|
||||||
self.onNewService)
|
self.onNewServiceClicked)
|
||||||
self.toolbar.addToolbarButton(
|
self.toolbar.addToolbarButton(
|
||||||
translate('OpenLP.ServiceManager', 'Open Service'),
|
translate('OpenLP.ServiceManager', 'Open Service'),
|
||||||
u':/general/general_open.png',
|
u':/general/general_open.png',
|
||||||
translate('OpenLP.ServiceManager', 'Load an existing service'),
|
translate('OpenLP.ServiceManager', 'Load an existing service'),
|
||||||
self.onLoadService)
|
self.onLoadServiceClicked)
|
||||||
self.toolbar.addToolbarButton(
|
self.toolbar.addToolbarButton(
|
||||||
translate('OpenLP.ServiceManager', 'Save Service'),
|
translate('OpenLP.ServiceManager', 'Save Service'),
|
||||||
u':/general/general_save.png',
|
u':/general/general_save.png',
|
||||||
translate('OpenLP.ServiceManager', 'Save this service'),
|
translate('OpenLP.ServiceManager', 'Save this service'),
|
||||||
self.onQuickSaveService)
|
self.onSaveServiceClicked)
|
||||||
self.toolbar.addSeparator()
|
self.toolbar.addSeparator()
|
||||||
self.themeLabel = QtGui.QLabel(translate('OpenLP.ServiceManager',
|
self.themeLabel = QtGui.QLabel(translate('OpenLP.ServiceManager',
|
||||||
'Theme:'), self)
|
'Theme:'), self)
|
||||||
@ -282,6 +284,40 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
self.menu.addMenu(self.themeMenu)
|
self.menu.addMenu(self.themeMenu)
|
||||||
self.configUpdated(True)
|
self.configUpdated(True)
|
||||||
|
|
||||||
|
def setModified(self, modified=True):
|
||||||
|
"""
|
||||||
|
Setter for property "modified". Sets whether or not the current service
|
||||||
|
has been modified.
|
||||||
|
"""
|
||||||
|
self._modified = modified
|
||||||
|
serviceFile = self.shortFileName() or u'Untitled Service'
|
||||||
|
self.parent.setServiceModified(modified, serviceFile)
|
||||||
|
|
||||||
|
def isModified(self):
|
||||||
|
"""
|
||||||
|
Getter for boolean property "modified".
|
||||||
|
"""
|
||||||
|
return self._modified
|
||||||
|
|
||||||
|
def setFileName(self, fileName):
|
||||||
|
"""
|
||||||
|
Setter for service file.
|
||||||
|
"""
|
||||||
|
self._fileName = unicode(fileName)
|
||||||
|
self.parent.setServiceModified(self.isModified, self.shortFileName())
|
||||||
|
|
||||||
|
def fileName(self):
|
||||||
|
"""
|
||||||
|
Return the current file name including path.
|
||||||
|
"""
|
||||||
|
return self._fileName
|
||||||
|
|
||||||
|
def shortFileName(self):
|
||||||
|
"""
|
||||||
|
Return the current file name, excluding the path.
|
||||||
|
"""
|
||||||
|
return split_filename(self._fileName)[1]
|
||||||
|
|
||||||
def configUpdated(self, firstTime=False):
|
def configUpdated(self, firstTime=False):
|
||||||
"""
|
"""
|
||||||
Triggered when Config dialog is updated.
|
Triggered when Config dialog is updated.
|
||||||
@ -295,6 +331,213 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
def supportedSuffixes(self, suffix):
|
def supportedSuffixes(self, suffix):
|
||||||
self.suffixes.append(suffix)
|
self.suffixes.append(suffix)
|
||||||
|
|
||||||
|
def onNewServiceClicked(self):
|
||||||
|
"""
|
||||||
|
Create a new service.
|
||||||
|
"""
|
||||||
|
if self.isModified():
|
||||||
|
result = QtGui.QMessageBox.question(self.parent,
|
||||||
|
translate('OpenLP.ServiceManager', 'Save Changes'),
|
||||||
|
translate('OpenLP.ServiceManager', 'The current service has '
|
||||||
|
'been modified, would you like to save it?'),
|
||||||
|
QtGui.QMessageBox.Save | QtGui.QMessageBox.Discard |
|
||||||
|
QtGui.QMessageBox.Cancel, QtGui.QMessageBox.Save)
|
||||||
|
if result == QtGui.QMessageBox.Cancel:
|
||||||
|
return False
|
||||||
|
elif result == QtGui.QMessageBox.Save:
|
||||||
|
if not self.saveFile():
|
||||||
|
return False
|
||||||
|
self.newFile()
|
||||||
|
|
||||||
|
def onLoadServiceClicked(self):
|
||||||
|
if self.isModified():
|
||||||
|
result = QtGui.QMessageBox.question(self.parent,
|
||||||
|
translate('OpenLP.ServiceManager', 'Save Changes'),
|
||||||
|
translate('OpenLP.ServiceManager', 'The current service has '
|
||||||
|
'been modified, would you like to save it?'),
|
||||||
|
QtGui.QMessageBox.Save | QtGui.QMessageBox.Discard |
|
||||||
|
QtGui.QMessageBox.Cancel, QtGui.QMessageBox.Save)
|
||||||
|
if result == QtGui.QMessageBox.Cancel:
|
||||||
|
return False
|
||||||
|
elif result == QtGui.QMessageBox.Save:
|
||||||
|
self.saveFile()
|
||||||
|
fileName = unicode(QtGui.QFileDialog.getOpenFileName(self.parent,
|
||||||
|
translate('OpenLP.ServiceManager', 'Open File'),
|
||||||
|
SettingsManager.get_last_dir(self.parent.serviceSettingsSection),
|
||||||
|
translate('OpenLP.ServiceManager',
|
||||||
|
'OpenLP Service Files (*.osz) (*.osz)')))
|
||||||
|
if not fileName:
|
||||||
|
return False
|
||||||
|
SettingsManager.set_last_dir(self.parent.serviceSettingsSection,
|
||||||
|
split_filename(fileName)[0])
|
||||||
|
self.loadFile(fileName)
|
||||||
|
|
||||||
|
def onSaveServiceClicked(self):
|
||||||
|
self.saveFile()
|
||||||
|
|
||||||
|
def onSaveServiceAsClicked(self):
|
||||||
|
self.saveFileAs()
|
||||||
|
|
||||||
|
def onRecentServiceClicked(self):
|
||||||
|
sender = self.sender()
|
||||||
|
self.loadFile(sender.data().toString())
|
||||||
|
|
||||||
|
def newFile(self):
|
||||||
|
"""
|
||||||
|
Create a blank new service file.
|
||||||
|
"""
|
||||||
|
self.serviceManagerList.clear()
|
||||||
|
self.serviceItems = []
|
||||||
|
self.setFileName(u'')
|
||||||
|
self.setModified(False)
|
||||||
|
|
||||||
|
def saveFile(self):
|
||||||
|
"""
|
||||||
|
Save the current Service file.
|
||||||
|
"""
|
||||||
|
if not self.fileName():
|
||||||
|
return self.saveFileAs()
|
||||||
|
else:
|
||||||
|
fileName = self.fileName()
|
||||||
|
log.debug(u'ServiceManager.saveFile - %s' % fileName)
|
||||||
|
SettingsManager.set_last_dir(self.parent.serviceSettingsSection,
|
||||||
|
split_filename(fileName)[0])
|
||||||
|
service = []
|
||||||
|
serviceFileName = fileName.replace(u'.osz', u'.osd')
|
||||||
|
zip = None
|
||||||
|
file = None
|
||||||
|
try:
|
||||||
|
write_list = []
|
||||||
|
zip = zipfile.ZipFile(unicode(fileName), 'w')
|
||||||
|
for item in self.serviceItems:
|
||||||
|
service.append({u'serviceitem': \
|
||||||
|
item[u'service_item'].get_service_repr()})
|
||||||
|
if item[u'service_item'].uses_file():
|
||||||
|
for frame in item[u'service_item'].get_frames():
|
||||||
|
if item[u'service_item'].is_image():
|
||||||
|
path_from = frame[u'path']
|
||||||
|
else:
|
||||||
|
path_from = unicode(os.path.join(
|
||||||
|
frame[u'path'],
|
||||||
|
frame[u'title']))
|
||||||
|
# On write a file once
|
||||||
|
if not path_from in write_list:
|
||||||
|
write_list.append(path_from)
|
||||||
|
zip.write(path_from.encode(u'utf-8'))
|
||||||
|
file = open(serviceFileName, u'wb')
|
||||||
|
cPickle.dump(service, file)
|
||||||
|
file.close()
|
||||||
|
zip.write(serviceFileName.encode(u'utf-8'))
|
||||||
|
except IOError:
|
||||||
|
log.exception(u'Failed to save service to disk')
|
||||||
|
finally:
|
||||||
|
if file:
|
||||||
|
file.close()
|
||||||
|
if zip:
|
||||||
|
zip.close()
|
||||||
|
try:
|
||||||
|
os.remove(serviceFileName)
|
||||||
|
except (IOError, OSError):
|
||||||
|
# if not present do not worry
|
||||||
|
pass
|
||||||
|
self.parent.addRecentFile(fileName)
|
||||||
|
self.setModified(False)
|
||||||
|
return True
|
||||||
|
|
||||||
|
def saveFileAs(self):
|
||||||
|
"""
|
||||||
|
Get a file name and then call :function:`ServiceManager.saveFile` to
|
||||||
|
save the file.
|
||||||
|
"""
|
||||||
|
fileName = unicode(QtGui.QFileDialog.getSaveFileName(self.parent,
|
||||||
|
translate('OpenLP.ServiceManager', 'Save Service'),
|
||||||
|
SettingsManager.get_last_dir(self.parent.serviceSettingsSection),
|
||||||
|
translate('OpenLP.ServiceManager',
|
||||||
|
'OpenLP Service Files (*.osz) (*.osz)')))
|
||||||
|
if not fileName:
|
||||||
|
return False
|
||||||
|
if os.path.splitext(fileName)[1] == u'':
|
||||||
|
fileName += u'.osz'
|
||||||
|
else:
|
||||||
|
ext = os.path.splitext(fileName)[1]
|
||||||
|
fileName.replace(ext, u'.osz')
|
||||||
|
self.setFileName(fileName)
|
||||||
|
return self.saveFile()
|
||||||
|
|
||||||
|
def loadFile(self, fileName):
|
||||||
|
if not fileName:
|
||||||
|
return False
|
||||||
|
else:
|
||||||
|
fileName = unicode(fileName)
|
||||||
|
zip = None
|
||||||
|
fileTo = None
|
||||||
|
try:
|
||||||
|
zip = zipfile.ZipFile(unicode(fileName))
|
||||||
|
for file in zip.namelist():
|
||||||
|
try:
|
||||||
|
ucsfile = file.decode(u'utf-8')
|
||||||
|
except UnicodeDecodeError:
|
||||||
|
QtGui.QMessageBox.critical(
|
||||||
|
self, translate('OpenLP.ServiceManager', 'Error'),
|
||||||
|
translate('OpenLP.ServiceManager',
|
||||||
|
'File is not a valid service.\n'
|
||||||
|
'The content encoding is not UTF-8.'))
|
||||||
|
log.exception(u'Filename "%s" is not valid UTF-8' %
|
||||||
|
file.decode(u'utf-8', u'replace'))
|
||||||
|
continue
|
||||||
|
osfile = unicode(QtCore.QDir.toNativeSeparators(ucsfile))
|
||||||
|
filePath = os.path.join(self.servicePath,
|
||||||
|
os.path.split(osfile)[1])
|
||||||
|
fileTo = open(filePath, u'wb')
|
||||||
|
fileTo.write(zip.read(file))
|
||||||
|
fileTo.flush()
|
||||||
|
fileTo.close()
|
||||||
|
if filePath.endswith(u'osd'):
|
||||||
|
p_file = filePath
|
||||||
|
if 'p_file' in locals():
|
||||||
|
fileTo = open(p_file, u'r')
|
||||||
|
items = cPickle.load(fileTo)
|
||||||
|
fileTo.close()
|
||||||
|
self.newFile()
|
||||||
|
for item in items:
|
||||||
|
serviceItem = ServiceItem()
|
||||||
|
serviceItem.render_manager = self.parent.renderManager
|
||||||
|
serviceItem.set_from_service(item, self.servicePath)
|
||||||
|
self.validateItem(serviceItem)
|
||||||
|
self.addServiceItem(serviceItem)
|
||||||
|
if serviceItem.is_capable(
|
||||||
|
ItemCapabilities.OnLoadUpdate):
|
||||||
|
Receiver.send_message(u'%s_service_load' %
|
||||||
|
serviceItem.name.lower(), serviceItem)
|
||||||
|
try:
|
||||||
|
if os.path.isfile(p_file):
|
||||||
|
os.remove(p_file)
|
||||||
|
except (IOError, OSError):
|
||||||
|
log.exception(u'Failed to remove osd file')
|
||||||
|
else:
|
||||||
|
QtGui.QMessageBox.critical(
|
||||||
|
self, translate('OpenLP.ServiceManager', 'Error'),
|
||||||
|
translate('OpenLP.ServiceManager',
|
||||||
|
'File is not a valid service.'))
|
||||||
|
log.exception(u'File contains no service data')
|
||||||
|
except (IOError, NameError):
|
||||||
|
log.exception(u'Problem loading a service file')
|
||||||
|
finally:
|
||||||
|
if fileTo:
|
||||||
|
fileTo.close()
|
||||||
|
if zip:
|
||||||
|
zip.close()
|
||||||
|
self.setFileName(fileName)
|
||||||
|
self.parent.addRecentFile(fileName)
|
||||||
|
self.setModified(False)
|
||||||
|
# Refresh Plugin lists
|
||||||
|
Receiver.send_message(u'plugin_list_refresh')
|
||||||
|
|
||||||
|
def loadLastFile(self):
|
||||||
|
if not self.parent.recentFiles:
|
||||||
|
return
|
||||||
|
self.loadFile(self.parent.recentFiles[0])
|
||||||
|
|
||||||
def contextMenu(self, point):
|
def contextMenu(self, point):
|
||||||
item = self.serviceManagerList.itemAt(point)
|
item = self.serviceManagerList.itemAt(point)
|
||||||
if item is None:
|
if item is None:
|
||||||
@ -427,6 +670,7 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
# Top Item was selected so set the last one
|
# Top Item was selected so set the last one
|
||||||
if setLastItem:
|
if setLastItem:
|
||||||
lastItem.setSelected(True)
|
lastItem.setSelected(True)
|
||||||
|
self.isModified = True
|
||||||
|
|
||||||
def onMoveSelectionDown(self):
|
def onMoveSelectionDown(self):
|
||||||
"""
|
"""
|
||||||
@ -449,6 +693,7 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
serviceIterator += 1
|
serviceIterator += 1
|
||||||
if setSelected:
|
if setSelected:
|
||||||
firstItem.setSelected(True)
|
firstItem.setSelected(True)
|
||||||
|
self.isModified = True
|
||||||
|
|
||||||
def onCollapseAll(self):
|
def onCollapseAll(self):
|
||||||
"""
|
"""
|
||||||
@ -492,7 +737,7 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
self.serviceItems.remove(self.serviceItems[item])
|
self.serviceItems.remove(self.serviceItems[item])
|
||||||
self.serviceItems.insert(0, temp)
|
self.serviceItems.insert(0, temp)
|
||||||
self.repaintServiceList(0, count)
|
self.repaintServiceList(0, count)
|
||||||
self.parent.serviceChanged(False, self.serviceName)
|
self.isModified = True
|
||||||
|
|
||||||
def onServiceUp(self):
|
def onServiceUp(self):
|
||||||
"""
|
"""
|
||||||
@ -505,7 +750,7 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
self.serviceItems.remove(self.serviceItems[item])
|
self.serviceItems.remove(self.serviceItems[item])
|
||||||
self.serviceItems.insert(item - 1, temp)
|
self.serviceItems.insert(item - 1, temp)
|
||||||
self.repaintServiceList(item - 1, count)
|
self.repaintServiceList(item - 1, count)
|
||||||
self.parent.serviceChanged(False, self.serviceName)
|
self.setModified(True)
|
||||||
|
|
||||||
def onServiceDown(self):
|
def onServiceDown(self):
|
||||||
"""
|
"""
|
||||||
@ -518,7 +763,7 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
self.serviceItems.remove(self.serviceItems[item])
|
self.serviceItems.remove(self.serviceItems[item])
|
||||||
self.serviceItems.insert(item + 1, temp)
|
self.serviceItems.insert(item + 1, temp)
|
||||||
self.repaintServiceList(item + 1, count)
|
self.repaintServiceList(item + 1, count)
|
||||||
self.parent.serviceChanged(False, self.serviceName)
|
self.setModified(True)
|
||||||
|
|
||||||
def onServiceEnd(self):
|
def onServiceEnd(self):
|
||||||
"""
|
"""
|
||||||
@ -530,30 +775,7 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
self.serviceItems.remove(self.serviceItems[item])
|
self.serviceItems.remove(self.serviceItems[item])
|
||||||
self.serviceItems.insert(len(self.serviceItems), temp)
|
self.serviceItems.insert(len(self.serviceItems), temp)
|
||||||
self.repaintServiceList(len(self.serviceItems) - 1, count)
|
self.repaintServiceList(len(self.serviceItems) - 1, count)
|
||||||
self.parent.serviceChanged(False, self.serviceName)
|
self.setModified(True)
|
||||||
|
|
||||||
def onNewService(self):
|
|
||||||
"""
|
|
||||||
Clear the list to create a new service
|
|
||||||
"""
|
|
||||||
if self.parent.serviceNotSaved and QtCore.QSettings().value(
|
|
||||||
self.parent.generalSettingsSection + u'/save prompt',
|
|
||||||
QtCore.QVariant(False)).toBool():
|
|
||||||
ret = QtGui.QMessageBox.question(self,
|
|
||||||
translate('OpenLP.ServiceManager', 'Save Changes to Service?'),
|
|
||||||
translate('OpenLP.ServiceManager',
|
|
||||||
'Your service is unsaved, do you want to save '
|
|
||||||
'those changes before creating a new one?'),
|
|
||||||
QtGui.QMessageBox.StandardButtons(
|
|
||||||
QtGui.QMessageBox.Cancel | QtGui.QMessageBox.Save),
|
|
||||||
QtGui.QMessageBox.Save)
|
|
||||||
if ret == QtGui.QMessageBox.Save:
|
|
||||||
self.onSaveService()
|
|
||||||
self.serviceManagerList.clear()
|
|
||||||
self.serviceItems = []
|
|
||||||
self.serviceName = u''
|
|
||||||
self.isNew = True
|
|
||||||
self.parent.serviceChanged(True, self.serviceName)
|
|
||||||
|
|
||||||
def onDeleteFromService(self):
|
def onDeleteFromService(self):
|
||||||
"""
|
"""
|
||||||
@ -563,13 +785,19 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
if item is not -1:
|
if item is not -1:
|
||||||
self.serviceItems.remove(self.serviceItems[item])
|
self.serviceItems.remove(self.serviceItems[item])
|
||||||
self.repaintServiceList(0, 0)
|
self.repaintServiceList(0, 0)
|
||||||
self.parent.serviceChanged(False, self.serviceName)
|
self.setModified(True)
|
||||||
|
|
||||||
def repaintServiceList(self, serviceItem, serviceItemCount):
|
def repaintServiceList(self, serviceItem, serviceItemCount):
|
||||||
"""
|
"""
|
||||||
Clear the existing service list and prepaint all the items
|
Clear the existing service list and prepaint all the items. This is
|
||||||
Used when moving items as the move takes place in supporting array,
|
used when moving items as the move takes place in a supporting list,
|
||||||
and when regenerating all the items due to theme changes
|
and when regenerating all the items due to theme changes.
|
||||||
|
|
||||||
|
``serviceItem``
|
||||||
|
The item which changed.
|
||||||
|
|
||||||
|
``serviceItemCount``
|
||||||
|
The number of items in the service.
|
||||||
"""
|
"""
|
||||||
# Correct order of items in array
|
# Correct order of items in array
|
||||||
count = 1
|
count = 1
|
||||||
@ -615,183 +843,6 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
item[u'expanded'] = temp
|
item[u'expanded'] = temp
|
||||||
treewidgetitem.setExpanded(item[u'expanded'])
|
treewidgetitem.setExpanded(item[u'expanded'])
|
||||||
|
|
||||||
def onSaveService(self, quick=False):
|
|
||||||
"""
|
|
||||||
Save the current service in a zip (OSZ) file
|
|
||||||
This file contains
|
|
||||||
* An osd which is a pickle of the service items
|
|
||||||
* All image, presentation and video files needed to run the service.
|
|
||||||
"""
|
|
||||||
log.debug(u'onSaveService %s' % quick)
|
|
||||||
if not quick or self.isNew:
|
|
||||||
filename = QtGui.QFileDialog.getSaveFileName(self,
|
|
||||||
translate('OpenLP.ServiceManager', 'Save Service'),
|
|
||||||
SettingsManager.get_last_dir(self.parent.serviceSettingsSection),
|
|
||||||
translate('OpenLP.ServiceManager', 'OpenLP Service Files (*.osz)'))
|
|
||||||
else:
|
|
||||||
filename = os.path.join(SettingsManager.get_last_dir(
|
|
||||||
self.parent.serviceSettingsSection), self.serviceName)
|
|
||||||
if filename:
|
|
||||||
filename = QtCore.QDir.toNativeSeparators(filename)
|
|
||||||
splittedFile = filename.split(u'.')
|
|
||||||
if splittedFile[-1] != u'osz':
|
|
||||||
filename = filename + u'.osz'
|
|
||||||
filename = unicode(filename)
|
|
||||||
self.isNew = False
|
|
||||||
SettingsManager.set_last_dir(self.parent.serviceSettingsSection,
|
|
||||||
os.path.split(filename)[0])
|
|
||||||
service = []
|
|
||||||
servicefile = filename + u'.osd'
|
|
||||||
zip = None
|
|
||||||
file = None
|
|
||||||
try:
|
|
||||||
write_list = []
|
|
||||||
zip = zipfile.ZipFile(unicode(filename), 'w')
|
|
||||||
for item in self.serviceItems:
|
|
||||||
service.append({u'serviceitem':item[u'service_item']
|
|
||||||
.get_service_repr()})
|
|
||||||
if item[u'service_item'].uses_file():
|
|
||||||
for frame in item[u'service_item'].get_frames():
|
|
||||||
if item[u'service_item'].is_image():
|
|
||||||
path_from = frame[u'path']
|
|
||||||
else:
|
|
||||||
path_from = unicode(os.path.join(
|
|
||||||
frame[u'path'],
|
|
||||||
frame[u'title']))
|
|
||||||
# On write a file once
|
|
||||||
if not path_from in write_list:
|
|
||||||
write_list.append(path_from)
|
|
||||||
zip.write(path_from.encode(u'utf-8'))
|
|
||||||
file = open(servicefile, u'wb')
|
|
||||||
cPickle.dump(service, file)
|
|
||||||
file.close()
|
|
||||||
zip.write(servicefile.encode(u'utf-8'))
|
|
||||||
except IOError:
|
|
||||||
log.exception(u'Failed to save service to disk')
|
|
||||||
finally:
|
|
||||||
if file:
|
|
||||||
file.close()
|
|
||||||
if zip:
|
|
||||||
zip.close()
|
|
||||||
try:
|
|
||||||
os.remove(servicefile)
|
|
||||||
except (IOError, OSError):
|
|
||||||
pass #if not present do not worry
|
|
||||||
name = filename.split(os.path.sep)
|
|
||||||
self.serviceName = name[-1]
|
|
||||||
self.parent.addRecentFile(filename)
|
|
||||||
self.parent.serviceChanged(True, self.serviceName)
|
|
||||||
|
|
||||||
def onQuickSaveService(self):
|
|
||||||
self.onSaveService(True)
|
|
||||||
|
|
||||||
def onLoadService(self, lastService=False):
|
|
||||||
if lastService:
|
|
||||||
if not self.parent.recentFiles:
|
|
||||||
return
|
|
||||||
filename = self.parent.recentFiles[0]
|
|
||||||
else:
|
|
||||||
filename = QtGui.QFileDialog.getOpenFileName(
|
|
||||||
self, translate('OpenLP.ServiceManager', 'Open Service'),
|
|
||||||
SettingsManager.get_last_dir(
|
|
||||||
self.parent.serviceSettingsSection), u'Services (*.osz)')
|
|
||||||
filename = QtCore.QDir.toNativeSeparators(filename)
|
|
||||||
self.loadService(filename)
|
|
||||||
|
|
||||||
def loadService(self, filename=None):
|
|
||||||
"""
|
|
||||||
Load an existing service from disk and rebuild the serviceitems. All
|
|
||||||
files retrieved from the zip file are placed in a temporary directory
|
|
||||||
and will only be used for this service.
|
|
||||||
"""
|
|
||||||
if self.parent.serviceNotSaved:
|
|
||||||
ret = QtGui.QMessageBox.question(self,
|
|
||||||
translate('OpenLP.ServiceManager', 'Save Changes to Service?'),
|
|
||||||
translate('OpenLP.ServiceManager',
|
|
||||||
'Your current service is unsaved, do you want to '
|
|
||||||
'save the changes before opening a new one?'),
|
|
||||||
QtGui.QMessageBox.StandardButtons(
|
|
||||||
QtGui.QMessageBox.Discard | QtGui.QMessageBox.Save),
|
|
||||||
QtGui.QMessageBox.Save)
|
|
||||||
if ret == QtGui.QMessageBox.Save:
|
|
||||||
self.onSaveService()
|
|
||||||
if filename is None:
|
|
||||||
action = self.sender()
|
|
||||||
if isinstance(action, QtGui.QAction):
|
|
||||||
filename = action.data().toString()
|
|
||||||
else:
|
|
||||||
return
|
|
||||||
filename = unicode(filename)
|
|
||||||
name = filename.split(os.path.sep)
|
|
||||||
if filename:
|
|
||||||
SettingsManager.set_last_dir(self.parent.serviceSettingsSection,
|
|
||||||
os.path.split(filename)[0])
|
|
||||||
zip = None
|
|
||||||
file_to = None
|
|
||||||
try:
|
|
||||||
zip = zipfile.ZipFile(unicode(filename))
|
|
||||||
for file in zip.namelist():
|
|
||||||
try:
|
|
||||||
ucsfile = file.decode(u'utf-8')
|
|
||||||
except UnicodeDecodeError:
|
|
||||||
QtGui.QMessageBox.critical(
|
|
||||||
self, translate('OpenLP.ServiceManager', 'Error'),
|
|
||||||
translate('OpenLP.ServiceManager',
|
|
||||||
'File is not a valid service.\n'
|
|
||||||
'The content encoding is not UTF-8.'))
|
|
||||||
log.exception(u'Filename "%s" is not valid UTF-8' %
|
|
||||||
file.decode(u'utf-8', u'replace'))
|
|
||||||
continue
|
|
||||||
osfile = unicode(QtCore.QDir.toNativeSeparators(ucsfile))
|
|
||||||
names = osfile.split(os.path.sep)
|
|
||||||
file_path = os.path.join(self.servicePath,
|
|
||||||
names[len(names) - 1])
|
|
||||||
file_to = open(file_path, u'wb')
|
|
||||||
file_to.write(zip.read(file))
|
|
||||||
file_to.flush()
|
|
||||||
file_to.close()
|
|
||||||
if file_path.endswith(u'osd'):
|
|
||||||
p_file = file_path
|
|
||||||
if 'p_file' in locals():
|
|
||||||
file_to = open(p_file, u'r')
|
|
||||||
items = cPickle.load(file_to)
|
|
||||||
file_to.close()
|
|
||||||
self.onNewService()
|
|
||||||
for item in items:
|
|
||||||
serviceitem = ServiceItem()
|
|
||||||
serviceitem.render_manager = self.parent.renderManager
|
|
||||||
serviceitem.set_from_service(item, self.servicePath)
|
|
||||||
self.validateItem(serviceitem)
|
|
||||||
self.addServiceItem(serviceitem)
|
|
||||||
if serviceitem.is_capable(
|
|
||||||
ItemCapabilities.OnLoadUpdate):
|
|
||||||
Receiver.send_message(u'%s_service_load' %
|
|
||||||
serviceitem.name.lower(), serviceitem)
|
|
||||||
try:
|
|
||||||
if os.path.isfile(p_file):
|
|
||||||
os.remove(p_file)
|
|
||||||
except (IOError, OSError):
|
|
||||||
log.exception(u'Failed to remove osd file')
|
|
||||||
else:
|
|
||||||
QtGui.QMessageBox.critical(
|
|
||||||
self, translate('OpenLP.ServiceManager', 'Error'),
|
|
||||||
translate('OpenLP.ServiceManager',
|
|
||||||
'File is not a valid service.'))
|
|
||||||
log.exception(u'File contains no service data')
|
|
||||||
except (IOError, NameError):
|
|
||||||
log.exception(u'Problem loading a service file')
|
|
||||||
finally:
|
|
||||||
if file_to:
|
|
||||||
file_to.close()
|
|
||||||
if zip:
|
|
||||||
zip.close()
|
|
||||||
self.isNew = False
|
|
||||||
self.serviceName = name[len(name) - 1]
|
|
||||||
self.parent.addRecentFile(filename)
|
|
||||||
self.parent.serviceChanged(True, self.serviceName)
|
|
||||||
# Refresh Plugin lists
|
|
||||||
Receiver.send_message(u'plugin_list_refresh')
|
|
||||||
|
|
||||||
def validateItem(self, serviceItem):
|
def validateItem(self, serviceItem):
|
||||||
"""
|
"""
|
||||||
Validates the service item and if the suffix matches an accepted
|
Validates the service item and if the suffix matches an accepted
|
||||||
@ -844,6 +895,7 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
Rebuild the service list as things have changed and a
|
Rebuild the service list as things have changed and a
|
||||||
repaint is the easiest way to do this.
|
repaint is the easiest way to do this.
|
||||||
"""
|
"""
|
||||||
|
Receiver.send_message(u'cursor_busy')
|
||||||
log.debug(u'regenerateServiceItems')
|
log.debug(u'regenerateServiceItems')
|
||||||
# force reset of renderer as theme data has changed
|
# force reset of renderer as theme data has changed
|
||||||
self.parent.renderManager.themedata = None
|
self.parent.renderManager.themedata = None
|
||||||
@ -857,7 +909,8 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
item[u'service_item'], False, expand=item[u'expanded'])
|
item[u'service_item'], False, expand=item[u'expanded'])
|
||||||
# Set to False as items may have changed rendering
|
# Set to False as items may have changed rendering
|
||||||
# does not impact the saved song so True may also be valid
|
# does not impact the saved song so True may also be valid
|
||||||
self.parent.serviceChanged(False, self.serviceName)
|
self.setModified(True)
|
||||||
|
Receiver.send_message(u'cursor_normal')
|
||||||
|
|
||||||
def serviceItemUpdate(self, message):
|
def serviceItemUpdate(self, message):
|
||||||
"""
|
"""
|
||||||
@ -881,7 +934,7 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
item[u'service_item'] = newItem
|
item[u'service_item'] = newItem
|
||||||
self.repaintServiceList(itemcount + 1, 0)
|
self.repaintServiceList(itemcount + 1, 0)
|
||||||
self.parent.liveController.replaceServiceManagerItem(newItem)
|
self.parent.liveController.replaceServiceManagerItem(newItem)
|
||||||
self.parent.serviceChanged(False, self.serviceName)
|
self.setModified(True)
|
||||||
|
|
||||||
def addServiceItem(self, item, rebuild=False, expand=None, replace=False):
|
def addServiceItem(self, item, rebuild=False, expand=None, replace=False):
|
||||||
"""
|
"""
|
||||||
@ -905,7 +958,7 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
self.parent.liveController.replaceServiceManagerItem(item)
|
self.parent.liveController.replaceServiceManagerItem(item)
|
||||||
else:
|
else:
|
||||||
# nothing selected for dnd
|
# nothing selected for dnd
|
||||||
if self.droppos == 0:
|
if self.dropPosition == 0:
|
||||||
if isinstance(item, list):
|
if isinstance(item, list):
|
||||||
for inditem in item:
|
for inditem in item:
|
||||||
self.serviceItems.append({u'service_item': inditem,
|
self.serviceItems.append({u'service_item': inditem,
|
||||||
@ -917,15 +970,15 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
u'expanded':expand})
|
u'expanded':expand})
|
||||||
self.repaintServiceList(len(self.serviceItems) + 1, 0)
|
self.repaintServiceList(len(self.serviceItems) + 1, 0)
|
||||||
else:
|
else:
|
||||||
self.serviceItems.insert(self.droppos, {u'service_item': item,
|
self.serviceItems.insert(self.dropPosition, {u'service_item': item,
|
||||||
u'order': self.droppos,
|
u'order': self.dropPosition,
|
||||||
u'expanded':expand})
|
u'expanded':expand})
|
||||||
self.repaintServiceList(self.droppos, 0)
|
self.repaintServiceList(self.dropPosition, 0)
|
||||||
# if rebuilding list make sure live is fixed.
|
# if rebuilding list make sure live is fixed.
|
||||||
if rebuild:
|
if rebuild:
|
||||||
self.parent.liveController.replaceServiceManagerItem(item)
|
self.parent.liveController.replaceServiceManagerItem(item)
|
||||||
self.droppos = 0
|
self.dropPosition = 0
|
||||||
self.parent.serviceChanged(False, self.serviceName)
|
self.setModified(True)
|
||||||
|
|
||||||
def makePreview(self):
|
def makePreview(self):
|
||||||
"""
|
"""
|
||||||
@ -1045,7 +1098,7 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
# we are not over anything so drop
|
# we are not over anything so drop
|
||||||
replace = False
|
replace = False
|
||||||
if item is None:
|
if item is None:
|
||||||
self.droppos = len(self.serviceItems)
|
self.dropPosition = len(self.serviceItems)
|
||||||
else:
|
else:
|
||||||
# we are over somthing so lets investigate
|
# we are over somthing so lets investigate
|
||||||
pos = self._getParentItemData(item) - 1
|
pos = self._getParentItemData(item) - 1
|
||||||
@ -1056,14 +1109,14 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
action = self.dndMenu.exec_(QtGui.QCursor.pos())
|
action = self.dndMenu.exec_(QtGui.QCursor.pos())
|
||||||
# New action required
|
# New action required
|
||||||
if action == self.newAction:
|
if action == self.newAction:
|
||||||
self.droppos = self._getParentItemData(item)
|
self.dropPosition = self._getParentItemData(item)
|
||||||
# Append to existing action
|
# Append to existing action
|
||||||
if action == self.addToAction:
|
if action == self.addToAction:
|
||||||
self.droppos = self._getParentItemData(item)
|
self.dropPosition = self._getParentItemData(item)
|
||||||
item.setSelected(True)
|
item.setSelected(True)
|
||||||
replace = True
|
replace = True
|
||||||
else:
|
else:
|
||||||
self.droppos = self._getParentItemData(item)
|
self.dropPosition = self._getParentItemData(item)
|
||||||
Receiver.send_message(u'%s_add_service_item' % plugin, replace)
|
Receiver.send_message(u'%s_add_service_item' % plugin, replace)
|
||||||
|
|
||||||
def updateThemeList(self, theme_list):
|
def updateThemeList(self, theme_list):
|
||||||
|
@ -275,6 +275,13 @@ def get_images_filter():
|
|||||||
visible_formats, actual_formats)
|
visible_formats, actual_formats)
|
||||||
return images_filter
|
return images_filter
|
||||||
|
|
||||||
|
def split_filename(path):
|
||||||
|
path = os.path.abspath(path)
|
||||||
|
if not os.path.isfile(path):
|
||||||
|
return path, u''
|
||||||
|
else:
|
||||||
|
return os.path.split(path)
|
||||||
|
|
||||||
from languagemanager import LanguageManager
|
from languagemanager import LanguageManager
|
||||||
from actions import ActionList
|
from actions import ActionList
|
||||||
|
|
||||||
|
@ -33,7 +33,7 @@ from sqlalchemy import Column, ForeignKey, or_, Table, types
|
|||||||
from sqlalchemy.orm import class_mapper, mapper, relation
|
from sqlalchemy.orm import class_mapper, mapper, relation
|
||||||
from sqlalchemy.orm.exc import UnmappedClassError
|
from sqlalchemy.orm.exc import UnmappedClassError
|
||||||
|
|
||||||
from openlp.core.lib import translate
|
from openlp.core.lib import Receiver, translate
|
||||||
from openlp.core.lib.db import BaseModel, init_db, Manager
|
from openlp.core.lib.db import BaseModel, init_db, Manager
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
@ -354,12 +354,12 @@ class BibleDB(QtCore.QObject, Manager):
|
|||||||
verse_list.extend(verses)
|
verse_list.extend(verses)
|
||||||
else:
|
else:
|
||||||
log.debug(u'OpenLP failed to find book %s', book)
|
log.debug(u'OpenLP failed to find book %s', book)
|
||||||
QtGui.QMessageBox.information(self.bible_plugin.mediaItem,
|
Receiver.send_message(u'openlp_error_message', {
|
||||||
translate('BiblesPlugin.BibleDB', 'Book not found'),
|
u'title': translate('BiblesPlugin', 'No Book Found'),
|
||||||
translate('BiblesPlugin.BibleDB', 'The book you requested '
|
u'message': translate('BiblesPlugin', 'No matching book '
|
||||||
'could not be found in this Bible. Please check your '
|
'could be found in this Bible. Check that you have '
|
||||||
'spelling and that this is a complete Bible not just '
|
'spelled the name of the book correctly.')
|
||||||
'one testament.'))
|
})
|
||||||
return verse_list
|
return verse_list
|
||||||
|
|
||||||
def verse_search(self, text):
|
def verse_search(self, text):
|
||||||
|
@ -28,13 +28,14 @@ import logging
|
|||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
import sqlite3
|
import sqlite3
|
||||||
|
import socket
|
||||||
import urllib
|
import urllib
|
||||||
import urllib2
|
import urllib2
|
||||||
from HTMLParser import HTMLParseError
|
from HTMLParser import HTMLParseError
|
||||||
|
|
||||||
from BeautifulSoup import BeautifulSoup, NavigableString
|
from BeautifulSoup import BeautifulSoup, NavigableString
|
||||||
|
|
||||||
from openlp.core.lib import Receiver
|
from openlp.core.lib import Receiver, translate
|
||||||
from openlp.core.utils import AppLocation
|
from openlp.core.utils import AppLocation
|
||||||
from openlp.plugins.bibles.lib import SearchResults
|
from openlp.plugins.bibles.lib import SearchResults
|
||||||
from openlp.plugins.bibles.lib.db import BibleDB, Book
|
from openlp.plugins.bibles.lib.db import BibleDB, Book
|
||||||
@ -184,6 +185,7 @@ class BGExtract(object):
|
|||||||
def __init__(self, proxyurl=None):
|
def __init__(self, proxyurl=None):
|
||||||
log.debug(u'init %s', proxyurl)
|
log.debug(u'init %s', proxyurl)
|
||||||
self.proxyurl = proxyurl
|
self.proxyurl = proxyurl
|
||||||
|
socket.setdefaulttimeout(30)
|
||||||
|
|
||||||
def get_bible_chapter(self, version, bookname, chapter):
|
def get_bible_chapter(self, version, bookname, chapter):
|
||||||
"""
|
"""
|
||||||
@ -210,6 +212,13 @@ class BGExtract(object):
|
|||||||
Receiver.send_message(u'openlp_process_events')
|
Receiver.send_message(u'openlp_process_events')
|
||||||
except urllib2.URLError:
|
except urllib2.URLError:
|
||||||
log.exception(u'The web bible page could not be downloaded.')
|
log.exception(u'The web bible page could not be downloaded.')
|
||||||
|
Receiver.send_message(u'openlp_error_message', {
|
||||||
|
u'title': translate('BiblePlugin.HTTPBible', 'Download Error'),
|
||||||
|
u'message': translate('BiblePlugin.HTTPBible', 'There was a '
|
||||||
|
'problem downloading your verse selection. Please check your '
|
||||||
|
'Internet connection, and if this error continues to occur '
|
||||||
|
'consider reporting a bug.')
|
||||||
|
})
|
||||||
finally:
|
finally:
|
||||||
if not page:
|
if not page:
|
||||||
return None
|
return None
|
||||||
@ -219,6 +228,7 @@ class BGExtract(object):
|
|||||||
soup = BeautifulSoup(page, markupMassage=cleaner)
|
soup = BeautifulSoup(page, markupMassage=cleaner)
|
||||||
except HTMLParseError:
|
except HTMLParseError:
|
||||||
log.exception(u'BeautifulSoup could not parse the bible page.')
|
log.exception(u'BeautifulSoup could not parse the bible page.')
|
||||||
|
Receiver.send_message(u'bibles_download_error')
|
||||||
finally:
|
finally:
|
||||||
if not soup:
|
if not soup:
|
||||||
return None
|
return None
|
||||||
@ -247,6 +257,7 @@ class BSExtract(object):
|
|||||||
def __init__(self, proxyurl=None):
|
def __init__(self, proxyurl=None):
|
||||||
log.debug(u'init %s', proxyurl)
|
log.debug(u'init %s', proxyurl)
|
||||||
self.proxyurl = proxyurl
|
self.proxyurl = proxyurl
|
||||||
|
socket.setdefaulttimeout(30)
|
||||||
|
|
||||||
def get_bible_chapter(self, version, bookname, chapter):
|
def get_bible_chapter(self, version, bookname, chapter):
|
||||||
"""
|
"""
|
||||||
@ -272,6 +283,13 @@ class BSExtract(object):
|
|||||||
Receiver.send_message(u'openlp_process_events')
|
Receiver.send_message(u'openlp_process_events')
|
||||||
except urllib2.URLError:
|
except urllib2.URLError:
|
||||||
log.exception(u'The web bible page could not be downloaded.')
|
log.exception(u'The web bible page could not be downloaded.')
|
||||||
|
Receiver.send_message(u'openlp_error_message', {
|
||||||
|
u'title': translate('BiblePlugin.HTTPBible', 'Download Error'),
|
||||||
|
u'message': translate('BiblePlugin.HTTPBible', 'There was a '
|
||||||
|
'problem downloading your verse selection. Please check your '
|
||||||
|
'Internet connection, and if this error continues to occur '
|
||||||
|
'consider reporting a bug.')
|
||||||
|
})
|
||||||
finally:
|
finally:
|
||||||
if not page:
|
if not page:
|
||||||
return None
|
return None
|
||||||
@ -280,9 +298,13 @@ class BSExtract(object):
|
|||||||
soup = BeautifulSoup(page)
|
soup = BeautifulSoup(page)
|
||||||
except HTMLParseError:
|
except HTMLParseError:
|
||||||
log.exception(u'BeautifulSoup could not parse the bible page.')
|
log.exception(u'BeautifulSoup could not parse the bible page.')
|
||||||
finally:
|
Receiver.send_message(u'openlp_error_message', {
|
||||||
if not soup:
|
u'title': translate('BiblePlugin.HTTPBible', 'Parse Error'),
|
||||||
return None
|
u'message': translate('BiblePlugin.HTTPBible', 'There was a '
|
||||||
|
'problem extracting your verse selection. If this error '
|
||||||
|
'continues to occur consider reporting a bug.')
|
||||||
|
})
|
||||||
|
return None
|
||||||
Receiver.send_message(u'openlp_process_events')
|
Receiver.send_message(u'openlp_process_events')
|
||||||
content = None
|
content = None
|
||||||
try:
|
try:
|
||||||
@ -308,6 +330,7 @@ class CWExtract(object):
|
|||||||
def __init__(self, proxyurl=None):
|
def __init__(self, proxyurl=None):
|
||||||
log.debug(u'init %s', proxyurl)
|
log.debug(u'init %s', proxyurl)
|
||||||
self.proxyurl = proxyurl
|
self.proxyurl = proxyurl
|
||||||
|
socket.setdefaulttimeout(30)
|
||||||
|
|
||||||
def get_bible_chapter(self, version, bookname, chapter):
|
def get_bible_chapter(self, version, bookname, chapter):
|
||||||
"""
|
"""
|
||||||
@ -333,17 +356,26 @@ class CWExtract(object):
|
|||||||
Receiver.send_message(u'openlp_process_events')
|
Receiver.send_message(u'openlp_process_events')
|
||||||
except urllib2.URLError:
|
except urllib2.URLError:
|
||||||
log.exception(u'The web bible page could not be downloaded.')
|
log.exception(u'The web bible page could not be downloaded.')
|
||||||
finally:
|
Receiver.send_message(u'openlp_error_message', {
|
||||||
if not page:
|
u'title': translate('BiblePlugin.HTTPBible', 'Download Error'),
|
||||||
return None
|
u'message': translate('BiblePlugin.HTTPBible', 'There was a '
|
||||||
|
'problem downloading your verse selection. Please check your '
|
||||||
|
'Internet connection, and if this error continues to occur '
|
||||||
|
'consider reporting a bug.')
|
||||||
|
})
|
||||||
|
return None
|
||||||
soup = None
|
soup = None
|
||||||
try:
|
try:
|
||||||
soup = BeautifulSoup(page)
|
soup = BeautifulSoup(page)
|
||||||
except HTMLParseError:
|
except HTMLParseError:
|
||||||
log.exception(u'BeautifulSoup could not parse the bible page.')
|
log.exception(u'BeautifulSoup could not parse the bible page.')
|
||||||
finally:
|
Receiver.send_message(u'openlp_error_message', {
|
||||||
if not soup:
|
u'title': translate('BiblePlugin.HTTPBible', 'Parse Error'),
|
||||||
return None
|
u'message': translate('BiblePlugin.HTTPBible', 'There was a '
|
||||||
|
'problem extracting your verse selection. If this error '
|
||||||
|
'continues to occur consider reporting a bug.')
|
||||||
|
})
|
||||||
|
return None
|
||||||
Receiver.send_message(u'openlp_process_events')
|
Receiver.send_message(u'openlp_process_events')
|
||||||
htmlverses = soup.findAll(u'span', u'versetext')
|
htmlverses = soup.findAll(u'span', u'versetext')
|
||||||
verses = {}
|
verses = {}
|
||||||
@ -453,7 +485,12 @@ class HTTPBible(BibleDB):
|
|||||||
if not db_book:
|
if not db_book:
|
||||||
book_details = self.lookup_book(book)
|
book_details = self.lookup_book(book)
|
||||||
if not book_details:
|
if not book_details:
|
||||||
Receiver.send_message(u'bibles_nobook')
|
Receiver.send_message(u'openlp_error_message', {
|
||||||
|
u'title': translate('BiblesPlugin', 'No Book Found'),
|
||||||
|
u'message': translate('BiblesPlugin', 'No matching '
|
||||||
|
'book could be found in this Bible. Check that you'
|
||||||
|
'have spelled the name of the book correctly.')
|
||||||
|
})
|
||||||
return []
|
return []
|
||||||
db_book = self.create_book(book_details[u'name'],
|
db_book = self.create_book(book_details[u'name'],
|
||||||
book_details[u'abbreviation'],
|
book_details[u'abbreviation'],
|
||||||
|
@ -259,8 +259,6 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
QtCore.SIGNAL(u'bibles_showprogress'), self.onSearchProgressShow)
|
QtCore.SIGNAL(u'bibles_showprogress'), self.onSearchProgressShow)
|
||||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
QtCore.SIGNAL(u'bibles_hideprogress'), self.onSearchProgressHide)
|
QtCore.SIGNAL(u'bibles_hideprogress'), self.onSearchProgressHide)
|
||||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
|
||||||
QtCore.SIGNAL(u'bibles_nobook'), self.onNoBookFound)
|
|
||||||
|
|
||||||
def addListViewToToolBar(self):
|
def addListViewToToolBar(self):
|
||||||
MediaManagerItem.addListViewToToolBar(self)
|
MediaManagerItem.addListViewToToolBar(self)
|
||||||
@ -360,13 +358,6 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
def onSearchProgressHide(self):
|
def onSearchProgressHide(self):
|
||||||
self.SearchProgress.setVisible(False)
|
self.SearchProgress.setVisible(False)
|
||||||
|
|
||||||
def onNoBookFound(self):
|
|
||||||
QtGui.QMessageBox.critical(self,
|
|
||||||
translate('BiblesPlugin.MediaItem', 'No Book Found'),
|
|
||||||
translate('BiblesPlugin.MediaItem',
|
|
||||||
'No matching book could be found in this Bible.'))
|
|
||||||
self.AdvancedSearchButton.setEnabled(True)
|
|
||||||
|
|
||||||
def onImportClick(self):
|
def onImportClick(self):
|
||||||
if not hasattr(self, u'import_wizard'):
|
if not hasattr(self, u'import_wizard'):
|
||||||
self.import_wizard = BibleImportForm(self, self.parent.manager,
|
self.import_wizard = BibleImportForm(self, self.parent.manager,
|
||||||
|
@ -139,8 +139,6 @@ class ImageMediaItem(MediaManagerItem):
|
|||||||
self.settingsSection, self.getFileList())
|
self.settingsSection, self.getFileList())
|
||||||
|
|
||||||
def loadList(self, list):
|
def loadList(self, list):
|
||||||
self.listView.setCursor(QtCore.Qt.BusyCursor)
|
|
||||||
Receiver.send_message(u'openlp_process_events')
|
|
||||||
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)
|
||||||
@ -155,8 +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)
|
||||||
self.listView.setCursor(QtCore.Qt.ArrowCursor)
|
|
||||||
Receiver.send_message(u'openlp_process_events')
|
|
||||||
|
|
||||||
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()
|
||||||
|
Loading…
Reference in New Issue
Block a user