forked from openlp/openlp
Head 1149
This commit is contained in:
commit
06f195108a
@ -113,6 +113,14 @@ class ImageManager(QtCore.QObject):
|
|||||||
time.sleep(0.1)
|
time.sleep(0.1)
|
||||||
return self._cache[name].image_bytes
|
return self._cache[name].image_bytes
|
||||||
|
|
||||||
|
def del_image(self, name):
|
||||||
|
"""
|
||||||
|
Delete the Image from the Cache
|
||||||
|
"""
|
||||||
|
log.debug(u'del_image %s' % name)
|
||||||
|
if name in self._cache:
|
||||||
|
del self._cache[name]
|
||||||
|
|
||||||
def add_image(self, name, path):
|
def add_image(self, name, path):
|
||||||
"""
|
"""
|
||||||
Add image to cache if it is not already there
|
Add image to cache if it is not already there
|
||||||
@ -125,6 +133,8 @@ class ImageManager(QtCore.QObject):
|
|||||||
image.image = resize_image(path,
|
image.image = resize_image(path,
|
||||||
self.width, self.height)
|
self.width, self.height)
|
||||||
self._cache[name] = image
|
self._cache[name] = image
|
||||||
|
else:
|
||||||
|
log.debug(u'Image in cache %s:%s' % (name, path))
|
||||||
self._cache_dirty = True
|
self._cache_dirty = True
|
||||||
# only one thread please
|
# only one thread please
|
||||||
if not self._thread_running:
|
if not self._thread_running:
|
||||||
|
@ -108,7 +108,7 @@ class Plugin(QtCore.QObject):
|
|||||||
"""
|
"""
|
||||||
log.info(u'loaded')
|
log.info(u'loaded')
|
||||||
|
|
||||||
def __init__(self, name, version=None, plugin_helpers=None):
|
def __init__(self, name, version=None, pluginHelpers=None):
|
||||||
"""
|
"""
|
||||||
This is the constructor for the plugin object. This provides an easy
|
This is the constructor for the plugin object. This provides an easy
|
||||||
way for descendent plugins to populate common data. This method *must*
|
way for descendent plugins to populate common data. This method *must*
|
||||||
@ -124,7 +124,7 @@ class Plugin(QtCore.QObject):
|
|||||||
``version``
|
``version``
|
||||||
Defaults to *None*. The version of the plugin.
|
Defaults to *None*. The version of the plugin.
|
||||||
|
|
||||||
``plugin_helpers``
|
``pluginHelpers``
|
||||||
Defaults to *None*. A list of helper objects.
|
Defaults to *None*. A list of helper objects.
|
||||||
"""
|
"""
|
||||||
QtCore.QObject.__init__(self)
|
QtCore.QObject.__init__(self)
|
||||||
@ -139,14 +139,14 @@ class Plugin(QtCore.QObject):
|
|||||||
self.status = PluginStatus.Inactive
|
self.status = PluginStatus.Inactive
|
||||||
# Set up logging
|
# Set up logging
|
||||||
self.log = logging.getLogger(self.name)
|
self.log = logging.getLogger(self.name)
|
||||||
self.previewController = plugin_helpers[u'preview']
|
self.previewController = pluginHelpers[u'preview']
|
||||||
self.liveController = plugin_helpers[u'live']
|
self.liveController = pluginHelpers[u'live']
|
||||||
self.renderManager = plugin_helpers[u'render']
|
self.renderManager = pluginHelpers[u'render']
|
||||||
self.serviceManager = plugin_helpers[u'service']
|
self.serviceManager = pluginHelpers[u'service']
|
||||||
self.settingsForm = plugin_helpers[u'settings form']
|
self.settingsForm = pluginHelpers[u'settings form']
|
||||||
self.mediadock = plugin_helpers[u'toolbox']
|
self.mediadock = pluginHelpers[u'toolbox']
|
||||||
self.pluginManager = plugin_helpers[u'pluginmanager']
|
self.pluginManager = pluginHelpers[u'pluginmanager']
|
||||||
self.formparent = plugin_helpers[u'formparent']
|
self.formparent = pluginHelpers[u'formparent']
|
||||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
QtCore.SIGNAL(u'%s_add_service_item' % self.name),
|
QtCore.SIGNAL(u'%s_add_service_item' % self.name),
|
||||||
self.processAddServiceEvent)
|
self.processAddServiceEvent)
|
||||||
|
@ -213,6 +213,8 @@ class RenderManager(object):
|
|||||||
# make big page for theme edit dialog to get line count
|
# make big page for theme edit dialog to get line count
|
||||||
if self.force_page:
|
if self.force_page:
|
||||||
verse = verse + verse + verse
|
verse = verse + verse + verse
|
||||||
|
else:
|
||||||
|
self.image_manager.del_image(self.theme_data.theme_name)
|
||||||
footer = []
|
footer = []
|
||||||
footer.append(u'Arky Arky (Unknown)' )
|
footer.append(u'Arky Arky (Unknown)' )
|
||||||
footer.append(u'Public Domain')
|
footer.append(u'Public Domain')
|
||||||
|
@ -44,6 +44,7 @@ class ServiceItemType(object):
|
|||||||
Image = 2
|
Image = 2
|
||||||
Command = 3
|
Command = 3
|
||||||
|
|
||||||
|
|
||||||
class ItemCapabilities(object):
|
class ItemCapabilities(object):
|
||||||
"""
|
"""
|
||||||
Provides an enumeration of a serviceitem's capabilities
|
Provides an enumeration of a serviceitem's capabilities
|
||||||
|
@ -166,6 +166,17 @@ class Ui_AboutDialog(object):
|
|||||||
' PyQt4: http://www.riverbankcomputing.co.uk/software/pyqt/'
|
' PyQt4: http://www.riverbankcomputing.co.uk/software/pyqt/'
|
||||||
'intro\n'
|
'intro\n'
|
||||||
' Oxygen Icons: http://oxygen-icons.org/\n'
|
' Oxygen Icons: http://oxygen-icons.org/\n'
|
||||||
|
'\n'
|
||||||
|
'Final Credit\n'
|
||||||
|
' "For God so loved the world that He gave\n'
|
||||||
|
' His one and only Son, so that whoever\n'
|
||||||
|
' believes in Him will not perish but inherit\n'
|
||||||
|
' eternal life." -- John 3:16\n\n'
|
||||||
|
' And last but not least, final credit goes to\n'
|
||||||
|
' God our Father, for sending His Son to die\n'
|
||||||
|
' on the cross, setting us free from sin. We\n'
|
||||||
|
' bring this software to you for free because\n'
|
||||||
|
' He has set us free.'
|
||||||
))
|
))
|
||||||
self.aboutNotebook.setTabText(
|
self.aboutNotebook.setTabText(
|
||||||
self.aboutNotebook.indexOf(self.creditsTab),
|
self.aboutNotebook.indexOf(self.creditsTab),
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
|
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
|
||||||
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
import logging
|
||||||
import re
|
import re
|
||||||
import os
|
import os
|
||||||
import platform
|
import platform
|
||||||
@ -59,6 +59,8 @@ from openlp.core.lib.mailto import mailto
|
|||||||
|
|
||||||
from exceptiondialog import Ui_ExceptionDialog
|
from exceptiondialog import Ui_ExceptionDialog
|
||||||
|
|
||||||
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
|
class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
|
||||||
"""
|
"""
|
||||||
The exception dialog
|
The exception dialog
|
||||||
@ -103,7 +105,8 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
|
|||||||
filename = QtGui.QFileDialog.getSaveFileName(self,
|
filename = QtGui.QFileDialog.getSaveFileName(self,
|
||||||
translate('OpenLP.ExceptionForm', 'Save Crash Report'),
|
translate('OpenLP.ExceptionForm', 'Save Crash Report'),
|
||||||
SettingsManager.get_last_dir(self.settingsSection),
|
SettingsManager.get_last_dir(self.settingsSection),
|
||||||
translate('OpenLP.ExceptionForm', 'Text files (*.txt *.log *.text)'))
|
translate('OpenLP.ExceptionForm',
|
||||||
|
'Text files (*.txt *.log *.text)'))
|
||||||
if filename:
|
if filename:
|
||||||
filename = unicode(QtCore.QDir.toNativeSeparators(filename))
|
filename = unicode(QtCore.QDir.toNativeSeparators(filename))
|
||||||
SettingsManager.set_last_dir(self.settingsSection, os.path.dirname(
|
SettingsManager.set_last_dir(self.settingsSection, os.path.dirname(
|
||||||
@ -140,4 +143,5 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
|
|||||||
if u':' in line:
|
if u':' in line:
|
||||||
exception = line.split(u'\n')[-1].split(u':')[0]
|
exception = line.split(u'\n')[-1].split(u':')[0]
|
||||||
subject = u'Bug report: %s in %s' % (exception, source)
|
subject = u'Bug report: %s in %s' % (exception, source)
|
||||||
mailto(address=u'bugs@openlp.org', subject=subject, body=body % content)
|
mailto(address=u'bugs@openlp.org', subject=subject,
|
||||||
|
body=body % content)
|
||||||
|
@ -30,24 +30,24 @@ from openlp.core.lib import translate
|
|||||||
|
|
||||||
class Ui_FileRenameDialog(object):
|
class Ui_FileRenameDialog(object):
|
||||||
def setupUi(self, FileRenameDialog):
|
def setupUi(self, FileRenameDialog):
|
||||||
FileRenameDialog.setObjectName("FileRenameDialog")
|
FileRenameDialog.setObjectName(u'FileRenameDialog')
|
||||||
FileRenameDialog.resize(400, 87)
|
FileRenameDialog.resize(400, 87)
|
||||||
self.buttonBox = QtGui.QDialogButtonBox(FileRenameDialog)
|
self.buttonBox = QtGui.QDialogButtonBox(FileRenameDialog)
|
||||||
self.buttonBox.setGeometry(QtCore.QRect(210, 50, 171, 25))
|
self.buttonBox.setGeometry(QtCore.QRect(210, 50, 171, 25))
|
||||||
self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel |
|
self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel |
|
||||||
QtGui.QDialogButtonBox.Ok)
|
QtGui.QDialogButtonBox.Ok)
|
||||||
self.buttonBox.setObjectName("buttonBox")
|
self.buttonBox.setObjectName(u'buttonBox')
|
||||||
self.widget = QtGui.QWidget(FileRenameDialog)
|
self.widget = QtGui.QWidget(FileRenameDialog)
|
||||||
self.widget.setGeometry(QtCore.QRect(10, 10, 381, 35))
|
self.widget.setGeometry(QtCore.QRect(10, 10, 381, 35))
|
||||||
self.widget.setObjectName("widget")
|
self.widget.setObjectName(u'widget')
|
||||||
self.horizontalLayout = QtGui.QHBoxLayout(self.widget)
|
self.horizontalLayout = QtGui.QHBoxLayout(self.widget)
|
||||||
self.horizontalLayout.setObjectName("horizontalLayout")
|
self.horizontalLayout.setObjectName(u'horizontalLayout')
|
||||||
self.FileRenameLabel = QtGui.QLabel(self.widget)
|
self.fileRenameLabel = QtGui.QLabel(self.widget)
|
||||||
self.FileRenameLabel.setObjectName("FileRenameLabel")
|
self.fileRenameLabel.setObjectName(u'fileRenameLabel')
|
||||||
self.horizontalLayout.addWidget(self.FileRenameLabel)
|
self.horizontalLayout.addWidget(self.fileRenameLabel)
|
||||||
self.FileNameEdit = QtGui.QLineEdit(self.widget)
|
self.fileNameEdit = QtGui.QLineEdit(self.widget)
|
||||||
self.FileNameEdit.setObjectName("FileNameEdit")
|
self.fileNameEdit.setObjectName(u'fileNameEdit')
|
||||||
self.horizontalLayout.addWidget(self.FileNameEdit)
|
self.horizontalLayout.addWidget(self.fileNameEdit)
|
||||||
|
|
||||||
self.retranslateUi(FileRenameDialog)
|
self.retranslateUi(FileRenameDialog)
|
||||||
QtCore.QMetaObject.connectSlotsByName(FileRenameDialog)
|
QtCore.QMetaObject.connectSlotsByName(FileRenameDialog)
|
||||||
@ -55,6 +55,5 @@ class Ui_FileRenameDialog(object):
|
|||||||
def retranslateUi(self, FileRenameDialog):
|
def retranslateUi(self, FileRenameDialog):
|
||||||
FileRenameDialog.setWindowTitle(translate('OpenLP.FileRenameForm',
|
FileRenameDialog.setWindowTitle(translate('OpenLP.FileRenameForm',
|
||||||
'File Rename'))
|
'File Rename'))
|
||||||
self.FileRenameLabel.setText(translate('OpenLP.FileRenameForm',
|
self.fileRenameLabel.setText(translate('OpenLP.FileRenameForm',
|
||||||
'New File Name:'))
|
'New File Name:'))
|
||||||
|
|
||||||
|
@ -97,16 +97,16 @@ class Ui_MainWindow(object):
|
|||||||
self.ControlSplitter.setObjectName(u'ControlSplitter')
|
self.ControlSplitter.setObjectName(u'ControlSplitter')
|
||||||
self.MainContentLayout.addWidget(self.ControlSplitter)
|
self.MainContentLayout.addWidget(self.ControlSplitter)
|
||||||
# Create slide controllers
|
# Create slide controllers
|
||||||
self.PreviewController = SlideController(self, self.settingsmanager,
|
self.previewController = SlideController(self, self.settingsmanager,
|
||||||
self.screens)
|
self.screens)
|
||||||
self.LiveController = SlideController(self, self.settingsmanager,
|
self.liveController = SlideController(self, self.settingsmanager,
|
||||||
self.screens, True)
|
self.screens, True)
|
||||||
previewVisible = QtCore.QSettings().value(
|
previewVisible = QtCore.QSettings().value(
|
||||||
u'user interface/preview panel', QtCore.QVariant(True)).toBool()
|
u'user interface/preview panel', QtCore.QVariant(True)).toBool()
|
||||||
self.PreviewController.Panel.setVisible(previewVisible)
|
self.previewController.Panel.setVisible(previewVisible)
|
||||||
liveVisible = QtCore.QSettings().value(u'user interface/live panel',
|
liveVisible = QtCore.QSettings().value(u'user interface/live panel',
|
||||||
QtCore.QVariant(True)).toBool()
|
QtCore.QVariant(True)).toBool()
|
||||||
self.LiveController.Panel.setVisible(liveVisible)
|
self.liveController.Panel.setVisible(liveVisible)
|
||||||
# Create menu
|
# Create menu
|
||||||
self.MenuBar = QtGui.QMenuBar(MainWindow)
|
self.MenuBar = QtGui.QMenuBar(MainWindow)
|
||||||
self.MenuBar.setGeometry(QtCore.QRect(0, 0, 1087, 27))
|
self.MenuBar.setGeometry(QtCore.QRect(0, 0, 1087, 27))
|
||||||
@ -362,8 +362,8 @@ class Ui_MainWindow(object):
|
|||||||
"""
|
"""
|
||||||
Splitter between the Preview and Live Controllers.
|
Splitter between the Preview and Live Controllers.
|
||||||
"""
|
"""
|
||||||
self.LiveController.widthChanged()
|
self.liveController.widthChanged()
|
||||||
self.PreviewController.widthChanged()
|
self.previewController.widthChanged()
|
||||||
|
|
||||||
def retranslateUi(self, MainWindow):
|
def retranslateUi(self, MainWindow):
|
||||||
"""
|
"""
|
||||||
@ -548,8 +548,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
self.recentFiles = QtCore.QStringList()
|
self.recentFiles = QtCore.QStringList()
|
||||||
# Set up the path with plugins
|
# Set up the path with plugins
|
||||||
pluginpath = AppLocation.get_directory(AppLocation.PluginsDir)
|
pluginpath = AppLocation.get_directory(AppLocation.PluginsDir)
|
||||||
self.plugin_manager = PluginManager(pluginpath)
|
self.pluginManager = PluginManager(pluginpath)
|
||||||
self.plugin_helpers = {}
|
self.pluginHelpers = {}
|
||||||
# Set up the interface
|
# Set up the interface
|
||||||
self.setupUi(self)
|
self.setupUi(self)
|
||||||
# Load settings after setupUi so default UI sizes are overwritten
|
# Load settings after setupUi so default UI sizes are overwritten
|
||||||
@ -633,33 +633,33 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
self.mediaDockManager = MediaDockManager(self.MediaToolBox)
|
self.mediaDockManager = MediaDockManager(self.MediaToolBox)
|
||||||
log.info(u'Load Plugins')
|
log.info(u'Load Plugins')
|
||||||
# make the controllers available to the plugins
|
# make the controllers available to the plugins
|
||||||
self.plugin_helpers[u'preview'] = self.PreviewController
|
self.pluginHelpers[u'preview'] = self.previewController
|
||||||
self.plugin_helpers[u'live'] = self.LiveController
|
self.pluginHelpers[u'live'] = self.liveController
|
||||||
self.plugin_helpers[u'render'] = self.renderManager
|
self.pluginHelpers[u'render'] = self.renderManager
|
||||||
self.plugin_helpers[u'service'] = self.ServiceManagerContents
|
self.pluginHelpers[u'service'] = self.ServiceManagerContents
|
||||||
self.plugin_helpers[u'settings form'] = self.settingsForm
|
self.pluginHelpers[u'settings form'] = self.settingsForm
|
||||||
self.plugin_helpers[u'toolbox'] = self.mediaDockManager
|
self.pluginHelpers[u'toolbox'] = self.mediaDockManager
|
||||||
self.plugin_helpers[u'pluginmanager'] = self.plugin_manager
|
self.pluginHelpers[u'pluginmanager'] = self.pluginManager
|
||||||
self.plugin_helpers[u'formparent'] = self
|
self.pluginHelpers[u'formparent'] = self
|
||||||
self.plugin_manager.find_plugins(pluginpath, self.plugin_helpers)
|
self.pluginManager.find_plugins(pluginpath, self.pluginHelpers)
|
||||||
# hook methods have to happen after find_plugins. Find plugins needs
|
# hook methods have to happen after find_plugins. Find plugins needs
|
||||||
# the controllers hence the hooks have moved from setupUI() to here
|
# the controllers hence the hooks have moved from setupUI() to here
|
||||||
# Find and insert settings tabs
|
# Find and insert settings tabs
|
||||||
log.info(u'hook settings')
|
log.info(u'hook settings')
|
||||||
self.plugin_manager.hook_settings_tabs(self.settingsForm)
|
self.pluginManager.hook_settings_tabs(self.settingsForm)
|
||||||
# Find and insert media manager items
|
# Find and insert media manager items
|
||||||
log.info(u'hook media')
|
log.info(u'hook media')
|
||||||
self.plugin_manager.hook_media_manager(self.mediaDockManager)
|
self.pluginManager.hook_media_manager(self.mediaDockManager)
|
||||||
# Call the hook method to pull in import menus.
|
# Call the hook method to pull in import menus.
|
||||||
log.info(u'hook menus')
|
log.info(u'hook menus')
|
||||||
self.plugin_manager.hook_import_menu(self.FileImportMenu)
|
self.pluginManager.hook_import_menu(self.FileImportMenu)
|
||||||
# Call the hook method to pull in export menus.
|
# Call the hook method to pull in export menus.
|
||||||
self.plugin_manager.hook_export_menu(self.FileExportMenu)
|
self.pluginManager.hook_export_menu(self.FileExportMenu)
|
||||||
# Call the hook method to pull in tools menus.
|
# Call the hook method to pull in tools menus.
|
||||||
self.plugin_manager.hook_tools_menu(self.ToolsMenu)
|
self.pluginManager.hook_tools_menu(self.ToolsMenu)
|
||||||
# Call the initialise method to setup plugins.
|
# Call the initialise method to setup plugins.
|
||||||
log.info(u'initialise plugins')
|
log.info(u'initialise plugins')
|
||||||
self.plugin_manager.initialise_plugins()
|
self.pluginManager.initialise_plugins()
|
||||||
# Once all components are initialised load the Themes
|
# Once all components are initialised load the Themes
|
||||||
log.info(u'Load Themes')
|
log.info(u'Load Themes')
|
||||||
self.ThemeManagerContents.loadThemes()
|
self.ThemeManagerContents.loadThemes()
|
||||||
@ -695,10 +695,10 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
Show the main form, as well as the display form
|
Show the main form, as well as the display form
|
||||||
"""
|
"""
|
||||||
QtGui.QWidget.show(self)
|
QtGui.QWidget.show(self)
|
||||||
self.LiveController.display.setup()
|
self.liveController.display.setup()
|
||||||
self.PreviewController.display.setup()
|
self.previewController.display.setup()
|
||||||
if self.LiveController.display.isVisible():
|
if self.liveController.display.isVisible():
|
||||||
self.LiveController.display.setFocus()
|
self.liveController.display.setFocus()
|
||||||
self.activateWindow()
|
self.activateWindow()
|
||||||
if QtCore.QSettings().value(
|
if QtCore.QSettings().value(
|
||||||
self.generalSettingsSection + u'/auto open',
|
self.generalSettingsSection + u'/auto open',
|
||||||
@ -723,7 +723,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
settings = QtCore.QSettings()
|
settings = QtCore.QSettings()
|
||||||
if settings.value(u'%s/screen blank' % self.generalSettingsSection,
|
if settings.value(u'%s/screen blank' % self.generalSettingsSection,
|
||||||
QtCore.QVariant(False)).toBool():
|
QtCore.QVariant(False)).toBool():
|
||||||
self.LiveController.mainDisplaySetBackground()
|
self.liveController.mainDisplaySetBackground()
|
||||||
if settings.value(u'blank warning',
|
if settings.value(u'blank warning',
|
||||||
QtCore.QVariant(False)).toBool():
|
QtCore.QVariant(False)).toBool():
|
||||||
QtGui.QMessageBox.question(self,
|
QtGui.QMessageBox.question(self,
|
||||||
@ -852,11 +852,11 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
QtCore.QVariant(self.MediaToolBox.currentIndex()))
|
QtCore.QVariant(self.MediaToolBox.currentIndex()))
|
||||||
# Call the cleanup method to shutdown plugins.
|
# Call the cleanup method to shutdown plugins.
|
||||||
log.info(u'cleanup plugins')
|
log.info(u'cleanup plugins')
|
||||||
self.plugin_manager.finalise_plugins()
|
self.pluginManager.finalise_plugins()
|
||||||
# Save settings
|
# Save settings
|
||||||
self.saveSettings()
|
self.saveSettings()
|
||||||
# Close down the display
|
# Close down the display
|
||||||
self.LiveController.display.close()
|
self.liveController.display.close()
|
||||||
|
|
||||||
def serviceChanged(self, reset=False, serviceName=None):
|
def serviceChanged(self, reset=False, serviceName=None):
|
||||||
"""
|
"""
|
||||||
@ -910,7 +910,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
True - Visible
|
True - Visible
|
||||||
False - Hidden
|
False - Hidden
|
||||||
"""
|
"""
|
||||||
self.PreviewController.Panel.setVisible(visible)
|
self.previewController.Panel.setVisible(visible)
|
||||||
QtCore.QSettings().setValue(u'user interface/preview panel',
|
QtCore.QSettings().setValue(u'user interface/preview panel',
|
||||||
QtCore.QVariant(visible))
|
QtCore.QVariant(visible))
|
||||||
self.ViewPreviewPanel.setChecked(visible)
|
self.ViewPreviewPanel.setChecked(visible)
|
||||||
@ -925,7 +925,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
True - Visible
|
True - Visible
|
||||||
False - Hidden
|
False - Hidden
|
||||||
"""
|
"""
|
||||||
self.LiveController.Panel.setVisible(visible)
|
self.liveController.Panel.setVisible(visible)
|
||||||
QtCore.QSettings().setValue(u'user interface/live panel',
|
QtCore.QSettings().setValue(u'user interface/live panel',
|
||||||
QtCore.QVariant(visible))
|
QtCore.QVariant(visible))
|
||||||
self.ViewLivePanel.setChecked(visible)
|
self.ViewLivePanel.setChecked(visible)
|
||||||
|
@ -61,7 +61,7 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
|
|||||||
self.programaticChange = True
|
self.programaticChange = True
|
||||||
self._clearDetails()
|
self._clearDetails()
|
||||||
self.programaticChange = True
|
self.programaticChange = True
|
||||||
for plugin in self.parent.plugin_manager.plugins:
|
for plugin in self.parent.pluginManager.plugins:
|
||||||
item = QtGui.QListWidgetItem(self.pluginListWidget)
|
item = QtGui.QListWidgetItem(self.pluginListWidget)
|
||||||
# We do this just to make 100% sure the status is an integer as
|
# We do this just to make 100% sure the status is an integer as
|
||||||
# sometimes when it's loaded from the config, it isn't cast to int.
|
# sometimes when it's loaded from the config, it isn't cast to int.
|
||||||
@ -110,7 +110,7 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
|
|||||||
plugin_name_plural = \
|
plugin_name_plural = \
|
||||||
self.pluginListWidget.currentItem().text().split(u' ')[0]
|
self.pluginListWidget.currentItem().text().split(u' ')[0]
|
||||||
self.activePlugin = None
|
self.activePlugin = None
|
||||||
for plugin in self.parent.plugin_manager.plugins:
|
for plugin in self.parent.pluginManager.plugins:
|
||||||
name_string = plugin.getString(StringContent.Name)
|
name_string = plugin.getString(StringContent.Name)
|
||||||
if name_string[u'plural'] == plugin_name_plural:
|
if name_string[u'plural'] == plugin_name_plural:
|
||||||
self.activePlugin = plugin
|
self.activePlugin = plugin
|
||||||
|
@ -64,8 +64,7 @@ class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog):
|
|||||||
self.item._raw_frames = []
|
self.item._raw_frames = []
|
||||||
if self.item.is_image():
|
if self.item.is_image():
|
||||||
for item in self.itemList:
|
for item in self.itemList:
|
||||||
self.item.add_from_image(item[u'path'], item[u'title'],
|
self.item.add_from_image(item[u'path'], item[u'title'])
|
||||||
item[u'image'])
|
|
||||||
self.item.render()
|
self.item.render()
|
||||||
return self.item
|
return self.item
|
||||||
|
|
||||||
|
@ -880,7 +880,7 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
newItem.merge(item[u'service_item'])
|
newItem.merge(item[u'service_item'])
|
||||||
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.parent.serviceChanged(False, self.serviceName)
|
||||||
|
|
||||||
def addServiceItem(self, item, rebuild=False, expand=None, replace=False):
|
def addServiceItem(self, item, rebuild=False, expand=None, replace=False):
|
||||||
@ -902,7 +902,7 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
item.merge(self.serviceItems[sitem][u'service_item'])
|
item.merge(self.serviceItems[sitem][u'service_item'])
|
||||||
self.serviceItems[sitem][u'service_item'] = item
|
self.serviceItems[sitem][u'service_item'] = item
|
||||||
self.repaintServiceList(sitem + 1, 0)
|
self.repaintServiceList(sitem + 1, 0)
|
||||||
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.droppos == 0:
|
||||||
@ -923,7 +923,7 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
self.repaintServiceList(self.droppos, 0)
|
self.repaintServiceList(self.droppos, 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.droppos = 0
|
||||||
self.parent.serviceChanged(False, self.serviceName)
|
self.parent.serviceChanged(False, self.serviceName)
|
||||||
|
|
||||||
@ -933,7 +933,7 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
"""
|
"""
|
||||||
item, count = self.findServiceItem()
|
item, count = self.findServiceItem()
|
||||||
if self.serviceItems[item][u'service_item'].is_valid:
|
if self.serviceItems[item][u'service_item'].is_valid:
|
||||||
self.parent.PreviewController.addServiceManagerItem(
|
self.parent.previewController.addServiceManagerItem(
|
||||||
self.serviceItems[item][u'service_item'], count)
|
self.serviceItems[item][u'service_item'], count)
|
||||||
else:
|
else:
|
||||||
QtGui.QMessageBox.critical(self,
|
QtGui.QMessageBox.critical(self,
|
||||||
@ -957,7 +957,7 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
"""
|
"""
|
||||||
item, count = self.findServiceItem()
|
item, count = self.findServiceItem()
|
||||||
if self.serviceItems[item][u'service_item'].is_valid:
|
if self.serviceItems[item][u'service_item'].is_valid:
|
||||||
self.parent.LiveController.addServiceManagerItem(
|
self.parent.liveController.addServiceManagerItem(
|
||||||
self.serviceItems[item][u'service_item'], count)
|
self.serviceItems[item][u'service_item'], count)
|
||||||
if QtCore.QSettings().value(
|
if QtCore.QSettings().value(
|
||||||
self.parent.generalSettingsSection + u'/auto preview',
|
self.parent.generalSettingsSection + u'/auto preview',
|
||||||
@ -966,9 +966,9 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
if self.serviceItems and item < len(self.serviceItems) and \
|
if self.serviceItems and item < len(self.serviceItems) and \
|
||||||
self.serviceItems[item][u'service_item'].is_capable(
|
self.serviceItems[item][u'service_item'].is_capable(
|
||||||
ItemCapabilities.AllowsPreview):
|
ItemCapabilities.AllowsPreview):
|
||||||
self.parent.PreviewController.addServiceManagerItem(
|
self.parent.previewController.addServiceManagerItem(
|
||||||
self.serviceItems[item][u'service_item'], 0)
|
self.serviceItems[item][u'service_item'], 0)
|
||||||
self.parent.LiveController.PreviewListWidget.setFocus()
|
self.parent.liveController.PreviewListWidget.setFocus()
|
||||||
else:
|
else:
|
||||||
QtGui.QMessageBox.critical(self,
|
QtGui.QMessageBox.critical(self,
|
||||||
translate('OpenLP.ServiceManager', 'Missing Display Handler'),
|
translate('OpenLP.ServiceManager', 'Missing Display Handler'),
|
||||||
|
@ -332,7 +332,8 @@ class SlideController(QtGui.QWidget):
|
|||||||
QtCore.SIGNAL(u'clicked(QModelIndex)'), self.onSlideSelected)
|
QtCore.SIGNAL(u'clicked(QModelIndex)'), self.onSlideSelected)
|
||||||
if not self.isLive:
|
if not self.isLive:
|
||||||
QtCore.QObject.connect(self.PreviewListWidget,
|
QtCore.QObject.connect(self.PreviewListWidget,
|
||||||
QtCore.SIGNAL(u'doubleClicked(QModelIndex)'), self.onGoLiveClick)
|
QtCore.SIGNAL(u'doubleClicked(QModelIndex)'),
|
||||||
|
self.onGoLiveClick)
|
||||||
if isLive:
|
if isLive:
|
||||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
QtCore.SIGNAL(u'slidecontroller_live_spin_delay'),
|
QtCore.SIGNAL(u'slidecontroller_live_spin_delay'),
|
||||||
@ -466,7 +467,7 @@ class SlideController(QtGui.QWidget):
|
|||||||
self.Toolbar.actions[u'Stop Loop'].setVisible(False)
|
self.Toolbar.actions[u'Stop Loop'].setVisible(False)
|
||||||
if item.is_text():
|
if item.is_text():
|
||||||
if QtCore.QSettings().value(
|
if QtCore.QSettings().value(
|
||||||
self.parent.songsSettingsSection + u'/show songbar',
|
self.parent.songsSettingsSection + u'/display songbar',
|
||||||
QtCore.QVariant(True)).toBool() and len(self.slideList) > 0:
|
QtCore.QVariant(True)).toBool() and len(self.slideList) > 0:
|
||||||
self.Toolbar.makeWidgetsVisible([u'Song Menu'])
|
self.Toolbar.makeWidgetsVisible([u'Song Menu'])
|
||||||
if item.is_capable(ItemCapabilities.AllowsLoop) and \
|
if item.is_capable(ItemCapabilities.AllowsLoop) and \
|
||||||
@ -560,7 +561,7 @@ class SlideController(QtGui.QWidget):
|
|||||||
[serviceItem, self.isLive, blanked, slideno])
|
[serviceItem, self.isLive, blanked, slideno])
|
||||||
self.slideList = {}
|
self.slideList = {}
|
||||||
width = self.parent.ControlSplitter.sizes()[self.split]
|
width = self.parent.ControlSplitter.sizes()[self.split]
|
||||||
# Set pointing cursor when we have somthing to point at
|
# Set pointing cursor when we have something to point at
|
||||||
self.PreviewListWidget.setCursor(QtCore.Qt.PointingHandCursor)
|
self.PreviewListWidget.setCursor(QtCore.Qt.PointingHandCursor)
|
||||||
self.serviceItem = serviceItem
|
self.serviceItem = serviceItem
|
||||||
self.PreviewListWidget.clear()
|
self.PreviewListWidget.clear()
|
||||||
@ -957,7 +958,7 @@ class SlideController(QtGui.QWidget):
|
|||||||
"""
|
"""
|
||||||
row = self.PreviewListWidget.currentRow()
|
row = self.PreviewListWidget.currentRow()
|
||||||
if row > -1 and row < self.PreviewListWidget.rowCount():
|
if row > -1 and row < self.PreviewListWidget.rowCount():
|
||||||
self.parent.LiveController.addServiceManagerItem(
|
self.parent.liveController.addServiceManagerItem(
|
||||||
self.serviceItem, row)
|
self.serviceItem, row)
|
||||||
|
|
||||||
def onMediaStart(self, item):
|
def onMediaStart(self, item):
|
||||||
|
@ -289,6 +289,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
|
|||||||
"""
|
"""
|
||||||
Run the wizard.
|
Run the wizard.
|
||||||
"""
|
"""
|
||||||
|
log.debug(u'Editing theme %s' % self.theme.theme_name)
|
||||||
self.updateThemeAllowed = False
|
self.updateThemeAllowed = False
|
||||||
self.setDefaults()
|
self.setDefaults()
|
||||||
self.updateThemeAllowed = True
|
self.updateThemeAllowed = True
|
||||||
@ -444,7 +445,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
|
|||||||
|
|
||||||
def setPreviewTabValues(self):
|
def setPreviewTabValues(self):
|
||||||
self.setField(u'name', QtCore.QVariant(self.theme.theme_name))
|
self.setField(u'name', QtCore.QVariant(self.theme.theme_name))
|
||||||
if len(self.theme.theme_name) > 1:
|
if len(self.theme.theme_name) > 0:
|
||||||
self.themeNameEdit.setEnabled(False)
|
self.themeNameEdit.setEnabled(False)
|
||||||
else:
|
else:
|
||||||
self.themeNameEdit.setEnabled(True)
|
self.themeNameEdit.setEnabled(True)
|
||||||
|
@ -225,10 +225,10 @@ class ThemeManager(QtGui.QWidget):
|
|||||||
"""
|
"""
|
||||||
item = self.themeListWidget.currentItem()
|
item = self.themeListWidget.currentItem()
|
||||||
oldThemeName = unicode(item.data(QtCore.Qt.UserRole).toString())
|
oldThemeName = unicode(item.data(QtCore.Qt.UserRole).toString())
|
||||||
self.fileRenameForm.FileNameEdit.setText(oldThemeName)
|
self.fileRenameForm.fileNameEdit.setText(oldThemeName)
|
||||||
self.saveThemeName = u''
|
self.saveThemeName = u''
|
||||||
if self.fileRenameForm.exec_():
|
if self.fileRenameForm.exec_():
|
||||||
newThemeName = unicode(self.fileRenameForm.FileNameEdit.text())
|
newThemeName = unicode(self.fileRenameForm.fileNameEdit.text())
|
||||||
oldThemeData = self.getThemeData(oldThemeName)
|
oldThemeData = self.getThemeData(oldThemeName)
|
||||||
self.deleteTheme(oldThemeName)
|
self.deleteTheme(oldThemeName)
|
||||||
self.cloneThemeData(oldThemeData, newThemeName)
|
self.cloneThemeData(oldThemeData, newThemeName)
|
||||||
@ -239,10 +239,10 @@ class ThemeManager(QtGui.QWidget):
|
|||||||
"""
|
"""
|
||||||
item = self.themeListWidget.currentItem()
|
item = self.themeListWidget.currentItem()
|
||||||
oldThemeName = unicode(item.data(QtCore.Qt.UserRole).toString())
|
oldThemeName = unicode(item.data(QtCore.Qt.UserRole).toString())
|
||||||
self.fileRenameForm.FileNameEdit.setText(oldThemeName)
|
self.fileRenameForm.fileNameEdit.setText(oldThemeName)
|
||||||
self.saveThemeName = u''
|
self.saveThemeName = u''
|
||||||
if self.fileRenameForm.exec_():
|
if self.fileRenameForm.exec_():
|
||||||
newThemeName = unicode(self.fileRenameForm.FileNameEdit.text())
|
newThemeName = unicode(self.fileRenameForm.fileNameEdit.text())
|
||||||
themeData = self.getThemeData(oldThemeName)
|
themeData = self.getThemeData(oldThemeName)
|
||||||
self.cloneThemeData(themeData, newThemeName)
|
self.cloneThemeData(themeData, newThemeName)
|
||||||
self.loadThemes()
|
self.loadThemes()
|
||||||
@ -310,7 +310,7 @@ class ThemeManager(QtGui.QWidget):
|
|||||||
translate('OpenLP.ThemeManager',
|
translate('OpenLP.ThemeManager',
|
||||||
'You are unable to delete the default theme.'))
|
'You are unable to delete the default theme.'))
|
||||||
else:
|
else:
|
||||||
for plugin in self.parent.plugin_manager.plugins:
|
for plugin in self.parent.pluginManager.plugins:
|
||||||
if plugin.usesTheme(theme):
|
if plugin.usesTheme(theme):
|
||||||
QtGui.QMessageBox.critical(self,
|
QtGui.QMessageBox.critical(self,
|
||||||
translate('OpenLP.ThemeManager', 'Error'),
|
translate('OpenLP.ThemeManager', 'Error'),
|
||||||
@ -663,7 +663,7 @@ class ThemeManager(QtGui.QWidget):
|
|||||||
(QtGui.QMessageBox.Yes | QtGui.QMessageBox.No),
|
(QtGui.QMessageBox.Yes | QtGui.QMessageBox.No),
|
||||||
QtGui.QMessageBox.No)
|
QtGui.QMessageBox.No)
|
||||||
if self.saveThemeName != u'':
|
if self.saveThemeName != u'':
|
||||||
for plugin in self.parent.plugin_manager.plugins:
|
for plugin in self.parent.pluginManager.plugins:
|
||||||
if plugin.usesTheme(self.saveThemeName):
|
if plugin.usesTheme(self.saveThemeName):
|
||||||
plugin.renameTheme(self.saveThemeName, name)
|
plugin.renameTheme(self.saveThemeName, name)
|
||||||
if unicode(self.serviceComboBox.currentText()) == name:
|
if unicode(self.serviceComboBox.currentText()) == name:
|
||||||
|
@ -555,7 +555,8 @@ class Ui_ThemeWizard(object):
|
|||||||
u'footerDefaultPositionCheckBox')
|
u'footerDefaultPositionCheckBox')
|
||||||
self.footerPositionLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
|
self.footerPositionLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
|
||||||
self.footerDefaultPositionCheckBox)
|
self.footerDefaultPositionCheckBox)
|
||||||
self.areaPositionLayout.addWidget(self.footerPositionGroupBox, 1, 1, 1, 1)
|
self.areaPositionLayout.addWidget(
|
||||||
|
self.footerPositionGroupBox, 1, 1, 1, 1)
|
||||||
ThemeWizard.addPage(self.areaPositionPage)
|
ThemeWizard.addPage(self.areaPositionPage)
|
||||||
self.previewPage = QtGui.QWizardPage()
|
self.previewPage = QtGui.QWizardPage()
|
||||||
self.previewPage.setObjectName(u'previewPage')
|
self.previewPage.setObjectName(u'previewPage')
|
||||||
@ -733,18 +734,24 @@ class Ui_ThemeWizard(object):
|
|||||||
self.mainWidthSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
|
self.mainWidthSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
|
||||||
self.mainWidthLabel.setText(translate('OpenLP.ThemeWizard', 'Width:'))
|
self.mainWidthLabel.setText(translate('OpenLP.ThemeWizard', 'Width:'))
|
||||||
self.mainHeightSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
|
self.mainHeightSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
|
||||||
self.mainHeightLabel.setText(translate('OpenLP.ThemeWizard', 'Height:'))
|
self.mainHeightLabel.setText(
|
||||||
|
translate('OpenLP.ThemeWizard', 'Height:'))
|
||||||
self.footerPositionGroupBox.setTitle(
|
self.footerPositionGroupBox.setTitle(
|
||||||
translate('OpenLP.ThemeWizard', 'Footer Area'))
|
translate('OpenLP.ThemeWizard', 'Footer Area'))
|
||||||
self.footerXLabel.setText(translate('OpenLP.ThemeWizard', 'X position:'))
|
self.footerXLabel.setText(
|
||||||
|
translate('OpenLP.ThemeWizard', 'X position:'))
|
||||||
self.footerXSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
|
self.footerXSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
|
||||||
self.footerYLabel.setText(translate('OpenLP.ThemeWizard', 'Y position:'))
|
self.footerYLabel.setText(
|
||||||
|
translate('OpenLP.ThemeWizard', 'Y position:'))
|
||||||
self.footerYSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
|
self.footerYSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
|
||||||
self.footerWidthLabel.setText(translate('OpenLP.ThemeWizard', 'Width:'))
|
self.footerWidthLabel.setText(
|
||||||
self.footerWidthSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
|
translate('OpenLP.ThemeWizard', 'Width:'))
|
||||||
|
self.footerWidthSpinBox.setSuffix(
|
||||||
|
translate('OpenLP.ThemeWizard', 'px'))
|
||||||
self.footerHeightLabel.setText(
|
self.footerHeightLabel.setText(
|
||||||
translate('OpenLP.ThemeWizard', 'Height:'))
|
translate('OpenLP.ThemeWizard', 'Height:'))
|
||||||
self.footerHeightSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
|
self.footerHeightSpinBox.setSuffix(
|
||||||
|
translate('OpenLP.ThemeWizard', 'px'))
|
||||||
self.footerDefaultPositionCheckBox.setText(
|
self.footerDefaultPositionCheckBox.setText(
|
||||||
translate('OpenLP.ThemeWizard', 'Use default location'))
|
translate('OpenLP.ThemeWizard', 'Use default location'))
|
||||||
self.previewPage.setTitle(
|
self.previewPage.setTitle(
|
||||||
|
@ -62,6 +62,9 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog):
|
|||||||
QtCore.SIGNAL(u'clicked(QModelIndex)'), self.onSingleClick)
|
QtCore.SIGNAL(u'clicked(QModelIndex)'), self.onSingleClick)
|
||||||
|
|
||||||
def loadList(self):
|
def loadList(self):
|
||||||
|
"""
|
||||||
|
Loads the list with alerts.
|
||||||
|
"""
|
||||||
self.AlertListWidget.clear()
|
self.AlertListWidget.clear()
|
||||||
alerts = self.manager.get_all_objects(AlertItem,
|
alerts = self.manager.get_all_objects(AlertItem,
|
||||||
order_by_ref=AlertItem.text)
|
order_by_ref=AlertItem.text)
|
||||||
@ -81,12 +84,16 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog):
|
|||||||
self.close()
|
self.close()
|
||||||
|
|
||||||
def onDeleteClick(self):
|
def onDeleteClick(self):
|
||||||
|
"""
|
||||||
|
Deletes the selected item.
|
||||||
|
"""
|
||||||
item = self.AlertListWidget.currentItem()
|
item = self.AlertListWidget.currentItem()
|
||||||
if item:
|
if item:
|
||||||
item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
|
item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
|
||||||
self.manager.delete_object(AlertItem, item_id)
|
self.manager.delete_object(AlertItem, item_id)
|
||||||
row = self.AlertListWidget.row(item)
|
row = self.AlertListWidget.row(item)
|
||||||
self.AlertListWidget.takeItem(row)
|
self.AlertListWidget.takeItem(row)
|
||||||
|
self.item_id = None
|
||||||
self.AlertTextEdit.setText(u'')
|
self.AlertTextEdit.setText(u'')
|
||||||
self.SaveButton.setEnabled(False)
|
self.SaveButton.setEnabled(False)
|
||||||
self.DeleteButton.setEnabled(False)
|
self.DeleteButton.setEnabled(False)
|
||||||
@ -107,7 +114,7 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog):
|
|||||||
|
|
||||||
def onSaveClick(self):
|
def onSaveClick(self):
|
||||||
"""
|
"""
|
||||||
Save an alert
|
Save the alert, we are editing.
|
||||||
"""
|
"""
|
||||||
if self.item_id:
|
if self.item_id:
|
||||||
alert = self.manager.get_object(AlertItem, self.item_id)
|
alert = self.manager.get_object(AlertItem, self.item_id)
|
||||||
@ -115,13 +122,13 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog):
|
|||||||
self.manager.save_object(alert)
|
self.manager.save_object(alert)
|
||||||
self.item_id = None
|
self.item_id = None
|
||||||
self.loadList()
|
self.loadList()
|
||||||
else:
|
|
||||||
self.onNewClick()
|
|
||||||
|
|
||||||
def onTextChanged(self):
|
def onTextChanged(self):
|
||||||
"""
|
"""
|
||||||
Enable save button when data has been changed by editing the form
|
Enable save button when data has been changed by editing the form
|
||||||
"""
|
"""
|
||||||
|
# Only enable the button, if we are editing an item.
|
||||||
|
if self.item_id:
|
||||||
self.SaveButton.setEnabled(True)
|
self.SaveButton.setEnabled(True)
|
||||||
|
|
||||||
def onDoubleClick(self):
|
def onDoubleClick(self):
|
||||||
@ -131,8 +138,8 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog):
|
|||||||
items = self.AlertListWidget.selectedIndexes()
|
items = self.AlertListWidget.selectedIndexes()
|
||||||
for item in items:
|
for item in items:
|
||||||
bitem = self.AlertListWidget.item(item.row())
|
bitem = self.AlertListWidget.item(item.row())
|
||||||
self.triggerAlert(bitem.text())
|
self.triggerAlert(unicode(bitem.text()))
|
||||||
self.AlertTextEdit.setText(bitem.text())
|
self.AlertTextEdit.setText(unicode(bitem.text()))
|
||||||
self.item_id = (bitem.data(QtCore.Qt.UserRole)).toInt()[0]
|
self.item_id = (bitem.data(QtCore.Qt.UserRole)).toInt()[0]
|
||||||
self.SaveButton.setEnabled(False)
|
self.SaveButton.setEnabled(False)
|
||||||
self.DeleteButton.setEnabled(True)
|
self.DeleteButton.setEnabled(True)
|
||||||
@ -145,13 +152,44 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog):
|
|||||||
items = self.AlertListWidget.selectedIndexes()
|
items = self.AlertListWidget.selectedIndexes()
|
||||||
for item in items:
|
for item in items:
|
||||||
bitem = self.AlertListWidget.item(item.row())
|
bitem = self.AlertListWidget.item(item.row())
|
||||||
self.AlertTextEdit.setText(bitem.text())
|
self.AlertTextEdit.setText(unicode(bitem.text()))
|
||||||
self.item_id = (bitem.data(QtCore.Qt.UserRole)).toInt()[0]
|
self.item_id = (bitem.data(QtCore.Qt.UserRole)).toInt()[0]
|
||||||
|
# If the alert does not contain '<>' we clear the ParameterEdit field.
|
||||||
|
if unicode(self.AlertTextEdit.text()).find(u'<>') == -1:
|
||||||
|
self.ParameterEdit.setText(u'')
|
||||||
self.SaveButton.setEnabled(False)
|
self.SaveButton.setEnabled(False)
|
||||||
self.DeleteButton.setEnabled(True)
|
self.DeleteButton.setEnabled(True)
|
||||||
|
|
||||||
def triggerAlert(self, text):
|
def triggerAlert(self, text):
|
||||||
|
"""
|
||||||
|
Prepares the alert text for displaying.
|
||||||
|
|
||||||
|
``text``
|
||||||
|
The alert text (unicode).
|
||||||
|
"""
|
||||||
if text:
|
if text:
|
||||||
|
# We found '<>' in the alert text, but the ParameterEdit field is
|
||||||
|
# empty.
|
||||||
|
if text.find(u'<>') != -1 and not self.ParameterEdit.text() and \
|
||||||
|
QtGui.QMessageBox.question(self,
|
||||||
|
translate('AlertPlugin.AlertForm', 'No Parameter found'),
|
||||||
|
translate('AlertPlugin.AlertForm', 'You have not entered a '
|
||||||
|
'parameter to be replaced.\nDo you want to continue anyway?'),
|
||||||
|
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
|
||||||
|
QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.No:
|
||||||
|
self.ParameterEdit.setFocus()
|
||||||
|
return False
|
||||||
|
# The ParameterEdit field is not empty, but we have not found '<>'
|
||||||
|
# in the alert text.
|
||||||
|
elif text.find(u'<>') == -1 and self.ParameterEdit.text() and \
|
||||||
|
QtGui.QMessageBox.question(self,
|
||||||
|
translate('AlertPlugin.AlertForm', 'No Placeholder found'),
|
||||||
|
translate('AlertPlugin.AlertForm', 'The alert text does not'
|
||||||
|
' contain \'<>\'.\nDo want to continue anyway?'),
|
||||||
|
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
|
||||||
|
QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.No:
|
||||||
|
self.ParameterEdit.setFocus()
|
||||||
|
return False
|
||||||
text = text.replace(u'<>', unicode(self.ParameterEdit.text()))
|
text = text.replace(u'<>', unicode(self.ParameterEdit.text()))
|
||||||
self.parent.alertsmanager.displayAlert(text)
|
self.parent.alertsmanager.displayAlert(text)
|
||||||
return True
|
return True
|
||||||
|
@ -86,7 +86,7 @@ class AlertsManager(QtCore.QObject):
|
|||||||
text = self.alertList.pop(0)
|
text = self.alertList.pop(0)
|
||||||
alertTab = self.parent.alertsTab
|
alertTab = self.parent.alertsTab
|
||||||
self.parent.liveController.display.alert(text)
|
self.parent.liveController.display.alert(text)
|
||||||
# check to see if we have a timer running
|
# Check to see if we have a timer running.
|
||||||
if self.timer_id == 0:
|
if self.timer_id == 0:
|
||||||
self.timer_id = self.startTimer(int(alertTab.timeout) * 1000)
|
self.timer_id = self.startTimer(int(alertTab.timeout) * 1000)
|
||||||
|
|
||||||
@ -94,9 +94,9 @@ class AlertsManager(QtCore.QObject):
|
|||||||
"""
|
"""
|
||||||
Time has finished so if our time then request the next Alert
|
Time has finished so if our time then request the next Alert
|
||||||
if there is one and reset the timer.
|
if there is one and reset the timer.
|
||||||
|
|
||||||
``event``
|
``event``
|
||||||
the QT event that has been triggered.
|
the QT event that has been triggered.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
log.debug(u'timer event')
|
log.debug(u'timer event')
|
||||||
if event.timerId() == self.timer_id:
|
if event.timerId() == self.timer_id:
|
||||||
|
@ -43,10 +43,12 @@ class WebDownload(object):
|
|||||||
Unknown = -1
|
Unknown = -1
|
||||||
Crosswalk = 0
|
Crosswalk = 0
|
||||||
BibleGateway = 1
|
BibleGateway = 1
|
||||||
|
Bibleserver = 2
|
||||||
|
|
||||||
Names = {
|
Names = {
|
||||||
0: u'Crosswalk',
|
0: u'Crosswalk',
|
||||||
1: u'BibleGateway'
|
1: u'BibleGateway',
|
||||||
|
2: u'Bibleserver'
|
||||||
}
|
}
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
@ -77,6 +79,12 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
|
|||||||
QtGui.QWizard.__init__(self, parent)
|
QtGui.QWizard.__init__(self, parent)
|
||||||
self.setupUi(self)
|
self.setupUi(self)
|
||||||
self.registerFields()
|
self.registerFields()
|
||||||
|
if not BibleFormat.get_availability(BibleFormat.OpenLP1):
|
||||||
|
self.openlp1Page.setVisible(False)
|
||||||
|
self.openlp1LocationLabel.setVisible(False)
|
||||||
|
self.openlp1LocationEdit.setVisible(False)
|
||||||
|
self.openlp1FileButton.setVisible(False)
|
||||||
|
self.openlp1DisabledLabel.setVisible(True)
|
||||||
self.finishButton = self.button(QtGui.QWizard.FinishButton)
|
self.finishButton = self.button(QtGui.QWizard.FinishButton)
|
||||||
self.cancelButton = self.button(QtGui.QWizard.CancelButton)
|
self.cancelButton = self.button(QtGui.QWizard.CancelButton)
|
||||||
self.manager = manager
|
self.manager = manager
|
||||||
@ -102,9 +110,6 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
|
|||||||
QtCore.QObject.connect(self.openlp1FileButton,
|
QtCore.QObject.connect(self.openlp1FileButton,
|
||||||
QtCore.SIGNAL(u'clicked()'),
|
QtCore.SIGNAL(u'clicked()'),
|
||||||
self.onOpenlp1FileButtonClicked)
|
self.onOpenlp1FileButtonClicked)
|
||||||
QtCore.QObject.connect(self.cancelButton,
|
|
||||||
QtCore.SIGNAL(u'clicked(bool)'),
|
|
||||||
self.onCancelButtonClicked)
|
|
||||||
QtCore.QObject.connect(self,
|
QtCore.QObject.connect(self,
|
||||||
QtCore.SIGNAL(u'currentIdChanged(int)'),
|
QtCore.SIGNAL(u'currentIdChanged(int)'),
|
||||||
self.onCurrentIdChanged)
|
self.onCurrentIdChanged)
|
||||||
@ -123,7 +128,6 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
|
|||||||
log.debug('Import canceled by user.')
|
log.debug('Import canceled by user.')
|
||||||
if self.currentId() == 3:
|
if self.currentId() == 3:
|
||||||
Receiver.send_message(u'bibles_stop_import')
|
Receiver.send_message(u'bibles_stop_import')
|
||||||
else:
|
|
||||||
self.done(QtGui.QDialog.Rejected)
|
self.done(QtGui.QDialog.Rejected)
|
||||||
|
|
||||||
def validateCurrentPage(self):
|
def validateCurrentPage(self):
|
||||||
@ -230,8 +234,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
|
|||||||
The index of the combo box.
|
The index of the combo box.
|
||||||
"""
|
"""
|
||||||
self.bibleComboBox.clear()
|
self.bibleComboBox.clear()
|
||||||
bibles = [unicode(translate('BiblesPlugin.ImportWizardForm', bible)) for
|
bibles = self.web_bible_list[index].keys()
|
||||||
bible in self.web_bible_list[index].keys()]
|
|
||||||
bibles.sort()
|
bibles.sort()
|
||||||
for bible in bibles:
|
for bible in bibles:
|
||||||
self.bibleComboBox.addItem(bible)
|
self.bibleComboBox.addItem(bible)
|
||||||
@ -250,14 +253,16 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
|
|||||||
"""
|
"""
|
||||||
self.getFileName(
|
self.getFileName(
|
||||||
translate('BiblesPlugin.ImportWizardForm', 'Open Books CSV File'),
|
translate('BiblesPlugin.ImportWizardForm', 'Open Books CSV File'),
|
||||||
self.booksLocationEdit)
|
self.booksLocationEdit, u'%s (*.csv)'
|
||||||
|
% translate('BiblesPlugin.ImportWizardForm', 'CSV File'))
|
||||||
|
|
||||||
def onCsvVersesFileButtonClicked(self):
|
def onCsvVersesFileButtonClicked(self):
|
||||||
"""
|
"""
|
||||||
Show the file open dialog for the verses CSV file.
|
Show the file open dialog for the verses CSV file.
|
||||||
"""
|
"""
|
||||||
self.getFileName(translate('BiblesPlugin.ImportWizardForm',
|
self.getFileName(translate('BiblesPlugin.ImportWizardForm',
|
||||||
'Open Verses CSV File'), self.csvVerseLocationEdit)
|
'Open Verses CSV File'), self.csvVerseLocationEdit, u'%s (*.csv)'
|
||||||
|
% translate('BiblesPlugin.ImportWizardForm', 'CSV File'))
|
||||||
|
|
||||||
def onOpenSongBrowseButtonClicked(self):
|
def onOpenSongBrowseButtonClicked(self):
|
||||||
"""
|
"""
|
||||||
@ -273,7 +278,9 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
|
|||||||
"""
|
"""
|
||||||
self.getFileName(
|
self.getFileName(
|
||||||
translate('BiblesPlugin.ImportWizardForm',
|
translate('BiblesPlugin.ImportWizardForm',
|
||||||
'Open openlp.org 1.x Bible'), self.openlp1LocationEdit)
|
'Open openlp.org 1.x Bible'), self.openlp1LocationEdit,
|
||||||
|
u'%s (*.bible)' % translate('BiblesPlugin.ImportWizardForm',
|
||||||
|
'openlp.org 1.x bible'))
|
||||||
|
|
||||||
def onCurrentIdChanged(self, pageId):
|
def onCurrentIdChanged(self, pageId):
|
||||||
if pageId == 3:
|
if pageId == 3:
|
||||||
@ -336,31 +343,27 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
|
|||||||
"""
|
"""
|
||||||
Load the list of Crosswalk and BibleGateway bibles.
|
Load the list of Crosswalk and BibleGateway bibles.
|
||||||
"""
|
"""
|
||||||
# Load and store Crosswalk Bibles.
|
# Load Crosswalk Bibles.
|
||||||
filepath = AppLocation.get_directory(AppLocation.PluginsDir)
|
filepath = AppLocation.get_directory(AppLocation.PluginsDir)
|
||||||
filepath = os.path.join(filepath, u'bibles', u'resources')
|
filepath = os.path.join(filepath, u'bibles', u'resources')
|
||||||
books_file = None
|
books_file = None
|
||||||
try:
|
try:
|
||||||
self.web_bible_list[WebDownload.Crosswalk] = {}
|
self.web_bible_list[WebDownload.Crosswalk] = {}
|
||||||
books_file = open(
|
books_file = open(
|
||||||
os.path.join(filepath, u'crosswalkbooks.csv'), 'r')
|
os.path.join(filepath, u'crosswalkbooks.csv'), 'rb')
|
||||||
dialect = csv.Sniffer().sniff(books_file.read(1024))
|
dialect = csv.Sniffer().sniff(books_file.read(1024))
|
||||||
books_file.seek(0)
|
books_file.seek(0)
|
||||||
books_reader = csv.reader(books_file, dialect)
|
books_reader = csv.reader(books_file, dialect)
|
||||||
for line in books_reader:
|
for line in books_reader:
|
||||||
ver = line[0]
|
ver = unicode(line[0], u'utf-8')
|
||||||
name = line[1]
|
name = unicode(line[1], u'utf-8')
|
||||||
if not isinstance(ver, unicode):
|
|
||||||
ver = unicode(ver, u'utf8')
|
|
||||||
if not isinstance(name, unicode):
|
|
||||||
name = unicode(name, u'utf8')
|
|
||||||
self.web_bible_list[WebDownload.Crosswalk][ver] = name.strip()
|
self.web_bible_list[WebDownload.Crosswalk][ver] = name.strip()
|
||||||
except IOError:
|
except IOError:
|
||||||
log.exception(u'Crosswalk resources missing')
|
log.exception(u'Crosswalk resources missing')
|
||||||
finally:
|
finally:
|
||||||
if books_file:
|
if books_file:
|
||||||
books_file.close()
|
books_file.close()
|
||||||
# Load and store BibleGateway Bibles.
|
# Load BibleGateway Bibles.
|
||||||
books_file = None
|
books_file = None
|
||||||
try:
|
try:
|
||||||
self.web_bible_list[WebDownload.BibleGateway] = {}
|
self.web_bible_list[WebDownload.BibleGateway] = {}
|
||||||
@ -382,10 +385,50 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
|
|||||||
finally:
|
finally:
|
||||||
if books_file:
|
if books_file:
|
||||||
books_file.close()
|
books_file.close()
|
||||||
|
# Load and Bibleserver Bibles.
|
||||||
|
filepath = AppLocation.get_directory(AppLocation.PluginsDir)
|
||||||
|
filepath = os.path.join(filepath, u'bibles', u'resources')
|
||||||
|
books_file = None
|
||||||
|
try:
|
||||||
|
self.web_bible_list[WebDownload.Bibleserver] = {}
|
||||||
|
books_file = open(
|
||||||
|
os.path.join(filepath, u'bibleserver.csv'), 'rb')
|
||||||
|
dialect = csv.Sniffer().sniff(books_file.read(1024))
|
||||||
|
books_file.seek(0)
|
||||||
|
books_reader = csv.reader(books_file, dialect)
|
||||||
|
for line in books_reader:
|
||||||
|
ver = unicode(line[0], u'utf-8')
|
||||||
|
name = unicode(line[1], u'utf-8')
|
||||||
|
self.web_bible_list[WebDownload.Bibleserver][ver] = name.strip()
|
||||||
|
except IOError, UnicodeError:
|
||||||
|
log.exception(u'Bibleserver resources missing')
|
||||||
|
finally:
|
||||||
|
if books_file:
|
||||||
|
books_file.close()
|
||||||
|
|
||||||
def getFileName(self, title, editbox):
|
def getFileName(self, title, editbox, filters=u''):
|
||||||
|
"""
|
||||||
|
Opens a QFileDialog and saves the filename to the given editbox.
|
||||||
|
|
||||||
|
``title``
|
||||||
|
The title of the dialog (unicode).
|
||||||
|
|
||||||
|
``editbox``
|
||||||
|
A editbox (QLineEdit).
|
||||||
|
|
||||||
|
``filters``
|
||||||
|
The file extension filters. It should contain the file description as
|
||||||
|
well as the file extension. For example::
|
||||||
|
|
||||||
|
u'openlp.org 1.x bible (*.bible)'
|
||||||
|
"""
|
||||||
|
if filters:
|
||||||
|
filters += u';;'
|
||||||
|
filters += u'%s (*)' % translate('BiblesPlugin.ImportWizardForm',
|
||||||
|
'All Files')
|
||||||
filename = QtGui.QFileDialog.getOpenFileName(self, title,
|
filename = QtGui.QFileDialog.getOpenFileName(self, title,
|
||||||
SettingsManager.get_last_dir(self.bibleplugin.settingsSection, 1))
|
os.path.dirname(SettingsManager.get_last_dir(
|
||||||
|
self.bibleplugin.settingsSection, 1)), filters)
|
||||||
if filename:
|
if filename:
|
||||||
editbox.setText(filename)
|
editbox.setText(filename)
|
||||||
SettingsManager.set_last_dir(
|
SettingsManager.set_last_dir(
|
||||||
@ -455,6 +498,9 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
|
|||||||
elif download_location == WebDownload.BibleGateway:
|
elif download_location == WebDownload.BibleGateway:
|
||||||
bible = \
|
bible = \
|
||||||
self.web_bible_list[WebDownload.BibleGateway][bible_version]
|
self.web_bible_list[WebDownload.BibleGateway][bible_version]
|
||||||
|
elif download_location == WebDownload.Bibleserver:
|
||||||
|
bible = \
|
||||||
|
self.web_bible_list[WebDownload.Bibleserver][bible_version]
|
||||||
importer = self.manager.import_bible(
|
importer = self.manager.import_bible(
|
||||||
BibleFormat.WebDownload,
|
BibleFormat.WebDownload,
|
||||||
name=license_version,
|
name=license_version,
|
||||||
|
@ -208,6 +208,7 @@ class Ui_BibleImportWizard(object):
|
|||||||
self.locationComboBox.setObjectName(u'LocationComboBox')
|
self.locationComboBox.setObjectName(u'LocationComboBox')
|
||||||
self.locationComboBox.addItem(u'')
|
self.locationComboBox.addItem(u'')
|
||||||
self.locationComboBox.addItem(u'')
|
self.locationComboBox.addItem(u'')
|
||||||
|
self.locationComboBox.addItem(u'')
|
||||||
self.downloadOptionsLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
|
self.downloadOptionsLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
|
||||||
self.locationComboBox)
|
self.locationComboBox)
|
||||||
self.bibleLabel = QtGui.QLabel(self.downloadOptionsTab)
|
self.bibleLabel = QtGui.QLabel(self.downloadOptionsTab)
|
||||||
@ -279,6 +280,11 @@ class Ui_BibleImportWizard(object):
|
|||||||
self.openlp1LocationLayout.addWidget(self.openlp1FileButton)
|
self.openlp1LocationLayout.addWidget(self.openlp1FileButton)
|
||||||
self.openlp1Layout.setLayout(1, QtGui.QFormLayout.FieldRole,
|
self.openlp1Layout.setLayout(1, QtGui.QFormLayout.FieldRole,
|
||||||
self.openlp1LocationLayout)
|
self.openlp1LocationLayout)
|
||||||
|
self.openlp1DisabledLabel = QtGui.QLabel(self.openlp1Page)
|
||||||
|
self.openlp1DisabledLabel.setObjectName(u'openlp1DisabledLabel')
|
||||||
|
self.openlp1DisabledLabel.setVisible(False)
|
||||||
|
self.openlp1DisabledLabel.setWordWrap(True)
|
||||||
|
self.openlp1Layout.addWidget(self.openlp1DisabledLabel)
|
||||||
self.formatWidget.addWidget(self.openlp1Page)
|
self.formatWidget.addWidget(self.openlp1Page)
|
||||||
self.selectPageLayout.addWidget(self.formatWidget)
|
self.selectPageLayout.addWidget(self.formatWidget)
|
||||||
bibleImportWizard.addPage(self.selectPage)
|
bibleImportWizard.addPage(self.selectPage)
|
||||||
@ -383,6 +389,8 @@ class Ui_BibleImportWizard(object):
|
|||||||
translate('BiblesPlugin.ImportWizardForm', 'Crosswalk'))
|
translate('BiblesPlugin.ImportWizardForm', 'Crosswalk'))
|
||||||
self.locationComboBox.setItemText(1,
|
self.locationComboBox.setItemText(1,
|
||||||
translate('BiblesPlugin.ImportWizardForm', 'BibleGateway'))
|
translate('BiblesPlugin.ImportWizardForm', 'BibleGateway'))
|
||||||
|
self.locationComboBox.setItemText(2,
|
||||||
|
translate('BiblesPlugin.ImportWizardForm', 'Bibleserver'))
|
||||||
self.bibleLabel.setText(
|
self.bibleLabel.setText(
|
||||||
translate('BiblesPlugin.ImportWizardForm', 'Bible:'))
|
translate('BiblesPlugin.ImportWizardForm', 'Bible:'))
|
||||||
self.webDownloadTabWidget.setTabText(
|
self.webDownloadTabWidget.setTabText(
|
||||||
@ -417,3 +425,8 @@ class Ui_BibleImportWizard(object):
|
|||||||
self.importProgressLabel.setText(
|
self.importProgressLabel.setText(
|
||||||
translate('BiblesPlugin.ImportWizardForm', 'Ready.'))
|
translate('BiblesPlugin.ImportWizardForm', 'Ready.'))
|
||||||
self.importProgressBar.setFormat(u'%p%')
|
self.importProgressBar.setFormat(u'%p%')
|
||||||
|
self.openlp1DisabledLabel.setText(
|
||||||
|
translate('BiblesPlugin.ImportWizardForm', 'The openlp.org 1.x '
|
||||||
|
'importer has been disabled due to a missing Python module. If '
|
||||||
|
'you want to use this importer, you will need to install the '
|
||||||
|
'"python-sqlite" module.'))
|
||||||
|
@ -32,134 +32,164 @@ import re
|
|||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
BIBLE_REFERENCE = re.compile(
|
def get_reference_match(match_type):
|
||||||
r'^([\w ]+?) *([0-9]+)' # Initial book and chapter
|
local_separator = unicode(u':;;\s*[:vV]\s*;;-;;\s*-\s*;;,;;\s*,\s*;;end'
|
||||||
r'(?: *[:|v|V] *([0-9]+))?' # Verse for first chapter
|
).split(u';;') # English
|
||||||
r'(?: *- *([0-9]+|end$))?' # Range for verses or chapters
|
# local_separator = unicode(u',;;\s*,\s*;;-;;\s*-\s*;;.;;\.;;[Ee]nde'
|
||||||
r'(?:(?:,([0-9]+))?' # Second chapter
|
# ).split(u';;') # German
|
||||||
r' *[,|:|v|V] *([0-9]+|end$)' # More range for verses or chapters
|
separators = {
|
||||||
r'(?: *- *([0-9]+|end$))?)?$', # End of second verse range
|
u'sep_v_display': local_separator[0], u'sep_v': local_separator[1],
|
||||||
re.UNICODE)
|
u'sep_r_display': local_separator[2], u'sep_r': local_separator[3],
|
||||||
|
u'sep_l_display': local_separator[4], u'sep_l': local_separator[5],
|
||||||
|
u'sep_e': local_separator[6]}
|
||||||
|
|
||||||
def check_end(match_group):
|
# verse range match: (<chapter>:)?<verse>(-((<chapter>:)?<verse>|end)?)?
|
||||||
"""
|
range_string = str(r'(?:(?P<from_chapter>[0-9]+)%(sep_v)s)?(?P<from_verse>'
|
||||||
Check if a regular expression match group contains the text u'end' or
|
r'[0-9]+)(?P<range_to>%(sep_r)s(?:(?:(?P<to_chapter>[0-9]+)%(sep_v)s)?'
|
||||||
should be converted to an int.
|
r'(?P<to_verse>[0-9]+)|%(sep_e)s)?)?') % separators
|
||||||
|
if match_type == u'range':
|
||||||
``match_group``
|
return re.compile(r'^\s*' + range_string + r'\s*$', re.UNICODE)
|
||||||
The match group to check.
|
elif match_type == u'range_separator':
|
||||||
"""
|
return re.compile(separators[u'sep_l'])
|
||||||
if match_group == u'end':
|
elif match_type == u'full':
|
||||||
return -1
|
# full reference match: <book>(<range>(,|(?=$)))+
|
||||||
|
return re.compile(str(r'^\s*(?!\s)(?P<book>[\d]*[^\d]+)(?<!\s)\s*'
|
||||||
|
r'(?P<ranges>(?:' + range_string + r'(?:%(sep_l)s|(?=\s*$)))+)\s*$')
|
||||||
|
% separators, re.UNICODE)
|
||||||
else:
|
else:
|
||||||
return int(match_group)
|
return separators[match_type]
|
||||||
|
|
||||||
def parse_reference(reference):
|
def parse_reference(reference):
|
||||||
"""
|
"""
|
||||||
This is the über-awesome function that takes a person's typed in string
|
This is the next generation über-awesome function that takes a person's
|
||||||
and converts it to a reference list, a list of references to be queried
|
typed in string and converts it to a reference list, a list of references to
|
||||||
from the Bible database files.
|
be queried from the Bible database files.
|
||||||
|
|
||||||
The ``BIBLE_REFERENCE`` constant regular expression produces the following
|
This is a user manual like description, how the references are working.
|
||||||
match groups:
|
|
||||||
|
|
||||||
0. (match string)
|
- Each reference starts with the book name. A chapter name is manditory.
|
||||||
This is a special group consisting of the whole string that matched.
|
``John 3`` refers to Gospel of John chapter 3
|
||||||
1. ``[\w ]+``
|
- A reference range can be given after a range separator.
|
||||||
The book the reference is from.
|
``John 3-5`` refers to John chapters 3 to 5
|
||||||
2. ``[0-9]+``
|
- Single verses can be addressed after a verse separator
|
||||||
The first (or only) chapter in the reference.
|
``John 3:16`` refers to John chapter 3 verse 16
|
||||||
3. ``None`` or ``[0-9]+``
|
``John 3:16-4:3`` refers to John chapter 3 verse 16 to chapter 4 verse 3
|
||||||
``None``, or the only verse, or the first verse in a verse range or,
|
- After a verse reference all further single values are treat as verse in
|
||||||
the start verse in a chapter range.
|
the last selected chapter.
|
||||||
4. ``None`` or ``[0-9]+`` or ``end``
|
``John 3:16-18`` refers to John chapter 3 verses 16 to 18
|
||||||
``None``, or the end verse of the first verse range, or the end chapter
|
- After a list separator it is possible to refer to additional verses. They
|
||||||
of a chapter range.
|
are build analog to the first ones. This way it is possible to define each
|
||||||
5. ``None`` or ``[0-9]+``
|
number of verse references. It is not possible to refer to verses in
|
||||||
``None``, or the second chapter in multiple (non-ranged) chapters.
|
additional books.
|
||||||
6. ``None`` or ``[0-9]+`` or ``end``
|
``John 3:16,18`` refers to John chapter 3 verses 16 and 18
|
||||||
``None``, the start of the second verse range. or the end of a chapter
|
``John 3:16-18,20`` refers to John chapter 3 verses 16 to 18 and 20
|
||||||
range.
|
``John 3:16-18,4:1`` refers to John chapter 3 verses 16 to 18 and
|
||||||
7. ``None`` or ``[0-9]+`` or ``end``
|
chapter 3 verse 1
|
||||||
``None``, or the end of the second verse range.
|
- If there is a range separator without further verse declaration the last
|
||||||
|
refered chapter is addressed until the end.
|
||||||
|
|
||||||
|
``range_string`` is a regular expression which matches for verse range
|
||||||
|
declarations:
|
||||||
|
|
||||||
|
1. ``(?:(?P<from_chapter>[0-9]+)%(sep_v)s)?'
|
||||||
|
It starts with a optional chapter reference ``from_chapter`` followed by
|
||||||
|
a verse separator.
|
||||||
|
2. ``(?P<from_verse>[0-9]+)``
|
||||||
|
The verse reference ``from_verse`` is manditory
|
||||||
|
3. ``(?P<range_to>%(sep_r)s(?:`` ... ``|%(sep_e)s)?)?``
|
||||||
|
A ``range_to`` declaration is optional. It starts with a range separator
|
||||||
|
and contains optional a chapter and verse declaration or a end
|
||||||
|
separator.
|
||||||
|
4. ``(?:(?P<to_chapter>[0-9]+)%(sep_v)s)?``
|
||||||
|
The ``to_chapter`` reference with separator is equivalent to group 1.
|
||||||
|
5. ``(?P<to_verse>[0-9]+)``
|
||||||
|
The ``to_verse`` reference is equivalent to group 2.
|
||||||
|
|
||||||
|
The full reference is matched against get_reference_match(u'full'). This
|
||||||
|
regular expression looks like this:
|
||||||
|
|
||||||
|
1. ``^\s*(?!\s)(?P<book>[\d]*[^\d]+)(?<!\s)\s*``
|
||||||
|
The ``book`` group starts with the first non-whitespace character. There
|
||||||
|
are optional leading digits followed by non-digits. The group ends
|
||||||
|
before the whitspace in front of the next digit.
|
||||||
|
2. ``(?P<ranges>(?:`` + range_string + ``(?:%(sep_l)s|(?=\s*$)))+)\s*$``
|
||||||
|
The second group contains all ``ranges``. This can be multiple
|
||||||
|
declarations of a range_string separated by a list separator.
|
||||||
|
|
||||||
The reference list is a list of tuples, with each tuple structured like
|
The reference list is a list of tuples, with each tuple structured like
|
||||||
this::
|
this::
|
||||||
|
|
||||||
(book, chapter, start_verse, end_verse)
|
(book, chapter, from_verse, to_verse)
|
||||||
|
|
||||||
``reference``
|
``reference``
|
||||||
The bible reference to parse.
|
The bible reference to parse.
|
||||||
|
|
||||||
Returns None or a reference list.
|
Returns None or a reference list.
|
||||||
"""
|
"""
|
||||||
reference = reference.strip()
|
|
||||||
log.debug('parse_reference("%s")', reference)
|
log.debug('parse_reference("%s")', reference)
|
||||||
unified_ref_list = []
|
match = get_reference_match(u'full').match(reference)
|
||||||
match = BIBLE_REFERENCE.match(reference)
|
|
||||||
if match:
|
if match:
|
||||||
log.debug(u'Matched reference %s' % reference)
|
log.debug(u'Matched reference %s' % reference)
|
||||||
book = match.group(1)
|
book = match.group(u'book')
|
||||||
chapter = int(match.group(2))
|
ranges = match.group(u'ranges')
|
||||||
if match.group(7):
|
range_list = get_reference_match(u'range_separator').split(ranges)
|
||||||
# Two verse ranges
|
ref_list = []
|
||||||
vr1_start = int(match.group(3))
|
chapter = None
|
||||||
vr1_end = int(match.group(4))
|
for this_range in range_list:
|
||||||
unified_ref_list.append((book, chapter, vr1_start, vr1_end))
|
range_match = get_reference_match(u'range').match(this_range)
|
||||||
vr2_start = int(match.group(6))
|
from_chapter = range_match.group(u'from_chapter')
|
||||||
vr2_end = check_end(match.group(7))
|
from_verse = range_match.group(u'from_verse')
|
||||||
if match.group(5):
|
has_range = range_match.group(u'range_to')
|
||||||
# One verse range per chapter
|
to_chapter = range_match.group(u'to_chapter')
|
||||||
chapter2 = int(match.group(5))
|
to_verse = range_match.group(u'to_verse')
|
||||||
unified_ref_list.append((book, chapter2, vr2_start, vr2_end))
|
if from_chapter:
|
||||||
|
from_chapter = int(from_chapter)
|
||||||
|
if from_verse:
|
||||||
|
from_verse = int(from_verse)
|
||||||
|
if to_chapter:
|
||||||
|
to_chapter = int(to_chapter)
|
||||||
|
if to_verse:
|
||||||
|
to_verse = int(to_verse)
|
||||||
|
# Fill chapter fields with reasonable values.
|
||||||
|
if from_chapter:
|
||||||
|
chapter = from_chapter
|
||||||
|
elif chapter:
|
||||||
|
from_chapter = chapter
|
||||||
else:
|
else:
|
||||||
unified_ref_list.append((book, chapter, vr2_start, vr2_end))
|
from_chapter = from_verse
|
||||||
elif match.group(6):
|
from_verse = None
|
||||||
# Chapter range with verses
|
if to_chapter:
|
||||||
if match.group(3):
|
if to_chapter < from_chapter:
|
||||||
vr1_start = int(match.group(3))
|
continue
|
||||||
else:
|
else:
|
||||||
vr1_start = 1
|
chapter = to_chapter
|
||||||
if match.group(2) == match.group(4):
|
elif to_verse:
|
||||||
vr1_end = int(match.group(6))
|
if chapter:
|
||||||
unified_ref_list.append((book, chapter, vr1_start, vr1_end))
|
to_chapter = chapter
|
||||||
else:
|
else:
|
||||||
vr1_end = -1
|
to_chapter = to_verse
|
||||||
unified_ref_list.append((book, chapter, vr1_start, vr1_end))
|
to_verse = None
|
||||||
vr2_end = check_end(match.group(6))
|
# Append references to the list
|
||||||
if int(match.group(4)) > chapter:
|
if has_range:
|
||||||
for i in range(chapter + 1, int(match.group(4)) + 1):
|
if not from_verse:
|
||||||
if i == int(match.group(4)):
|
from_verse = 1
|
||||||
unified_ref_list.append((book, i, 1, vr2_end))
|
if not to_verse:
|
||||||
|
to_verse = -1
|
||||||
|
if to_chapter > from_chapter:
|
||||||
|
ref_list.append((book, from_chapter, from_verse, -1))
|
||||||
|
for i in range(from_chapter + 1, to_chapter - 1):
|
||||||
|
ref_list.append((book, i, 1, -1))
|
||||||
|
ref_list.append((book, to_chapter, 1, to_verse))
|
||||||
|
elif to_verse >= from_verse or to_verse == -1:
|
||||||
|
ref_list.append((book, from_chapter, from_verse, to_verse))
|
||||||
|
elif from_verse:
|
||||||
|
ref_list.append((book, from_chapter, from_verse, from_verse))
|
||||||
else:
|
else:
|
||||||
unified_ref_list.append((book, i, 1, -1))
|
ref_list.append((book, from_chapter, 1, -1))
|
||||||
elif match.group(4):
|
return ref_list
|
||||||
# Chapter range or chapter and verse range
|
|
||||||
if match.group(3):
|
|
||||||
vr1_start = int(match.group(3))
|
|
||||||
vr1_end = check_end(match.group(4))
|
|
||||||
if vr1_end == -1 or vr1_end > vr1_start:
|
|
||||||
unified_ref_list.append((book, chapter, vr1_start, vr1_end))
|
|
||||||
else:
|
|
||||||
log.debug(u'Ambiguous reference: %s' % reference)
|
|
||||||
return None
|
|
||||||
elif match.group(4) != u'end':
|
|
||||||
for i in range(chapter, int(match.group(4)) + 1):
|
|
||||||
unified_ref_list.append((book, i, 1, -1))
|
|
||||||
else:
|
|
||||||
log.debug(u'Unsupported reference: %s' % reference)
|
|
||||||
return None
|
|
||||||
elif match.group(3):
|
|
||||||
# Single chapter and verse
|
|
||||||
verse = int(match.group(3))
|
|
||||||
unified_ref_list.append((book, chapter, verse, verse))
|
|
||||||
else:
|
|
||||||
# Single chapter
|
|
||||||
unified_ref_list.append((book, chapter, -1, -1))
|
|
||||||
else:
|
else:
|
||||||
log.debug(u'Invalid reference: %s' % reference)
|
log.debug(u'Invalid reference: %s' % reference)
|
||||||
return None
|
return None
|
||||||
return unified_ref_list
|
|
||||||
|
|
||||||
|
|
||||||
class SearchResults(object):
|
class SearchResults(object):
|
||||||
|
@ -240,6 +240,66 @@ class BGExtract(object):
|
|||||||
return SearchResults(bookname, chapter, verse_list)
|
return SearchResults(bookname, chapter, verse_list)
|
||||||
|
|
||||||
|
|
||||||
|
class BSExtract(object):
|
||||||
|
"""
|
||||||
|
Extract verses from Bibleserver.com
|
||||||
|
"""
|
||||||
|
def __init__(self, proxyurl=None):
|
||||||
|
log.debug(u'init %s', proxyurl)
|
||||||
|
self.proxyurl = proxyurl
|
||||||
|
|
||||||
|
def get_bible_chapter(self, version, bookname, chapter):
|
||||||
|
"""
|
||||||
|
Access and decode bibles via Bibleserver mobile website
|
||||||
|
|
||||||
|
``version``
|
||||||
|
The version of the bible like NIV for New International Version
|
||||||
|
|
||||||
|
``bookname``
|
||||||
|
Text name of bible book e.g. Genesis, 1. John, 1John or Offenbarung
|
||||||
|
|
||||||
|
``chapter``
|
||||||
|
Chapter number
|
||||||
|
"""
|
||||||
|
log.debug(u'get_bible_chapter %s,%s,%s', version, bookname, chapter)
|
||||||
|
chapter_url = u'http://m.bibleserver.com/text/%s/%s%s' % \
|
||||||
|
(version, bookname, chapter)
|
||||||
|
|
||||||
|
log.debug(u'URL: %s', chapter_url)
|
||||||
|
page = None
|
||||||
|
try:
|
||||||
|
page = urllib2.urlopen(chapter_url)
|
||||||
|
Receiver.send_message(u'openlp_process_events')
|
||||||
|
except urllib2.URLError:
|
||||||
|
log.exception(u'The web bible page could not be downloaded.')
|
||||||
|
finally:
|
||||||
|
if not page:
|
||||||
|
return None
|
||||||
|
soup = None
|
||||||
|
try:
|
||||||
|
soup = BeautifulSoup(page)
|
||||||
|
except HTMLParseError:
|
||||||
|
log.exception(u'BeautifulSoup could not parse the bible page.')
|
||||||
|
finally:
|
||||||
|
if not soup:
|
||||||
|
return None
|
||||||
|
Receiver.send_message(u'openlp_process_events')
|
||||||
|
try:
|
||||||
|
content = soup.find(u'div', u'content').find(u'div').findAll(u'div')
|
||||||
|
except:
|
||||||
|
log.exception(u'No verses found.')
|
||||||
|
finally:
|
||||||
|
if not content:
|
||||||
|
return None
|
||||||
|
verse_number = re.compile(r'v(\d{2})(\d{3})(\d{3}) verse')
|
||||||
|
verses = {}
|
||||||
|
for verse in content:
|
||||||
|
Receiver.send_message(u'openlp_process_events')
|
||||||
|
versenumber = int(verse_number.sub(r'\3', verse[u'class']))
|
||||||
|
verses[versenumber] = verse.contents[1].rstrip(u'\n')
|
||||||
|
return SearchResults(bookname, chapter, verses)
|
||||||
|
|
||||||
|
|
||||||
class CWExtract(object):
|
class CWExtract(object):
|
||||||
"""
|
"""
|
||||||
Extract verses from CrossWalk/BibleStudyTools
|
Extract verses from CrossWalk/BibleStudyTools
|
||||||
@ -350,7 +410,7 @@ class HTTPBible(BibleDB):
|
|||||||
Run the import. This method overrides the parent class method. Returns
|
Run the import. This method overrides the parent class method. Returns
|
||||||
``True`` on success, ``False`` on failure.
|
``True`` on success, ``False`` on failure.
|
||||||
"""
|
"""
|
||||||
self.wizard.ImportProgressBar.setMaximum(2)
|
self.wizard.importProgressBar.setMaximum(2)
|
||||||
self.wizard.incrementProgressBar('Registering bible...')
|
self.wizard.incrementProgressBar('Registering bible...')
|
||||||
self.create_meta(u'download source', self.download_source)
|
self.create_meta(u'download source', self.download_source)
|
||||||
self.create_meta(u'download name', self.download_name)
|
self.create_meta(u'download name', self.download_name)
|
||||||
@ -426,8 +486,10 @@ class HTTPBible(BibleDB):
|
|||||||
log.debug(u'source = %s', self.download_source)
|
log.debug(u'source = %s', self.download_source)
|
||||||
if self.download_source.lower() == u'crosswalk':
|
if self.download_source.lower() == u'crosswalk':
|
||||||
ev = CWExtract(self.proxy_server)
|
ev = CWExtract(self.proxy_server)
|
||||||
else:
|
elif self.download_source.lower() == u'biblegateway':
|
||||||
ev = BGExtract(self.proxy_server)
|
ev = BGExtract(self.proxy_server)
|
||||||
|
elif self.download_source.lower() == u'bibleserver':
|
||||||
|
ev = BSExtract(self.proxy_server)
|
||||||
return ev.get_bible_chapter(self.download_name, book, chapter)
|
return ev.get_bible_chapter(self.download_name, book, chapter)
|
||||||
|
|
||||||
def get_books(self):
|
def get_books(self):
|
||||||
|
@ -35,9 +35,14 @@ from openlp.plugins.bibles.lib.db import BibleDB, BibleMeta
|
|||||||
|
|
||||||
from csvbible import CSVBible
|
from csvbible import CSVBible
|
||||||
from http import HTTPBible
|
from http import HTTPBible
|
||||||
from openlp1 import OpenLP1Bible
|
|
||||||
from opensong import OpenSongBible
|
from opensong import OpenSongBible
|
||||||
from osis import OSISBible
|
from osis import OSISBible
|
||||||
|
# Imports that might fail.
|
||||||
|
try:
|
||||||
|
from openlp1 import OpenLP1Bible
|
||||||
|
has_openlp1 = True
|
||||||
|
except ImportError:
|
||||||
|
has_openlp1 = False
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
@ -57,6 +62,7 @@ class BibleFormat(object):
|
|||||||
plus a few helper functions to facilitate generic handling of Bible types
|
plus a few helper functions to facilitate generic handling of Bible types
|
||||||
for importing.
|
for importing.
|
||||||
"""
|
"""
|
||||||
|
_format_availability = {}
|
||||||
Unknown = -1
|
Unknown = -1
|
||||||
OSIS = 0
|
OSIS = 0
|
||||||
CSV = 1
|
CSV = 1
|
||||||
@ -98,6 +104,14 @@ class BibleFormat(object):
|
|||||||
BibleFormat.OpenLP1
|
BibleFormat.OpenLP1
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def set_availability(format, available):
|
||||||
|
BibleFormat._format_availability[format] = available
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def get_availability(format):
|
||||||
|
return BibleFormat._format_availability.get(format, True)
|
||||||
|
|
||||||
|
|
||||||
class BibleManager(object):
|
class BibleManager(object):
|
||||||
"""
|
"""
|
||||||
@ -298,7 +312,7 @@ class BibleManager(object):
|
|||||||
'Scripture Reference Error'),
|
'Scripture Reference Error'),
|
||||||
translate('BiblesPlugin.BibleManager', 'You did not enter a '
|
translate('BiblesPlugin.BibleManager', 'You did not enter a '
|
||||||
'search keyword.\nYou can separate different keywords by a '
|
'search keyword.\nYou can separate different keywords by a '
|
||||||
'space to search for all of your keywords and you can seperate '
|
'space to search for all of your keywords and you can separate '
|
||||||
'them by a comma to search for one of them.'))
|
'them by a comma to search for one of them.'))
|
||||||
return None
|
return None
|
||||||
|
|
||||||
@ -339,3 +353,8 @@ class BibleManager(object):
|
|||||||
"""
|
"""
|
||||||
for bible in self.db_cache:
|
for bible in self.db_cache:
|
||||||
self.db_cache[bible].finalise()
|
self.db_cache[bible].finalise()
|
||||||
|
|
||||||
|
BibleFormat.set_availability(BibleFormat.OpenLP1, has_openlp1)
|
||||||
|
|
||||||
|
__all__ = [u'BibleFormat']
|
||||||
|
|
||||||
|
@ -32,6 +32,7 @@ from PyQt4 import QtCore, QtGui
|
|||||||
from openlp.core.lib import MediaManagerItem, Receiver, BaseListWithDnD, \
|
from openlp.core.lib import MediaManagerItem, Receiver, BaseListWithDnD, \
|
||||||
ItemCapabilities, translate
|
ItemCapabilities, translate
|
||||||
from openlp.plugins.bibles.forms import BibleImportForm
|
from openlp.plugins.bibles.forms import BibleImportForm
|
||||||
|
from openlp.plugins.bibles.lib import get_reference_match
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
@ -72,7 +73,7 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
self.hasNewIcon = False
|
self.hasNewIcon = False
|
||||||
self.hasEditIcon = False
|
self.hasEditIcon = False
|
||||||
self.hasDeleteIcon = False
|
self.hasDeleteIcon = False
|
||||||
self.addToServiceItem = True
|
self.addToServiceItem = False
|
||||||
|
|
||||||
def addEndHeaderBar(self):
|
def addEndHeaderBar(self):
|
||||||
self.SearchTabWidget = QtGui.QTabWidget(self)
|
self.SearchTabWidget = QtGui.QTabWidget(self)
|
||||||
@ -553,12 +554,15 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
bible = unicode(self.AdvancedVersionComboBox.currentText())
|
bible = unicode(self.AdvancedVersionComboBox.currentText())
|
||||||
second_bible = unicode(self.AdvancedSecondBibleComboBox.currentText())
|
second_bible = unicode(self.AdvancedSecondBibleComboBox.currentText())
|
||||||
book = unicode(self.AdvancedBookComboBox.currentText())
|
book = unicode(self.AdvancedBookComboBox.currentText())
|
||||||
chapter_from = int(self.AdvancedFromChapter.currentText())
|
chapter_from = self.AdvancedFromChapter.currentText()
|
||||||
chapter_to = int(self.AdvancedToChapter.currentText())
|
chapter_to = self.AdvancedToChapter.currentText()
|
||||||
verse_from = int(self.AdvancedFromVerse.currentText())
|
verse_from = self.AdvancedFromVerse.currentText()
|
||||||
verse_to = int(self.AdvancedToVerse.currentText())
|
verse_to = self.AdvancedToVerse.currentText()
|
||||||
versetext = u'%s %s:%s-%s:%s' % (book, chapter_from, verse_from,
|
verse_separator = get_reference_match(u'sep_v_display')
|
||||||
chapter_to, verse_to)
|
range_separator = get_reference_match(u'sep_r_display')
|
||||||
|
verse_range = chapter_from + verse_separator + verse_from + \
|
||||||
|
range_separator + chapter_to + verse_separator + verse_to
|
||||||
|
versetext = u'%s %s' % (book, verse_range)
|
||||||
self.search_results = self.parent.manager.get_verses(bible, versetext)
|
self.search_results = self.parent.manager.get_verses(bible, versetext)
|
||||||
if second_bible:
|
if second_bible:
|
||||||
self.second_search_results = self.parent.manager.get_verses(
|
self.second_search_results = self.parent.manager.get_verses(
|
||||||
@ -709,7 +713,7 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
obj = reference[QtCore.QString(key)]
|
obj = reference[QtCore.QString(key)]
|
||||||
if isinstance(obj, QtCore.QVariant):
|
if isinstance(obj, QtCore.QVariant):
|
||||||
obj = obj.toPyObject()
|
obj = obj.toPyObject()
|
||||||
return unicode(obj)
|
return unicode(obj).strip()
|
||||||
|
|
||||||
def generateSlideData(self, service_item, item=None, xmlVersion=False):
|
def generateSlideData(self, service_item, item=None, xmlVersion=False):
|
||||||
"""
|
"""
|
||||||
@ -739,7 +743,8 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
second_bible = self._decodeQtObject(bitem, 'second_bible')
|
second_bible = self._decodeQtObject(bitem, 'second_bible')
|
||||||
second_version = self._decodeQtObject(bitem, 'second_version')
|
second_version = self._decodeQtObject(bitem, 'second_version')
|
||||||
second_copyright = self._decodeQtObject(bitem, 'second_copyright')
|
second_copyright = self._decodeQtObject(bitem, 'second_copyright')
|
||||||
second_permissions = self._decodeQtObject(bitem, 'second_permissions')
|
second_permissions = \
|
||||||
|
self._decodeQtObject(bitem, 'second_permissions')
|
||||||
second_text = self._decodeQtObject(bitem, 'second_text')
|
second_text = self._decodeQtObject(bitem, 'second_text')
|
||||||
verse_text = self.formatVerse(old_chapter, chapter, verse)
|
verse_text = self.formatVerse(old_chapter, chapter, verse)
|
||||||
footer = u'%s (%s %s %s)' % (book, version, copyright, permissions)
|
footer = u'%s (%s %s %s)' % (book, version, copyright, permissions)
|
||||||
@ -750,21 +755,21 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
second_copyright, second_permissions)
|
second_copyright, second_permissions)
|
||||||
if footer not in raw_footer:
|
if footer not in raw_footer:
|
||||||
raw_footer.append(footer)
|
raw_footer.append(footer)
|
||||||
bible_text = u'%s %s\n\n%s %s' % (verse_text, text, verse_text,
|
bible_text = u'%s\u00a0%s\n\n%s\u00a0%s' % (verse_text, text,
|
||||||
second_text)
|
verse_text, second_text)
|
||||||
raw_slides.append(bible_text)
|
raw_slides.append(bible_text)
|
||||||
bible_text = u''
|
bible_text = u''
|
||||||
# If we are 'Verse Per Slide' then create a new slide.
|
# If we are 'Verse Per Slide' then create a new slide.
|
||||||
elif self.parent.settings_tab.layout_style == 0:
|
elif self.parent.settings_tab.layout_style == 0:
|
||||||
bible_text = u'%s %s' % (verse_text, text)
|
bible_text = u'%s\u00a0%s' % (verse_text, text)
|
||||||
raw_slides.append(bible_text)
|
raw_slides.append(bible_text)
|
||||||
bible_text = u''
|
bible_text = u''
|
||||||
# If we are 'Verse Per Line' then force a new line.
|
# If we are 'Verse Per Line' then force a new line.
|
||||||
elif self.parent.settings_tab.layout_style == 1:
|
elif self.parent.settings_tab.layout_style == 1:
|
||||||
bible_text = u'%s %s %s\n' % (bible_text, verse_text, text)
|
bible_text = u'%s %s\u00a0%s\n' % (bible_text, verse_text, text)
|
||||||
# We have to be 'Continuous'.
|
# We have to be 'Continuous'.
|
||||||
else:
|
else:
|
||||||
bible_text = u'%s %s %s\n' % (bible_text, verse_text, text)
|
bible_text = u'%s %s\u00a0%s\n' % (bible_text, verse_text, text)
|
||||||
if first_item:
|
if first_item:
|
||||||
start_item = item
|
start_item = item
|
||||||
first_item = False
|
first_item = False
|
||||||
@ -816,36 +821,31 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
``old_item``
|
``old_item``
|
||||||
The last item of a range.
|
The last item of a range.
|
||||||
"""
|
"""
|
||||||
|
verse_separator = get_reference_match(u'sep_v_display')
|
||||||
|
range_separator = get_reference_match(u'sep_r_display')
|
||||||
old_bitem = self.listView.item(old_item.row())
|
old_bitem = self.listView.item(old_item.row())
|
||||||
old_chapter = int(self._decodeQtObject(old_bitem, 'chapter'))
|
old_chapter = self._decodeQtObject(old_bitem, 'chapter')
|
||||||
old_verse = int(self._decodeQtObject(old_bitem, 'verse'))
|
old_verse = self._decodeQtObject(old_bitem, 'verse')
|
||||||
start_bitem = self.listView.item(start_item.row())
|
start_bitem = self.listView.item(start_item.row())
|
||||||
start_book = self._decodeQtObject(start_bitem, 'book')
|
start_book = self._decodeQtObject(start_bitem, 'book')
|
||||||
start_chapter = int(self._decodeQtObject(start_bitem, 'chapter'))
|
start_chapter = self._decodeQtObject(start_bitem, 'chapter')
|
||||||
start_verse = int(self._decodeQtObject(start_bitem, 'verse'))
|
start_verse = self._decodeQtObject(start_bitem, 'verse')
|
||||||
start_bible = self._decodeQtObject(start_bitem, 'bible')
|
start_bible = self._decodeQtObject(start_bitem, 'bible')
|
||||||
start_second_bible = self._decodeQtObject(start_bitem, 'second_bible')
|
start_second_bible = self._decodeQtObject(start_bitem, 'second_bible')
|
||||||
if start_second_bible:
|
if start_second_bible:
|
||||||
if start_verse == old_verse and start_chapter == old_chapter:
|
bibles = u'%s, %s' % (start_bible, start_second_bible)
|
||||||
title = u'%s %s:%s (%s, %s)' % (start_book, start_chapter,
|
|
||||||
start_verse, start_bible, start_second_bible)
|
|
||||||
elif start_chapter == old_chapter:
|
|
||||||
title = u'%s %s:%s-%s (%s, %s)' % (start_book, start_chapter,
|
|
||||||
start_verse, old_verse, start_bible, start_second_bible)
|
|
||||||
else:
|
else:
|
||||||
title = u'%s %s:%s-%s:%s (%s, %s)' % (start_book, start_chapter,
|
bibles = start_bible
|
||||||
start_verse, old_chapter, old_verse, start_bible,
|
if start_chapter == old_chapter:
|
||||||
start_second_bible)
|
if start_verse == old_verse:
|
||||||
|
verse_range = start_chapter + verse_separator + start_verse
|
||||||
else:
|
else:
|
||||||
if start_verse == old_verse and start_chapter == old_chapter:
|
verse_range = start_chapter + verse_separator + start_verse + \
|
||||||
title = u'%s %s:%s (%s)' % (start_book, start_chapter,
|
range_separator + old_verse
|
||||||
start_verse, start_bible)
|
|
||||||
elif start_chapter == old_chapter:
|
|
||||||
title = u'%s %s:%s-%s (%s)' % (start_book, start_chapter,
|
|
||||||
start_verse, old_verse, start_bible)
|
|
||||||
else:
|
else:
|
||||||
title = u'%s %s:%s-%s:%s (%s)' % (start_book, start_chapter,
|
verse_range = start_chapter + verse_separator + start_verse + \
|
||||||
start_verse, old_chapter, old_verse, start_bible)
|
range_separator + old_chapter + verse_separator + old_verse
|
||||||
|
title = u'%s %s (%s)' % (start_book, verse_range, bibles)
|
||||||
return title
|
return title
|
||||||
|
|
||||||
def checkTitle(self, item, old_item):
|
def checkTitle(self, item, old_item):
|
||||||
@ -907,9 +907,10 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
``verse``
|
``verse``
|
||||||
The verse number (int).
|
The verse number (int).
|
||||||
"""
|
"""
|
||||||
|
verse_separator = get_reference_match(u'sep_v_display')
|
||||||
if not self.parent.settings_tab.show_new_chapters or \
|
if not self.parent.settings_tab.show_new_chapters or \
|
||||||
old_chapter != chapter:
|
old_chapter != chapter:
|
||||||
verse_text = u'%s:%s' % (chapter, verse)
|
verse_text = unicode(chapter) + verse_separator + unicode(verse)
|
||||||
else:
|
else:
|
||||||
verse_text = u'%s' % verse
|
verse_text = u'%s' % verse
|
||||||
if self.parent.settings_tab.display_style == 1:
|
if self.parent.settings_tab.display_style == 1:
|
||||||
|
1
openlp/plugins/bibles/lib/openlp1.py
Executable file → Normal file
1
openlp/plugins/bibles/lib/openlp1.py
Executable file → Normal file
@ -62,6 +62,7 @@ class OpenLP1Bible(BibleDB):
|
|||||||
# Create all books.
|
# Create all books.
|
||||||
cursor.execute(u'SELECT id, testament_id, name, abbreviation FROM book')
|
cursor.execute(u'SELECT id, testament_id, name, abbreviation FROM book')
|
||||||
books = cursor.fetchall()
|
books = cursor.fetchall()
|
||||||
|
self.wizard.importProgressBar.setMaximum(len(books) + 1)
|
||||||
for book in books:
|
for book in books:
|
||||||
if self.stop_import_flag:
|
if self.stop_import_flag:
|
||||||
connection.close()
|
connection.close()
|
||||||
|
@ -134,9 +134,9 @@ class OSISBible(BibleDB):
|
|||||||
testament)
|
testament)
|
||||||
if last_chapter == 0:
|
if last_chapter == 0:
|
||||||
if book == u'Gen':
|
if book == u'Gen':
|
||||||
self.wizard.ImportProgressBar.setMaximum(1188)
|
self.wizard.importProgressBar.setMaximum(1188)
|
||||||
else:
|
else:
|
||||||
self.wizard.ImportProgressBar.setMaximum(260)
|
self.wizard.importProgressBar.setMaximum(260)
|
||||||
if last_chapter != chapter:
|
if last_chapter != chapter:
|
||||||
if last_chapter != 0:
|
if last_chapter != 0:
|
||||||
self.session.commit()
|
self.session.commit()
|
||||||
|
@ -1,80 +1,81 @@
|
|||||||
Amuzgo de Guerrero,AMU
|
|
||||||
Arabic Life Application Bible,ALAB
|
|
||||||
Bulgarian Bible,BULG
|
|
||||||
1940 Bulgarian Bible,BG1940
|
|
||||||
Chinanteco de Comaltepec,CCO
|
|
||||||
Cakchiquel Occidental,CKW
|
|
||||||
Haitian Creole Version,HCV
|
|
||||||
Slovo na cestu,SNC
|
|
||||||
Dette er Biblen på dansk,DN1933
|
|
||||||
Hoffnung für Alle,HOF
|
|
||||||
Luther Bibel 1545,LUTH1545
|
|
||||||
New International Version,NIV
|
|
||||||
New American Standard Bible,NASB
|
|
||||||
The Message,MSG
|
|
||||||
Amplified Bible,AMP
|
|
||||||
New Living Translation,NLT
|
|
||||||
King James Version,KJV
|
|
||||||
English Standard Version,ESV
|
|
||||||
Contemporary English Version,CEV
|
|
||||||
New King James Version,NKJV
|
|
||||||
New Century Version,NCV
|
|
||||||
21st Century King James Version,KJ21
|
|
||||||
American Standard Version,ASV
|
|
||||||
Young's Literal Translation,YLT
|
|
||||||
Darby Translation,DARBY
|
|
||||||
Holman Christian Standard Bible,HCSB
|
|
||||||
New International Reader's Version,NIRV
|
|
||||||
Wycliffe New Testament,WYC
|
|
||||||
Worldwide English (New Testament),WE
|
|
||||||
New International Version - UK,NIVUK
|
|
||||||
Today's New International Version,TNIV
|
|
||||||
Reina-Valera 1960,RVR1960
|
|
||||||
Nueva Versión Internacional,NVI
|
|
||||||
Reina-Valera 1995,RVR1995
|
|
||||||
Castilian,CST
|
|
||||||
Reina-Valera Antigua,RVA
|
|
||||||
Biblia en Lenguaje Sencillo,BLS
|
|
||||||
La Biblia de las Américas,LBLA
|
|
||||||
Louis Segond,LSG
|
|
||||||
La Bible du Semeur,BDS
|
|
||||||
1881 Westcott-Hort New Testament,WHNU
|
|
||||||
1550 Stephanus New Testament,TR1550
|
|
||||||
1894 Scrivener New Testament,TR1894
|
|
||||||
The Westminster Leningrad Codex,WLC
|
|
||||||
Hiligaynon Bible,HLGN
|
|
||||||
Croatian Bible,CRO
|
|
||||||
Hungarian Károli,KAR
|
|
||||||
Icelandic Bible,ICELAND
|
|
||||||
La Nuova Diodati,LND
|
|
||||||
La Parola è Vita,LM
|
|
||||||
Jacalteco, Oriental,JAC
|
|
||||||
Kekchi,KEK
|
|
||||||
Korean Bible,KOREAN
|
|
||||||
Maori Bible,MAORI
|
|
||||||
Macedonian New Testament,MNT
|
|
||||||
Mam, Central,MVC
|
|
||||||
Mam de Todos Santos Chuchumatán,MVJ
|
|
||||||
Reimer 2001,REIMER
|
|
||||||
Náhuatl de Guerrero,NGU
|
|
||||||
Het Boek,HTB
|
|
||||||
Det Norsk Bibelselskap 1930,DNB1930
|
|
||||||
Levande Bibeln,LB
|
|
||||||
O Livro,OL
|
|
||||||
João Ferreira de Almeida Atualizada,AA
|
João Ferreira de Almeida Atualizada,AA
|
||||||
Quiché, Centro Occidental,QUT
|
التفسير التطبيقى للكتاب المقدس,ALAB
|
||||||
Romanian,RMNN
|
Shqip,ALB
|
||||||
Romanian,TLCR
|
Amplified Bible,AMP
|
||||||
Russian Synodal Version,RUSV
|
Amuzgo de Guerrero,AMU
|
||||||
Slovo Zhizny,SZ
|
American Standard Version,ASV
|
||||||
|
La Bible du Semeur,BDS
|
||||||
|
Български 1940,BG1940
|
||||||
|
Български,BULG
|
||||||
|
Chinanteco de Comaltepec,CCO
|
||||||
|
Contemporary English Version,CEV
|
||||||
|
Cakchiquel Occidental,CKW
|
||||||
|
Hrvatski,CRO
|
||||||
|
Castilian,CST
|
||||||
|
聖經和合本 (简体中文),CUVS
|
||||||
|
聖經和合本 (繁体中文),CUV
|
||||||
|
Darby Translation,DARBY
|
||||||
|
Dette er Biblen på dansk,DN1933
|
||||||
|
Det Norsk Bibelselskap 1930,DNB1930
|
||||||
|
English Standard Version,ESV
|
||||||
|
GOD’S WORD Translation,GW
|
||||||
|
Holman Christian Standard Bible,HCSB
|
||||||
|
Kreyòl ayisyen bib,HCV
|
||||||
|
Hiligaynon Bible,HLGN
|
||||||
|
Hoffnung für Alle,HOF
|
||||||
|
Het Boek,HTB
|
||||||
|
Icelandic Bible,ICELAND
|
||||||
|
Jacalteco – Oriental,JAC
|
||||||
|
Károlyi-biblia,KAR
|
||||||
|
Kekchi,KEK
|
||||||
|
21st Century King James Version,KJ21
|
||||||
|
King James Version,KJV
|
||||||
|
La Biblia de las Américas,LBLA
|
||||||
|
Levande Bibeln,LB
|
||||||
|
La Parola è Vita,LM
|
||||||
|
La Nuova Diodati,LND
|
||||||
|
Louis Segond,LSG
|
||||||
|
Luther Bibel 1545,LUTH1545
|
||||||
|
Māori Bible,MAORI
|
||||||
|
Македонски Новиот Завет,MNT
|
||||||
|
The Message,MSG
|
||||||
|
Mam de Comitancillo Central,MVC
|
||||||
|
Mam de Todos Santos Cuchumatán,MVJ
|
||||||
|
New American Standard Bible,NASB
|
||||||
|
New Century Version,NCV
|
||||||
|
Náhuatl de Guerrero,NGU
|
||||||
|
New International Reader's Version,NIRV
|
||||||
|
New International Version 1984,NIV1984
|
||||||
|
New International Version 2010,NIV
|
||||||
|
New International Version - UK,NIVUK
|
||||||
|
New King James Version,NKJV
|
||||||
|
New Living Translation,NLT
|
||||||
Nádej pre kazdého,NPK
|
Nádej pre kazdého,NPK
|
||||||
Albanian Bible,ALB
|
Nueva Versión Internacional,NVI
|
||||||
Levande Bibeln,SVL
|
O Livro,OL
|
||||||
Svenska 1917,SV1917
|
Quiché – Centro Occidental,QUT
|
||||||
Swahili New Testament,SNT
|
Reimer 2001,REIMER
|
||||||
|
Română Cornilescu,RMNN
|
||||||
|
Новый перевод на русский язык,RUSV
|
||||||
|
Reina-Valera Antigua,RVA
|
||||||
|
Reina-Valera 1960,RVR1960
|
||||||
|
Reina-Valera 1995,RVR1995
|
||||||
|
Slovo na cestu,SNC
|
||||||
Ang Salita ng Diyos,SND
|
Ang Salita ng Diyos,SND
|
||||||
Ukrainian Bible,UKR
|
Swahili New Testament,SNT
|
||||||
|
Svenska 1917,SV1917
|
||||||
|
Levande Bibeln,SVL
|
||||||
|
Создать страницу,SZ
|
||||||
|
Traducción en lenguaje actual,TLA
|
||||||
|
New Romanian Translation,TLCR
|
||||||
|
Today’s New International Version 2005,TNIV
|
||||||
|
Textus Receptus Stephanus 1550,TR1550
|
||||||
|
Textus Receptus Scrivener 1894,TR1894
|
||||||
|
Українська Біблія. Переклад Івана Огієнка,UKR
|
||||||
Uspanteco,USP
|
Uspanteco,USP
|
||||||
1934 Vietnamese Bible,VIET
|
Kinh Thánh tiếng Việt 1934,VIET
|
||||||
Chinese Union Version (Simplified),CUVS
|
Worldwide English (New Testament),WE
|
||||||
Chinese Union Version (Traditional),CUV
|
Codex Vaticanus Westcott-Hort 1881,WHNU
|
||||||
|
Westminster Leningrad Codex,WLC
|
||||||
|
Wycliffe New Testament,WYC
|
||||||
|
Young's Literal Translation,YLT
|
||||||
|
Can't render this file because it has a wrong number of fields in line 51.
|
39
openlp/plugins/bibles/resources/bibleserver.csv
Normal file
39
openlp/plugins/bibles/resources/bibleserver.csv
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
عربي, ARA
|
||||||
|
Bible – překlad 21. století, B21
|
||||||
|
Bible du Semeur, BDS
|
||||||
|
Българската Библия, BLG
|
||||||
|
Český ekumenický překlad, CEP
|
||||||
|
Hrvatski, CRO
|
||||||
|
Священное Писание, CRS
|
||||||
|
Version La Biblia al Dia, CST
|
||||||
|
中文和合本(简体), CUVS
|
||||||
|
Bibelen på hverdagsdansk, DK
|
||||||
|
Revidierte Elberfelder, ELB
|
||||||
|
Einheitsübersetzung, EU
|
||||||
|
Gute Nachricht Bibel, GNB
|
||||||
|
Hoffnung für alle, HFA
|
||||||
|
Hungarian, HUN
|
||||||
|
Het Boek, HTB
|
||||||
|
La Parola è Vita, ITA
|
||||||
|
IBS-fordítás (Új Károli), KAR
|
||||||
|
King James Version, KJV
|
||||||
|
Luther 1984, LUT
|
||||||
|
Septuaginta, LXX
|
||||||
|
Neue Genfer Übersetzung, NGÜ
|
||||||
|
New International Readers Version, NIRV
|
||||||
|
New International Version, NIV
|
||||||
|
Neues Leben, NL
|
||||||
|
En Levende Bok (NOR), NOR
|
||||||
|
Nádej pre kazdého, NPK
|
||||||
|
Noua traducere în limba românã, NTR
|
||||||
|
Nueva Versión Internacional, NVI
|
||||||
|
הברית הישנה, OT
|
||||||
|
Słowo Życia, POL
|
||||||
|
O Livro, PRT
|
||||||
|
Новый перевод на русский язык, RUS
|
||||||
|
Slovo na cestu, SNC
|
||||||
|
Schlachter 2000, SLT
|
||||||
|
En Levande Bok (SWE), SVL
|
||||||
|
Today's New International Version, TNIV
|
||||||
|
Türkçe, TR
|
||||||
|
Biblia Vulgata, VUL
|
|
@ -109,7 +109,7 @@ class CustomPlugin(Plugin):
|
|||||||
}
|
}
|
||||||
## Name for MediaDockManager, SettingsManager ##
|
## Name for MediaDockManager, SettingsManager ##
|
||||||
self.textStrings[StringContent.VisibleName] = {
|
self.textStrings[StringContent.VisibleName] = {
|
||||||
u'title': translate('CustomsPlugin', 'Customs')
|
u'title': translate('CustomsPlugin', 'Custom')
|
||||||
}
|
}
|
||||||
# Middle Header Bar
|
# Middle Header Bar
|
||||||
## Import Button ##
|
## Import Button ##
|
||||||
|
@ -224,9 +224,6 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
|
|||||||
``edit_all``
|
``edit_all``
|
||||||
Indicates if all slides or only one slide has been edited.
|
Indicates if all slides or only one slide has been edited.
|
||||||
"""
|
"""
|
||||||
if len(slides) == 1:
|
|
||||||
self.slideListView.currentItem().setText(slides[0])
|
|
||||||
else:
|
|
||||||
if edit_all:
|
if edit_all:
|
||||||
self.slideListView.clear()
|
self.slideListView.clear()
|
||||||
for slide in slides:
|
for slide in slides:
|
||||||
|
@ -31,7 +31,7 @@ from PyQt4 import QtCore, QtGui
|
|||||||
|
|
||||||
from openlp.core.lib import MediaManagerItem, BaseListWithDnD, build_icon, \
|
from openlp.core.lib import MediaManagerItem, BaseListWithDnD, build_icon, \
|
||||||
context_menu_action, ItemCapabilities, SettingsManager, translate, \
|
context_menu_action, ItemCapabilities, SettingsManager, translate, \
|
||||||
check_item_selected
|
check_item_selected, Receiver
|
||||||
from openlp.core.utils import AppLocation, get_images_filter
|
from openlp.core.utils import AppLocation, get_images_filter
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
@ -139,6 +139,8 @@ 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)
|
||||||
@ -153,6 +155,8 @@ 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()
|
||||||
|
@ -108,6 +108,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
|
|||||||
self.TopicsListView.setSortingEnabled(False)
|
self.TopicsListView.setSortingEnabled(False)
|
||||||
self.TopicsListView.setAlternatingRowColors(True)
|
self.TopicsListView.setAlternatingRowColors(True)
|
||||||
self.findVerseSplit = re.compile(u'---\[\]---\n', re.UNICODE)
|
self.findVerseSplit = re.compile(u'---\[\]---\n', re.UNICODE)
|
||||||
|
self.whitespace = re.compile(r'\W+', re.UNICODE)
|
||||||
|
|
||||||
def initialise(self):
|
def initialise(self):
|
||||||
self.VerseEditButton.setEnabled(False)
|
self.VerseEditButton.setEnabled(False)
|
||||||
@ -120,35 +121,55 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
|
|||||||
order_by_ref=Author.display_name)
|
order_by_ref=Author.display_name)
|
||||||
self.AuthorsSelectionComboItem.clear()
|
self.AuthorsSelectionComboItem.clear()
|
||||||
self.AuthorsSelectionComboItem.addItem(u'')
|
self.AuthorsSelectionComboItem.addItem(u'')
|
||||||
|
self.authors = []
|
||||||
for author in authors:
|
for author in authors:
|
||||||
row = self.AuthorsSelectionComboItem.count()
|
row = self.AuthorsSelectionComboItem.count()
|
||||||
self.AuthorsSelectionComboItem.addItem(author.display_name)
|
self.AuthorsSelectionComboItem.addItem(author.display_name)
|
||||||
self.AuthorsSelectionComboItem.setItemData(
|
self.AuthorsSelectionComboItem.setItemData(
|
||||||
row, QtCore.QVariant(author.id))
|
row, QtCore.QVariant(author.id))
|
||||||
|
self.authors.append(author.display_name)
|
||||||
|
completer = QtGui.QCompleter(self.authors)
|
||||||
|
completer.setCaseSensitivity(QtCore.Qt.CaseInsensitive)
|
||||||
|
self.AuthorsSelectionComboItem.setCompleter(completer)
|
||||||
|
|
||||||
def loadTopics(self):
|
def loadTopics(self):
|
||||||
topics = self.manager.get_all_objects(Topic, order_by_ref=Topic.name)
|
topics = self.manager.get_all_objects(Topic, order_by_ref=Topic.name)
|
||||||
self.SongTopicCombo.clear()
|
self.SongTopicCombo.clear()
|
||||||
self.SongTopicCombo.addItem(u'')
|
self.SongTopicCombo.addItem(u'')
|
||||||
|
self.topics = []
|
||||||
for topic in topics:
|
for topic in topics:
|
||||||
row = self.SongTopicCombo.count()
|
row = self.SongTopicCombo.count()
|
||||||
self.SongTopicCombo.addItem(topic.name)
|
self.SongTopicCombo.addItem(topic.name)
|
||||||
|
self.topics.append(topic.name)
|
||||||
self.SongTopicCombo.setItemData(row, QtCore.QVariant(topic.id))
|
self.SongTopicCombo.setItemData(row, QtCore.QVariant(topic.id))
|
||||||
|
completer = QtGui.QCompleter(self.topics)
|
||||||
|
completer.setCaseSensitivity(QtCore.Qt.CaseInsensitive)
|
||||||
|
self.SongTopicCombo.setCompleter(completer)
|
||||||
|
|
||||||
def loadBooks(self):
|
def loadBooks(self):
|
||||||
books = self.manager.get_all_objects(Book, order_by_ref=Book.name)
|
books = self.manager.get_all_objects(Book, order_by_ref=Book.name)
|
||||||
self.SongbookCombo.clear()
|
self.SongbookCombo.clear()
|
||||||
self.SongbookCombo.addItem(u'')
|
self.SongbookCombo.addItem(u'')
|
||||||
|
self.books = []
|
||||||
for book in books:
|
for book in books:
|
||||||
row = self.SongbookCombo.count()
|
row = self.SongbookCombo.count()
|
||||||
self.SongbookCombo.addItem(book.name)
|
self.SongbookCombo.addItem(book.name)
|
||||||
|
self.books.append(book.name)
|
||||||
self.SongbookCombo.setItemData(row, QtCore.QVariant(book.id))
|
self.SongbookCombo.setItemData(row, QtCore.QVariant(book.id))
|
||||||
|
completer = QtGui.QCompleter(self.books)
|
||||||
|
completer.setCaseSensitivity(QtCore.Qt.CaseInsensitive)
|
||||||
|
self.SongbookCombo.setCompleter(completer)
|
||||||
|
|
||||||
def loadThemes(self, theme_list):
|
def loadThemes(self, theme_list):
|
||||||
self.ThemeSelectionComboItem.clear()
|
self.ThemeSelectionComboItem.clear()
|
||||||
self.ThemeSelectionComboItem.addItem(u'')
|
self.ThemeSelectionComboItem.addItem(u'')
|
||||||
|
self.themes = []
|
||||||
for theme in theme_list:
|
for theme in theme_list:
|
||||||
self.ThemeSelectionComboItem.addItem(theme)
|
self.ThemeSelectionComboItem.addItem(theme)
|
||||||
|
self.themes.append(theme)
|
||||||
|
completer = QtGui.QCompleter(self.themes)
|
||||||
|
completer.setCaseSensitivity(QtCore.Qt.CaseInsensitive)
|
||||||
|
self.ThemeSelectionComboItem.setCompleter(completer)
|
||||||
|
|
||||||
def newSong(self):
|
def newSong(self):
|
||||||
log.debug(u'New Song')
|
log.debug(u'New Song')
|
||||||
@ -526,13 +547,10 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
|
|||||||
if self.AuthorsListView.count() == 0:
|
if self.AuthorsListView.count() == 0:
|
||||||
self.SongTabWidget.setCurrentIndex(1)
|
self.SongTabWidget.setCurrentIndex(1)
|
||||||
self.AuthorsListView.setFocus()
|
self.AuthorsListView.setFocus()
|
||||||
answer = QtGui.QMessageBox.warning(self,
|
QtGui.QMessageBox.critical(self,
|
||||||
translate('SongsPlugin.EditSongForm', 'Warning'),
|
translate('SongsPlugin.EditSongForm', 'Warning'),
|
||||||
translate('SongsPlugin.EditSongForm',
|
translate('SongsPlugin.EditSongForm',
|
||||||
'You have not added any authors for this song. Do you '
|
'You need to have an author for this song.'))
|
||||||
'want to add an author now?'),
|
|
||||||
QtGui.QMessageBox.Yes | QtGui.QMessageBox.No)
|
|
||||||
if answer == QtGui.QMessageBox.Yes:
|
|
||||||
return False
|
return False
|
||||||
if self.song.verse_order:
|
if self.song.verse_order:
|
||||||
order = []
|
order = []
|
||||||
@ -614,12 +632,29 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
|
|||||||
self.saveSong(True):
|
self.saveSong(True):
|
||||||
Receiver.send_message(u'songs_preview')
|
Receiver.send_message(u'songs_preview')
|
||||||
|
|
||||||
|
def clearCaches(self):
|
||||||
|
"""
|
||||||
|
Free up autocompletion memory on dialog exit
|
||||||
|
"""
|
||||||
|
self.authors = []
|
||||||
|
self.themes = []
|
||||||
|
self.books = []
|
||||||
|
self.topics = []
|
||||||
|
|
||||||
def closePressed(self):
|
def closePressed(self):
|
||||||
|
"""
|
||||||
|
Exit Dialog and do not save
|
||||||
|
"""
|
||||||
Receiver.send_message(u'songs_edit_clear')
|
Receiver.send_message(u'songs_edit_clear')
|
||||||
|
self.clearCaches()
|
||||||
self.close()
|
self.close()
|
||||||
|
|
||||||
def accept(self):
|
def accept(self):
|
||||||
|
"""
|
||||||
|
Exit Dialog and save soong if valid
|
||||||
|
"""
|
||||||
log.debug(u'accept')
|
log.debug(u'accept')
|
||||||
|
self.clearCaches()
|
||||||
if not self.song:
|
if not self.song:
|
||||||
self.song = Song()
|
self.song = Song()
|
||||||
item = int(self.SongbookCombo.currentIndex())
|
item = int(self.SongbookCombo.currentIndex())
|
||||||
@ -701,7 +736,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
|
|||||||
verseId = unicode(item.data(QtCore.Qt.UserRole).toString())
|
verseId = unicode(item.data(QtCore.Qt.UserRole).toString())
|
||||||
bits = verseId.split(u':')
|
bits = verseId.split(u':')
|
||||||
sxml.add_verse_to_lyrics(bits[0], bits[1], unicode(item.text()))
|
sxml.add_verse_to_lyrics(bits[0], bits[1], unicode(item.text()))
|
||||||
text = text + re.sub(r'\W+', u' ',
|
text = text + self.whitespace.sub(u' ',
|
||||||
unicode(self.VerseListWidget.item(i, 0).text())) + u' '
|
unicode(self.VerseListWidget.item(i, 0).text())) + u' '
|
||||||
if (bits[1] > u'1') and (bits[0][0] not in multiple):
|
if (bits[1] > u'1') and (bits[0][0] not in multiple):
|
||||||
multiple.append(bits[0][0])
|
multiple.append(bits[0][0])
|
||||||
|
@ -29,7 +29,7 @@ import logging
|
|||||||
|
|
||||||
from PyQt4 import QtCore, QtGui
|
from PyQt4 import QtCore, QtGui
|
||||||
|
|
||||||
from openlp.plugins.songs.lib import VerseType
|
from openlp.plugins.songs.lib import VerseType, translate
|
||||||
|
|
||||||
from editversedialog import Ui_EditVerseDialog
|
from editversedialog import Ui_EditVerseDialog
|
||||||
|
|
||||||
@ -131,6 +131,7 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog):
|
|||||||
|
|
||||||
def setVerse(self, text, single=False,
|
def setVerse(self, text, single=False,
|
||||||
tag=u'%s:1' % VerseType.to_string(VerseType.Verse)):
|
tag=u'%s:1' % VerseType.to_string(VerseType.Verse)):
|
||||||
|
self.hasSingleVerse = single
|
||||||
if single:
|
if single:
|
||||||
verse_type, verse_number = tag.split(u':')
|
verse_type, verse_number = tag.split(u':')
|
||||||
verse_type_index = VerseType.from_string(verse_type)
|
verse_type_index = VerseType.from_string(verse_type)
|
||||||
@ -159,3 +160,16 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog):
|
|||||||
text = u'---[%s:1]---\n%s' % (VerseType.to_string(VerseType.Verse),
|
text = u'---[%s:1]---\n%s' % (VerseType.to_string(VerseType.Verse),
|
||||||
text)
|
text)
|
||||||
return text
|
return text
|
||||||
|
|
||||||
|
def accept(self):
|
||||||
|
if self.hasSingleVerse:
|
||||||
|
value = unicode(self.getVerse()[0])
|
||||||
|
else:
|
||||||
|
value = self.getVerse()[0].split(u'\n')[1]
|
||||||
|
if len(value) == 0:
|
||||||
|
QtGui.QMessageBox.critical(self,
|
||||||
|
translate('SongsPlugin.EditSongForm', 'Error'),
|
||||||
|
translate('SongsPlugin.EditSongForm',
|
||||||
|
'You need to type some text in to the verse.'))
|
||||||
|
return False
|
||||||
|
QtGui.QDialog.accept(self)
|
||||||
|
@ -136,7 +136,6 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
|
|||||||
log.debug('Import canceled by user.')
|
log.debug('Import canceled by user.')
|
||||||
if self.currentId() == 2:
|
if self.currentId() == 2:
|
||||||
Receiver.send_message(u'songs_stop_import')
|
Receiver.send_message(u'songs_stop_import')
|
||||||
else:
|
|
||||||
self.done(QtGui.QDialog.Rejected)
|
self.done(QtGui.QDialog.Rejected)
|
||||||
|
|
||||||
def validateCurrentPage(self):
|
def validateCurrentPage(self):
|
||||||
@ -255,24 +254,57 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
|
|||||||
# Progress page
|
# Progress page
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def getFileName(self, title, editbox,
|
def getFileName(self, title, editbox, filters=u''):
|
||||||
filters = '%s (*)' % translate('SongsPlugin.ImportWizardForm',
|
"""
|
||||||
'All Files')):
|
Opens a QFileDialog and writes the filename to the given editbox.
|
||||||
|
|
||||||
|
``title``
|
||||||
|
The title of the dialog (unicode).
|
||||||
|
|
||||||
|
``editbox``
|
||||||
|
A editbox (QLineEdit).
|
||||||
|
|
||||||
|
``filters``
|
||||||
|
The file extension filters. It should contain the file descriptions
|
||||||
|
as well as the file extensions. For example::
|
||||||
|
|
||||||
|
u'OpenLP 2.0 Databases (*.sqlite)'
|
||||||
|
"""
|
||||||
|
if filters:
|
||||||
|
filters += u';;'
|
||||||
|
filters += u'%s (*)' % translate('SongsPlugin.ImportWizardForm',
|
||||||
|
'All Files')
|
||||||
filename = QtGui.QFileDialog.getOpenFileName(self, title,
|
filename = QtGui.QFileDialog.getOpenFileName(self, title,
|
||||||
SettingsManager.get_last_dir(self.plugin.settingsSection, 1),
|
os.path.dirname(SettingsManager.get_last_dir(
|
||||||
filters)
|
self.plugin.settingsSection, 1)), filters)
|
||||||
if filename:
|
if filename:
|
||||||
editbox.setText(filename)
|
editbox.setText(filename)
|
||||||
SettingsManager.set_last_dir(
|
SettingsManager.set_last_dir(self.plugin.settingsSection,
|
||||||
self.plugin.settingsSection,
|
|
||||||
os.path.split(unicode(filename))[0], 1)
|
os.path.split(unicode(filename))[0], 1)
|
||||||
|
|
||||||
def getFiles(self, title, listbox,
|
def getFiles(self, title, listbox, filters=u''):
|
||||||
filters = u'%s (*)' % translate('SongsPlugin.ImportWizardForm',
|
"""
|
||||||
'All Files')):
|
Opens a QFileDialog and writes the filenames to the given listbox.
|
||||||
|
|
||||||
|
``title``
|
||||||
|
The title of the dialog (unicode).
|
||||||
|
|
||||||
|
``listbox``
|
||||||
|
A listbox (QListWidget).
|
||||||
|
|
||||||
|
``filters``
|
||||||
|
The file extension filters. It should contain the file descriptions
|
||||||
|
as well as the file extensions. For example::
|
||||||
|
|
||||||
|
u'SongBeamer files (*.sng)'
|
||||||
|
"""
|
||||||
|
if filters:
|
||||||
|
filters += u';;'
|
||||||
|
filters += u'%s (*)' % translate('SongsPlugin.ImportWizardForm',
|
||||||
|
'All Files')
|
||||||
filenames = QtGui.QFileDialog.getOpenFileNames(self, title,
|
filenames = QtGui.QFileDialog.getOpenFileNames(self, title,
|
||||||
SettingsManager.get_last_dir(self.plugin.settingsSection, 1),
|
os.path.dirname(SettingsManager.get_last_dir(
|
||||||
filters)
|
self.plugin.settingsSection, 1)), filters)
|
||||||
if filenames:
|
if filenames:
|
||||||
listbox.addItems(filenames)
|
listbox.addItems(filenames)
|
||||||
SettingsManager.set_last_dir(
|
SettingsManager.set_last_dir(
|
||||||
@ -294,24 +326,18 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
|
|||||||
self.getFileName(
|
self.getFileName(
|
||||||
translate('SongsPlugin.ImportWizardForm',
|
translate('SongsPlugin.ImportWizardForm',
|
||||||
'Select OpenLP 2.0 Database File'),
|
'Select OpenLP 2.0 Database File'),
|
||||||
self.openLP2FilenameEdit,
|
self.openLP2FilenameEdit, u'%s (*.sqlite)'
|
||||||
u'%s (*.sqlite);;%s (*)'
|
|
||||||
% (translate('SongsPlugin.ImportWizardForm',
|
% (translate('SongsPlugin.ImportWizardForm',
|
||||||
'OpenLP 2.0 Databases'),
|
'OpenLP 2.0 Databases'))
|
||||||
translate('SongsPlugin.ImportWizardForm',
|
|
||||||
'All Files'))
|
|
||||||
)
|
)
|
||||||
|
|
||||||
def onOpenLP1BrowseButtonClicked(self):
|
def onOpenLP1BrowseButtonClicked(self):
|
||||||
self.getFileName(
|
self.getFileName(
|
||||||
translate('SongsPlugin.ImportWizardForm',
|
translate('SongsPlugin.ImportWizardForm',
|
||||||
'Select openlp.org 1.x Database File'),
|
'Select openlp.org 1.x Database File'),
|
||||||
self.openLP1FilenameEdit,
|
self.openLP1FilenameEdit, u'%s (*.olp)'
|
||||||
u'%s (*.olp);;%s (*)'
|
% translate('SongsPlugin.ImportWizardForm',
|
||||||
% (translate('SongsPlugin.ImportWizardForm',
|
'openlp.org v1.x Databases')
|
||||||
'openlp.org v1.x Databases'),
|
|
||||||
translate('SongsPlugin.ImportWizardForm',
|
|
||||||
'All Files'))
|
|
||||||
)
|
)
|
||||||
|
|
||||||
#def onOpenLyricsAddButtonClicked(self):
|
#def onOpenLyricsAddButtonClicked(self):
|
||||||
@ -338,12 +364,9 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
|
|||||||
self.getFiles(
|
self.getFiles(
|
||||||
translate('SongsPlugin.ImportWizardForm',
|
translate('SongsPlugin.ImportWizardForm',
|
||||||
'Select Words of Worship Files'),
|
'Select Words of Worship Files'),
|
||||||
self.wordsOfWorshipFileListWidget,
|
self.wordsOfWorshipFileListWidget, u'%s (*.wsg *.wow-song)'
|
||||||
u'%s (*.wsg *.wow-song);;%s (*)'
|
% translate('SongsPlugin.ImportWizardForm',
|
||||||
% (translate('SongsPlugin.ImportWizardForm',
|
'Words Of Worship Song Files')
|
||||||
'Words Of Worship Song Files'),
|
|
||||||
translate('SongsPlugin.ImportWizardForm',
|
|
||||||
'All Files'))
|
|
||||||
)
|
)
|
||||||
|
|
||||||
def onWordsOfWorshipRemoveButtonClicked(self):
|
def onWordsOfWorshipRemoveButtonClicked(self):
|
||||||
@ -363,12 +386,9 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
|
|||||||
self.getFiles(
|
self.getFiles(
|
||||||
translate('SongsPlugin.ImportWizardForm',
|
translate('SongsPlugin.ImportWizardForm',
|
||||||
'Select Songs of Fellowship Files'),
|
'Select Songs of Fellowship Files'),
|
||||||
self.songsOfFellowshipFileListWidget,
|
self.songsOfFellowshipFileListWidget, u'%s (*.rtf)'
|
||||||
u'%s (*.rtf);;%s (*)'
|
% translate('SongsPlugin.ImportWizardForm',
|
||||||
% (translate('SongsPlugin.ImportWizardForm',
|
'Songs Of Felloship Song Files')
|
||||||
'Songs Of Felloship Song Files'),
|
|
||||||
translate('SongsPlugin.ImportWizardForm',
|
|
||||||
'All Files'))
|
|
||||||
)
|
)
|
||||||
|
|
||||||
def onSongsOfFellowshipRemoveButtonClicked(self):
|
def onSongsOfFellowshipRemoveButtonClicked(self):
|
||||||
@ -395,7 +415,8 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
|
|||||||
self.getFiles(
|
self.getFiles(
|
||||||
translate('SongsPlugin.ImportWizardForm',
|
translate('SongsPlugin.ImportWizardForm',
|
||||||
'Select SongBeamer Files'),
|
'Select SongBeamer Files'),
|
||||||
self.songBeamerFileListWidget
|
self.songBeamerFileListWidget, u'%s (*.sng)' %
|
||||||
|
translate('SongsPlugin.ImportWizardForm', 'SongBeamer files')
|
||||||
)
|
)
|
||||||
|
|
||||||
def onSongBeamerRemoveButtonClicked(self):
|
def onSongBeamerRemoveButtonClicked(self):
|
||||||
|
@ -71,7 +71,8 @@ class VerseType(object):
|
|||||||
The string to return a VerseType for
|
The string to return a VerseType for
|
||||||
"""
|
"""
|
||||||
verse_type = verse_type.lower()
|
verse_type = verse_type.lower()
|
||||||
if verse_type == unicode(VerseType.to_string(VerseType.Verse)).lower()[0]:
|
if verse_type == \
|
||||||
|
unicode(VerseType.to_string(VerseType.Verse)).lower()[0]:
|
||||||
return translate('SongsPlugin.VerseType', 'Verse')
|
return translate('SongsPlugin.VerseType', 'Verse')
|
||||||
elif verse_type == \
|
elif verse_type == \
|
||||||
unicode(VerseType.to_string(VerseType.Chorus)).lower()[0]:
|
unicode(VerseType.to_string(VerseType.Chorus)).lower()[0]:
|
||||||
|
@ -44,6 +44,7 @@ class SongListView(BaseListWithDnD):
|
|||||||
self.PluginName = u'Songs'
|
self.PluginName = u'Songs'
|
||||||
BaseListWithDnD.__init__(self, parent)
|
BaseListWithDnD.__init__(self, parent)
|
||||||
|
|
||||||
|
|
||||||
class SongMediaItem(MediaManagerItem):
|
class SongMediaItem(MediaManagerItem):
|
||||||
"""
|
"""
|
||||||
This is the custom media manager item for Songs.
|
This is the custom media manager item for Songs.
|
||||||
@ -417,27 +418,37 @@ class SongMediaItem(MediaManagerItem):
|
|||||||
item.data_string[u'title'].split(u'@')[0].lower() ,
|
item.data_string[u'title'].split(u'@')[0].lower() ,
|
||||||
Song.search_title.asc())
|
Song.search_title.asc())
|
||||||
author_list = item.data_string[u'authors'].split(u', ')
|
author_list = item.data_string[u'authors'].split(u', ')
|
||||||
|
# The service item always has an author (at least it has u'' as
|
||||||
|
# author). However, songs saved in the database do not have to have
|
||||||
|
# an author.
|
||||||
|
if u'' in author_list:
|
||||||
|
author_list.remove(u'')
|
||||||
editId = 0
|
editId = 0
|
||||||
uuid = item._uuid
|
uuid = item._uuid
|
||||||
|
add_song = True
|
||||||
if search_results:
|
if search_results:
|
||||||
for song in search_results:
|
for song in search_results:
|
||||||
count = 0
|
same_authors = True
|
||||||
|
# If the author counts are different, we do not have to do
|
||||||
|
# any further checking. This is also important when a song
|
||||||
|
# does not have any author (because we can not loop over an
|
||||||
|
# empty list).
|
||||||
|
if len(song.authors) == len(author_list):
|
||||||
for author in song.authors:
|
for author in song.authors:
|
||||||
if author.display_name in author_list:
|
if author.display_name not in author_list:
|
||||||
count += 1
|
same_authors = False
|
||||||
# All Authors the same
|
else:
|
||||||
if count == len(author_list):
|
same_authors = False
|
||||||
|
# All authors are the same, so we can stop here and the song
|
||||||
|
# does not have to be saved.
|
||||||
|
if same_authors:
|
||||||
|
add_song = False
|
||||||
editId = song.id
|
editId = song.id
|
||||||
else:
|
break
|
||||||
# Authors different
|
if add_song:
|
||||||
if self.addSongFromService:
|
|
||||||
editId = self.openLyrics. \
|
|
||||||
xml_to_song(item.xml_version)
|
|
||||||
else:
|
|
||||||
# Title does not match
|
|
||||||
if self.addSongFromService:
|
if self.addSongFromService:
|
||||||
editId = self.openLyrics.xml_to_song(item.xml_version)
|
editId = self.openLyrics.xml_to_song(item.xml_version)
|
||||||
# Update service with correct song id
|
# Update service with correct song id.
|
||||||
if editId != 0:
|
if editId != 0:
|
||||||
Receiver.send_message(u'service_item_update',
|
Receiver.send_message(u'service_item_update',
|
||||||
u'%s:%s' %(editId, uuid))
|
u'%s:%s' %(editId, uuid))
|
||||||
|
@ -32,6 +32,7 @@ import os
|
|||||||
import chardet
|
import chardet
|
||||||
import codecs
|
import codecs
|
||||||
|
|
||||||
|
from openlp.core.lib import translate
|
||||||
from openlp.plugins.songs.lib.songimport import SongImport
|
from openlp.plugins.songs.lib.songimport import SongImport
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
@ -54,7 +55,8 @@ class SongBeamerTypes(object):
|
|||||||
u'Pre-Bridge': u'O',
|
u'Pre-Bridge': u'O',
|
||||||
u'Pre-Coda': u'O',
|
u'Pre-Coda': u'O',
|
||||||
u'Unbekannt': u'O',
|
u'Unbekannt': u'O',
|
||||||
u'Unknown': u'O'
|
u'Unknown': u'O',
|
||||||
|
u'Unbenannt': u'O'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -100,6 +102,7 @@ class SongBeamerImport(SongImport):
|
|||||||
detect_file.close()
|
detect_file.close()
|
||||||
infile = codecs.open(file, u'r', details['encoding'])
|
infile = codecs.open(file, u'r', details['encoding'])
|
||||||
self.songData = infile.readlines()
|
self.songData = infile.readlines()
|
||||||
|
infile.close()
|
||||||
else:
|
else:
|
||||||
return False
|
return False
|
||||||
for line in self.songData:
|
for line in self.songData:
|
||||||
@ -127,8 +130,9 @@ class SongBeamerImport(SongImport):
|
|||||||
self.replace_html_tags()
|
self.replace_html_tags()
|
||||||
self.add_verse(self.current_verse, self.current_verse_type)
|
self.add_verse(self.current_verse, self.current_verse_type)
|
||||||
self.finish()
|
self.finish()
|
||||||
self.import_wizard.incrementProgressBar(
|
self.import_wizard.incrementProgressBar(u'%s %s...' %
|
||||||
"Importing %s" % (self.file_name))
|
(translate('SongsPlugin.SongBeamerImport', 'Importing'),
|
||||||
|
self.file_name))
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def replace_html_tags(self):
|
def replace_html_tags(self):
|
||||||
@ -263,6 +267,9 @@ class SongBeamerImport(SongImport):
|
|||||||
pass
|
pass
|
||||||
elif tag_val[0] == u'#Version':
|
elif tag_val[0] == u'#Version':
|
||||||
pass
|
pass
|
||||||
|
elif tag_val[0] == u'#VerseOrder':
|
||||||
|
# TODO: add the verse order.
|
||||||
|
pass
|
||||||
|
|
||||||
def check_verse_marks(self, line):
|
def check_verse_marks(self, line):
|
||||||
"""
|
"""
|
||||||
|
@ -247,7 +247,7 @@ class SongImport(QtCore.QObject):
|
|||||||
"""
|
"""
|
||||||
Extracts alphanumeric words for searchable fields
|
Extracts alphanumeric words for searchable fields
|
||||||
"""
|
"""
|
||||||
return re.sub(r'\W+', u' ', text)
|
return re.sub(r'\W+', u' ', text, re.UNICODE)
|
||||||
|
|
||||||
def finish(self):
|
def finish(self):
|
||||||
"""
|
"""
|
||||||
|
@ -297,6 +297,8 @@ class OpenLyricsParser(object):
|
|||||||
song_xml = objectify.fromstring(xml)
|
song_xml = objectify.fromstring(xml)
|
||||||
properties = song_xml.properties
|
properties = song_xml.properties
|
||||||
song.copyright = unicode(properties.copyright.text)
|
song.copyright = unicode(properties.copyright.text)
|
||||||
|
if song.copyright == u'None':
|
||||||
|
song.copyright = u''
|
||||||
song.verse_order = unicode(properties.verseOrder.text)
|
song.verse_order = unicode(properties.verseOrder.text)
|
||||||
if song.verse_order == u'None':
|
if song.verse_order == u'None':
|
||||||
song.verse_order = u''
|
song.verse_order = u''
|
||||||
|
@ -31,7 +31,7 @@ from PyQt4 import QtCore, QtGui
|
|||||||
|
|
||||||
from openlp.core.lib import Plugin, StringContent, build_icon, translate
|
from openlp.core.lib import Plugin, StringContent, build_icon, translate
|
||||||
from openlp.core.lib.db import Manager
|
from openlp.core.lib.db import Manager
|
||||||
from openlp.plugins.songs.lib import SongMediaItem, SongsTab
|
from openlp.plugins.songs.lib import SongMediaItem, SongsTab, SongXMLParser
|
||||||
from openlp.plugins.songs.lib.db import init_schema, Song
|
from openlp.plugins.songs.lib.db import init_schema, Song
|
||||||
from openlp.plugins.songs.lib.importer import SongFormat
|
from openlp.plugins.songs.lib.importer import SongFormat
|
||||||
|
|
||||||
@ -150,9 +150,13 @@ class SongsPlugin(Plugin):
|
|||||||
song.title = u''
|
song.title = u''
|
||||||
if song.alternate_title is None:
|
if song.alternate_title is None:
|
||||||
song.alternate_title = u''
|
song.alternate_title = u''
|
||||||
song.search_title = self.whitespace.sub(u' ', \
|
song.search_title = self.whitespace.sub(u' ', song.title.lower() + \
|
||||||
song.title.lower()) + u' ' + \
|
u' ' + song.alternate_title.lower())
|
||||||
self.whitespace.sub(u' ', song.alternate_title.lower())
|
lyrics = u''
|
||||||
|
verses = SongXMLParser(song.lyrics).get_verses()
|
||||||
|
for verse in verses:
|
||||||
|
lyrics = lyrics + self.whitespace.sub(u' ', verse[1]) + u' '
|
||||||
|
song.search_lyrics = lyrics.lower()
|
||||||
progressDialog.setValue(counter)
|
progressDialog.setValue(counter)
|
||||||
self.manager.save_objects(songs)
|
self.manager.save_objects(songs)
|
||||||
counter += 1
|
counter += 1
|
||||||
|
3047
resources/i18n/af.ts
3047
resources/i18n/af.ts
File diff suppressed because it is too large
Load Diff
3192
resources/i18n/de.ts
3192
resources/i18n/de.ts
File diff suppressed because it is too large
Load Diff
2973
resources/i18n/en.ts
2973
resources/i18n/en.ts
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
2977
resources/i18n/es.ts
2977
resources/i18n/es.ts
File diff suppressed because it is too large
Load Diff
3046
resources/i18n/et.ts
3046
resources/i18n/et.ts
File diff suppressed because it is too large
Load Diff
3226
resources/i18n/hu.ts
3226
resources/i18n/hu.ts
File diff suppressed because it is too large
Load Diff
2977
resources/i18n/ja.ts
2977
resources/i18n/ja.ts
File diff suppressed because it is too large
Load Diff
3154
resources/i18n/ko.ts
3154
resources/i18n/ko.ts
File diff suppressed because it is too large
Load Diff
3013
resources/i18n/nb.ts
3013
resources/i18n/nb.ts
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
3308
resources/i18n/sv.ts
3308
resources/i18n/sv.ts
File diff suppressed because it is too large
Load Diff
0
scripts/openlp-remoteclient.py
Executable file → Normal file
0
scripts/openlp-remoteclient.py
Executable file → Normal file
Loading…
Reference in New Issue
Block a user