diff --git a/demo_theme.xml b/demo_theme.xml
deleted file mode 100644
index 118a1d7d4..000000000
--- a/demo_theme.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- openlp.org 2.0 Demo Theme
- 2
- ./openlp/core/test/data_for_tests/treesbig.jpg
- clBlack
- Tahoma
- clWhite
- 16
- -1
- $00000001
- -1
- clRed
- 2
- 2
-
diff --git a/documentation/api/source/plugins/songs.rst b/documentation/api/source/plugins/songs.rst
index fed9907a2..1e86ce020 100644
--- a/documentation/api/source/plugins/songs.rst
+++ b/documentation/api/source/plugins/songs.rst
@@ -72,9 +72,6 @@ Song Importers
.. automodule:: openlp.plugins.songs.lib.cclifileimport
:members:
-.. autoclass:: openlp.plugins.songs.lib.cclifileimport.CCLIFileImportError
- :members:
-
.. automodule:: openlp.plugins.songs.lib.ewimport
:members:
diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index 7ad377817..76d7c0617 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -293,6 +293,7 @@ def clean_tags(text):
Remove Tags from text for display
"""
text = text.replace(u'.setObjectName()`.
+ ``checkable``
+ If *True* the button has two, *off* and *on*, states. Default is
+ *False*, which means the buttons has only one state.
"""
newAction = None
if icon:
diff --git a/openlp/core/ui/__init__.py b/openlp/core/ui/__init__.py
index 698216365..80124c2be 100644
--- a/openlp/core/ui/__init__.py
+++ b/openlp/core/ui/__init__.py
@@ -26,6 +26,9 @@
"""
The :mod:`ui` module provides the core user interface for OpenLP
"""
+from PyQt4 import QtGui
+
+from openlp.core.lib import translate, Receiver
class HideMode(object):
"""
@@ -48,6 +51,34 @@ class HideMode(object):
Theme = 2
Screen = 3
+
+def criticalErrorMessageBox(title=None, message=None, parent=None,
+ question=False):
+ """
+ Provides a standard critical message box for errors that OpenLP displays
+ to users.
+
+ ``title``
+ The title for the message box.
+
+ ``message``
+ The message to display to the user.
+
+ ``parent``
+ The parent UI element to attach the dialog to.
+
+ ``question``
+ Should this message box question the user.
+ """
+ error = translate('OpenLP.Ui', 'Error')
+ if question:
+ return QtGui.QMessageBox.critical(parent, error, message,
+ QtGui.QMessageBox.StandardButtons(
+ QtGui.QMessageBox.Yes | QtGui.QMessageBox.No))
+ data = {u'message': message}
+ data[u'title'] = title if title else error
+ return Receiver.send_message(u'openlp_error_message', data)
+
from themeform import ThemeForm
from filerenameform import FileRenameForm
from maindisplay import MainDisplay
@@ -68,6 +99,6 @@ from mediadockmanager import MediaDockManager
from servicemanager import ServiceManager
from thememanager import ThemeManager
-__all__ = ['SplashScreen', 'AboutForm', 'SettingsForm',
- 'MainDisplay', 'SlideController', 'ServiceManager', 'ThemeManager',
- 'MediaDockManager', 'ServiceItemEditForm']
+__all__ = ['criticalErrorMessageBox', 'SplashScreen', 'AboutForm',
+ 'SettingsForm', 'MainDisplay', 'SlideController', 'ServiceManager',
+ 'ThemeManager', 'MediaDockManager', 'ServiceItemEditForm']
diff --git a/openlp/core/ui/advancedtab.py b/openlp/core/ui/advancedtab.py
index 7cebe9930..58b637bc2 100644
--- a/openlp/core/ui/advancedtab.py
+++ b/openlp/core/ui/advancedtab.py
@@ -72,6 +72,14 @@ class AdvancedTab(SettingsTab):
u'enableAutoCloseCheckBox')
self.uiLayout.addRow(self.enableAutoCloseCheckBox)
self.leftLayout.addWidget(self.uiGroupBox)
+ self.hideMouseGroupBox = QtGui.QGroupBox(self.leftColumn)
+ self.hideMouseGroupBox.setObjectName(u'hideMouseGroupBox')
+ self.hideMouseLayout = QtGui.QVBoxLayout(self.hideMouseGroupBox)
+ self.hideMouseLayout.setObjectName(u'hideMouseLayout')
+ self.hideMouseCheckBox = QtGui.QCheckBox(self.hideMouseGroupBox)
+ self.hideMouseCheckBox.setObjectName(u'hideMouseCheckBox')
+ self.hideMouseLayout.addWidget(self.hideMouseCheckBox)
+ self.leftLayout.addWidget(self.hideMouseGroupBox)
# self.sharedDirGroupBox = QtGui.QGroupBox(self.leftColumn)
# self.sharedDirGroupBox.setObjectName(u'sharedDirGroupBox')
# self.sharedDirLayout = QtGui.QFormLayout(self.sharedDirGroupBox)
@@ -117,6 +125,10 @@ class AdvancedTab(SettingsTab):
'Expand new service items on creation'))
self.enableAutoCloseCheckBox.setText(translate('OpenLP.AdvancedTab',
'Enable application exit confirmation'))
+ self.hideMouseGroupBox.setTitle(translate('OpenLP.AdvancedTab',
+ 'Mouse Cursor'))
+ self.hideMouseCheckBox.setText(translate('OpenLP.AdvancedTab',
+ 'Hide the mouse cursor when moved over the display window'))
# self.sharedDirGroupBox.setTitle(
# translate('AdvancedTab', 'Central Data Store'))
# self.sharedCheckBox.setText(
@@ -150,6 +162,8 @@ class AdvancedTab(SettingsTab):
self.enableAutoCloseCheckBox.setChecked(
settings.value(u'enable exit confirmation',
QtCore.QVariant(True)).toBool())
+ self.hideMouseCheckBox.setChecked(
+ settings.value(u'hide mouse', QtCore.QVariant(False)).toBool())
settings.endGroup()
def save(self):
@@ -168,6 +182,8 @@ class AdvancedTab(SettingsTab):
QtCore.QVariant(self.expandServiceItemCheckBox.isChecked()))
settings.setValue(u'enable exit confirmation',
QtCore.QVariant(self.enableAutoCloseCheckBox.isChecked()))
+ settings.setValue(u'hide mouse',
+ QtCore.QVariant(self.hideMouseCheckBox.isChecked()))
settings.endGroup()
# def onSharedCheckBoxChanged(self, checked):
diff --git a/openlp/core/ui/displaytagtab.py b/openlp/core/ui/displaytagtab.py
index 154d397b9..1c77084b9 100644
--- a/openlp/core/ui/displaytagtab.py
+++ b/openlp/core/ui/displaytagtab.py
@@ -34,6 +34,7 @@ import cPickle
from PyQt4 import QtCore, QtGui
from openlp.core.lib import SettingsTab, translate, DisplayTags
+from openlp.core.ui import criticalErrorMessageBox
class DisplayTagTab(SettingsTab):
'''
@@ -275,12 +276,10 @@ class DisplayTagTab(SettingsTab):
"""
for html in DisplayTags.get_html_tags():
if self._strip(html[u'start tag']) == u'n':
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('OpenLP.DisplayTagTab', 'Update Error'),
translate('OpenLP.DisplayTagTab',
- 'Tag "n" already defined.'),
- QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok),
- QtGui.QMessageBox.Ok)
+ 'Tag "n" already defined.'))
return
# Add new tag to list
tag = {u'desc': u'New Item', u'start tag': u'{n}',
@@ -318,12 +317,10 @@ class DisplayTagTab(SettingsTab):
for linenumber, html1 in enumerate(html_expands):
if self._strip(html1[u'start tag']) == tag and \
linenumber != self.selected:
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('OpenLP.DisplayTagTab', 'Update Error'),
unicode(translate('OpenLP.DisplayTagTab',
- 'Tag %s already defined.')) % tag,
- QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok),
- QtGui.QMessageBox.Ok)
+ 'Tag %s already defined.')) % tag)
return
html[u'desc'] = unicode(self.descriptionLineEdit.text())
html[u'start html'] = unicode(self.startTagLineEdit.text())
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index adc2cb5fa..ec5ab7b3f 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -24,6 +24,8 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
"""
+The :mod:`maindisplay` module provides the functionality to display screens
+and play multimedia within OpenLP.
"""
import logging
import os
@@ -92,6 +94,7 @@ class DisplayWidget(QtGui.QGraphicsView):
else:
event.ignore()
+
class MainDisplay(DisplayWidget):
"""
This is the display screen.
@@ -198,7 +201,7 @@ class MainDisplay(DisplayWidget):
The slide text to be displayed
"""
log.debug(u'text to display')
- # Wait for the webview to update before displayiong text.
+ # Wait for the webview to update before displaying text.
while not self.loaded:
Receiver.send_message(u'openlp_process_events')
self.frame.evaluateJavaScript(u'show_text("%s")' % \
@@ -268,6 +271,8 @@ class MainDisplay(DisplayWidget):
else:
js = u'show_image("");'
self.frame.evaluateJavaScript(js)
+ # Update the preview frame.
+ Receiver.send_message(u'maindisplay_active')
def resetImage(self):
"""
@@ -276,6 +281,8 @@ class MainDisplay(DisplayWidget):
"""
log.debug(u'resetImage')
self.displayImage(self.serviceItem.bg_image_bytes)
+ # Update the preview frame.
+ Receiver.send_message(u'maindisplay_active')
def resetVideo(self):
"""
@@ -290,6 +297,8 @@ class MainDisplay(DisplayWidget):
self.phononActive = False
else:
self.frame.evaluateJavaScript(u'show_video("close");')
+ # Update the preview frame.
+ Receiver.send_message(u'maindisplay_active')
def videoPlay(self):
"""
@@ -357,6 +366,8 @@ class MainDisplay(DisplayWidget):
self.webView.setVisible(False)
self.videoWidget.setVisible(True)
self.audio.setVolume(vol)
+ # Update the preview frame.
+ Receiver.send_message(u'maindisplay_active')
return self.preview()
def isLoaded(self):
@@ -424,6 +435,15 @@ class MainDisplay(DisplayWidget):
# if was hidden keep it hidden
if self.hideMode and self.isLive:
self.hideDisplay(self.hideMode)
+ # Hide mouse cursor when moved over display if enabled in settings
+ settings = QtCore.QSettings()
+ if settings.value(u'advanced/hide mouse',
+ QtCore.QVariant(False)).toBool():
+ self.setCursor(QtCore.Qt.BlankCursor)
+ self.frame.evaluateJavaScript('document.body.style.cursor = "none"')
+ else:
+ self.setCursor(QtCore.Qt.ArrowCursor)
+ self.frame.evaluateJavaScript('document.body.style.cursor = "auto"')
def footer(self, text):
"""
@@ -473,6 +493,7 @@ class MainDisplay(DisplayWidget):
# Trigger actions when display is active again
Receiver.send_message(u'maindisplay_active')
+
class AudioPlayer(QtCore.QObject):
"""
This Class will play audio only allowing components to work with a
diff --git a/openlp/core/ui/pluginform.py b/openlp/core/ui/pluginform.py
index 8e82f0003..d6ffc69f0 100644
--- a/openlp/core/ui/pluginform.py
+++ b/openlp/core/ui/pluginform.py
@@ -85,7 +85,7 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
item.setIcon(plugin.icon)
self.pluginListWidget.addItem(item)
pluginListWidth = max(pluginListWidth, self.fontMetrics().width(
- unicode(translate('OpenLP.PluginForm', '%s (Inactive)')) %
+ unicode(translate('OpenLP.PluginForm', '%s (Inactive)')) %
name_string[u'singular']))
self.pluginListWidget.setFixedWidth(pluginListWidth +
self.pluginListWidget.iconSize().width() + 48)
diff --git a/openlp/core/ui/serviceitemeditform.py b/openlp/core/ui/serviceitemeditform.py
index 6516fa40f..edd4ee29f 100644
--- a/openlp/core/ui/serviceitemeditform.py
+++ b/openlp/core/ui/serviceitemeditform.py
@@ -25,6 +25,7 @@
###############################################################################
from PyQt4 import QtCore, QtGui
+
from serviceitemeditdialog import Ui_ServiceItemEditDialog
class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog):
@@ -39,16 +40,18 @@ class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog):
self.setupUi(self)
self.itemList = []
# enable drop
- QtCore.QObject.connect(self.upButton, QtCore.SIGNAL(u'clicked()'),
- self.onItemUp)
- QtCore.QObject.connect(self.downButton, QtCore.SIGNAL(u'clicked()'),
- self.onItemDown)
- QtCore.QObject.connect(self.deleteButton, QtCore.SIGNAL(u'clicked()'),
- self.onItemDelete)
- QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'accepted()'),
- self.accept)
- QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'rejected()'),
- self.reject)
+ QtCore.QObject.connect(self.upButton,
+ QtCore.SIGNAL(u'clicked()'), self.onItemUp)
+ QtCore.QObject.connect(self.downButton,
+ QtCore.SIGNAL(u'clicked()'), self.onItemDown)
+ QtCore.QObject.connect(self.deleteButton,
+ QtCore.SIGNAL(u'clicked()'), self.onItemDelete)
+ QtCore.QObject.connect(self.buttonBox,
+ QtCore.SIGNAL(u'accepted()'), self.accept)
+ QtCore.QObject.connect(self.buttonBox,
+ QtCore.SIGNAL(u'rejected()'), self.reject)
+ QtCore.QObject.connect(self.listWidget,
+ QtCore.SIGNAL(u'currentRowChanged(int)'), self.onCurrentRowChanged)
def setServiceItem(self, item):
self.item = item
@@ -58,6 +61,7 @@ class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog):
for frame in self.item._raw_frames:
self.itemList.append(frame)
self.loadData()
+ self.listWidget.setCurrentItem(self.listWidget.currentItem())
def getServiceItem(self):
if self.data:
@@ -69,57 +73,79 @@ class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog):
return self.item
def loadData(self):
+ """
+ Loads the image list.
+ """
self.listWidget.clear()
for frame in self.itemList:
item_name = QtGui.QListWidgetItem(frame[u'title'])
self.listWidget.addItem(item_name)
- if self.listWidget.count() == 1:
+
+ def onItemDelete(self):
+ """
+ Delete the current row.
+ """
+ item = self.listWidget.currentItem()
+ if not item:
+ return
+ row = self.listWidget.row(item)
+ self.itemList.remove(self.itemList[row])
+ self.loadData()
+ if row == self.listWidget.count():
+ self.listWidget.setCurrentRow(row - 1)
+ else:
+ self.listWidget.setCurrentRow(row)
+
+ def onItemUp(self):
+ """
+ Move the current row up in the list.
+ """
+ item = self.listWidget.currentItem()
+ if not item:
+ return
+ row = self.listWidget.row(item)
+ temp = self.itemList[row]
+ self.itemList.remove(self.itemList[row])
+ self.itemList.insert(row - 1, temp)
+ self.loadData()
+ self.listWidget.setCurrentRow(row - 1)
+
+ def onItemDown(self):
+ """
+ Move the current row down in the list
+ """
+ item = self.listWidget.currentItem()
+ if not item:
+ return
+ row = self.listWidget.row(item)
+ temp = self.itemList[row]
+ self.itemList.remove(self.itemList[row])
+ self.itemList.insert(row + 1, temp)
+ self.loadData()
+ self.listWidget.setCurrentRow(row + 1)
+
+ def onCurrentRowChanged(self, row):
+ """
+ Called when the currentRow has changed.
+
+ ``row``
+ The row number (int).
+ """
+ # Disable all buttons, as no row is selected or only one image is left.
+ if row == -1 or self.listWidget.count() == 1:
self.downButton.setEnabled(False)
self.upButton.setEnabled(False)
self.deleteButton.setEnabled(False)
else:
- self.downButton.setEnabled(True)
- self.upButton.setEnabled(True)
+ # Check if we are at the end of the list.
+ if self.listWidget.count() == row + 1:
+ self.downButton.setEnabled(False)
+ else:
+ self.downButton.setEnabled(True)
+ # Check if we are at the beginning of the list.
+ if row == 0:
+ self.upButton.setEnabled(False)
+ else:
+ self.upButton.setEnabled(True)
self.deleteButton.setEnabled(True)
- def onItemDelete(self):
- """
- Delete the selected row
- """
- items = self.listWidget.selectedItems()
- for item in items:
- row = self.listWidget.row(item)
- self.itemList.remove(self.itemList[row])
- self.loadData()
- if row == self.listWidget.count():
- self.listWidget.setCurrentRow(row - 1)
- else:
- self.listWidget.setCurrentRow(row)
-
- def onItemUp(self):
- """
- Move the selected row up in the list
- """
- items = self.listWidget.selectedItems()
- for item in items:
- row = self.listWidget.row(item)
- if row > 0:
- temp = self.itemList[row]
- self.itemList.remove(self.itemList[row])
- self.itemList.insert(row - 1, temp)
- self.loadData()
- self.listWidget.setCurrentRow(row - 1)
-
- def onItemDown(self):
- """
- Move the selected row down in the list
- """
- items = self.listWidget.selectedItems()
- for item in items:
- row = self.listWidget.row(item)
- if row < len(self.itemList) and row is not -1:
- temp = self.itemList[row]
- self.itemList.remove(self.itemList[row])
- self.itemList.insert(row + 1, temp)
- self.loadData()
- self.listWidget.setCurrentRow(row + 1)
\ No newline at end of file
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 2d85e4b7f..81f514959 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -36,8 +36,10 @@ from PyQt4 import QtCore, QtGui
from openlp.core.lib import OpenLPToolbar, ServiceItem, context_menu_action, \
Receiver, build_icon, ItemCapabilities, SettingsManager, translate, \
ThemeLevel
-from openlp.core.ui import ServiceNoteForm, ServiceItemEditForm
-from openlp.core.utils import AppLocation, split_filename
+from openlp.core.ui import criticalErrorMessageBox, ServiceNoteForm, \
+ ServiceItemEditForm
+from openlp.core.utils import AppLocation, delete_file, file_is_unicode, \
+ split_filename
class ServiceManagerList(QtGui.QTreeWidget):
"""
@@ -445,11 +447,7 @@ class ServiceManager(QtGui.QWidget):
file.close()
if zip:
zip.close()
- try:
- os.remove(serviceFileName)
- except (IOError, OSError):
- # if not present do not worry
- pass
+ delete_file(serviceFileName)
self.mainwindow.addRecentFile(fileName)
self.setModified(False)
return True
@@ -484,16 +482,12 @@ class ServiceManager(QtGui.QWidget):
try:
zip = zipfile.ZipFile(fileName)
for file in zip.namelist():
- try:
- ucsfile = file.decode(u'utf-8')
- except UnicodeDecodeError:
- QtGui.QMessageBox.critical(
- self, translate('OpenLP.ServiceManager', 'Error'),
- translate('OpenLP.ServiceManager',
- 'File is not a valid service.\n'
- 'The content encoding is not UTF-8.'))
- log.exception(u'Filename "%s" is not valid UTF-8' %
- file.decode(u'utf-8', u'replace'))
+ ucsfile = file_is_unicode(file)
+ if not ucsfile:
+ criticalErrorMessageBox(
+ message=translate('OpenLP.ServiceManager',
+ 'File is not a valid service.\n'
+ 'The content encoding is not UTF-8.'))
continue
osfile = unicode(QtCore.QDir.toNativeSeparators(ucsfile))
filePath = os.path.join(self.servicePath,
@@ -515,20 +509,14 @@ class ServiceManager(QtGui.QWidget):
serviceItem.set_from_service(item, self.servicePath)
self.validateItem(serviceItem)
self.addServiceItem(serviceItem)
- if serviceItem.is_capable(
- ItemCapabilities.OnLoadUpdate):
+ if serviceItem.is_capable(ItemCapabilities.OnLoadUpdate):
Receiver.send_message(u'%s_service_load' %
serviceItem.name.lower(), serviceItem)
- try:
- if os.path.isfile(p_file):
- os.remove(p_file)
- except (IOError, OSError):
- log.exception(u'Failed to remove osd file')
+ delete_file(p_file)
else:
- QtGui.QMessageBox.critical(
- self, translate('OpenLP.ServiceManager', 'Error'),
- translate('OpenLP.ServiceManager',
- 'File is not a valid service.'))
+ criticalErrorMessageBox(
+ message=translate('OpenLP.ServiceManager',
+ 'File is not a valid service.'))
log.exception(u'File contains no service data')
except (IOError, NameError):
log.exception(u'Problem loading a service file')
@@ -877,11 +865,7 @@ class ServiceManager(QtGui.QWidget):
"""
for file in os.listdir(self.servicePath):
file_path = os.path.join(self.servicePath, file)
- try:
- if os.path.isfile(file_path):
- os.remove(file_path)
- except OSError:
- log.exception(u'Failed to clean up servicePath')
+ delete_file(file_path)
def onThemeComboBoxSelected(self, currentIndex):
"""
@@ -1008,7 +992,7 @@ class ServiceManager(QtGui.QWidget):
self.mainwindow.previewController.addServiceManagerItem(
self.serviceItems[item][u'service_item'], count)
else:
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('OpenLP.ServiceManager', 'Missing Display Handler'),
translate('OpenLP.ServiceManager', 'Your item cannot be '
'displayed as there is no handler to display it'))
@@ -1042,11 +1026,11 @@ class ServiceManager(QtGui.QWidget):
self.serviceItems[item][u'service_item'], 0)
self.mainwindow.liveController.PreviewListWidget.setFocus()
else:
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('OpenLP.ServiceManager', 'Missing Display Handler'),
translate('OpenLP.ServiceManager', 'Your item cannot be '
- 'displayed as the plugin required to display it is missing '
- 'or inactive'))
+ 'displayed as the plugin required to display it is missing '
+ 'or inactive'))
def remoteEdit(self):
"""
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 690cb9264..1563b7dbe 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -399,7 +399,8 @@ class SlideController(QtGui.QWidget):
def previewSizeChanged(self):
"""
Takes care of the SlidePreview's size. Is called when one of the the
- splitters is moved or when the screen size is changed.
+ splitters is moved or when the screen size is changed. Note, that this
+ method is (also) called frequently from the mainwindow *paintEvent*.
"""
if self.ratio < float(self.PreviewFrame.width()) / float(
self.PreviewFrame.height()):
@@ -412,13 +413,19 @@ class SlideController(QtGui.QWidget):
max_width = self.PreviewFrame.width() - self.grid.margin() * 2
self.SlidePreview.setFixedSize(QtCore.QSize(max_width,
max_width / self.ratio))
- width = self.parent.ControlSplitter.sizes()[self.split]
- self.PreviewListWidget.setColumnWidth(0, width)
- # Sort out image heights (Songs, bibles excluded)
- if self.serviceItem and not self.serviceItem.is_text():
- for framenumber in range(len(self.serviceItem.get_frames())):
- self.PreviewListWidget.setRowHeight(
- framenumber, width / self.ratio)
+ # Make sure that the frames have the correct size.
+ self.PreviewListWidget.setColumnWidth(0,
+ self.PreviewListWidget.viewport().size().width())
+ if self.serviceItem:
+ # Sort out songs, bibles, etc.
+ if self.serviceItem.is_text():
+ self.PreviewListWidget.resizeRowsToContents()
+ else:
+ # Sort out image heights.
+ width = self.parent.ControlSplitter.sizes()[self.split]
+ for framenumber in range(len(self.serviceItem.get_frames())):
+ self.PreviewListWidget.setRowHeight(
+ framenumber, width / self.ratio)
def onSongBarHandler(self):
request = unicode(self.sender().text())
@@ -590,7 +597,7 @@ class SlideController(QtGui.QWidget):
self.parent.renderManager.height)
else:
image = self.parent.renderManager.image_manager. \
- get_image(frame[u'title'])
+ get_image(frame[u'title'])
label.setPixmap(QtGui.QPixmap.fromImage(image))
self.PreviewListWidget.setCellWidget(framenumber, 0, label)
slideHeight = width * self.parent.renderManager.screen_ratio
@@ -680,8 +687,17 @@ class SlideController(QtGui.QWidget):
Allow the main display to blank the main display at startup time
"""
log.debug(u'mainDisplaySetBackground live = %s' % self.isLive)
+ display_type = QtCore.QSettings().value(
+ self.parent.generalSettingsSection + u'/screen blank',
+ QtCore.QVariant(u'')).toString()
if not self.display.primary:
- self.onBlankDisplay(True)
+ # Order done to handle initial conversion
+ if display_type == u'themed':
+ self.onThemeDisplay(True)
+ elif display_type == u'hidden':
+ self.onHideDisplay(True)
+ else:
+ self.onBlankDisplay(True)
def onSlideBlank(self):
"""
@@ -705,13 +721,15 @@ class SlideController(QtGui.QWidget):
self.ThemeScreen.setChecked(False)
if self.screens.display_count > 1:
self.DesktopScreen.setChecked(False)
- QtCore.QSettings().setValue(
- self.parent.generalSettingsSection + u'/screen blank',
- QtCore.QVariant(checked))
if checked:
Receiver.send_message(u'maindisplay_hide', HideMode.Blank)
+ QtCore.QSettings().setValue(
+ self.parent.generalSettingsSection + u'/screen blank',
+ QtCore.QVariant(u'blanked'))
else:
Receiver.send_message(u'maindisplay_show')
+ QtCore.QSettings().remove(
+ self.parent.generalSettingsSection + u'/screen blank')
self.blankPlugin(checked)
def onThemeDisplay(self, checked):
@@ -726,8 +744,13 @@ class SlideController(QtGui.QWidget):
self.DesktopScreen.setChecked(False)
if checked:
Receiver.send_message(u'maindisplay_hide', HideMode.Theme)
+ QtCore.QSettings().setValue(
+ self.parent.generalSettingsSection + u'/screen blank',
+ QtCore.QVariant(u'themed'))
else:
Receiver.send_message(u'maindisplay_show')
+ QtCore.QSettings().remove(
+ self.parent.generalSettingsSection + u'/screen blank')
self.blankPlugin(checked)
def onHideDisplay(self, checked):
@@ -738,12 +761,19 @@ class SlideController(QtGui.QWidget):
self.HideMenu.setDefaultAction(self.DesktopScreen)
self.BlankScreen.setChecked(False)
self.ThemeScreen.setChecked(False)
- if self.screens.display_count > 1:
- self.DesktopScreen.setChecked(checked)
+ # On valid if more than 1 display
+ if self.screens.display_count <= 1:
+ return
+ self.DesktopScreen.setChecked(checked)
if checked:
Receiver.send_message(u'maindisplay_hide', HideMode.Screen)
+ QtCore.QSettings().setValue(
+ self.parent.generalSettingsSection + u'/screen blank',
+ QtCore.QVariant(u'hidden'))
else:
Receiver.send_message(u'maindisplay_show')
+ QtCore.QSettings().remove(
+ self.parent.generalSettingsSection + u'/screen blank')
self.hidePlugin(checked)
def blankPlugin(self, blank):
@@ -1033,9 +1063,8 @@ class SlideController(QtGui.QWidget):
if self.BlankScreen.isChecked:
self.BlankScreen.setChecked(False)
self.HideMenu.setDefaultAction(self.BlankScreen)
- QtCore.QSettings().setValue(
- self.parent.generalSettingsSection + u'/screen blank',
- QtCore.QVariant(False))
+ QtCore.QSettings().remove(
+ self.parent.generalSettingsSection + u'/screen blank')
if self.ThemeScreen.isChecked:
self.ThemeScreen.setChecked(False)
self.HideMenu.setDefaultAction(self.ThemeScreen)
diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py
index f8236a1eb..2db76063c 100644
--- a/openlp/core/ui/themeform.py
+++ b/openlp/core/ui/themeform.py
@@ -31,6 +31,7 @@ from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate, BackgroundType, BackgroundGradientType, \
Receiver
+from openlp.core.ui import criticalErrorMessageBox
from openlp.core.utils import get_images_filter
from themewizard import Ui_ThemeWizard
@@ -567,20 +568,16 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
self.theme.theme_name = \
unicode(self.field(u'name').toString())
if not self.theme.theme_name:
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('OpenLP.ThemeForm', 'Theme Name Missing'),
translate('OpenLP.ThemeForm',
- 'There is no name for this theme. Please enter one.'),
- (QtGui.QMessageBox.Ok),
- QtGui.QMessageBox.Ok)
+ 'There is no name for this theme. Please enter one.'))
return
if self.theme.theme_name == u'-1' or self.theme.theme_name == u'None':
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('OpenLP.ThemeForm', 'Theme Name Invalid'),
translate('OpenLP.ThemeForm',
- 'Invalid theme name. Please enter one.'),
- (QtGui.QMessageBox.Ok),
- QtGui.QMessageBox.Ok)
+ 'Invalid theme name. Please enter one.'))
return
saveFrom = None
saveTo = None
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index 7e929bb33..df1f1f775 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -32,12 +32,13 @@ import logging
from xml.etree.ElementTree import ElementTree, XML
from PyQt4 import QtCore, QtGui
-from openlp.core.ui import FileRenameForm, ThemeForm
+from openlp.core.ui import criticalErrorMessageBox, FileRenameForm, ThemeForm
from openlp.core.theme import Theme
from openlp.core.lib import OpenLPToolbar, ThemeXML, get_text_file_string, \
build_icon, Receiver, SettingsManager, translate, check_item_selected, \
BackgroundType, BackgroundGradientType, check_directory_exists
-from openlp.core.utils import AppLocation, get_filesystem_encoding
+from openlp.core.utils import AppLocation, delete_file, file_is_unicode, \
+ get_filesystem_encoding
log = logging.getLogger(__name__)
@@ -69,7 +70,7 @@ class ThemeManager(QtGui.QWidget):
u':/themes/theme_edit.png',
translate('OpenLP.ThemeManager', 'Edit a theme.'),
self.onEditTheme)
- self.toolbar.addToolbarButton(
+ self.deleteToolbarAction = self.toolbar.addToolbarButton(
translate('OpenLP.ThemeManager', 'Delete Theme'),
u':/general/general_delete.png',
translate('OpenLP.ThemeManager', 'Delete a theme.'),
@@ -124,6 +125,9 @@ class ThemeManager(QtGui.QWidget):
QtCore.QObject.connect(self.themeListWidget,
QtCore.SIGNAL(u'doubleClicked(QModelIndex)'),
self.changeGlobalFromScreen)
+ QtCore.QObject.connect(self.themeListWidget,
+ QtCore.SIGNAL(u'itemClicked(QListWidgetItem *)'),
+ self.checkListState)
QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'theme_update_global'), self.changeGlobalFromTab)
QtCore.QObject.connect(Receiver.get_receiver(),
@@ -147,6 +151,18 @@ class ThemeManager(QtGui.QWidget):
self.settingsSection + u'/global theme',
QtCore.QVariant(u'')).toString())
+ def checkListState(self, item):
+ """
+ If Default theme selected remove delete button.
+ """
+ realThemeName = unicode(item.data(QtCore.Qt.UserRole).toString())
+ themeName = unicode(item.text())
+ # If default theme restrict actions
+ if realThemeName == themeName:
+ self.deleteToolbarAction.setVisible(True)
+ else:
+ self.deleteToolbarAction.setVisible(False)
+
def contextMenu(self, point):
"""
Build the Right Click Context menu and set state depending on
@@ -325,9 +341,9 @@ class ThemeManager(QtGui.QWidget):
"""
self.themelist.remove(theme)
thumb = theme + u'.png'
+ delete_file(os.path.join(self.path, thumb))
+ delete_file(os.path.join(self.thumbPath, thumb))
try:
- os.remove(os.path.join(self.path, thumb))
- os.remove(os.path.join(self.thumbPath, thumb))
encoding = get_filesystem_encoding()
shutil.rmtree(os.path.join(self.path, theme).encode(encoding))
except OSError:
@@ -343,9 +359,7 @@ class ThemeManager(QtGui.QWidget):
"""
item = self.themeListWidget.currentItem()
if item is None:
- QtGui.QMessageBox.critical(self,
- translate('OpenLP.ThemeManager', 'Error'),
- translate('OpenLP.ThemeManager',
+ criticalErrorMessageBox(message=translate('OpenLP.ThemeManager',
'You have not selected a theme.'))
return
theme = unicode(item.data(QtCore.Qt.UserRole).toString())
@@ -372,10 +386,10 @@ class ThemeManager(QtGui.QWidget):
'Your theme has been successfully exported.'))
except (IOError, OSError):
log.exception(u'Export Theme Failed')
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('OpenLP.ThemeManager', 'Theme Export Failed'),
translate('OpenLP.ThemeManager',
- 'Your theme could not be exported due to an error.'))
+ 'Your theme could not be exported due to an error.'))
finally:
if zip:
zip.close()
@@ -460,7 +474,8 @@ class ThemeManager(QtGui.QWidget):
unicode(themeName) + u'.xml')
xml = get_text_file_string(xmlFile)
if not xml:
- return self._baseTheme()
+ log.debug("No theme data - using default theme")
+ return ThemeXML()
else:
return self._createThemeFromXml(xml, self.path)
@@ -479,16 +494,12 @@ class ThemeManager(QtGui.QWidget):
filexml = None
themename = None
for file in zip.namelist():
- try:
- ucsfile = file.decode(u'utf-8')
- except UnicodeDecodeError:
- QtGui.QMessageBox.critical(
- self, translate('OpenLP.ThemeManager', 'Error'),
- translate('OpenLP.ThemeManager',
- 'File is not a valid theme.\n'
- 'The content encoding is not UTF-8.'))
- log.exception(u'Filename "%s" is not valid UTF-8' %
- file.decode(u'utf-8', u'replace'))
+ ucsfile = file_is_unicode(file)
+ if not ucsfile:
+ criticalErrorMessageBox(
+ message=translate('OpenLP.ThemeManager',
+ 'File is not a valid theme.\n'
+ 'The content encoding is not UTF-8.'))
continue
osfile = unicode(QtCore.QDir.toNativeSeparators(ucsfile))
theme_dir = None
@@ -507,13 +518,10 @@ class ThemeManager(QtGui.QWidget):
check_directory_exists(theme_dir)
if os.path.splitext(ucsfile)[1].lower() in [u'.xml']:
xml_data = zip.read(file)
- try:
- xml_data = xml_data.decode(u'utf-8')
- except UnicodeDecodeError:
- log.exception(u'Theme XML is not UTF-8 '
- u'encoded.')
+ xml_data = file_is_unicode(xml_data)
+ if not xml_data:
break
- filexml = self.checkVersionAndConvert(xml_data)
+ filexml = self._checkVersionAndConvert(xml_data)
outfile = open(fullpath, u'w')
outfile.write(filexml.encode(u'utf-8'))
else:
@@ -523,19 +531,17 @@ class ThemeManager(QtGui.QWidget):
theme = self._createThemeFromXml(filexml, self.path)
self.generateAndSaveImage(dir, themename, theme)
else:
- Receiver.send_message(u'openlp_error_message', {
- u'title': translate('OpenLP.ThemeManager',
- 'Validation Error'),
- u'message':translate('OpenLP.ThemeManager',
- 'File is not a valid theme.')})
+ criticalErrorMessageBox(
+ translate('OpenLP.ThemeManager', 'Validation Error'),
+ translate('OpenLP.ThemeManager',
+ 'File is not a valid theme.'))
log.exception(u'Theme file does not contain XML data %s' %
filename)
except (IOError, NameError):
- Receiver.send_message(u'openlp_error_message', {
- u'title': translate('OpenLP.ThemeManager',
- 'Validation Error'),
- u'message':translate('OpenLP.ThemeManager',
- 'File is not a valid theme.')})
+ criticalErrorMessageBox(
+ translate('OpenLP.ThemeManager', 'Validation Error'),
+ translate('OpenLP.ThemeManager',
+ 'File is not a valid theme.'))
log.exception(u'Importing theme from zip failed %s' % filename)
finally:
if zip:
@@ -543,22 +549,6 @@ class ThemeManager(QtGui.QWidget):
if outfile:
outfile.close()
- def checkVersionAndConvert(self, xml_data):
- """
- Check if a theme is from OpenLP version 1
-
- ``xml_data``
- Theme XML to check the version of
- """
- log.debug(u'checkVersion1 ')
- theme = xml_data.encode(u'ascii', u'xmlcharrefreplace')
- tree = ElementTree(element=XML(theme)).getroot()
- # look for old version 1 tags
- if tree.find(u'BackgroundType') is None:
- return xml_data
- else:
- return self._migrateVersion122(xml_data)
-
def checkIfThemeExists(self, themeName):
"""
Check if theme already exists and displays error message
@@ -568,11 +558,10 @@ class ThemeManager(QtGui.QWidget):
"""
theme_dir = os.path.join(self.path, themeName)
if os.path.exists(theme_dir):
- Receiver.send_message(u'openlp_error_message', {
- u'title': translate('OpenLP.ThemeManager',
- 'Validation Error'),
- u'message':translate('OpenLP.ThemeManager',
- 'A theme with this name already exists.')})
+ criticalErrorMessageBox(
+ translate('OpenLP.ThemeManager', 'Validation Error'),
+ translate('OpenLP.ThemeManager',
+ 'A theme with this name already exists.'))
return False
return True
@@ -589,10 +578,7 @@ class ThemeManager(QtGui.QWidget):
theme_file = os.path.join(theme_dir, name + u'.xml')
if imageTo and self.oldBackgroundImage and \
imageTo != self.oldBackgroundImage:
- try:
- os.remove(self.oldBackgroundImage)
- except OSError:
- log.exception(u'Unable to remove old theme background')
+ delete_file(self.oldBackgroundImage)
outfile = None
try:
outfile = open(theme_file, u'w')
@@ -653,13 +639,21 @@ class ThemeManager(QtGui.QWidget):
image = os.path.join(self.path, theme + u'.png')
return image
- def _baseTheme(self):
+ def _checkVersionAndConvert(self, xml_data):
"""
- Provide a base theme with sensible defaults
+ Check if a theme is from OpenLP version 1
+
+ ``xml_data``
+ Theme XML to check the version of
"""
- log.debug(u'base theme created')
- newtheme = ThemeXML()
- return newtheme
+ log.debug(u'checkVersion1 ')
+ theme = xml_data.encode(u'ascii', u'xmlcharrefreplace')
+ tree = ElementTree(element=XML(theme)).getroot()
+ # look for old version 1 tags
+ if tree.find(u'BackgroundType') is None:
+ return xml_data
+ else:
+ return self._migrateVersion122(xml_data)
def _createThemeFromXml(self, themeXml, path):
"""
@@ -694,21 +688,19 @@ class ThemeManager(QtGui.QWidget):
return False
# should be the same unless default
if theme != unicode(item.data(QtCore.Qt.UserRole).toString()):
- QtGui.QMessageBox.critical(self,
- translate('OpenLP.ThemeManager', 'Error'),
- translate('OpenLP.ThemeManager',
- 'You are unable to delete the default theme.'))
+ criticalErrorMessageBox(
+ message=translate('OpenLP.ThemeManager',
+ 'You are unable to delete the default theme.'))
return False
# check for use in the system else where.
if testPlugin:
for plugin in self.mainwindow.pluginManager.plugins:
if plugin.usesTheme(theme):
- Receiver.send_message(u'openlp_error_message', {
- u'title': translate('OpenLP.ThemeManager',
+ criticalErrorMessageBox(translate('OpenLP.ThemeManager',
'Validation Error'),
- u'message': unicode(translate('OpenLP.ThemeManager',
+ unicode(translate('OpenLP.ThemeManager',
'Theme %s is used in the %s plugin.')) % \
- (theme, plugin.name)})
+ (theme, plugin.name))
return False
return True
diff --git a/openlp/core/ui/wizard.py b/openlp/core/ui/wizard.py
new file mode 100644
index 000000000..d3a0255b4
--- /dev/null
+++ b/openlp/core/ui/wizard.py
@@ -0,0 +1,171 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
+# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
+# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
+# Carsten Tinggaard, Frode Woldsund #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU General Public License as published by the Free #
+# Software Foundation; version 2 of the License. #
+# #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
+# more details. #
+# #
+# You should have received a copy of the GNU General Public License along #
+# with this program; if not, write to the Free Software Foundation, Inc., 59 #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+###############################################################################
+"""
+The :mod:``wizard`` module provides generic wizard tools for OpenLP.
+"""
+import logging
+
+from PyQt4 import QtCore, QtGui
+
+from openlp.core.lib import build_icon, Receiver
+
+log = logging.getLogger(__name__)
+
+class OpenLPWizard(QtGui.QWizard):
+ """
+ Generic OpenLP wizard to provide generic functionality and a unified look
+ and feel.
+ """
+ def __init__(self, parent, plugin, name, image):
+ QtGui.QWizard.__init__(self, parent)
+ self.setObjectName(name)
+ self.openIcon = build_icon(u':/general/general_open.png')
+ self.deleteIcon = build_icon(u':/general/general_delete.png')
+ self.finishButton = self.button(QtGui.QWizard.FinishButton)
+ self.cancelButton = self.button(QtGui.QWizard.CancelButton)
+ self.setupUi(image)
+ self.registerFields()
+ self.plugin = plugin
+ self.customInit()
+ self.customSignals()
+ QtCore.QObject.connect(self, QtCore.SIGNAL(u'currentIdChanged(int)'),
+ self.onCurrentIdChanged)
+
+ def setupUi(self, image):
+ """
+ Set up the wizard UI
+ """
+ self.setModal(True)
+ self.setWizardStyle(QtGui.QWizard.ModernStyle)
+ self.setOptions(QtGui.QWizard.IndependentPages |
+ QtGui.QWizard.NoBackButtonOnStartPage |
+ QtGui.QWizard.NoBackButtonOnLastPage)
+ self.addWelcomePage(image)
+ self.addCustomPages()
+ self.addProgressPage()
+ self.retranslateUi()
+ QtCore.QMetaObject.connectSlotsByName(self)
+
+ def addWelcomePage(self, image):
+ """
+ Add the opening welcome page to the wizard.
+
+ ``image``
+ A splash image for the wizard
+ """
+ self.welcomePage = QtGui.QWizardPage()
+ self.welcomePage.setPixmap(QtGui.QWizard.WatermarkPixmap,
+ QtGui.QPixmap(image))
+ self.welcomePage.setObjectName(u'WelcomePage')
+ self.welcomeLayout = QtGui.QVBoxLayout(self.welcomePage)
+ self.welcomeLayout.setObjectName(u'WelcomeLayout')
+ self.titleLabel = QtGui.QLabel(self.welcomePage)
+ self.titleLabel.setObjectName(u'TitleLabel')
+ self.welcomeLayout.addWidget(self.titleLabel)
+ self.welcomeLayout.addSpacing(40)
+ self.informationLabel = QtGui.QLabel(self.welcomePage)
+ self.informationLabel.setWordWrap(True)
+ self.informationLabel.setObjectName(u'InformationLabel')
+ self.welcomeLayout.addWidget(self.informationLabel)
+ self.welcomeLayout.addStretch()
+ self.addPage(self.welcomePage)
+
+ def addProgressPage(self):
+ """
+ Add the progress page for the wizard. This page informs the user how
+ the wizard is progressing with its task.
+ """
+ self.progressPage = QtGui.QWizardPage()
+ self.progressPage.setObjectName(u'progressPage')
+ self.progressLayout = QtGui.QVBoxLayout(self.progressPage)
+ self.progressLayout.setMargin(48)
+ self.progressLayout.setObjectName(u'progressLayout')
+ self.progressLabel = QtGui.QLabel(self.progressPage)
+ self.progressLabel.setObjectName(u'progressLabel')
+ self.progressLayout.addWidget(self.progressLabel)
+ self.progressBar = QtGui.QProgressBar(self.progressPage)
+ self.progressBar.setObjectName(u'progressBar')
+ self.progressLayout.addWidget(self.progressBar)
+ self.addPage(self.progressPage)
+
+ def exec_(self):
+ """
+ Run the wizard.
+ """
+ self.setDefaults()
+ return QtGui.QWizard.exec_(self)
+
+ def reject(self):
+ """
+ Stop the wizard on cancel button, close button or ESC key.
+ """
+ log.debug(u'Wizard cancelled by user.')
+ if self.currentPage() == self.progressPage:
+ Receiver.send_message(u'openlp_stop_wizard')
+ self.done(QtGui.QDialog.Rejected)
+
+ def onCurrentIdChanged(self, pageId):
+ """
+ Perform necessary functions depending on which wizard page is active.
+ """
+ if self.page(pageId) == self.progressPage:
+ self.preWizard()
+ self.performWizard()
+ self.postWizard()
+
+ def incrementProgressBar(self, status_text, increment=1):
+ """
+ Update the wizard progress page.
+
+ ``status_text``
+ Current status information to display.
+
+ ``increment``
+ The value to increment the progress bar by.
+ """
+ log.debug(u'IncrementBar %s', status_text)
+ self.progressLabel.setText(status_text)
+ if increment > 0:
+ self.progressBar.setValue(self.progressBar.value() + increment)
+ Receiver.send_message(u'openlp_process_events')
+
+ def preWizard(self):
+ """
+ Prepare the UI for the import.
+ """
+ self.finishButton.setVisible(False)
+ self.progressBar.setMinimum(0)
+ self.progressBar.setMaximum(1188)
+ self.progressBar.setValue(0)
+
+ def postWizard(self):
+ """
+ Clean up the UI after the import has finished.
+ """
+ self.progressBar.setValue(self.progressBar.maximum())
+ self.finishButton.setVisible(True)
+ self.cancelButton.setVisible(False)
+ Receiver.send_message(u'openlp_process_events')
diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py
index 5274a6186..9117a8e19 100644
--- a/openlp/core/utils/__init__.py
+++ b/openlp/core/utils/__init__.py
@@ -26,7 +26,6 @@
"""
The :mod:`utils` module provides the utility libraries for OpenLP
"""
-
import logging
import os
import re
@@ -36,12 +35,18 @@ import urllib2
from datetime import datetime
from PyQt4 import QtGui, QtCore
+if sys.platform != u'win32' and sys.platform != u'darwin':
+ try:
+ from xdg import BaseDirectory
+ XDG_BASE_AVAILABLE = True
+ except ImportError:
+ XDG_BASE_AVAILABLE = False
import openlp
from openlp.core.lib import Receiver, translate
log = logging.getLogger(__name__)
-images_filter = None
+IMAGES_FILTER = None
class VersionThread(QtCore.QThread):
"""
@@ -113,77 +118,46 @@ class AppLocation(object):
The directory type you want, for instance the data directory.
"""
if dir_type == AppLocation.AppDir:
- if hasattr(sys, u'frozen') and sys.frozen == 1:
- app_path = os.path.abspath(os.path.split(sys.argv[0])[0])
- else:
- app_path = os.path.split(openlp.__file__)[0]
- return app_path
+ return _get_frozen_path(
+ os.path.abspath(os.path.split(sys.argv[0])[0]),
+ os.path.split(openlp.__file__)[0])
elif dir_type == AppLocation.ConfigDir:
- if sys.platform == u'win32':
- path = os.path.join(os.getenv(u'APPDATA'), u'openlp')
- elif sys.platform == u'darwin':
- path = os.path.join(os.getenv(u'HOME'), u'Library',
- u'Application Support', u'openlp')
- else:
- try:
- from xdg import BaseDirectory
- path = os.path.join(
- BaseDirectory.xdg_config_home, u'openlp')
- except ImportError:
- path = os.path.join(os.getenv(u'HOME'), u'.openlp')
- return path
+ return _get_os_dir_path(u'openlp',
+ os.path.join(os.getenv(u'HOME'), u'Library',
+ u'Application Support', u'openlp'),
+ os.path.join(BaseDirectory.xdg_config_home, u'openlp'),
+ os.path.join(os.getenv(u'HOME'), u'.openlp'))
elif dir_type == AppLocation.DataDir:
- if sys.platform == u'win32':
- path = os.path.join(os.getenv(u'APPDATA'), u'openlp', u'data')
- elif sys.platform == u'darwin':
- path = os.path.join(os.getenv(u'HOME'), u'Library',
- u'Application Support', u'openlp', u'Data')
- else:
- try:
- from xdg import BaseDirectory
- path = os.path.join(BaseDirectory.xdg_data_home, u'openlp')
- except ImportError:
- path = os.path.join(os.getenv(u'HOME'), u'.openlp', u'data')
- return path
+ return _get_os_dir_path(os.path.join(u'openlp', u'data'),
+ os.path.join(os.getenv(u'HOME'), u'Library',
+ u'Application Support', u'openlp', u'Data'),
+ os.path.join(BaseDirectory.xdg_data_home, u'openlp'),
+ os.path.join(os.getenv(u'HOME'), u'.openlp', u'data'))
elif dir_type == AppLocation.PluginsDir:
- plugin_path = None
app_path = os.path.abspath(os.path.split(sys.argv[0])[0])
- if hasattr(sys, u'frozen') and sys.frozen == 1:
- plugin_path = os.path.join(app_path, u'plugins')
- else:
- plugin_path = os.path.join(
- os.path.split(openlp.__file__)[0], u'plugins')
- return plugin_path
+ return _get_frozen_path(os.path.join(app_path, u'plugins'),
+ os.path.join(os.path.split(openlp.__file__)[0], u'plugins'))
elif dir_type == AppLocation.VersionDir:
- if hasattr(sys, u'frozen') and sys.frozen == 1:
- version_path = os.path.abspath(os.path.split(sys.argv[0])[0])
- else:
- version_path = os.path.split(openlp.__file__)[0]
- return version_path
+ return _get_frozen_path(
+ os.path.abspath(os.path.split(sys.argv[0])[0]),
+ os.path.split(openlp.__file__)[0])
elif dir_type == AppLocation.CacheDir:
- if sys.platform == u'win32':
- path = os.path.join(os.getenv(u'APPDATA'), u'openlp')
- elif sys.platform == u'darwin':
- path = os.path.join(os.getenv(u'HOME'), u'Library',
- u'Application Support', u'openlp')
- else:
- try:
- from xdg import BaseDirectory
- path = os.path.join(
- BaseDirectory.xdg_cache_home, u'openlp')
- except ImportError:
- path = os.path.join(os.getenv(u'HOME'), u'.openlp')
- return path
+ return _get_os_dir_path(u'openlp',
+ os.path.join(os.getenv(u'HOME'), u'Library',
+ u'Application Support', u'openlp'),
+ os.path.join(BaseDirectory.xdg_cache_home, u'openlp'),
+ os.path.join(os.getenv(u'HOME'), u'.openlp'))
if dir_type == AppLocation.LanguageDir:
- if hasattr(sys, u'frozen') and sys.frozen == 1:
- app_path = os.path.abspath(os.path.split(sys.argv[0])[0])
- else:
- app_path = os.path.split(openlp.__file__)[0]
+ app_path = _get_frozen_path(
+ os.path.abspath(os.path.split(sys.argv[0])[0]),
+ os.path.split(openlp.__file__)[0])
return os.path.join(app_path, u'i18n')
-
@staticmethod
def get_data_path():
+ """
+ Return the path OpenLP stores all its data under.
+ """
path = AppLocation.get_directory(AppLocation.DataDir)
if not os.path.exists(path):
os.makedirs(path)
@@ -191,12 +165,38 @@ class AppLocation(object):
@staticmethod
def get_section_data_path(section):
+ """
+ Return the path a particular module stores its data under.
+ """
data_path = AppLocation.get_data_path()
path = os.path.join(data_path, section)
if not os.path.exists(path):
os.makedirs(path)
return path
+def _get_os_dir_path(win_option, darwin_option, base_dir_option,
+ non_base_dir_option):
+ """
+ Return a path based on which OS and environment we are running in.
+ """
+ if sys.platform == u'win32':
+ return os.path.join(os.getenv(u'APPDATA'), win_option)
+ elif sys.platform == u'darwin':
+ return darwin_option
+ else:
+ if XDG_BASE_AVAILABLE:
+ return base_dir_option
+ else:
+ return non_base_dir_option
+
+def _get_frozen_path(frozen_option, non_frozen_option):
+ """
+ Return a path based on the system status.
+ """
+ if hasattr(sys, u'frozen') and sys.frozen == 1:
+ return frozen_option
+ else:
+ return non_frozen_option
def check_latest_version(current_version):
"""
@@ -207,7 +207,7 @@ def check_latest_version(current_version):
The current version of OpenLP.
"""
version_string = current_version[u'full']
- #set to prod in the distribution config file.
+ # set to prod in the distribution config file.
settings = QtCore.QSettings()
settings.beginGroup(u'general')
last_test = unicode(settings.value(u'last version test',
@@ -225,9 +225,8 @@ def check_latest_version(current_version):
remote_version = None
try:
remote_version = unicode(urllib2.urlopen(req, None).read()).strip()
- except IOError, e:
- if hasattr(e, u'reason'):
- log.exception(u'Reason for failure: %s', e.reason)
+ except IOError:
+ log.exception(u'Failed to download the latest OpenLP version file')
if remote_version:
version_string = remote_version
return version_string
@@ -264,24 +263,44 @@ def get_images_filter():
Returns a filter string for a file dialog containing all the supported
image formats.
"""
- global images_filter
- if not images_filter:
+ global IMAGES_FILTER
+ if not IMAGES_FILTER:
log.debug(u'Generating images filter.')
formats = [unicode(fmt)
for fmt in QtGui.QImageReader.supportedImageFormats()]
visible_formats = u'(*.%s)' % u'; *.'.join(formats)
actual_formats = u'(*.%s)' % u' *.'.join(formats)
- images_filter = u'%s %s %s' % (translate('OpenLP', 'Image Files'),
+ IMAGES_FILTER = u'%s %s %s' % (translate('OpenLP', 'Image Files'),
visible_formats, actual_formats)
- return images_filter
+ return IMAGES_FILTER
def split_filename(path):
+ """
+ Return a list of the parts in a given path.
+ """
path = os.path.abspath(path)
if not os.path.isfile(path):
return path, u''
else:
return os.path.split(path)
+def delete_file(file_path_name):
+ """
+ Deletes a file from the system.
+
+ ``file_path_name``
+ The file, including path, to delete.
+ """
+ if not file_path_name:
+ return False
+ try:
+ if os.path.exists(file_path_name):
+ os.remove(file_path_name)
+ return True
+ except (IOError, OSError):
+ log.exception("Unable to delete file %s" % file_path_name)
+ return False
+
def get_web_page(url, header=None, update_openlp=False):
"""
Attempts to download the webpage at url and returns that page or None.
@@ -317,9 +336,48 @@ def get_web_page(url, header=None, update_openlp=False):
Receiver.send_message(u'openlp_process_events')
return page
+def file_is_unicode(filename):
+ """
+ Checks if a file is valid unicode and returns the unicode decoded file or
+ None.
+
+ ``filename``
+ File to check is valid unicode.
+ """
+ if not filename:
+ return None
+ ucsfile = None
+ try:
+ ucsfile = filename.decode(u'utf-8')
+ except UnicodeDecodeError:
+ log.exception(u'Filename "%s" is not valid UTF-8' %
+ filename.decode(u'utf-8', u'replace'))
+ if not ucsfile:
+ return None
+ return ucsfile
+
+def string_is_unicode(test_string):
+ """
+ Makes sure a string is unicode.
+
+ ``test_string``
+ The string to confirm is unicode.
+ """
+ return_string = u''
+ if not test_string:
+ return return_string
+ if isinstance(test_string, unicode):
+ return_string = test_string
+ if not isinstance(test_string, unicode):
+ try:
+ return_string = unicode(test_string, u'utf-8')
+ except UnicodeError:
+ log.exception("Error encoding string to unicode")
+ return return_string
+
from languagemanager import LanguageManager
from actions import ActionList
__all__ = [u'AppLocation', u'check_latest_version', u'add_actions',
u'get_filesystem_encoding', u'LanguageManager', u'ActionList',
- u'get_web_page']
+ u'get_web_page', u'file_is_unicode', u'string_is_unicode']
diff --git a/openlp/plugins/bibles/forms/bibleimportform.py b/openlp/plugins/bibles/forms/bibleimportform.py
index 4590ea739..d3f41804b 100644
--- a/openlp/plugins/bibles/forms/bibleimportform.py
+++ b/openlp/plugins/bibles/forms/bibleimportform.py
@@ -23,7 +23,9 @@
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
-
+"""
+The bible import functions for OpenLP
+"""
import csv
import logging
import os
@@ -31,15 +33,19 @@ import os.path
from PyQt4 import QtCore, QtGui
-from bibleimportwizard import Ui_BibleImportWizard
from openlp.core.lib import Receiver, SettingsManager, translate
from openlp.core.lib.db import delete_database
-from openlp.core.utils import AppLocation
+from openlp.core.ui import criticalErrorMessageBox
+from openlp.core.ui.wizard import OpenLPWizard
+from openlp.core.utils import AppLocation, string_is_unicode
from openlp.plugins.bibles.lib.manager import BibleFormat
log = logging.getLogger(__name__)
class WebDownload(object):
+ """
+ Provides an enumeration for the web bible types available to OpenLP.
+ """
Unknown = -1
Crosswalk = 0
BibleGateway = 1
@@ -53,10 +59,13 @@ class WebDownload(object):
@classmethod
def get_name(cls, name):
+ """
+ Get the web bible type name.
+ """
return cls.Names[name]
-class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
+class BibleImportForm(OpenLPWizard):
"""
This is the Bible Import Wizard, which allows easy importing of Bibles
into OpenLP from other formats like OSIS, CSV and OpenSong.
@@ -76,27 +85,42 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
``bibleplugin``
The Bible plugin.
"""
- QtGui.QWizard.__init__(self, parent)
- self.setupUi(self)
- self.registerFields()
+ self.manager = manager
+ self.web_bible_list = {}
+ OpenLPWizard.__init__(self, parent, bibleplugin, u'bibleImportWizard',
+ u':/wizards/wizard_importbible.bmp')
+
+ def setupUi(self, image):
+ """
+ Set up the UI for the bible wizard.
+ """
+ OpenLPWizard.setupUi(self, image)
+ QtCore.QObject.connect(self.formatComboBox,
+ QtCore.SIGNAL(u'currentIndexChanged(int)'), self.selectStack,
+ QtCore.SLOT(u'setCurrentIndex(int)'))
+
+ def customInit(self):
+ """
+ Perform any custom initialisation for bible importing.
+ """
if BibleFormat.get_availability(BibleFormat.OpenLP1):
self.openlp1DisabledLabel.hide()
else:
self.openlp1FileLabel.hide()
self.openlp1FileEdit.hide()
self.openlp1BrowseButton.hide()
- self.finishButton = self.button(QtGui.QWizard.FinishButton)
- self.cancelButton = self.button(QtGui.QWizard.CancelButton)
- self.manager = manager
- self.bibleplugin = bibleplugin
self.manager.set_process_dialog(self)
- self.web_bible_list = {}
self.loadWebBibles()
self.restart()
self.selectStack.setCurrentIndex(0)
+
+ def customSignals(self):
+ """
+ Set up the signals used in the bible importer.
+ """
QtCore.QObject.connect(self.webSourceComboBox,
QtCore.SIGNAL(u'currentIndexChanged(int)'),
- self.onWebSourceComboBoxCurrentIndexChanged)
+ self.onWebSourceComboBoxIndexChanged)
QtCore.QObject.connect(self.osisBrowseButton,
QtCore.SIGNAL(u'clicked()'),
self.onOsisBrowseButtonClicked)
@@ -112,25 +136,329 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
QtCore.QObject.connect(self.openlp1BrowseButton,
QtCore.SIGNAL(u'clicked()'),
self.onOpenlp1BrowseButtonClicked)
- QtCore.QObject.connect(self,
- QtCore.SIGNAL(u'currentIdChanged(int)'),
- self.onCurrentIdChanged)
- def exec_(self):
+ def addCustomPages(self):
"""
- Run the wizard.
+ Add the bible import specific wizard pages.
"""
- self.setDefaults()
- return QtGui.QWizard.exec_(self)
+ # Select Page
+ self.selectPage = QtGui.QWizardPage()
+ self.selectPage.setObjectName(u'SelectPage')
+ self.selectPageLayout = QtGui.QVBoxLayout(self.selectPage)
+ self.selectPageLayout.setObjectName(u'SelectPageLayout')
+ self.formatLayout = QtGui.QFormLayout()
+ self.formatLayout.setObjectName(u'FormatLayout')
+ self.formatLabel = QtGui.QLabel(self.selectPage)
+ self.formatLabel.setObjectName(u'FormatLabel')
+ self.formatComboBox = QtGui.QComboBox(self.selectPage)
+ self.formatComboBox.addItems([u'', u'', u'', u'', u''])
+ self.formatComboBox.setObjectName(u'FormatComboBox')
+ self.formatLayout.addRow(self.formatLabel, self.formatComboBox)
+ self.formatSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
+ QtGui.QSizePolicy.Minimum)
+ self.formatLayout.setItem(1, QtGui.QFormLayout.LabelRole,
+ self.formatSpacer)
+ self.selectPageLayout.addLayout(self.formatLayout)
+ self.selectStack = QtGui.QStackedLayout()
+ self.selectStack.setObjectName(u'SelectStack')
+ self.osisWidget = QtGui.QWidget(self.selectPage)
+ self.osisWidget.setObjectName(u'OsisWidget')
+ self.osisLayout = QtGui.QFormLayout(self.osisWidget)
+ self.osisLayout.setMargin(0)
+ self.osisLayout.setObjectName(u'OsisLayout')
+ self.osisFileLabel = QtGui.QLabel(self.osisWidget)
+ self.osisFileLabel.setObjectName(u'OsisFileLabel')
+ self.osisFileLayout = QtGui.QHBoxLayout()
+ self.osisFileLayout.setObjectName(u'OsisFileLayout')
+ self.osisFileEdit = QtGui.QLineEdit(self.osisWidget)
+ self.osisFileEdit.setObjectName(u'OsisFileEdit')
+ self.osisFileLayout.addWidget(self.osisFileEdit)
+ self.osisBrowseButton = QtGui.QToolButton(self.osisWidget)
+ self.osisBrowseButton.setIcon(self.openIcon)
+ self.osisBrowseButton.setObjectName(u'OsisBrowseButton')
+ self.osisFileLayout.addWidget(self.osisBrowseButton)
+ self.osisLayout.addRow(self.osisFileLabel, self.osisFileLayout)
+ self.osisSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
+ QtGui.QSizePolicy.Minimum)
+ self.osisLayout.setItem(1, QtGui.QFormLayout.LabelRole, self.osisSpacer)
+ self.selectStack.addWidget(self.osisWidget)
+ self.csvWidget = QtGui.QWidget(self.selectPage)
+ self.csvWidget.setObjectName(u'CsvWidget')
+ self.csvLayout = QtGui.QFormLayout(self.csvWidget)
+ self.csvLayout.setMargin(0)
+ self.csvLayout.setObjectName(u'CsvLayout')
+ self.csvBooksLabel = QtGui.QLabel(self.csvWidget)
+ self.csvBooksLabel.setObjectName(u'CsvBooksLabel')
+ self.csvBooksLayout = QtGui.QHBoxLayout()
+ self.csvBooksLayout.setObjectName(u'CsvBooksLayout')
+ self.csvBooksEdit = QtGui.QLineEdit(self.csvWidget)
+ self.csvBooksEdit.setObjectName(u'CsvBooksEdit')
+ self.csvBooksLayout.addWidget(self.csvBooksEdit)
+ self.csvBooksButton = QtGui.QToolButton(self.csvWidget)
+ self.csvBooksButton.setIcon(self.openIcon)
+ self.csvBooksButton.setObjectName(u'CsvBooksButton')
+ self.csvBooksLayout.addWidget(self.csvBooksButton)
+ self.csvLayout.addRow(self.csvBooksLabel, self.csvBooksLayout)
+ self.csvVersesLabel = QtGui.QLabel(self.csvWidget)
+ self.csvVersesLabel.setObjectName(u'CsvVersesLabel')
+ self.csvVersesLayout = QtGui.QHBoxLayout()
+ self.csvVersesLayout.setObjectName(u'CsvVersesLayout')
+ self.csvVersesEdit = QtGui.QLineEdit(self.csvWidget)
+ self.csvVersesEdit.setObjectName(u'CsvVersesEdit')
+ self.csvVersesLayout.addWidget(self.csvVersesEdit)
+ self.csvVersesButton = QtGui.QToolButton(self.csvWidget)
+ self.csvVersesButton.setIcon(self.openIcon)
+ self.csvVersesButton.setObjectName(u'CsvVersesButton')
+ self.csvVersesLayout.addWidget(self.csvVersesButton)
+ self.csvLayout.addRow(self.csvVersesLabel, self.csvVersesLayout)
+ self.csvSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
+ QtGui.QSizePolicy.Minimum)
+ self.csvLayout.setItem(2, QtGui.QFormLayout.LabelRole, self.csvSpacer)
+ self.selectStack.addWidget(self.csvWidget)
+ self.openSongWidget = QtGui.QWidget(self.selectPage)
+ self.openSongWidget.setObjectName(u'OpenSongWidget')
+ self.openSongLayout = QtGui.QFormLayout(self.openSongWidget)
+ self.openSongLayout.setMargin(0)
+ self.openSongLayout.setObjectName(u'OpenSongLayout')
+ self.openSongFileLabel = QtGui.QLabel(self.openSongWidget)
+ self.openSongFileLabel.setObjectName(u'OpenSongFileLabel')
+ self.openSongFileLayout = QtGui.QHBoxLayout()
+ self.openSongFileLayout.setObjectName(u'OpenSongFileLayout')
+ self.openSongFileEdit = QtGui.QLineEdit(self.openSongWidget)
+ self.openSongFileEdit.setObjectName(u'OpenSongFileEdit')
+ self.openSongFileLayout.addWidget(self.openSongFileEdit)
+ self.openSongBrowseButton = QtGui.QToolButton(self.openSongWidget)
+ self.openSongBrowseButton.setIcon(self.openIcon)
+ self.openSongBrowseButton.setObjectName(u'OpenSongBrowseButton')
+ self.openSongFileLayout.addWidget(self.openSongBrowseButton)
+ self.openSongLayout.addRow(self.openSongFileLabel,
+ self.openSongFileLayout)
+ self.openSongSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
+ QtGui.QSizePolicy.Minimum)
+ self.openSongLayout.setItem(1, QtGui.QFormLayout.LabelRole,
+ self.openSongSpacer)
+ self.selectStack.addWidget(self.openSongWidget)
+ self.webTabWidget = QtGui.QTabWidget(self.selectPage)
+ self.webTabWidget.setObjectName(u'WebTabWidget')
+ self.webBibleTab = QtGui.QWidget()
+ self.webBibleTab.setObjectName(u'WebBibleTab')
+ self.webBibleLayout = QtGui.QFormLayout(self.webBibleTab)
+ self.webBibleLayout.setObjectName(u'WebBibleLayout')
+ self.webSourceLabel = QtGui.QLabel(self.webBibleTab)
+ self.webSourceLabel.setObjectName(u'WebSourceLabel')
+ self.webBibleLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
+ self.webSourceLabel)
+ self.webSourceComboBox = QtGui.QComboBox(self.webBibleTab)
+ self.webSourceComboBox.setObjectName(u'WebSourceComboBox')
+ self.webSourceComboBox.addItems([u'', u'', u''])
+ self.webBibleLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
+ self.webSourceComboBox)
+ self.webTranslationLabel = QtGui.QLabel(self.webBibleTab)
+ self.webTranslationLabel.setObjectName(u'webTranslationLabel')
+ self.webBibleLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
+ self.webTranslationLabel)
+ self.webTranslationComboBox = QtGui.QComboBox(self.webBibleTab)
+ self.webTranslationComboBox.setSizeAdjustPolicy(
+ QtGui.QComboBox.AdjustToContents)
+ self.webTranslationComboBox.setObjectName(u'WebTranslationComboBox')
+ self.webBibleLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
+ self.webTranslationComboBox)
+ self.webTabWidget.addTab(self.webBibleTab, u'')
+ self.webProxyTab = QtGui.QWidget()
+ self.webProxyTab.setObjectName(u'WebProxyTab')
+ self.webProxyLayout = QtGui.QFormLayout(self.webProxyTab)
+ self.webProxyLayout.setObjectName(u'WebProxyLayout')
+ self.webServerLabel = QtGui.QLabel(self.webProxyTab)
+ self.webServerLabel.setObjectName(u'WebServerLabel')
+ self.webProxyLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
+ self.webServerLabel)
+ self.webServerEdit = QtGui.QLineEdit(self.webProxyTab)
+ self.webServerEdit.setObjectName(u'WebServerEdit')
+ self.webProxyLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
+ self.webServerEdit)
+ self.webUserLabel = QtGui.QLabel(self.webProxyTab)
+ self.webUserLabel.setObjectName(u'WebUserLabel')
+ self.webProxyLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
+ self.webUserLabel)
+ self.webUserEdit = QtGui.QLineEdit(self.webProxyTab)
+ self.webUserEdit.setObjectName(u'WebUserEdit')
+ self.webProxyLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
+ self.webUserEdit)
+ self.webPasswordLabel = QtGui.QLabel(self.webProxyTab)
+ self.webPasswordLabel.setObjectName(u'WebPasswordLabel')
+ self.webProxyLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
+ self.webPasswordLabel)
+ self.webPasswordEdit = QtGui.QLineEdit(self.webProxyTab)
+ self.webPasswordEdit.setObjectName(u'WebPasswordEdit')
+ self.webProxyLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
+ self.webPasswordEdit)
+ self.webTabWidget.addTab(self.webProxyTab, u'')
+ self.selectStack.addWidget(self.webTabWidget)
+ self.openlp1Widget = QtGui.QWidget(self.selectPage)
+ self.openlp1Widget.setObjectName(u'Openlp1Widget')
+ self.openlp1Layout = QtGui.QFormLayout(self.openlp1Widget)
+ self.openlp1Layout.setMargin(0)
+ self.openlp1Layout.setObjectName(u'Openlp1Layout')
+ self.openlp1FileLabel = QtGui.QLabel(self.openlp1Widget)
+ self.openlp1FileLabel.setObjectName(u'Openlp1FileLabel')
+ self.openlp1FileLayout = QtGui.QHBoxLayout()
+ self.openlp1FileLayout.setObjectName(u'Openlp1FileLayout')
+ self.openlp1FileEdit = QtGui.QLineEdit(self.openlp1Widget)
+ self.openlp1FileEdit.setObjectName(u'Openlp1FileEdit')
+ self.openlp1FileLayout.addWidget(self.openlp1FileEdit)
+ self.openlp1BrowseButton = QtGui.QToolButton(self.openlp1Widget)
+ self.openlp1BrowseButton.setIcon(self.openIcon)
+ self.openlp1BrowseButton.setObjectName(u'Openlp1BrowseButton')
+ self.openlp1FileLayout.addWidget(self.openlp1BrowseButton)
+ self.openlp1Layout.addRow(self.openlp1FileLabel, self.openlp1FileLayout)
+ self.openlp1DisabledLabel = QtGui.QLabel(self.openlp1Widget)
+ self.openlp1DisabledLabel.setWordWrap(True)
+ self.openlp1DisabledLabel.setObjectName(u'Openlp1DisabledLabel')
+ self.openlp1Layout.addRow(self.openlp1DisabledLabel)
+ self.openlp1Spacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
+ QtGui.QSizePolicy.Minimum)
+ self.openlp1Layout.setItem(1, QtGui.QFormLayout.LabelRole,
+ self.openlp1Spacer)
+ self.selectStack.addWidget(self.openlp1Widget)
+ self.selectPageLayout.addLayout(self.selectStack)
+ self.addPage(self.selectPage)
+ # License Page
+ self.licenseDetailsPage = QtGui.QWizardPage()
+ self.licenseDetailsPage.setObjectName(u'LicenseDetailsPage')
+ self.licenseDetailsLayout = QtGui.QFormLayout(self.licenseDetailsPage)
+ self.licenseDetailsLayout.setObjectName(u'LicenseDetailsLayout')
+ self.versionNameLabel = QtGui.QLabel(self.licenseDetailsPage)
+ self.versionNameLabel.setObjectName(u'VersionNameLabel')
+ self.licenseDetailsLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
+ self.versionNameLabel)
+ self.versionNameEdit = QtGui.QLineEdit(self.licenseDetailsPage)
+ self.versionNameEdit.setObjectName(u'VersionNameEdit')
+ self.licenseDetailsLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
+ self.versionNameEdit)
+ self.copyrightLabel = QtGui.QLabel(self.licenseDetailsPage)
+ self.copyrightLabel.setObjectName(u'CopyrightLabel')
+ self.licenseDetailsLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
+ self.copyrightLabel)
+ self.copyrightEdit = QtGui.QLineEdit(self.licenseDetailsPage)
+ self.copyrightEdit.setObjectName(u'CopyrightEdit')
+ self.licenseDetailsLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
+ self.copyrightEdit)
+ self.permissionsLabel = QtGui.QLabel(self.licenseDetailsPage)
+ self.permissionsLabel.setObjectName(u'PermissionsLabel')
+ self.licenseDetailsLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
+ self.permissionsLabel)
+ self.permissionsEdit = QtGui.QLineEdit(self.licenseDetailsPage)
+ self.permissionsEdit.setObjectName(u'PermissionsEdit')
+ self.licenseDetailsLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
+ self.permissionsEdit)
+ self.addPage(self.licenseDetailsPage)
- def reject(self):
+ def retranslateUi(self):
"""
- Stop the import on cancel button, close button or ESC key.
+ Allow for localisation of the bible import wizard.
"""
- log.debug(u'Import canceled by user.')
- if self.currentPage() == self.importPage:
- Receiver.send_message(u'bibles_stop_import')
- self.done(QtGui.QDialog.Rejected)
+ self.setWindowTitle(
+ translate('BiblesPlugin.ImportWizardForm', 'Bible Import Wizard'))
+ self.titleLabel.setText(
+ u'%s ' % \
+ translate('BiblesPlugin.ImportWizardForm',
+ 'Welcome to the Bible Import Wizard'))
+ self.informationLabel.setText(
+ translate('BiblesPlugin.ImportWizardForm',
+ 'This wizard will help you to import Bibles from a '
+ 'variety of formats. Click the next button below to start the '
+ 'process by selecting a format to import from.'))
+ self.selectPage.setTitle(translate('BiblesPlugin.ImportWizardForm',
+ 'Select Import Source'))
+ self.selectPage.setSubTitle(
+ translate('BiblesPlugin.ImportWizardForm',
+ 'Select the import format, and where to import from.'))
+ self.formatLabel.setText(
+ translate('BiblesPlugin.ImportWizardForm', 'Format:'))
+ self.formatComboBox.setItemText(0,
+ translate('BiblesPlugin.ImportWizardForm', 'OSIS'))
+ self.formatComboBox.setItemText(1,
+ translate('BiblesPlugin.ImportWizardForm', 'CSV'))
+ self.formatComboBox.setItemText(2,
+ translate('BiblesPlugin.ImportWizardForm', 'OpenSong'))
+ self.formatComboBox.setItemText(3,
+ translate('BiblesPlugin.ImportWizardForm', 'Web Download'))
+ self.formatComboBox.setItemText(4,
+ translate('BiblesPlugin.ImportWizardForm', 'openlp.org 1.x'))
+ self.openlp1FileLabel.setText(
+ translate('BiblesPlugin.ImportWizardForm', 'File location:'))
+ self.osisFileLabel.setText(
+ translate('BiblesPlugin.ImportWizardForm', 'File location:'))
+ self.csvBooksLabel.setText(
+ translate('BiblesPlugin.ImportWizardForm', 'Books location:'))
+ self.csvVersesLabel.setText(
+ translate('BiblesPlugin.ImportWizardForm', 'Verse location:'))
+ self.openSongFileLabel.setText(
+ translate('BiblesPlugin.ImportWizardForm', 'Bible filename:'))
+ self.webSourceLabel.setText(
+ translate('BiblesPlugin.ImportWizardForm', 'Location:'))
+ self.webSourceComboBox.setItemText(0,
+ translate('BiblesPlugin.ImportWizardForm', 'Crosswalk'))
+ self.webSourceComboBox.setItemText(1,
+ translate('BiblesPlugin.ImportWizardForm', 'BibleGateway'))
+ self.webSourceComboBox.setItemText(2,
+ translate('BiblesPlugin.ImportWizardForm', 'Bibleserver'))
+ self.webTranslationLabel.setText(
+ translate('BiblesPlugin.ImportWizardForm', 'Bible:'))
+ self.webTabWidget.setTabText(
+ self.webTabWidget.indexOf(self.webBibleTab),
+ translate('BiblesPlugin.ImportWizardForm', 'Download Options'))
+ self.webServerLabel.setText(
+ translate('BiblesPlugin.ImportWizardForm', 'Server:'))
+ self.webUserLabel.setText(
+ translate('BiblesPlugin.ImportWizardForm', 'Username:'))
+ self.webPasswordLabel.setText(
+ translate('BiblesPlugin.ImportWizardForm', 'Password:'))
+ self.webTabWidget.setTabText(
+ self.webTabWidget.indexOf(self.webProxyTab),
+ translate('BiblesPlugin.ImportWizardForm',
+ 'Proxy Server (Optional)'))
+ self.licenseDetailsPage.setTitle(
+ translate('BiblesPlugin.ImportWizardForm', 'License Details'))
+ self.licenseDetailsPage.setSubTitle(
+ translate('BiblesPlugin.ImportWizardForm',
+ 'Set up the Bible\'s license details.'))
+ self.versionNameLabel.setText(
+ translate('BiblesPlugin.ImportWizardForm', 'Version name:'))
+ self.copyrightLabel.setText(
+ translate('BiblesPlugin.ImportWizardForm', 'Copyright:'))
+ self.permissionsLabel.setText(
+ translate('BiblesPlugin.ImportWizardForm', 'Permissions:'))
+ self.progressPage.setTitle(
+ translate('BiblesPlugin.ImportWizardForm', 'Importing'))
+ self.progressPage.setSubTitle(
+ translate('BiblesPlugin.ImportWizardForm',
+ 'Please wait while your Bible is imported.'))
+ self.progressLabel.setText(
+ translate('BiblesPlugin.ImportWizardForm', 'Ready.'))
+ self.progressBar.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.'))
+ # Align all QFormLayouts towards each other.
+ labelWidth = max(self.formatLabel.minimumSizeHint().width(),
+ self.osisFileLabel.minimumSizeHint().width(),
+ self.csvBooksLabel.minimumSizeHint().width(),
+ self.csvVersesLabel.minimumSizeHint().width(),
+ self.openSongFileLabel.minimumSizeHint().width(),
+ self.openlp1FileLabel.minimumSizeHint().width())
+ self.formatSpacer.changeSize(labelWidth, 0,
+ QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+ self.osisSpacer.changeSize(labelWidth, 0,
+ QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+ self.csvSpacer.changeSize(labelWidth, 0,
+ QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+ self.openSongSpacer.changeSize(labelWidth, 0,
+ QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+ self.openlp1Spacer.changeSize(labelWidth, 0,
+ QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
def validateCurrentPage(self):
"""
@@ -141,7 +469,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
elif self.currentPage() == self.selectPage:
if self.field(u'source_format').toInt()[0] == BibleFormat.OSIS:
if not self.field(u'osis_location').toString():
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('BiblesPlugin.ImportWizardForm',
'Invalid Bible Location'),
translate('BiblesPlugin.ImportWizardForm',
@@ -151,7 +479,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
return False
elif self.field(u'source_format').toInt()[0] == BibleFormat.CSV:
if not self.field(u'csv_booksfile').toString():
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('BiblesPlugin.ImportWizardForm',
'Invalid Books File'),
translate('BiblesPlugin.ImportWizardForm',
@@ -160,7 +488,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
self.csvBooksEdit.setFocus()
return False
elif not self.field(u'csv_versefile').toString():
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('BiblesPlugin.ImportWizardForm',
'Invalid Verse File'),
translate('BiblesPlugin.ImportWizardForm',
@@ -171,7 +499,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
elif self.field(u'source_format').toInt()[0] == \
BibleFormat.OpenSong:
if not self.field(u'opensong_file').toString():
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('BiblesPlugin.ImportWizardForm',
'Invalid OpenSong Bible'),
translate('BiblesPlugin.ImportWizardForm',
@@ -181,7 +509,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
return False
elif self.field(u'source_format').toInt()[0] == BibleFormat.OpenLP1:
if not self.field(u'openlp1_location').toString():
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('BiblesPlugin.ImportWizardForm',
'Invalid Bible Location'),
translate('BiblesPlugin.ImportWizardForm',
@@ -195,7 +523,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
license_copyright = \
unicode(self.field(u'license_copyright').toString())
if not license_version:
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('BiblesPlugin.ImportWizardForm',
'Empty Version Name'),
translate('BiblesPlugin.ImportWizardForm',
@@ -203,7 +531,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
self.versionNameEdit.setFocus()
return False
elif not license_copyright:
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('BiblesPlugin.ImportWizardForm',
'Empty Copyright'),
translate('BiblesPlugin.ImportWizardForm',
@@ -212,7 +540,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
self.copyrightEdit.setFocus()
return False
elif self.manager.exists(license_version):
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('BiblesPlugin.ImportWizardForm', 'Bible Exists'),
translate('BiblesPlugin.ImportWizardForm',
'This Bible already exists. Please import '
@@ -220,10 +548,10 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
self.versionNameEdit.setFocus()
return False
return True
- if self.currentPage() == self.importPage:
+ if self.currentPage() == self.progressPage:
return True
- def onWebSourceComboBoxCurrentIndexChanged(self, index):
+ def onWebSourceComboBoxIndexChanged(self, index):
"""
Setup the list of Bibles when you select a different source on the web
download page.
@@ -279,13 +607,10 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
u'%s (*.bible)' % translate('BiblesPlugin.ImportWizardForm',
'openlp.org 1.x bible'))
- def onCurrentIdChanged(self, pageId):
- if self.page(pageId) == self.importPage:
- self.preImport()
- self.performImport()
- self.postImport()
-
def registerFields(self):
+ """
+ Register the bible import wizard fields.
+ """
self.selectPage.registerField(u'source_format', self.formatComboBox)
self.selectPage.registerField(u'osis_location', self.osisFileEdit)
self.selectPage.registerField(u'csv_booksfile', self.csvBooksEdit)
@@ -306,8 +631,11 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
u'license_permissions', self.permissionsEdit)
def setDefaults(self):
+ """
+ Set default values for the wizard pages.
+ """
settings = QtCore.QSettings()
- settings.beginGroup(self.bibleplugin.settingsSection)
+ settings.beginGroup(self.plugin.settingsSection)
self.restart()
self.finishButton.setVisible(False)
self.cancelButton.setVisible(True)
@@ -332,72 +660,50 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
QtCore.QVariant(self.copyrightEdit.text()))
self.setField(u'license_permissions',
QtCore.QVariant(self.permissionsEdit.text()))
- self.onWebSourceComboBoxCurrentIndexChanged(WebDownload.Crosswalk)
+ self.onWebSourceComboBoxIndexChanged(WebDownload.Crosswalk)
settings.endGroup()
def loadWebBibles(self):
"""
- Load the list of Crosswalk and BibleGateway bibles.
+ Load the lists of Crosswalk, BibleGateway and Bibleserver bibles.
"""
+ filepath = AppLocation.get_directory(AppLocation.PluginsDir)
+ filepath = os.path.join(filepath, u'bibles', u'resources')
# Load Crosswalk 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.Crosswalk] = {}
- books_file = open(
- os.path.join(filepath, u'crosswalkbooks.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.Crosswalk][ver] = name.strip()
- except IOError:
- log.exception(u'Crosswalk resources missing')
- finally:
- if books_file:
- books_file.close()
+ self.loadBibleResourceFile(
+ os.path.join(filepath, u'crosswalkbooks.csv'),
+ WebDownload.Crosswalk)
# Load BibleGateway Bibles.
- books_file = None
- try:
- self.web_bible_list[WebDownload.BibleGateway] = {}
- books_file = open(os.path.join(filepath, u'biblegateway.csv'), 'r')
- 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 = line[0]
- name = line[1]
- 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.BibleGateway][ver] = \
- name.strip()
- except IOError:
- log.exception(u'Biblegateway resources missing')
- finally:
- if books_file:
- books_file.close()
+ self.loadBibleResourceFile(os.path.join(filepath, u'biblegateway.csv'),
+ WebDownload.BibleGateway)
# Load and Bibleserver Bibles.
- filepath = AppLocation.get_directory(AppLocation.PluginsDir)
- filepath = os.path.join(filepath, u'bibles', u'resources')
+ self.loadBibleResourceFile(os.path.join(filepath, u'bibleserver.csv'),
+ WebDownload.Bibleserver)
+
+ def loadBibleResourceFile(self, file_path_name, download_type):
+ """
+ Loads a web bible resource file.
+
+ ``file_path_name``
+ The file to load including the file's path.
+
+ ``download_type``
+ The WebDownload type this file is for.
+ """
+ self.web_bible_list[download_type] = {}
books_file = None
try:
- self.web_bible_list[WebDownload.Bibleserver] = {}
- books_file = open(
- os.path.join(filepath, u'bibleserver.csv'), 'rb')
+ books_file = open(file_path_name, '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')
+ ver = string_is_unicode(line[0])
+ name = string_is_unicode(line[1])
+ self.web_bible_list[download_type][ver] = name.strip()
+ except IOError:
+ log.exception(u'%s resources missing' %
+ WebDownload.get_name(download_type))
finally:
if books_file:
books_file.close()
@@ -413,8 +719,8 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
A editbox (QLineEdit).
``filters``
- The file extension filters. It should contain the file description as
- well as the file extension. For example::
+ 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)'
"""
@@ -424,37 +730,28 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
'All Files')
filename = QtGui.QFileDialog.getOpenFileName(self, title,
os.path.dirname(SettingsManager.get_last_dir(
- self.bibleplugin.settingsSection, 1)), filters)
+ self.plugin.settingsSection, 1)), filters)
if filename:
editbox.setText(filename)
SettingsManager.set_last_dir(
- self.bibleplugin.settingsSection, filename, 1)
+ self.plugin.settingsSection, filename, 1)
- def incrementProgressBar(self, status_text):
- log.debug(u'IncrementBar %s', status_text)
- self.importProgressLabel.setText(status_text)
- self.importProgressBar.setValue(self.importProgressBar.value() + 1)
- Receiver.send_message(u'openlp_process_events')
-
- def preImport(self):
+ def preWizard(self):
"""
Prepare the UI for the import.
"""
+ OpenLPWizard.preWizard(self)
bible_type = self.field(u'source_format').toInt()[0]
- self.finishButton.setVisible(False)
- self.importProgressBar.setMinimum(0)
- self.importProgressBar.setMaximum(1188)
- self.importProgressBar.setValue(0)
if bible_type == BibleFormat.WebDownload:
- self.importProgressLabel.setText(translate(
+ self.progressLabel.setText(translate(
'BiblesPlugin.ImportWizardForm',
'Starting Registering bible...'))
else:
- self.importProgressLabel.setText(translate(
+ self.progressLabel.setText(translate(
'BiblesPlugin.ImportWizardForm', 'Starting import...'))
Receiver.send_message(u'openlp_process_events')
- def performImport(self):
+ def performWizard(self):
"""
Perform the actual import.
"""
@@ -485,7 +782,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
)
elif bible_type == BibleFormat.WebDownload:
# Import a bible from the web.
- self.importProgressBar.setMaximum(1)
+ self.progressBar.setMaximum(1)
download_location = self.field(u'web_location').toInt()[0]
bible_version = unicode(self.webTranslationComboBox.currentText())
if download_location == WebDownload.Crosswalk:
@@ -518,20 +815,14 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
license_copyright, license_permissions)
self.manager.reload_bibles()
if bible_type == BibleFormat.WebDownload:
- self.importProgressLabel.setText(
+ self.progressLabel.setText(
translate('BiblesPlugin.ImportWizardForm', 'Registered '
'bible. Please note, that verses will be downloaded on\n'
'demand and thus an internet connection is required.'))
else:
- self.importProgressLabel.setText(translate(
+ self.progressLabel.setText(translate(
'BiblesPlugin.ImportWizardForm', 'Finished import.'))
else:
- self.importProgressLabel.setText(translate(
+ self.progressLabel.setText(translate(
'BiblesPlugin.ImportWizardForm', 'Your Bible import failed.'))
- delete_database(self.bibleplugin.settingsSection, importer.file)
-
- def postImport(self):
- self.importProgressBar.setValue(self.importProgressBar.maximum())
- self.finishButton.setVisible(True)
- self.cancelButton.setVisible(False)
- Receiver.send_message(u'openlp_process_events')
+ delete_database(self.plugin.settingsSection, importer.file)
diff --git a/openlp/plugins/bibles/forms/bibleimportwizard.py b/openlp/plugins/bibles/forms/bibleimportwizard.py
deleted file mode 100644
index c6a6775a5..000000000
--- a/openlp/plugins/bibles/forms/bibleimportwizard.py
+++ /dev/null
@@ -1,391 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
-
-###############################################################################
-# OpenLP - Open Source Lyrics Projection #
-# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2011 Raoul Snyman #
-# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
-# Carsten Tinggaard, Frode Woldsund #
-# --------------------------------------------------------------------------- #
-# This program is free software; you can redistribute it and/or modify it #
-# under the terms of the GNU General Public License as published by the Free #
-# Software Foundation; version 2 of the License. #
-# #
-# This program is distributed in the hope that it will be useful, but WITHOUT #
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
-# more details. #
-# #
-# You should have received a copy of the GNU General Public License along #
-# with this program; if not, write to the Free Software Foundation, Inc., 59 #
-# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-###############################################################################
-
-from PyQt4 import QtCore, QtGui
-
-from openlp.core.lib import build_icon, translate
-
-class Ui_BibleImportWizard(object):
- def setupUi(self, bibleImportWizard):
- bibleImportWizard.setObjectName(u'bibleImportWizard')
- bibleImportWizard.setModal(True)
- bibleImportWizard.setWizardStyle(QtGui.QWizard.ModernStyle)
- bibleImportWizard.setOptions(
- QtGui.QWizard.IndependentPages |
- QtGui.QWizard.NoBackButtonOnStartPage |
- QtGui.QWizard.NoBackButtonOnLastPage)
- # Welcome Page
- self.welcomePage = QtGui.QWizardPage()
- self.welcomePage.setPixmap(QtGui.QWizard.WatermarkPixmap,
- QtGui.QPixmap(u':/wizards/wizard_importbible.bmp'))
- self.welcomePage.setObjectName(u'WelcomePage')
- self.welcomeLayout = QtGui.QVBoxLayout(self.welcomePage)
- self.welcomeLayout.setObjectName(u'WelcomeLayout')
- self.titleLabel = QtGui.QLabel(self.welcomePage)
- self.titleLabel.setObjectName(u'TitleLabel')
- self.welcomeLayout.addWidget(self.titleLabel)
- self.welcomeLayout.addSpacing(40)
- self.informationLabel = QtGui.QLabel(self.welcomePage)
- self.informationLabel.setWordWrap(True)
- self.informationLabel.setObjectName(u'InformationLabel')
- self.welcomeLayout.addWidget(self.informationLabel)
- self.welcomeLayout.addStretch()
- bibleImportWizard.addPage(self.welcomePage)
- # Select Page
- self.selectPage = QtGui.QWizardPage()
- self.selectPage.setObjectName(u'SelectPage')
- self.selectPageLayout = QtGui.QVBoxLayout(self.selectPage)
- self.selectPageLayout.setObjectName(u'SelectPageLayout')
- self.formatLayout = QtGui.QFormLayout()
- self.formatLayout.setObjectName(u'FormatLayout')
- self.formatLabel = QtGui.QLabel(self.selectPage)
- self.formatLabel.setObjectName(u'FormatLabel')
- self.formatComboBox = QtGui.QComboBox(self.selectPage)
- self.formatComboBox.addItems([u'', u'', u'', u'', u''])
- self.formatComboBox.setObjectName(u'FormatComboBox')
- self.formatLayout.addRow(self.formatLabel, self.formatComboBox)
- self.formatSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
- QtGui.QSizePolicy.Minimum)
- self.formatLayout.setItem(1, QtGui.QFormLayout.LabelRole,
- self.formatSpacer)
- self.selectPageLayout.addLayout(self.formatLayout)
- self.selectStack = QtGui.QStackedLayout()
- self.selectStack.setObjectName(u'SelectStack')
- self.osisWidget = QtGui.QWidget(self.selectPage)
- self.osisWidget.setObjectName(u'OsisWidget')
- self.osisLayout = QtGui.QFormLayout(self.osisWidget)
- self.osisLayout.setMargin(0)
- self.osisLayout.setObjectName(u'OsisLayout')
- self.osisFileLabel = QtGui.QLabel(self.osisWidget)
- self.osisFileLabel.setObjectName(u'OsisFileLabel')
- self.osisFileLayout = QtGui.QHBoxLayout()
- self.osisFileLayout.setObjectName(u'OsisFileLayout')
- self.osisFileEdit = QtGui.QLineEdit(self.osisWidget)
- self.osisFileEdit.setObjectName(u'OsisFileEdit')
- self.osisFileLayout.addWidget(self.osisFileEdit)
- self.osisBrowseButton = QtGui.QToolButton(self.osisWidget)
- self.osisBrowseButton.setIcon(build_icon(u':/general/general_open.png'))
- self.osisBrowseButton.setObjectName(u'OsisBrowseButton')
- self.osisFileLayout.addWidget(self.osisBrowseButton)
- self.osisLayout.addRow(self.osisFileLabel, self.osisFileLayout)
- self.osisSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
- QtGui.QSizePolicy.Minimum)
- self.osisLayout.setItem(1, QtGui.QFormLayout.LabelRole, self.osisSpacer)
- self.selectStack.addWidget(self.osisWidget)
- self.csvWidget = QtGui.QWidget(self.selectPage)
- self.csvWidget.setObjectName(u'CsvWidget')
- self.csvLayout = QtGui.QFormLayout(self.csvWidget)
- self.csvLayout.setMargin(0)
- self.csvLayout.setObjectName(u'CsvLayout')
- self.csvBooksLabel = QtGui.QLabel(self.csvWidget)
- self.csvBooksLabel.setObjectName(u'CsvBooksLabel')
- self.csvBooksLayout = QtGui.QHBoxLayout()
- self.csvBooksLayout.setObjectName(u'CsvBooksLayout')
- self.csvBooksEdit = QtGui.QLineEdit(self.csvWidget)
- self.csvBooksEdit.setObjectName(u'CsvBooksEdit')
- self.csvBooksLayout.addWidget(self.csvBooksEdit)
- self.csvBooksButton = QtGui.QToolButton(self.csvWidget)
- self.csvBooksButton.setIcon(build_icon(u':/general/general_open.png'))
- self.csvBooksButton.setObjectName(u'CsvBooksButton')
- self.csvBooksLayout.addWidget(self.csvBooksButton)
- self.csvLayout.addRow(self.csvBooksLabel, self.csvBooksLayout)
- self.csvVersesLabel = QtGui.QLabel(self.csvWidget)
- self.csvVersesLabel.setObjectName(u'CsvVersesLabel')
- self.csvVersesLayout = QtGui.QHBoxLayout()
- self.csvVersesLayout.setObjectName(u'CsvVersesLayout')
- self.csvVersesEdit = QtGui.QLineEdit(self.csvWidget)
- self.csvVersesEdit.setObjectName(u'CsvVersesEdit')
- self.csvVersesLayout.addWidget(self.csvVersesEdit)
- self.csvVersesButton = QtGui.QToolButton(self.csvWidget)
- self.csvVersesButton.setIcon(build_icon(u':/general/general_open.png'))
- self.csvVersesButton.setObjectName(u'CsvVersesButton')
- self.csvVersesLayout.addWidget(self.csvVersesButton)
- self.csvLayout.addRow(self.csvVersesLabel, self.csvVersesLayout)
- self.csvSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
- QtGui.QSizePolicy.Minimum)
- self.csvLayout.setItem(2, QtGui.QFormLayout.LabelRole, self.csvSpacer)
- self.selectStack.addWidget(self.csvWidget)
- self.openSongWidget = QtGui.QWidget(self.selectPage)
- self.openSongWidget.setObjectName(u'OpenSongWidget')
- self.openSongLayout = QtGui.QFormLayout(self.openSongWidget)
- self.openSongLayout.setMargin(0)
- self.openSongLayout.setObjectName(u'OpenSongLayout')
- self.openSongFileLabel = QtGui.QLabel(self.openSongWidget)
- self.openSongFileLabel.setObjectName(u'OpenSongFileLabel')
- self.openSongFileLayout = QtGui.QHBoxLayout()
- self.openSongFileLayout.setObjectName(u'OpenSongFileLayout')
- self.openSongFileEdit = QtGui.QLineEdit(self.openSongWidget)
- self.openSongFileEdit.setObjectName(u'OpenSongFileEdit')
- self.openSongFileLayout.addWidget(self.openSongFileEdit)
- self.openSongBrowseButton = QtGui.QToolButton(self.openSongWidget)
- self.openSongBrowseButton.setIcon(
- build_icon(u':/general/general_open.png'))
- self.openSongBrowseButton.setObjectName(u'OpenSongBrowseButton')
- self.openSongFileLayout.addWidget(self.openSongBrowseButton)
- self.openSongLayout.addRow(self.openSongFileLabel,
- self.openSongFileLayout)
- self.openSongSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
- QtGui.QSizePolicy.Minimum)
- self.openSongLayout.setItem(1, QtGui.QFormLayout.LabelRole,
- self.openSongSpacer)
- self.selectStack.addWidget(self.openSongWidget)
- self.webTabWidget = QtGui.QTabWidget(self.selectPage)
- self.webTabWidget.setObjectName(u'WebTabWidget')
- self.webBibleTab = QtGui.QWidget()
- self.webBibleTab.setObjectName(u'WebBibleTab')
- self.webBibleLayout = QtGui.QFormLayout(self.webBibleTab)
- self.webBibleLayout.setObjectName(u'WebBibleLayout')
- self.webSourceLabel = QtGui.QLabel(self.webBibleTab)
- self.webSourceLabel.setObjectName(u'WebSourceLabel')
- self.webBibleLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
- self.webSourceLabel)
- self.webSourceComboBox = QtGui.QComboBox(self.webBibleTab)
- self.webSourceComboBox.setObjectName(u'WebSourceComboBox')
- self.webSourceComboBox.addItems([u'', u'', u''])
- self.webBibleLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
- self.webSourceComboBox)
- self.webTranslationLabel = QtGui.QLabel(self.webBibleTab)
- self.webTranslationLabel.setObjectName(u'webTranslationLabel')
- self.webBibleLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
- self.webTranslationLabel)
- self.webTranslationComboBox = QtGui.QComboBox(self.webBibleTab)
- self.webTranslationComboBox.setSizeAdjustPolicy(
- QtGui.QComboBox.AdjustToContents)
- self.webTranslationComboBox.setObjectName(u'WebTranslationComboBox')
- self.webBibleLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
- self.webTranslationComboBox)
- self.webTabWidget.addTab(self.webBibleTab, u'')
- self.webProxyTab = QtGui.QWidget()
- self.webProxyTab.setObjectName(u'WebProxyTab')
- self.webProxyLayout = QtGui.QFormLayout(self.webProxyTab)
- self.webProxyLayout.setObjectName(u'WebProxyLayout')
- self.webServerLabel = QtGui.QLabel(self.webProxyTab)
- self.webServerLabel.setObjectName(u'WebServerLabel')
- self.webProxyLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
- self.webServerLabel)
- self.webServerEdit = QtGui.QLineEdit(self.webProxyTab)
- self.webServerEdit.setObjectName(u'WebServerEdit')
- self.webProxyLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
- self.webServerEdit)
- self.webUserLabel = QtGui.QLabel(self.webProxyTab)
- self.webUserLabel.setObjectName(u'WebUserLabel')
- self.webProxyLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
- self.webUserLabel)
- self.webUserEdit = QtGui.QLineEdit(self.webProxyTab)
- self.webUserEdit.setObjectName(u'WebUserEdit')
- self.webProxyLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
- self.webUserEdit)
- self.webPasswordLabel = QtGui.QLabel(self.webProxyTab)
- self.webPasswordLabel.setObjectName(u'WebPasswordLabel')
- self.webProxyLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
- self.webPasswordLabel)
- self.webPasswordEdit = QtGui.QLineEdit(self.webProxyTab)
- self.webPasswordEdit.setObjectName(u'WebPasswordEdit')
- self.webProxyLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
- self.webPasswordEdit)
- self.webTabWidget.addTab(self.webProxyTab, u'')
- self.selectStack.addWidget(self.webTabWidget)
- self.openlp1Widget = QtGui.QWidget(self.selectPage)
- self.openlp1Widget.setObjectName(u'Openlp1Widget')
- self.openlp1Layout = QtGui.QFormLayout(self.openlp1Widget)
- self.openlp1Layout.setMargin(0)
- self.openlp1Layout.setObjectName(u'Openlp1Layout')
- self.openlp1FileLabel = QtGui.QLabel(self.openlp1Widget)
- self.openlp1FileLabel.setObjectName(u'Openlp1FileLabel')
- self.openlp1FileLayout = QtGui.QHBoxLayout()
- self.openlp1FileLayout.setObjectName(u'Openlp1FileLayout')
- self.openlp1FileEdit = QtGui.QLineEdit(self.openlp1Widget)
- self.openlp1FileEdit.setObjectName(u'Openlp1FileEdit')
- self.openlp1FileLayout.addWidget(self.openlp1FileEdit)
- self.openlp1BrowseButton = QtGui.QToolButton(self.openlp1Widget)
- self.openlp1BrowseButton.setIcon(
- build_icon(u':/general/general_open.png'))
- self.openlp1BrowseButton.setObjectName(u'Openlp1BrowseButton')
- self.openlp1FileLayout.addWidget(self.openlp1BrowseButton)
- self.openlp1Layout.addRow(self.openlp1FileLabel, self.openlp1FileLayout)
- self.openlp1DisabledLabel = QtGui.QLabel(self.openlp1Widget)
- self.openlp1DisabledLabel.setWordWrap(True)
- self.openlp1DisabledLabel.setObjectName(u'Openlp1DisabledLabel')
- self.openlp1Layout.addRow(self.openlp1DisabledLabel)
- self.openlp1Spacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
- QtGui.QSizePolicy.Minimum)
- self.openlp1Layout.setItem(1, QtGui.QFormLayout.LabelRole,
- self.openlp1Spacer)
- self.selectStack.addWidget(self.openlp1Widget)
- self.selectPageLayout.addLayout(self.selectStack)
- bibleImportWizard.addPage(self.selectPage)
- # License Page
- self.licenseDetailsPage = QtGui.QWizardPage()
- self.licenseDetailsPage.setObjectName(u'LicenseDetailsPage')
- self.licenseDetailsLayout = QtGui.QFormLayout(self.licenseDetailsPage)
- self.licenseDetailsLayout.setObjectName(u'LicenseDetailsLayout')
- self.versionNameLabel = QtGui.QLabel(self.licenseDetailsPage)
- self.versionNameLabel.setObjectName(u'VersionNameLabel')
- self.licenseDetailsLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
- self.versionNameLabel)
- self.versionNameEdit = QtGui.QLineEdit(self.licenseDetailsPage)
- self.versionNameEdit.setObjectName(u'VersionNameEdit')
- self.licenseDetailsLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
- self.versionNameEdit)
- self.copyrightLabel = QtGui.QLabel(self.licenseDetailsPage)
- self.copyrightLabel.setObjectName(u'CopyrightLabel')
- self.licenseDetailsLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
- self.copyrightLabel)
- self.copyrightEdit = QtGui.QLineEdit(self.licenseDetailsPage)
- self.copyrightEdit.setObjectName(u'CopyrightEdit')
- self.licenseDetailsLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
- self.copyrightEdit)
- self.permissionsLabel = QtGui.QLabel(self.licenseDetailsPage)
- self.permissionsLabel.setObjectName(u'PermissionsLabel')
- self.licenseDetailsLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
- self.permissionsLabel)
- self.permissionsEdit = QtGui.QLineEdit(self.licenseDetailsPage)
- self.permissionsEdit.setObjectName(u'PermissionsEdit')
- self.licenseDetailsLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
- self.permissionsEdit)
- bibleImportWizard.addPage(self.licenseDetailsPage)
- # Progress Page
- self.importPage = QtGui.QWizardPage()
- self.importPage.setObjectName(u'ImportPage')
- self.importLayout = QtGui.QVBoxLayout(self.importPage)
- self.importLayout.setMargin(48)
- self.importLayout.setObjectName(u'ImportLayout')
- self.importProgressLabel = QtGui.QLabel(self.importPage)
- self.importProgressLabel.setObjectName(u'ImportProgressLabel')
- self.importLayout.addWidget(self.importProgressLabel)
- self.importProgressBar = QtGui.QProgressBar(self.importPage)
- self.importProgressBar.setObjectName(u'ImportProgressBar')
- self.importLayout.addWidget(self.importProgressBar)
- bibleImportWizard.addPage(self.importPage)
- self.retranslateUi(bibleImportWizard)
- QtCore.QMetaObject.connectSlotsByName(bibleImportWizard)
- QtCore.QObject.connect(self.formatComboBox,
- QtCore.SIGNAL(u'currentIndexChanged(int)'), self.selectStack,
- QtCore.SLOT(u'setCurrentIndex(int)'))
-
- def retranslateUi(self, bibleImportWizard):
- bibleImportWizard.setWindowTitle(
- translate('BiblesPlugin.ImportWizardForm', 'Bible Import Wizard'))
- self.titleLabel.setText(
- u'%s ' % \
- translate('BiblesPlugin.ImportWizardForm',
- 'Welcome to the Bible Import Wizard'))
- self.informationLabel.setText(
- translate('BiblesPlugin.ImportWizardForm',
- 'This wizard will help you to import Bibles from a '
- 'variety of formats. Click the next button below to start the '
- 'process by selecting a format to import from.'))
- self.selectPage.setTitle(translate('BiblesPlugin.ImportWizardForm',
- 'Select Import Source'))
- self.selectPage.setSubTitle(
- translate('BiblesPlugin.ImportWizardForm',
- 'Select the import format, and where to import from.'))
- self.formatLabel.setText(
- translate('BiblesPlugin.ImportWizardForm', 'Format:'))
- self.formatComboBox.setItemText(0,
- translate('BiblesPlugin.ImportWizardForm', 'OSIS'))
- self.formatComboBox.setItemText(1,
- translate('BiblesPlugin.ImportWizardForm', 'CSV'))
- self.formatComboBox.setItemText(2,
- translate('BiblesPlugin.ImportWizardForm', 'OpenSong'))
- self.formatComboBox.setItemText(3,
- translate('BiblesPlugin.ImportWizardForm', 'Web Download'))
- self.formatComboBox.setItemText(4,
- translate('BiblesPlugin.ImportWizardForm', 'openlp.org 1.x'))
- self.openlp1FileLabel.setText(
- translate('BiblesPlugin.ImportWizardForm', 'File location:'))
- self.osisFileLabel.setText(
- translate('BiblesPlugin.ImportWizardForm', 'File location:'))
- self.csvBooksLabel.setText(
- translate('BiblesPlugin.ImportWizardForm', 'Books location:'))
- self.csvVersesLabel.setText(
- translate('BiblesPlugin.ImportWizardForm', 'Verse location:'))
- self.openSongFileLabel.setText(
- translate('BiblesPlugin.ImportWizardForm', 'Bible filename:'))
- self.webSourceLabel.setText(
- translate('BiblesPlugin.ImportWizardForm', 'Location:'))
- self.webSourceComboBox.setItemText(0,
- translate('BiblesPlugin.ImportWizardForm', 'Crosswalk'))
- self.webSourceComboBox.setItemText(1,
- translate('BiblesPlugin.ImportWizardForm', 'BibleGateway'))
- self.webSourceComboBox.setItemText(2,
- translate('BiblesPlugin.ImportWizardForm', 'Bibleserver'))
- self.webTranslationLabel.setText(
- translate('BiblesPlugin.ImportWizardForm', 'Bible:'))
- self.webTabWidget.setTabText(
- self.webTabWidget.indexOf(self.webBibleTab),
- translate('BiblesPlugin.ImportWizardForm', 'Download Options'))
- self.webServerLabel.setText(
- translate('BiblesPlugin.ImportWizardForm', 'Server:'))
- self.webUserLabel.setText(
- translate('BiblesPlugin.ImportWizardForm', 'Username:'))
- self.webPasswordLabel.setText(
- translate('BiblesPlugin.ImportWizardForm', 'Password:'))
- self.webTabWidget.setTabText(
- self.webTabWidget.indexOf(self.webProxyTab),
- translate('BiblesPlugin.ImportWizardForm',
- 'Proxy Server (Optional)'))
- self.licenseDetailsPage.setTitle(
- translate('BiblesPlugin.ImportWizardForm', 'License Details'))
- self.licenseDetailsPage.setSubTitle(
- translate('BiblesPlugin.ImportWizardForm',
- 'Set up the Bible\'s license details.'))
- self.versionNameLabel.setText(
- translate('BiblesPlugin.ImportWizardForm', 'Version name:'))
- self.copyrightLabel.setText(
- translate('BiblesPlugin.ImportWizardForm', 'Copyright:'))
- self.permissionsLabel.setText(
- translate('BiblesPlugin.ImportWizardForm', 'Permissions:'))
- self.importPage.setTitle(
- translate('BiblesPlugin.ImportWizardForm', 'Importing'))
- self.importPage.setSubTitle(
- translate('BiblesPlugin.ImportWizardForm',
- 'Please wait while your Bible is imported.'))
- self.importProgressLabel.setText(
- translate('BiblesPlugin.ImportWizardForm', 'Ready.'))
- 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.'))
- # Align all QFormLayouts towards each other.
- labelWidth = max(self.formatLabel.minimumSizeHint().width(),
- self.osisFileLabel.minimumSizeHint().width(),
- self.csvBooksLabel.minimumSizeHint().width(),
- self.csvVersesLabel.minimumSizeHint().width(),
- self.openSongFileLabel.minimumSizeHint().width(),
- self.openlp1FileLabel.minimumSizeHint().width())
- self.formatSpacer.changeSize(labelWidth, 0,
- QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
- self.osisSpacer.changeSize(labelWidth, 0,
- QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
- self.csvSpacer.changeSize(labelWidth, 0,
- QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
- self.openSongSpacer.changeSize(labelWidth, 0,
- QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
- self.openlp1Spacer.changeSize(labelWidth, 0,
- QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
diff --git a/openlp/plugins/bibles/lib/csvbible.py b/openlp/plugins/bibles/lib/csvbible.py
index 8b1d70128..8959167a6 100644
--- a/openlp/plugins/bibles/lib/csvbible.py
+++ b/openlp/plugins/bibles/lib/csvbible.py
@@ -31,7 +31,7 @@ import csv
from PyQt4 import QtCore
from openlp.core.lib import Receiver, translate
-from db import BibleDB
+from openlp.plugins.bibles.lib.db import BibleDB
log = logging.getLogger(__name__)
@@ -51,7 +51,7 @@ class CSVBible(BibleDB):
self.booksfile = kwargs[u'booksfile']
self.versesfile = kwargs[u'versefile']
QtCore.QObject.connect(Receiver.get_receiver(),
- QtCore.SIGNAL(u'bibles_stop_import'), self.stop_import)
+ QtCore.SIGNAL(u'openlp_stop_wizard'), self.stop_import)
def do_import(self):
success = True
@@ -72,7 +72,7 @@ class CSVBible(BibleDB):
self.create_book(unicode(line[1], details['encoding']),
line[2], int(line[0]))
Receiver.send_message(u'openlp_process_events')
- except IOError, IndexError:
+ except (IOError, IndexError):
log.exception(u'Loading books from file failed')
success = False
finally:
diff --git a/openlp/plugins/bibles/lib/db.py b/openlp/plugins/bibles/lib/db.py
index 9f4376da1..f442a9cd6 100644
--- a/openlp/plugins/bibles/lib/db.py
+++ b/openlp/plugins/bibles/lib/db.py
@@ -33,8 +33,9 @@ from sqlalchemy import Column, ForeignKey, or_, Table, types
from sqlalchemy.orm import class_mapper, mapper, relation
from sqlalchemy.orm.exc import UnmappedClassError
-from openlp.core.lib import Receiver, translate
+from openlp.core.lib import translate
from openlp.core.lib.db import BaseModel, init_db, Manager
+from openlp.core.ui import criticalErrorMessageBox
log = logging.getLogger(__name__)
@@ -339,11 +340,11 @@ class BibleDB(QtCore.QObject, Manager):
verse_list = []
for book, chapter, start_verse, end_verse in reference_list:
db_book = self.get_book(book)
- if end_verse == -1:
- end_verse = self.get_verse_count(book, chapter)
if db_book:
book = db_book.name
log.debug(u'Book name corrected to "%s"', book)
+ if end_verse == -1:
+ end_verse = self.get_verse_count(book, chapter)
verses = self.session.query(Verse)\
.filter_by(book_id=db_book.id)\
.filter_by(chapter=chapter)\
@@ -354,12 +355,11 @@ class BibleDB(QtCore.QObject, Manager):
verse_list.extend(verses)
else:
log.debug(u'OpenLP failed to find book %s', book)
- Receiver.send_message(u'openlp_error_message', {
- u'title': translate('BiblesPlugin', 'No Book Found'),
- u'message': translate('BiblesPlugin', 'No matching book '
+ criticalErrorMessageBox(
+ translate('BiblesPlugin', 'No Book Found'),
+ translate('BiblesPlugin', 'No matching book '
'could be found in this Bible. Check that you have '
- 'spelled the name of the book correctly.')
- })
+ 'spelled the name of the book correctly.'))
return verse_list
def verse_search(self, text):
diff --git a/openlp/plugins/bibles/lib/http.py b/openlp/plugins/bibles/lib/http.py
index 2476ae65d..b844bbe61 100644
--- a/openlp/plugins/bibles/lib/http.py
+++ b/openlp/plugins/bibles/lib/http.py
@@ -38,6 +38,7 @@ from HTMLParser import HTMLParseError
from BeautifulSoup import BeautifulSoup, NavigableString
from openlp.core.lib import Receiver, translate
+from openlp.core.ui import criticalErrorMessageBox
from openlp.core.utils import AppLocation, get_web_page
from openlp.plugins.bibles.lib import SearchResults
from openlp.plugins.bibles.lib.db import BibleDB, Book
@@ -208,7 +209,8 @@ class BGExtract(object):
u'version': u'%s' % version})
cleaner = [(re.compile(' | ...')) %
- (db_book.name, int(chapter.attrib[u'n'])))
+ (db_book.name, int(chapter.attrib[u'n'].split()[-1])))
self.session.commit()
- except IOError, AttributeError:
+ except (IOError, AttributeError):
log.exception(u'Loading bible from OpenSong file failed')
success = False
finally:
diff --git a/openlp/plugins/bibles/lib/osis.py b/openlp/plugins/bibles/lib/osis.py
index bf070c4bd..4a001987d 100644
--- a/openlp/plugins/bibles/lib/osis.py
+++ b/openlp/plugins/bibles/lib/osis.py
@@ -35,7 +35,7 @@ from PyQt4 import QtCore
from openlp.core.lib import Receiver, translate
from openlp.core.utils import AppLocation
-from db import BibleDB
+from openlp.plugins.bibles.lib.db import BibleDB
log = logging.getLogger(__name__)
@@ -87,7 +87,7 @@ class OSISBible(BibleDB):
if fbibles:
fbibles.close()
QtCore.QObject.connect(Receiver.get_receiver(),
- QtCore.SIGNAL(u'bibles_stop_import'), self.stop_import)
+ QtCore.SIGNAL(u'openlp_stop_wizard'), self.stop_import)
def do_import(self):
"""
@@ -134,9 +134,9 @@ class OSISBible(BibleDB):
testament)
if last_chapter == 0:
if book == u'Gen':
- self.wizard.importProgressBar.setMaximum(1188)
+ self.wizard.progressBar.setMaximum(1188)
else:
- self.wizard.importProgressBar.setMaximum(260)
+ self.wizard.progressBar.setMaximum(260)
if last_chapter != chapter:
if last_chapter != 0:
self.session.commit()
diff --git a/openlp/plugins/custom/forms/editcustomform.py b/openlp/plugins/custom/forms/editcustomform.py
index 2f005828a..ebc917e99 100644
--- a/openlp/plugins/custom/forms/editcustomform.py
+++ b/openlp/plugins/custom/forms/editcustomform.py
@@ -29,6 +29,7 @@ import logging
from PyQt4 import QtCore, QtGui
from openlp.core.lib import Receiver, translate
+from openlp.core.ui import criticalErrorMessageBox
from openlp.plugins.custom.lib import CustomXMLBuilder, CustomXMLParser
from openlp.plugins.custom.lib.db import CustomSlide
from editcustomdialog import Ui_CustomEditDialog
@@ -151,8 +152,7 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
"""
valid, message = self._validate()
if not valid:
- QtGui.QMessageBox.critical(self,
- translate('CustomPlugin.EditCustomForm', 'Error'), message)
+ criticalErrorMessageBox(message=message)
return False
sxml = CustomXMLBuilder()
sxml.new_document()
@@ -265,4 +265,4 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
if self.slideListView.count() == 0:
return False, translate('CustomPlugin.EditCustomForm',
'You need to add at least one slide')
- return True, u''
\ No newline at end of file
+ return True, u''
diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py
index 063a80d02..bd84219fb 100644
--- a/openlp/plugins/images/lib/mediaitem.py
+++ b/openlp/plugins/images/lib/mediaitem.py
@@ -31,8 +31,9 @@ from PyQt4 import QtCore, QtGui
from openlp.core.lib import MediaManagerItem, BaseListWithDnD, build_icon, \
ItemCapabilities, SettingsManager, translate, check_item_selected, \
- Receiver, check_directory_exists
-from openlp.core.utils import AppLocation, get_images_filter
+ check_directory_exists
+from openlp.core.ui import criticalErrorMessageBox
+from openlp.core.utils import AppLocation, delete_file, get_images_filter
log = logging.getLogger(__name__)
@@ -115,12 +116,8 @@ class ImageMediaItem(MediaManagerItem):
for row in row_list:
text = self.listView.item(row)
if text:
- try:
- os.remove(os.path.join(self.servicePath,
- unicode(text.text())))
- except OSError:
- # if not present do not worry
- pass
+ delete_file(os.path.join(self.servicePath,
+ unicode(text.text())))
self.listView.takeItem(row)
SettingsManager.set_list(self.settingsSection,
self.settingsSection, self.getFileList())
@@ -164,7 +161,7 @@ class ImageMediaItem(MediaManagerItem):
items.remove(item)
# We cannot continue, as all images do not exist.
if not items:
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('ImagePlugin.MediaItem', 'Missing Image(s)'),
unicode(translate('ImagePlugin.MediaItem',
'The following image(s) no longer exist: %s')) %
@@ -190,12 +187,15 @@ class ImageMediaItem(MediaManagerItem):
return False
def onResetClick(self):
+ """
+ Called to reset the Live backgound with the image selected,
+ """
self.resetAction.setVisible(False)
self.parent.liveController.display.resetImage()
def onReplaceClick(self):
"""
- Called to replace Live backgound with the video selected
+ Called to replace Live backgound with the image selected.
"""
if check_item_selected(self.listView,
translate('ImagePlugin.MediaItem',
@@ -208,12 +208,11 @@ class ImageMediaItem(MediaManagerItem):
self.parent.liveController.display.directImage(name, filename)
self.resetAction.setVisible(True)
else:
- Receiver.send_message(u'openlp_error_message', {
- u'title': translate('ImagePlugin.MediaItem',
- 'Live Background Error'),
- u'message': unicode(translate('ImagePlugin.MediaItem',
+ criticalErrorMessageBox(
+ translate('ImagePlugin.MediaItem', 'Live Background Error'),
+ unicode(translate('ImagePlugin.MediaItem',
'There was a problem replacing your background, '
- 'the image file "%s" no longer exists.')) % filename})
+ 'the image file "%s" no longer exists.')) % filename)
def onPreviewClick(self):
- MediaManagerItem.onPreviewClick(self)
\ No newline at end of file
+ MediaManagerItem.onPreviewClick(self)
diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py
index cc75dfc2b..121fa80a0 100644
--- a/openlp/plugins/media/lib/mediaitem.py
+++ b/openlp/plugins/media/lib/mediaitem.py
@@ -30,8 +30,8 @@ import os
from PyQt4 import QtCore, QtGui
from openlp.core.lib import MediaManagerItem, BaseListWithDnD, build_icon, \
- ItemCapabilities, SettingsManager, translate, check_item_selected, \
- Receiver
+ ItemCapabilities, SettingsManager, translate, check_item_selected
+from openlp.core.ui import criticalErrorMessageBox
log = logging.getLogger(__name__)
@@ -40,6 +40,7 @@ class MediaListView(BaseListWithDnD):
self.PluginName = u'Media'
BaseListWithDnD.__init__(self, parent)
+
class MediaMediaItem(MediaManagerItem):
"""
This is the custom media manager item for Media Slides.
@@ -92,10 +93,16 @@ class MediaMediaItem(MediaManagerItem):
self.resetAction.setVisible(False)
def onResetClick(self):
+ """
+ Called to reset the Live backgound with the media selected,
+ """
self.resetAction.setVisible(False)
self.parent.liveController.display.resetVideo()
def onReplaceClick(self):
+ """
+ Called to replace Live backgound with the media selected.
+ """
if check_item_selected(self.listView,
translate('MediaPlugin.MediaItem',
'You must select a media file to replace the background with.')):
@@ -106,12 +113,11 @@ class MediaMediaItem(MediaManagerItem):
self.parent.liveController.display.video(filename, 0, True)
self.resetAction.setVisible(True)
else:
- Receiver.send_message(u'openlp_error_message', {
- u'title': translate('MediaPlugin.MediaItem',
+ criticalErrorMessageBox(translate('MediaPlugin.MediaItem',
'Live Background Error'),
- u'message': unicode(translate('MediaPlugin.MediaItem',
+ unicode(translate('MediaPlugin.MediaItem',
'There was a problem replacing your background, '
- 'the media file "%s" no longer exists.')) % filename})
+ 'the media file "%s" no longer exists.')) % filename)
def generateSlideData(self, service_item, item=None, xmlVersion=False):
if item is None:
@@ -131,9 +137,8 @@ class MediaMediaItem(MediaManagerItem):
return True
else:
# File is no longer present
- QtGui.QMessageBox.critical(
- self, translate('MediaPlugin.MediaItem',
- 'Missing Media File'),
+ criticalErrorMessageBox(
+ translate('MediaPlugin.MediaItem', 'Missing Media File'),
unicode(translate('MediaPlugin.MediaItem',
'The file %s no longer exists.')) % filename)
return False
diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py
index 7c8cf593d..516c595c7 100644
--- a/openlp/plugins/presentations/lib/impresscontroller.py
+++ b/openlp/plugins/presentations/lib/impresscontroller.py
@@ -51,6 +51,7 @@ else:
from PyQt4 import QtCore
+from openlp.core.utils import delete_file
from presentationcontroller import PresentationController, PresentationDocument
log = logging.getLogger(__name__)
@@ -292,8 +293,7 @@ class ImpressDocument(PresentationDocument):
try:
doc.storeToURL(urlpath, props)
self.convert_thumbnail(path, idx + 1)
- if os.path.exists(path):
- os.remove(path)
+ delete_file(path)
except:
log.exception(u'%s - Unable to store openoffice preview' % path)
diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py
index 1e65a3358..2c9381a70 100644
--- a/openlp/plugins/presentations/lib/mediaitem.py
+++ b/openlp/plugins/presentations/lib/mediaitem.py
@@ -31,6 +31,7 @@ from PyQt4 import QtCore, QtGui
from openlp.core.lib import MediaManagerItem, BaseListWithDnD, build_icon, \
SettingsManager, translate, check_item_selected, Receiver, ItemCapabilities
+from openlp.core.ui import criticalErrorMessageBox
from openlp.plugins.presentations.lib import MessageListener
log = logging.getLogger(__name__)
@@ -180,7 +181,7 @@ class PresentationMediaItem(MediaManagerItem):
filename = os.path.split(unicode(file))[1]
if titles.count(filename) > 0:
if not initialLoad:
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('PresentationPlugin.MediaItem',
'File Exists'),
translate('PresentationPlugin.MediaItem',
@@ -204,7 +205,7 @@ class PresentationMediaItem(MediaManagerItem):
if initialLoad:
icon = build_icon(u':/general/general_delete.png')
else:
- QtGui.QMessageBox.critical(
+ criticalErrorMessageBox(
self, translate('PresentationPlugin.MediaItem',
'Unsupported File'),
translate('PresentationPlugin.MediaItem',
@@ -275,8 +276,8 @@ class PresentationMediaItem(MediaManagerItem):
return True
else:
# File is no longer present
- QtGui.QMessageBox.critical(
- self, translate('PresentationPlugin.MediaItem',
+ criticalErrorMessageBox(
+ translate('PresentationPlugin.MediaItem',
'Missing Presentation'),
unicode(translate('PresentationPlugin.MediaItem',
'The Presentation %s no longer exists.')) % filename)
diff --git a/openlp/plugins/songs/forms/authorsform.py b/openlp/plugins/songs/forms/authorsform.py
index 320d3c1d3..091618bde 100644
--- a/openlp/plugins/songs/forms/authorsform.py
+++ b/openlp/plugins/songs/forms/authorsform.py
@@ -27,6 +27,7 @@
from PyQt4 import QtGui, QtCore
from openlp.core.lib import translate
+from openlp.core.ui import criticalErrorMessageBox
from openlp.plugins.songs.forms.authorsdialog import Ui_AuthorsDialog
class AuthorsForm(QtGui.QDialog, Ui_AuthorsDialog):
@@ -79,28 +80,21 @@ class AuthorsForm(QtGui.QDialog, Ui_AuthorsDialog):
def accept(self):
if not self.firstNameEdit.text():
- QtGui.QMessageBox.critical(
- self, translate('SongsPlugin.AuthorsForm', 'Error'),
- translate('SongsPlugin.AuthorsForm',
- 'You need to type in the first name of the author.'))
+ criticalErrorMessageBox(message=translate('SongsPlugin.AuthorsForm',
+ 'You need to type in the first name of the author.'))
self.firstNameEdit.setFocus()
return False
elif not self.lastNameEdit.text():
- QtGui.QMessageBox.critical(
- self, translate('SongsPlugin.AuthorsForm', 'Error'),
- translate('SongsPlugin.AuthorsForm',
- 'You need to type in the last name of the author.'))
+ criticalErrorMessageBox(message=translate('SongsPlugin.AuthorsForm',
+ 'You need to type in the last name of the author.'))
self.lastNameEdit.setFocus()
return False
elif not self.displayEdit.text():
- if QtGui.QMessageBox.critical(
- self, translate('SongsPlugin.AuthorsForm', 'Error'),
- translate('SongsPlugin.AuthorsForm',
- 'You have not set a display name for the '
- 'author, combine the first and last names?'),
- QtGui.QMessageBox.StandardButtons(
- QtGui.QMessageBox.Yes | QtGui.QMessageBox.No)
- ) == QtGui.QMessageBox.Yes:
+ if criticalErrorMessageBox(
+ message=translate('SongsPlugin.AuthorsForm',
+ 'You have not set a display name for the '
+ 'author, combine the first and last names?'),
+ parent=self, question=True) == QtGui.QMessageBox.Yes:
self.displayEdit.setText(self.firstNameEdit.text() + \
u' ' + self.lastNameEdit.text())
return QtGui.QDialog.accept(self)
diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index 86249f024..b36ea55e1 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -30,6 +30,7 @@ import re
from PyQt4 import QtCore, QtGui
from openlp.core.lib import Receiver, translate
+from openlp.core.ui import criticalErrorMessageBox
from openlp.plugins.songs.forms import EditVerseForm
from openlp.plugins.songs.lib import SongXML, VerseType
from openlp.plugins.songs.lib.db import Book, Song, Author, Topic
@@ -346,10 +347,9 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
author = self.manager.get_object(Author, item_id)
if self.authorsListView.findItems(unicode(author.display_name),
QtCore.Qt.MatchExactly):
- QtGui.QMessageBox.warning(self,
- translate('SongsPlugin.EditSongForm', 'Error'),
- translate('SongsPlugin.EditSongForm', 'This author is '
- 'already in the list.'))
+ criticalErrorMessageBox(
+ message=translate('SongsPlugin.EditSongForm',
+ 'This author is already in the list.'))
else:
author_item = QtGui.QListWidgetItem(unicode(
author.display_name))
@@ -400,10 +400,9 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
topic = self.manager.get_object(Topic, item_id)
if self.topicsListView.findItems(unicode(topic.name),
QtCore.Qt.MatchExactly):
- QtGui.QMessageBox.warning(self,
- translate('SongsPlugin.EditSongForm', 'Error'),
- translate('SongsPlugin.EditSongForm', 'This topic is '
- 'already in the list.'))
+ criticalErrorMessageBox(
+ message=translate('SongsPlugin.EditSongForm',
+ 'This topic is already in the list.'))
else:
topic_item = QtGui.QListWidgetItem(unicode(topic.name))
topic_item.setData(QtCore.Qt.UserRole,
@@ -525,38 +524,36 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
def _validate_song(self):
"""
- Check the validity of the form. Only display the 'save' if the data
- can be saved.
+ Check the validity of the song.
"""
+ # This checks data in the form *not* self.song. self.song is still
+ # None at this point.
log.debug(u'Validate Song')
# Lets be nice and assume the data is correct.
- if len(self.titleEdit.displayText()) == 0:
+ if not self.titleEdit.text():
self.songTabWidget.setCurrentIndex(0)
self.titleEdit.setFocus()
- QtGui.QMessageBox.critical(self,
- translate('SongsPlugin.EditSongForm', 'Error'),
- translate('SongsPlugin.EditSongForm',
+ criticalErrorMessageBox(
+ message=translate('SongsPlugin.EditSongForm',
'You need to type in a song title.'))
return False
if self.verseListWidget.rowCount() == 0:
self.songTabWidget.setCurrentIndex(0)
self.verseListWidget.setFocus()
- QtGui.QMessageBox.critical(self,
- translate('SongsPlugin.EditSongForm', 'Error'),
- translate('SongsPlugin.EditSongForm',
+ criticalErrorMessageBox(
+ message=translate('SongsPlugin.EditSongForm',
'You need to type in at least one verse.'))
return False
if self.authorsListView.count() == 0:
self.songTabWidget.setCurrentIndex(1)
self.authorsListView.setFocus()
- QtGui.QMessageBox.critical(self,
- translate('SongsPlugin.EditSongForm', 'Warning'),
- translate('SongsPlugin.EditSongForm',
+ criticalErrorMessageBox(
+ message=translate('SongsPlugin.EditSongForm',
'You need to have an author for this song.'))
return False
- if self.song.verse_order:
+ if self.verseOrderEdit.text():
order = []
- order_names = self.song.verse_order.split()
+ order_names = unicode(self.verseOrderEdit.text()).split()
for item in order_names:
if len(item) == 1:
order.append(item.lower() + u'1')
@@ -578,9 +575,8 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
valid = verses.pop(0)
for verse in verses:
valid = valid + u', ' + verse
- QtGui.QMessageBox.critical(self,
- translate('SongsPlugin.EditSongForm', 'Error'),
- unicode(translate('SongsPlugin.EditSongForm',
+ criticalErrorMessageBox(
+ message=unicode(translate('SongsPlugin.EditSongForm',
'The verse order is invalid. There is no verse '
'corresponding to %s. Valid entries are %s.')) % \
(order_names[count], valid))
@@ -598,6 +594,19 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
QtGui.QMessageBox.Yes | QtGui.QMessageBox.No)
if answer == QtGui.QMessageBox.No:
return False
+ item = int(self.songBookComboBox.currentIndex())
+ text = unicode(self.songBookComboBox.currentText())
+ if self.songBookComboBox.findText(text, QtCore.Qt.MatchExactly) < 0:
+ if QtGui.QMessageBox.question(self,
+ translate('SongsPlugin.EditSongForm', 'Add Book'),
+ translate('SongsPlugin.EditSongForm', 'This song book does '
+ 'not exist, do you want to add it?'),
+ QtGui.QMessageBox.Yes | QtGui.QMessageBox.No,
+ QtGui.QMessageBox.Yes) == QtGui.QMessageBox.Yes:
+ book = Book.populate(name=text, publisher=u'')
+ self.manager.save_object(book)
+ else:
+ return False
return True
def onCopyrightInsertButtonTriggered(self):
@@ -654,37 +663,29 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
def accept(self):
"""
- Exit Dialog and save soong if valid
+ Exit Dialog and save song if valid
"""
log.debug(u'accept')
self.clearCaches()
- if not self.song:
- self.song = Song()
- item = int(self.songBookComboBox.currentIndex())
- text = unicode(self.songBookComboBox.currentText())
- if self.songBookComboBox.findText(text, QtCore.Qt.MatchExactly) < 0:
- if QtGui.QMessageBox.question(self,
- translate('SongsPlugin.EditSongForm', 'Add Book'),
- translate('SongsPlugin.EditSongForm', 'This song book does '
- 'not exist, do you want to add it?'),
- QtGui.QMessageBox.Yes | QtGui.QMessageBox.No,
- QtGui.QMessageBox.Yes) == QtGui.QMessageBox.Yes:
- book = Book.populate(name=text, publisher=u'')
- self.manager.save_object(book)
- else:
- return
- if self.saveSong():
+ if self._validate_song():
+ self.saveSong()
Receiver.send_message(u'songs_load_list')
self.close()
def saveSong(self, preview=False):
"""
Get all the data from the widgets on the form, and then save it to the
- database.
+ database. The form has been validated and all reference items
+ (Authors, Books and Topics) have been saved before this function is
+ called.
``preview``
Should be ``True`` if the song is also previewed (boolean).
"""
+ # The Song() assignment. No database calls should be made while a
+ # Song() is in a partially complete state.
+ if not self.song:
+ self.song = Song()
self.song.title = unicode(self.titleEdit.text())
self.song.alternate_title = unicode(self.alternativeEdit.text())
self.song.copyright = unicode(self.copyrightEdit.text())
@@ -708,27 +709,27 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
self.song.theme_name = theme_name
else:
self.song.theme_name = None
- if self._validate_song():
- self.processLyrics()
- self.processTitle()
- self.song.authors = []
- for row in range(self.authorsListView.count()):
- item = self.authorsListView.item(row)
- authorId = (item.data(QtCore.Qt.UserRole)).toInt()[0]
- self.song.authors.append(self.manager.get_object(Author,
- authorId))
- self.song.topics = []
- for row in range(self.topicsListView.count()):
- item = self.topicsListView.item(row)
- topicId = (item.data(QtCore.Qt.UserRole)).toInt()[0]
- self.song.topics.append(self.manager.get_object(Topic, topicId))
- self.manager.save_object(self.song)
- if not preview:
- self.song = None
- return True
- return False
+ self.processLyrics()
+ self.processTitle()
+ self.song.authors = []
+ for row in range(self.authorsListView.count()):
+ item = self.authorsListView.item(row)
+ authorId = (item.data(QtCore.Qt.UserRole)).toInt()[0]
+ self.song.authors.append(self.manager.get_object(Author, authorId))
+ self.song.topics = []
+ for row in range(self.topicsListView.count()):
+ item = self.topicsListView.item(row)
+ topicId = (item.data(QtCore.Qt.UserRole)).toInt()[0]
+ self.song.topics.append(self.manager.get_object(Topic, topicId))
+ self.manager.save_object(self.song)
+ if not preview:
+ self.song = None
def processLyrics(self):
+ """
+ Process the lyric data entered by the user into the OpenLP XML format.
+ """
+ # This method must only be run after the self.song = Song() assignment.
log.debug(u'processLyrics')
try:
sxml = SongXML()
@@ -754,6 +755,11 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
sxml.dump_xml())
def processTitle(self):
+ """
+ Process the song title entered by the user to remove stray punctuation
+ characters.
+ """
+ # This method must only be run after the self.song = Song() assignment.
log.debug(u'processTitle')
self.song.search_title = re.sub(r'[\'"`,;:(){}?]+', u'',
unicode(self.song.search_title)).lower()
diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py
index c01ad9726..c10e48cb7 100644
--- a/openlp/plugins/songs/forms/editverseform.py
+++ b/openlp/plugins/songs/forms/editverseform.py
@@ -29,6 +29,7 @@ import logging
from PyQt4 import QtCore, QtGui
+from openlp.core.ui import criticalErrorMessageBox
from openlp.plugins.songs.lib import VerseType, translate
from editversedialog import Ui_EditVerseDialog
@@ -167,9 +168,8 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog):
else:
value = self.getVerse()[0].split(u'\n')[1]
if len(value) == 0:
- QtGui.QMessageBox.critical(self,
- translate('SongsPlugin.EditSongForm', 'Error'),
- translate('SongsPlugin.EditSongForm',
+ criticalErrorMessageBox(
+ message=translate('SongsPlugin.EditSongForm',
'You need to type some text in to the verse.'))
return False
QtGui.QDialog.accept(self)
diff --git a/openlp/plugins/songs/forms/songbookform.py b/openlp/plugins/songs/forms/songbookform.py
index 4a4a08ff6..8341a7c4c 100644
--- a/openlp/plugins/songs/forms/songbookform.py
+++ b/openlp/plugins/songs/forms/songbookform.py
@@ -27,6 +27,7 @@
from PyQt4 import QtGui
from openlp.core.lib import translate
+from openlp.core.ui import criticalErrorMessageBox
from openlp.plugins.songs.forms.songbookdialog import Ui_SongBookDialog
class SongBookForm(QtGui.QDialog, Ui_SongBookDialog):
@@ -49,10 +50,9 @@ class SongBookForm(QtGui.QDialog, Ui_SongBookDialog):
def accept(self):
if not self.nameEdit.text():
- QtGui.QMessageBox.critical(
- self, translate('SongsPlugin.SongBookForm', 'Error'),
- translate('SongsPlugin.SongBookForm',
- 'You need to type in a name for the book.'))
+ criticalErrorMessageBox(
+ message=translate('SongsPlugin.SongBookForm',
+ 'You need to type in a name for the book.'))
self.nameEdit.setFocus()
return False
else:
diff --git a/openlp/plugins/songs/forms/songimportform.py b/openlp/plugins/songs/forms/songimportform.py
index 5776dd21a..d14ab9c36 100644
--- a/openlp/plugins/songs/forms/songimportform.py
+++ b/openlp/plugins/songs/forms/songimportform.py
@@ -23,19 +23,22 @@
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
-
+"""
+The song import functions for OpenLP.
+"""
import logging
import os
from PyQt4 import QtCore, QtGui
-from songimportwizard import Ui_SongImportWizard
from openlp.core.lib import Receiver, SettingsManager, translate
+from openlp.core.ui import criticalErrorMessageBox
+from openlp.core.ui.wizard import OpenLPWizard
from openlp.plugins.songs.lib.importer import SongFormat
log = logging.getLogger(__name__)
-class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
+class SongImportForm(OpenLPWizard):
"""
This is the Song Import Wizard, which allows easy importing of Songs
into OpenLP from other formats like OpenLyrics, OpenSong and CCLI.
@@ -52,11 +55,23 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
``plugin``
The songs plugin.
"""
- QtGui.QWizard.__init__(self, parent)
- self.setupUi(self)
- self.registerFields()
- self.finishButton = self.button(QtGui.QWizard.FinishButton)
- self.cancelButton = self.button(QtGui.QWizard.CancelButton)
+ OpenLPWizard.__init__(self, parent, plugin, u'songImportWizard',
+ u':/wizards/wizard_importsong.bmp')
+
+ def setupUi(self, image):
+ """
+ Set up the song wizard UI.
+ """
+ OpenLPWizard.setupUi(self, image)
+ self.formatStack.setCurrentIndex(0)
+ QtCore.QObject.connect(self.formatComboBox,
+ QtCore.SIGNAL(u'currentIndexChanged(int)'),
+ self.formatStack.setCurrentIndex)
+
+ def customInit(self):
+ """
+ Song wizard specific initialisation.
+ """
if not SongFormat.get_availability(SongFormat.OpenLP1):
self.openLP1DisabledWidget.setVisible(True)
self.openLP1ImportWidget.setVisible(False)
@@ -66,7 +81,11 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
if not SongFormat.get_availability(SongFormat.Generic):
self.genericDisabledWidget.setVisible(True)
self.genericImportWidget.setVisible(False)
- self.plugin = plugin
+
+ def customSignals(self):
+ """
+ Song wizard specific signals.
+ """
QtCore.QObject.connect(self.openLP2BrowseButton,
QtCore.SIGNAL(u'clicked()'),
self.onOpenLP2BrowseButtonClicked)
@@ -109,6 +128,9 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
QtCore.QObject.connect(self.genericRemoveButton,
QtCore.SIGNAL(u'clicked()'),
self.onGenericRemoveButtonClicked)
+ QtCore.QObject.connect(self.easiSlidesBrowseButton,
+ QtCore.SIGNAL(u'clicked()'),
+ self.onEasiSlidesBrowseButtonClicked)
QtCore.QObject.connect(self.ewBrowseButton,
QtCore.SIGNAL(u'clicked()'),
self.onEWBrowseButtonClicked)
@@ -118,25 +140,194 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
QtCore.QObject.connect(self.songBeamerRemoveButton,
QtCore.SIGNAL(u'clicked()'),
self.onSongBeamerRemoveButtonClicked)
- QtCore.QObject.connect(self,
- QtCore.SIGNAL(u'currentIdChanged(int)'),
- self.onCurrentIdChanged)
- def exec_(self):
+ def addCustomPages(self):
"""
- Run the wizard.
+ Add song wizard specific pages.
"""
- self.setDefaults()
- return QtGui.QWizard.exec_(self)
+ # Source Page
+ self.sourcePage = QtGui.QWizardPage()
+ self.sourcePage.setObjectName(u'SourcePage')
+ self.sourceLayout = QtGui.QVBoxLayout(self.sourcePage)
+ self.sourceLayout.setObjectName(u'SourceLayout')
+ self.formatLayout = QtGui.QFormLayout()
+ self.formatLayout.setObjectName(u'FormatLayout')
+ self.formatLabel = QtGui.QLabel(self.sourcePage)
+ self.formatLabel.setObjectName(u'FormatLabel')
+ self.formatComboBox = QtGui.QComboBox(self.sourcePage)
+ self.formatComboBox.setObjectName(u'FormatComboBox')
+ self.formatLayout.addRow(self.formatLabel, self.formatComboBox)
+ self.formatSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
+ QtGui.QSizePolicy.Minimum)
+ self.formatLayout.setItem(1, QtGui.QFormLayout.LabelRole,
+ self.formatSpacer)
+ self.sourceLayout.addLayout(self.formatLayout)
+ self.formatStack = QtGui.QStackedLayout()
+ self.formatStack.setObjectName(u'FormatStack')
+ # OpenLP 2.0
+ self.addSingleFileSelectItem(u'openLP2')
+ # openlp.org 1.x
+ self.addSingleFileSelectItem(u'openLP1', None, True)
+ # OpenLyrics
+ self.addMultiFileSelectItem(u'openLyrics', u'OpenLyrics', True)
+ # Open Song
+ self.addMultiFileSelectItem(u'openSong', u'OpenSong')
+ # Words of Worship
+ self.addMultiFileSelectItem(u'wordsOfWorship')
+ # CCLI File import
+ self.addMultiFileSelectItem(u'ccli')
+ # Songs of Fellowship
+ self.addMultiFileSelectItem(u'songsOfFellowship', None, True)
+ # Generic Document/Presentation import
+ self.addMultiFileSelectItem(u'generic', None, True)
+ # EasySlides
+ self.addSingleFileSelectItem(u'easiSlides')
+ # EasyWorship
+ self.addSingleFileSelectItem(u'ew')
+ # Words of Worship
+ self.addMultiFileSelectItem(u'songBeamer')
+# Commented out for future use.
+# self.addSingleFileSelectItem(u'csv', u'CSV')
+ self.sourceLayout.addLayout(self.formatStack)
+ self.addPage(self.sourcePage)
- def reject(self):
+ def retranslateUi(self):
"""
- Stop the import on cancel button, close button or ESC key.
+ Song wizard localisation.
"""
- log.debug(u'Import canceled by user.')
- if self.currentPage() == self.importPage:
- Receiver.send_message(u'songs_stop_import')
- self.done(QtGui.QDialog.Rejected)
+ self.setWindowTitle(
+ translate('SongsPlugin.ImportWizardForm', 'Song Import Wizard'))
+ self.titleLabel.setText(
+ u'%s ' % \
+ translate('SongsPlugin.ImportWizardForm',
+ 'Welcome to the Song Import Wizard'))
+ self.informationLabel.setText(
+ translate('SongsPlugin.ImportWizardForm',
+ 'This wizard will help you to import songs from a variety of '
+ 'formats. Click the next button below to start the process by '
+ 'selecting a format to import from.'))
+ self.sourcePage.setTitle(
+ translate('SongsPlugin.ImportWizardForm', 'Select Import Source'))
+ self.sourcePage.setSubTitle(
+ translate('SongsPlugin.ImportWizardForm',
+ 'Select the import format, and where to import from.'))
+ self.formatLabel.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Format:'))
+ self.formatComboBox.setItemText(0,
+ translate('SongsPlugin.ImportWizardForm', 'OpenLP 2.0'))
+ self.formatComboBox.setItemText(1,
+ translate('SongsPlugin.ImportWizardForm', 'openlp.org 1.x'))
+ self.formatComboBox.setItemText(2,
+ translate('SongsPlugin.ImportWizardForm', 'OpenLyrics'))
+ self.formatComboBox.setItemText(3,
+ translate('SongsPlugin.ImportWizardForm', 'OpenSong'))
+ self.formatComboBox.setItemText(4,
+ translate('SongsPlugin.ImportWizardForm', 'Words of Worship'))
+ self.formatComboBox.setItemText(5,
+ translate('SongsPlugin.ImportWizardForm', 'CCLI/SongSelect'))
+ self.formatComboBox.setItemText(6,
+ translate('SongsPlugin.ImportWizardForm', 'Songs of Fellowship'))
+ self.formatComboBox.setItemText(7,
+ translate('SongsPlugin.ImportWizardForm',
+ 'Generic Document/Presentation'))
+ self.formatComboBox.setItemText(8,
+ translate('SongsPlugin.ImportWizardForm', 'EasiSlides'))
+ self.formatComboBox.setItemText(9,
+ translate('SongsPlugin.ImportWizardForm', 'EasyWorship'))
+ self.formatComboBox.setItemText(10,
+ translate('SongsPlugin.ImportWizardForm', 'SongBeamer'))
+# self.formatComboBox.setItemText(11,
+# translate('SongsPlugin.ImportWizardForm', 'CSV'))
+ self.openLP2FilenameLabel.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Filename:'))
+ self.openLP2BrowseButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Browse...'))
+ self.openLP1FilenameLabel.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Filename:'))
+ self.openLP1BrowseButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Browse...'))
+ self.openLP1DisabledLabel.setText(
+ translate('SongsPlugin.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.'))
+ self.openLyricsAddButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
+ self.openLyricsRemoveButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
+ self.openLyricsDisabledLabel.setText(
+ translate('SongsPlugin.ImportWizardForm', 'The OpenLyrics '
+ 'importer has not yet been developed, but as you can see, we are '
+ 'still intending to do so. Hopefully it will be in the next '
+ 'release.'))
+ self.openSongAddButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
+ self.openSongRemoveButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
+ self.wordsOfWorshipAddButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
+ self.wordsOfWorshipRemoveButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
+ self.ccliAddButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
+ self.ccliRemoveButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
+ self.songsOfFellowshipAddButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
+ self.songsOfFellowshipRemoveButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
+ self.songsOfFellowshipDisabledLabel.setText(
+ translate('SongsPlugin.ImportWizardForm', 'The Songs of '
+ 'Fellowship importer has been disabled because OpenLP cannot '
+ 'find OpenOffice.org on your computer.'))
+ self.genericAddButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
+ self.genericRemoveButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
+ self.genericDisabledLabel.setText(
+ translate('SongsPlugin.ImportWizardForm', 'The generic document/'
+ 'presentation importer has been disabled because OpenLP cannot '
+ 'find OpenOffice.org on your computer.'))
+ self.easiSlidesFilenameLabel.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Filename:'))
+ self.easiSlidesBrowseButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Browse...'))
+ self.ewFilenameLabel.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Filename:'))
+ self.ewBrowseButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Browse...'))
+ self.songBeamerAddButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
+ self.songBeamerRemoveButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
+# self.csvFilenameLabel.setText(
+# translate('SongsPlugin.ImportWizardForm', 'Filename:'))
+# self.csvBrowseButton.setText(
+# translate('SongsPlugin.ImportWizardForm', 'Browse...'))
+ self.progressPage.setTitle(
+ translate('SongsPlugin.ImportWizardForm', 'Importing'))
+ self.progressPage.setSubTitle(
+ translate('SongsPlugin.ImportWizardForm',
+ 'Please wait while your songs are imported.'))
+ self.progressLabel.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Ready.'))
+ self.progressBar.setFormat(
+ translate('SongsPlugin.ImportWizardForm', '%p%'))
+ # Align all QFormLayouts towards each other.
+ width = max(self.formatLabel.minimumSizeHint().width(),
+ self.openLP2FilenameLabel.minimumSizeHint().width())
+ self.formatSpacer.changeSize(width, 0, QtGui.QSizePolicy.Fixed,
+ QtGui.QSizePolicy.Fixed)
+ self.openLP2FormLabelSpacer.changeSize(width, 0,
+ QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+ self.openLP1FormLabelSpacer.changeSize(width, 0,
+ QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+ self.easiSlidesFormLabelSpacer.changeSize(width, 0,
+ QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+ self.ewFormLabelSpacer.changeSize(width, 0, QtGui.QSizePolicy.Fixed,
+ QtGui.QSizePolicy.Fixed)
+# self.csvFormLabelSpacer.changeSize(width, 0, QtGui.QSizePolicy.Fixed,
+# QtGui.QSizePolicy.Fixed)
def validateCurrentPage(self):
"""
@@ -148,7 +339,7 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
source_format = self.formatComboBox.currentIndex()
if source_format == SongFormat.OpenLP2:
if self.openLP2FilenameEdit.text().isEmpty():
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('SongsPlugin.ImportWizardForm',
'No OpenLP 2.0 Song Database Selected'),
translate('SongsPlugin.ImportWizardForm',
@@ -158,7 +349,7 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
return False
elif source_format == SongFormat.OpenLP1:
if self.openLP1FilenameEdit.text().isEmpty():
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('SongsPlugin.ImportWizardForm',
'No openlp.org 1.x Song Database Selected'),
translate('SongsPlugin.ImportWizardForm',
@@ -168,7 +359,7 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
return False
elif source_format == SongFormat.OpenLyrics:
if self.openLyricsFileListWidget.count() == 0:
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('SongsPlugin.ImportWizardForm',
'No OpenLyrics Files Selected'),
translate('SongsPlugin.ImportWizardForm',
@@ -178,7 +369,7 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
return False
elif source_format == SongFormat.OpenSong:
if self.openSongFileListWidget.count() == 0:
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('SongsPlugin.ImportWizardForm',
'No OpenSong Files Selected'),
translate('SongsPlugin.ImportWizardForm',
@@ -188,7 +379,7 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
return False
elif source_format == SongFormat.WordsOfWorship:
if self.wordsOfWorshipFileListWidget.count() == 0:
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('SongsPlugin.ImportWizardForm',
'No Words of Worship Files Selected'),
translate('SongsPlugin.ImportWizardForm',
@@ -198,7 +389,7 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
return False
elif source_format == SongFormat.CCLI:
if self.ccliFileListWidget.count() == 0:
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('SongsPlugin.ImportWizardForm',
'No CCLI Files Selected'),
translate('SongsPlugin.ImportWizardForm',
@@ -208,7 +399,7 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
return False
elif source_format == SongFormat.SongsOfFellowship:
if self.songsOfFellowshipFileListWidget.count() == 0:
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('SongsPlugin.ImportWizardForm',
'No Songs of Fellowship File Selected'),
translate('SongsPlugin.ImportWizardForm',
@@ -218,7 +409,7 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
return False
elif source_format == SongFormat.Generic:
if self.genericFileListWidget.count() == 0:
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('SongsPlugin.ImportWizardForm',
'No Document/Presentation Selected'),
translate('SongsPlugin.ImportWizardForm',
@@ -226,9 +417,19 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
'presentation file to import from.'))
self.genericAddButton.setFocus()
return False
+ elif source_format == SongFormat.EasiSlides:
+ if self.easiSlidesFilenameEdit.text().isEmpty():
+ criticalErrorMessageBox(
+ translate('SongsPlugin.ImportWizardForm',
+ 'No Easislides Songs file selected'),
+ translate('SongsPlugin.ImportWizardForm',
+ 'You need to select an xml song file exported from '
+ 'EasiSlides, to import from.'))
+ self.easiSlidesBrowseButton.setFocus()
+ return False
elif source_format == SongFormat.EasyWorship:
if self.ewFilenameEdit.text().isEmpty():
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('SongsPlugin.ImportWizardForm',
'No EasyWorship Song Database Selected'),
translate('SongsPlugin.ImportWizardForm',
@@ -238,7 +439,7 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
return False
elif source_format == SongFormat.SongBeamer:
if self.songBeamerFileListWidget.count() == 0:
- QtGui.QMessageBox.critical(self,
+ criticalErrorMessageBox(
translate('SongsPlugin.ImportWizardForm',
'No SongBeamer File Selected'),
translate('SongsPlugin.ImportWizardForm',
@@ -247,7 +448,7 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
self.songBeamerAddButton.setFocus()
return False
return True
- elif self.currentPage() == self.importPage:
+ elif self.currentPage() == self.progressPage:
return True
def getFileName(self, title, editbox, filters=u''):
@@ -308,17 +509,26 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
os.path.split(unicode(filenames[0]))[0], 1)
def getListOfFiles(self, listbox):
+ """
+ Return a list of file from the listbox
+ """
files = []
for row in range(0, listbox.count()):
files.append(unicode(listbox.item(row).text()))
return files
def removeSelectedItems(self, listbox):
+ """
+ Remove selected listbox items
+ """
for item in listbox.selectedItems():
item = listbox.takeItem(listbox.row(item))
del item
def onOpenLP2BrowseButtonClicked(self):
+ """
+ Get OpenLP v2 song database file
+ """
self.getFileName(
translate('SongsPlugin.ImportWizardForm',
'Select OpenLP 2.0 Database File'),
@@ -328,6 +538,9 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
)
def onOpenLP1BrowseButtonClicked(self):
+ """
+ Get OpenLP v1 song database file
+ """
self.getFileName(
translate('SongsPlugin.ImportWizardForm',
'Select openlp.org 1.x Database File'),
@@ -337,6 +550,9 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
)
def onOpenLyricsAddButtonClicked(self):
+ """
+ Get OpenLyrics song database files
+ """
self.getFiles(
translate('SongsPlugin.ImportWizardForm',
'Select OpenLyrics Files'),
@@ -344,19 +560,30 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
)
def onOpenLyricsRemoveButtonClicked(self):
+ """
+ Remove selected OpenLyrics files from the import list
+ """
self.removeSelectedItems(self.openLyricsFileListWidget)
def onOpenSongAddButtonClicked(self):
+ """
+ Get OpenSong song database files
+ """
self.getFiles(
- translate('SongsPlugin.ImportWizardForm',
- 'Select Open Song Files'),
+ translate('SongsPlugin.ImportWizardForm', 'Select Open Song Files'),
self.openSongFileListWidget
)
def onOpenSongRemoveButtonClicked(self):
+ """
+ Remove selected OpenSong files from the import list
+ """
self.removeSelectedItems(self.openSongFileListWidget)
def onWordsOfWorshipAddButtonClicked(self):
+ """
+ Get Words of Worship song database files
+ """
self.getFiles(
translate('SongsPlugin.ImportWizardForm',
'Select Words of Worship Files'),
@@ -366,9 +593,15 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
)
def onWordsOfWorshipRemoveButtonClicked(self):
+ """
+ Remove selected Words of Worship files from the import list
+ """
self.removeSelectedItems(self.wordsOfWorshipFileListWidget)
def onCCLIAddButtonClicked(self):
+ """
+ Get CCLI song database files
+ """
self.getFiles(
translate('SongsPlugin.ImportWizardForm',
'Select CCLI Files'),
@@ -376,9 +609,15 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
)
def onCCLIRemoveButtonClicked(self):
+ """
+ Remove selected CCLI files from the import list
+ """
self.removeSelectedItems(self.ccliFileListWidget)
def onSongsOfFellowshipAddButtonClicked(self):
+ """
+ Get Songs of Fellowship song database files
+ """
self.getFiles(
translate('SongsPlugin.ImportWizardForm',
'Select Songs of Fellowship Files'),
@@ -388,9 +627,15 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
)
def onSongsOfFellowshipRemoveButtonClicked(self):
+ """
+ Remove selected Songs of Fellowship files from the import list
+ """
self.removeSelectedItems(self.songsOfFellowshipFileListWidget)
def onGenericAddButtonClicked(self):
+ """
+ Get song database files
+ """
self.getFiles(
translate('SongsPlugin.ImportWizardForm',
'Select Document/Presentation Files'),
@@ -398,9 +643,22 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
)
def onGenericRemoveButtonClicked(self):
+ """
+ Remove selected files from the import list
+ """
self.removeSelectedItems(self.genericFileListWidget)
+ def onEasiSlidesBrowseButtonClicked(self):
+ self.getFileName(
+ translate('SongsPlugin.ImportWizardForm',
+ 'Select EasiSlides songfile'),
+ self.easiSlidesFilenameEdit
+ )
+
def onEWBrowseButtonClicked(self):
+ """
+ Get EasyWorship song database files
+ """
self.getFileName(
translate('SongsPlugin.ImportWizardForm',
'Select EasyWorship Database File'),
@@ -408,6 +666,9 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
)
def onSongBeamerAddButtonClicked(self):
+ """
+ Get SongBeamer song database files
+ """
self.getFiles(
translate('SongsPlugin.ImportWizardForm',
'Select SongBeamer Files'),
@@ -416,18 +677,21 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
)
def onSongBeamerRemoveButtonClicked(self):
+ """
+ Remove selected SongBeamer files from the import list
+ """
self.removeSelectedItems(self.songBeamerFileListWidget)
- def onCurrentIdChanged(self, id):
- if self.page(id) == self.importPage:
- self.preImport()
- self.performImport()
- self.postImport()
-
def registerFields(self):
+ """
+ Register song import wizard fields.
+ """
pass
def setDefaults(self):
+ """
+ Set default form values for the song import wizard.
+ """
self.restart()
self.finishButton.setVisible(False)
self.cancelButton.setVisible(True)
@@ -440,29 +704,21 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
self.ccliFileListWidget.clear()
self.songsOfFellowshipFileListWidget.clear()
self.genericFileListWidget.clear()
+ self.easiSlidesFilenameEdit.setText(u'')
self.ewFilenameEdit.setText(u'')
self.songBeamerFileListWidget.clear()
#self.csvFilenameEdit.setText(u'')
- def incrementProgressBar(self, status_text, increment=1):
- log.debug(u'IncrementBar %s', status_text)
- if status_text:
- self.importProgressLabel.setText(status_text)
- if increment > 0:
- self.importProgressBar.setValue(self.importProgressBar.value() +
- increment)
- Receiver.send_message(u'openlp_process_events')
-
- def preImport(self):
- self.finishButton.setVisible(False)
- self.importProgressBar.setMinimum(0)
- self.importProgressBar.setMaximum(1188)
- self.importProgressBar.setValue(0)
- self.importProgressLabel.setText(
+ def preWizard(self):
+ """
+ Perform pre import tasks
+ """
+ OpenLPWizard.preWizard(self)
+ self.progressLabel.setText(
translate('SongsPlugin.ImportWizardForm', 'Starting import...'))
Receiver.send_message(u'openlp_process_events')
- def performImport(self):
+ def performWizard(self):
"""
Perform the actual import. This method pulls in the correct importer
class, and then runs the ``do_import`` method of the importer to do
@@ -512,28 +768,141 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
importer = self.plugin.importSongs(SongFormat.Generic,
filenames=self.getListOfFiles(self.genericFileListWidget)
)
+ elif source_format == SongFormat.EasiSlides:
+ # Import an EasiSlides export file
+ importer = self.plugin.importSongs(SongFormat.EasiSlides,
+ filename=unicode(self.easiSlidesFilenameEdit.text())
+ )
elif source_format == SongFormat.EasyWorship:
- # Import an OpenLP 2.0 database
+ # Import an EasyWorship database
importer = self.plugin.importSongs(SongFormat.EasyWorship,
filename=unicode(self.ewFilenameEdit.text())
)
elif source_format == SongFormat.SongBeamer:
# Import SongBeamer songs
importer = self.plugin.importSongs(SongFormat.SongBeamer,
- filenames=self.getListOfFiles(
- self.songBeamerFileListWidget)
+ filenames=self.getListOfFiles(self.songBeamerFileListWidget)
)
if importer.do_import():
# reload songs
- self.importProgressLabel.setText(
+ self.progressLabel.setText(
translate('SongsPlugin.SongImportForm', 'Finished import.'))
else:
- self.importProgressLabel.setText(
+ self.progressLabel.setText(
translate('SongsPlugin.SongImportForm',
'Your song import failed.'))
- def postImport(self):
- self.importProgressBar.setValue(self.importProgressBar.maximum())
- self.finishButton.setVisible(True)
- self.cancelButton.setVisible(False)
- Receiver.send_message(u'openlp_process_events')
+ def addSingleFileSelectItem(self, prefix, obj_prefix=None,
+ can_disable=False):
+ if not obj_prefix:
+ obj_prefix = prefix
+ page = QtGui.QWidget()
+ page.setObjectName(obj_prefix + u'Page')
+ if can_disable:
+ importWidget = self.disablableWidget(page, prefix, obj_prefix)
+ else:
+ importWidget = page
+ importLayout = QtGui.QFormLayout(importWidget)
+ importLayout.setMargin(0)
+ if can_disable:
+ importLayout.setObjectName(obj_prefix + u'ImportLayout')
+ else:
+ importLayout.setObjectName(obj_prefix + u'Layout')
+ filenameLabel = QtGui.QLabel(importWidget)
+ filenameLabel.setObjectName(obj_prefix + u'FilenameLabel')
+ fileLayout = QtGui.QHBoxLayout()
+ fileLayout.setObjectName(obj_prefix + u'FileLayout')
+ filenameEdit = QtGui.QLineEdit(importWidget)
+ filenameEdit.setObjectName(obj_prefix + u'FilenameEdit')
+ fileLayout.addWidget(filenameEdit)
+ browseButton = QtGui.QToolButton(importWidget)
+ browseButton.setIcon(self.openIcon)
+ browseButton.setObjectName(obj_prefix + u'BrowseButton')
+ fileLayout.addWidget(browseButton)
+ importLayout.addRow(filenameLabel, fileLayout)
+ formSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
+ QtGui.QSizePolicy.Minimum)
+ importLayout.setItem(1, QtGui.QFormLayout.LabelRole, formSpacer)
+ self.formatStack.addWidget(page)
+ setattr(self, prefix + u'Page', page)
+ setattr(self, prefix + u'FilenameLabel', filenameLabel)
+ setattr(self, prefix + u'FormLabelSpacer', formSpacer)
+ setattr(self, prefix + u'FileLayout', fileLayout)
+ setattr(self, prefix + u'FilenameEdit', filenameEdit)
+ setattr(self, prefix + u'BrowseButton', browseButton)
+ if can_disable:
+ setattr(self, prefix + u'ImportLayout', importLayout)
+ else:
+ setattr(self, prefix + u'Layout', importLayout)
+ self.formatComboBox.addItem(u'')
+
+ def addMultiFileSelectItem(self, prefix, obj_prefix=None,
+ can_disable=False):
+ if not obj_prefix:
+ obj_prefix = prefix
+ page = QtGui.QWidget()
+ page.setObjectName(obj_prefix + u'Page')
+ if can_disable:
+ importWidget = self.disablableWidget(page, prefix, obj_prefix)
+ else:
+ importWidget = page
+ importLayout = QtGui.QVBoxLayout(importWidget)
+ importLayout.setMargin(0)
+ if can_disable:
+ importLayout.setObjectName(obj_prefix + u'ImportLayout')
+ else:
+ importLayout.setObjectName(obj_prefix + u'Layout')
+ fileListWidget = QtGui.QListWidget(importWidget)
+ fileListWidget.setSelectionMode(
+ QtGui.QAbstractItemView.ExtendedSelection)
+ fileListWidget.setObjectName(obj_prefix + u'FileListWidget')
+ importLayout.addWidget(fileListWidget)
+ buttonLayout = QtGui.QHBoxLayout()
+ buttonLayout.setObjectName(obj_prefix + u'ButtonLayout')
+ addButton = QtGui.QPushButton(importWidget)
+ addButton.setIcon(self.openIcon)
+ addButton.setObjectName(obj_prefix + u'AddButton')
+ buttonLayout.addWidget(addButton)
+ buttonLayout.addStretch()
+ removeButton = QtGui.QPushButton(importWidget)
+ removeButton.setIcon(self.deleteIcon)
+ removeButton.setObjectName(obj_prefix + u'RemoveButton')
+ buttonLayout.addWidget(removeButton)
+ importLayout.addLayout(buttonLayout)
+ self.formatStack.addWidget(page)
+ setattr(self, prefix + u'Page', page)
+ setattr(self, prefix + u'FileListWidget', fileListWidget)
+ setattr(self, prefix + u'ButtonLayout', buttonLayout)
+ setattr(self, prefix + u'AddButton', addButton)
+ setattr(self, prefix + u'RemoveButton', removeButton)
+ if can_disable:
+ setattr(self, prefix + u'ImportLayout', importLayout)
+ else:
+ setattr(self, prefix + u'Layout', importLayout)
+ self.formatComboBox.addItem(u'')
+
+ def disablableWidget(self, page, prefix, obj_prefix):
+ layout = QtGui.QVBoxLayout(page)
+ layout.setMargin(0)
+ layout.setSpacing(0)
+ layout.setObjectName(obj_prefix + u'Layout')
+ disabledWidget = QtGui.QWidget(page)
+ disabledWidget.setVisible(False)
+ disabledWidget.setObjectName(obj_prefix + u'DisabledWidget')
+ disabledLayout = QtGui.QVBoxLayout(disabledWidget)
+ disabledLayout.setMargin(0)
+ disabledLayout.setObjectName(obj_prefix + u'DisabledLayout')
+ disabledLabel = QtGui.QLabel(disabledWidget)
+ disabledLabel.setWordWrap(True)
+ disabledLabel.setObjectName(obj_prefix + u'DisabledLabel')
+ disabledLayout.addWidget(disabledLabel)
+ layout.addWidget(disabledWidget)
+ importWidget = QtGui.QWidget(page)
+ importWidget.setObjectName(obj_prefix + u'ImportWidget')
+ layout.addWidget(importWidget)
+ setattr(self, prefix + u'Layout', layout)
+ setattr(self, prefix + u'DisabledWidget', disabledWidget)
+ setattr(self, prefix + u'DisabledLayout', disabledLayout)
+ setattr(self, prefix + u'DisabledLabel', disabledLabel)
+ setattr(self, prefix + u'ImportWidget', importWidget)
+ return importWidget
diff --git a/openlp/plugins/songs/forms/songimportwizard.py b/openlp/plugins/songs/forms/songimportwizard.py
deleted file mode 100644
index 903300d0c..000000000
--- a/openlp/plugins/songs/forms/songimportwizard.py
+++ /dev/null
@@ -1,362 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
-
-###############################################################################
-# OpenLP - Open Source Lyrics Projection #
-# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2011 Raoul Snyman #
-# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
-# Carsten Tinggaard, Frode Woldsund #
-# --------------------------------------------------------------------------- #
-# This program is free software; you can redistribute it and/or modify it #
-# under the terms of the GNU General Public License as published by the Free #
-# Software Foundation; version 2 of the License. #
-# #
-# This program is distributed in the hope that it will be useful, but WITHOUT #
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
-# more details. #
-# #
-# You should have received a copy of the GNU General Public License along #
-# with this program; if not, write to the Free Software Foundation, Inc., 59 #
-# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-###############################################################################
-
-from PyQt4 import QtCore, QtGui
-
-from openlp.core.lib import build_icon, translate
-
-class Ui_SongImportWizard(object):
- def setupUi(self, songImportWizard):
- self.openIcon = build_icon(u':/general/general_open.png')
- self.deleteIcon = build_icon(u':/general/general_delete.png')
- songImportWizard.setObjectName(u'songImportWizard')
- songImportWizard.setModal(True)
- songImportWizard.setWizardStyle(QtGui.QWizard.ModernStyle)
- songImportWizard.setOptions(
- QtGui.QWizard.IndependentPages |
- QtGui.QWizard.NoBackButtonOnStartPage |
- QtGui.QWizard.NoBackButtonOnLastPage)
- # Welcome Page
- self.welcomePage = QtGui.QWizardPage()
- self.welcomePage.setPixmap(QtGui.QWizard.WatermarkPixmap,
- QtGui.QPixmap(u':/wizards/wizard_importsong.bmp'))
- self.welcomePage.setObjectName(u'WelcomePage')
- self.welcomeLayout = QtGui.QVBoxLayout(self.welcomePage)
- self.welcomeLayout.setObjectName(u'WelcomeLayout')
- self.titleLabel = QtGui.QLabel(self.welcomePage)
- self.titleLabel.setObjectName(u'TitleLabel')
- self.welcomeLayout.addWidget(self.titleLabel)
- self.welcomeLayout.addSpacing(40)
- self.informationLabel = QtGui.QLabel(self.welcomePage)
- self.informationLabel.setWordWrap(True)
- self.informationLabel.setObjectName(u'InformationLabel')
- self.welcomeLayout.addWidget(self.informationLabel)
- self.welcomeLayout.addStretch()
- songImportWizard.addPage(self.welcomePage)
- # Source Page
- self.sourcePage = QtGui.QWizardPage()
- self.sourcePage.setObjectName(u'SourcePage')
- self.sourceLayout = QtGui.QVBoxLayout(self.sourcePage)
- self.sourceLayout.setObjectName(u'SourceLayout')
- self.formatLayout = QtGui.QFormLayout()
- self.formatLayout.setObjectName(u'FormatLayout')
- self.formatLabel = QtGui.QLabel(self.sourcePage)
- self.formatLabel.setObjectName(u'FormatLabel')
- self.formatComboBox = QtGui.QComboBox(self.sourcePage)
- self.formatComboBox.setObjectName(u'FormatComboBox')
- self.formatLayout.addRow(self.formatLabel, self.formatComboBox)
- self.formatSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
- QtGui.QSizePolicy.Minimum)
- self.formatLayout.setItem(1, QtGui.QFormLayout.LabelRole,
- self.formatSpacer)
- self.sourceLayout.addLayout(self.formatLayout)
- self.formatStack = QtGui.QStackedLayout()
- self.formatStack.setObjectName(u'FormatStack')
- # OpenLP 2.0
- self.addSingleFileSelectItem(u'openLP2')
- # openlp.org 1.x
- self.addSingleFileSelectItem(u'openLP1', None, True)
- # OpenLyrics
- self.addMultiFileSelectItem(u'openLyrics', u'OpenLyrics', True)
- # Open Song
- self.addMultiFileSelectItem(u'openSong', u'OpenSong')
- # Words of Worship
- self.addMultiFileSelectItem(u'wordsOfWorship')
- # CCLI File import
- self.addMultiFileSelectItem(u'ccli')
- # Songs of Fellowship
- self.addMultiFileSelectItem(u'songsOfFellowship', None, True)
- # Generic Document/Presentation import
- self.addMultiFileSelectItem(u'generic', None, True)
- # EasyWorship
- self.addSingleFileSelectItem(u'ew')
- # Words of Worship
- self.addMultiFileSelectItem(u'songBeamer')
-# Commented out for future use.
-# self.addSingleFileSelectItem(u'csv', u'CSV')
- self.sourceLayout.addLayout(self.formatStack)
- songImportWizard.addPage(self.sourcePage)
- # Import Page
- self.importPage = QtGui.QWizardPage()
- self.importPage.setObjectName(u'ImportPage')
- self.importLayout = QtGui.QVBoxLayout(self.importPage)
- self.importLayout.setMargin(48)
- self.importLayout.setObjectName(u'ImportLayout')
- self.importProgressLabel = QtGui.QLabel(self.importPage)
- self.importProgressLabel.setObjectName(u'ImportProgressLabel')
- self.importLayout.addWidget(self.importProgressLabel)
- self.importProgressBar = QtGui.QProgressBar(self.importPage)
- self.importProgressBar.setObjectName(u'ImportProgressBar')
- self.importLayout.addWidget(self.importProgressBar)
- songImportWizard.addPage(self.importPage)
- self.retranslateUi(songImportWizard)
- self.formatStack.setCurrentIndex(0)
- QtCore.QObject.connect(self.formatComboBox,
- QtCore.SIGNAL(u'currentIndexChanged(int)'),
- self.formatStack.setCurrentIndex)
- QtCore.QMetaObject.connectSlotsByName(songImportWizard)
-
- def retranslateUi(self, songImportWizard):
- songImportWizard.setWindowTitle(
- translate('SongsPlugin.ImportWizardForm', 'Song Import Wizard'))
- self.titleLabel.setText(
- u'%s ' % \
- translate('SongsPlugin.ImportWizardForm',
- 'Welcome to the Song Import Wizard'))
- self.informationLabel.setText(
- translate('SongsPlugin.ImportWizardForm',
- 'This wizard will help you to import songs from a variety of '
- 'formats. Click the next button below to start the process by '
- 'selecting a format to import from.'))
- self.sourcePage.setTitle(
- translate('SongsPlugin.ImportWizardForm', 'Select Import Source'))
- self.sourcePage.setSubTitle(
- translate('SongsPlugin.ImportWizardForm',
- 'Select the import format, and where to import from.'))
- self.formatLabel.setText(
- translate('SongsPlugin.ImportWizardForm', 'Format:'))
- self.formatComboBox.setItemText(0,
- translate('SongsPlugin.ImportWizardForm', 'OpenLP 2.0'))
- self.formatComboBox.setItemText(1,
- translate('SongsPlugin.ImportWizardForm', 'openlp.org 1.x'))
- self.formatComboBox.setItemText(2,
- translate('SongsPlugin.ImportWizardForm', 'OpenLyrics'))
- self.formatComboBox.setItemText(3,
- translate('SongsPlugin.ImportWizardForm', 'OpenSong'))
- self.formatComboBox.setItemText(4,
- translate('SongsPlugin.ImportWizardForm', 'Words of Worship'))
- self.formatComboBox.setItemText(5,
- translate('SongsPlugin.ImportWizardForm', 'CCLI/SongSelect'))
- self.formatComboBox.setItemText(6,
- translate('SongsPlugin.ImportWizardForm', 'Songs of Fellowship'))
- self.formatComboBox.setItemText(7,
- translate('SongsPlugin.ImportWizardForm',
- 'Generic Document/Presentation'))
- self.formatComboBox.setItemText(8,
- translate('SongsPlugin.ImportWizardForm', 'EasyWorship'))
- self.formatComboBox.setItemText(9,
- translate('SongsPlugin.ImportWizardForm', 'SongBeamer'))
-# self.formatComboBox.setItemText(9,
-# translate('SongsPlugin.ImportWizardForm', 'CSV'))
- self.openLP2FilenameLabel.setText(
- translate('SongsPlugin.ImportWizardForm', 'Filename:'))
- self.openLP2BrowseButton.setText(
- translate('SongsPlugin.ImportWizardForm', 'Browse...'))
- self.openLP1FilenameLabel.setText(
- translate('SongsPlugin.ImportWizardForm', 'Filename:'))
- self.openLP1BrowseButton.setText(
- translate('SongsPlugin.ImportWizardForm', 'Browse...'))
- self.openLP1DisabledLabel.setText(
- translate('SongsPlugin.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.'))
- self.openLyricsAddButton.setText(
- translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
- self.openLyricsRemoveButton.setText(
- translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
- self.openLyricsDisabledLabel.setText(
- translate('SongsPlugin.ImportWizardForm', 'The OpenLyrics '
- 'importer has not yet been developed, but as you can see, we are '
- 'still intending to do so. Hopefully it will be in the next '
- 'release.'))
- self.openSongAddButton.setText(
- translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
- self.openSongRemoveButton.setText(
- translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
- self.wordsOfWorshipAddButton.setText(
- translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
- self.wordsOfWorshipRemoveButton.setText(
- translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
- self.ccliAddButton.setText(
- translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
- self.ccliRemoveButton.setText(
- translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
- self.songsOfFellowshipAddButton.setText(
- translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
- self.songsOfFellowshipRemoveButton.setText(
- translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
- self.songsOfFellowshipDisabledLabel.setText(
- translate('SongsPlugin.ImportWizardForm', 'The Songs of '
- 'Fellowship importer has been disabled because OpenLP cannot '
- 'find OpenOffice.org on your computer.'))
- self.genericAddButton.setText(
- translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
- self.genericRemoveButton.setText(
- translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
- self.genericDisabledLabel.setText(
- translate('SongsPlugin.ImportWizardForm', 'The generic document/'
- 'presentation importer has been disabled because OpenLP cannot '
- 'find OpenOffice.org on your computer.'))
- self.ewFilenameLabel.setText(
- translate('SongsPlugin.ImportWizardForm', 'Filename:'))
- self.ewBrowseButton.setText(
- translate('SongsPlugin.ImportWizardForm', 'Browse...'))
- self.songBeamerAddButton.setText(
- translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
- self.songBeamerRemoveButton.setText(
- translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
-# self.csvFilenameLabel.setText(
-# translate('SongsPlugin.ImportWizardForm', 'Filename:'))
-# self.csvBrowseButton.setText(
-# translate('SongsPlugin.ImportWizardForm', 'Browse...'))
- self.importPage.setTitle(
- translate('SongsPlugin.ImportWizardForm', 'Importing'))
- self.importPage.setSubTitle(
- translate('SongsPlugin.ImportWizardForm',
- 'Please wait while your songs are imported.'))
- self.importProgressLabel.setText(
- translate('SongsPlugin.ImportWizardForm', 'Ready.'))
- self.importProgressBar.setFormat(
- translate('SongsPlugin.ImportWizardForm', '%p%'))
- # Align all QFormLayouts towards each other.
- width = max(self.formatLabel.minimumSizeHint().width(),
- self.openLP2FilenameLabel.minimumSizeHint().width())
- self.formatSpacer.changeSize(width, 0, QtGui.QSizePolicy.Fixed,
- QtGui.QSizePolicy.Fixed)
- self.openLP2FormLabelSpacer.changeSize(width, 0,
- QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
- self.openLP1FormLabelSpacer.changeSize(width, 0,
- QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
- self.ewFormLabelSpacer.changeSize(width, 0, QtGui.QSizePolicy.Fixed,
- QtGui.QSizePolicy.Fixed)
-# self.csvFormLabelSpacer.changeSize(width, 0, QtGui.QSizePolicy.Fixed,
-# QtGui.QSizePolicy.Fixed)
-
- def addSingleFileSelectItem(self, prefix, obj_prefix=None,
- can_disable=False):
- if not obj_prefix:
- obj_prefix = prefix
- page = QtGui.QWidget()
- page.setObjectName(obj_prefix + u'Page')
- if can_disable:
- importWidget = self.disablableWidget(page, prefix, obj_prefix)
- else:
- importWidget = page
- importLayout = QtGui.QFormLayout(importWidget)
- importLayout.setMargin(0)
- if can_disable:
- importLayout.setObjectName(obj_prefix + u'ImportLayout')
- else:
- importLayout.setObjectName(obj_prefix + u'Layout')
- filenameLabel = QtGui.QLabel(importWidget)
- filenameLabel.setObjectName(obj_prefix + u'FilenameLabel')
- fileLayout = QtGui.QHBoxLayout()
- fileLayout.setObjectName(obj_prefix + u'FileLayout')
- filenameEdit = QtGui.QLineEdit(importWidget)
- filenameEdit.setObjectName(obj_prefix + u'FilenameEdit')
- fileLayout.addWidget(filenameEdit)
- browseButton = QtGui.QToolButton(importWidget)
- browseButton.setIcon(self.openIcon)
- browseButton.setObjectName(obj_prefix + u'BrowseButton')
- fileLayout.addWidget(browseButton)
- importLayout.addRow(filenameLabel, fileLayout)
- formSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
- QtGui.QSizePolicy.Minimum)
- importLayout.setItem(1, QtGui.QFormLayout.LabelRole, formSpacer)
- self.formatStack.addWidget(page)
- setattr(self, prefix + u'Page', page)
- setattr(self, prefix + u'FilenameLabel', filenameLabel)
- setattr(self, prefix + u'FormLabelSpacer', formSpacer)
- setattr(self, prefix + u'FileLayout', fileLayout)
- setattr(self, prefix + u'FilenameEdit', filenameEdit)
- setattr(self, prefix + u'BrowseButton', browseButton)
- if can_disable:
- setattr(self, prefix + u'ImportLayout', importLayout)
- else:
- setattr(self, prefix + u'Layout', importLayout)
- self.formatComboBox.addItem(u'')
-
- def addMultiFileSelectItem(self, prefix, obj_prefix=None,
- can_disable=False):
- if not obj_prefix:
- obj_prefix = prefix
- page = QtGui.QWidget()
- page.setObjectName(obj_prefix + u'Page')
- if can_disable:
- importWidget = self.disablableWidget(page, prefix, obj_prefix)
- else:
- importWidget = page
- importLayout = QtGui.QVBoxLayout(importWidget)
- importLayout.setMargin(0)
- if can_disable:
- importLayout.setObjectName(obj_prefix + u'ImportLayout')
- else:
- importLayout.setObjectName(obj_prefix + u'Layout')
- fileListWidget = QtGui.QListWidget(importWidget)
- fileListWidget.setSelectionMode(
- QtGui.QAbstractItemView.ExtendedSelection)
- fileListWidget.setObjectName(obj_prefix + u'FileListWidget')
- importLayout.addWidget(fileListWidget)
- buttonLayout = QtGui.QHBoxLayout()
- buttonLayout.setObjectName(obj_prefix + u'ButtonLayout')
- addButton = QtGui.QPushButton(importWidget)
- addButton.setIcon(self.openIcon)
- addButton.setObjectName(obj_prefix + u'AddButton')
- buttonLayout.addWidget(addButton)
- buttonLayout.addStretch()
- removeButton = QtGui.QPushButton(importWidget)
- removeButton.setIcon(self.deleteIcon)
- removeButton.setObjectName(obj_prefix + u'RemoveButton')
- buttonLayout.addWidget(removeButton)
- importLayout.addLayout(buttonLayout)
- self.formatStack.addWidget(page)
- setattr(self, prefix + u'Page', page)
- setattr(self, prefix + u'FileListWidget', fileListWidget)
- setattr(self, prefix + u'ButtonLayout', buttonLayout)
- setattr(self, prefix + u'AddButton', addButton)
- setattr(self, prefix + u'RemoveButton', removeButton)
- if can_disable:
- setattr(self, prefix + u'ImportLayout', importLayout)
- else:
- setattr(self, prefix + u'Layout', importLayout)
- self.formatComboBox.addItem(u'')
-
- def disablableWidget(self, page, prefix, obj_prefix):
- layout = QtGui.QVBoxLayout(page)
- layout.setMargin(0)
- layout.setSpacing(0)
- layout.setObjectName(obj_prefix + u'Layout')
- disabledWidget = QtGui.QWidget(page)
- disabledWidget.setVisible(False)
- disabledWidget.setObjectName(obj_prefix + u'DisabledWidget')
- disabledLayout = QtGui.QVBoxLayout(disabledWidget)
- disabledLayout.setMargin(0)
- disabledLayout.setObjectName(obj_prefix + u'DisabledLayout')
- disabledLabel = QtGui.QLabel(disabledWidget)
- disabledLabel.setWordWrap(True)
- disabledLabel.setObjectName(obj_prefix + u'DisabledLabel')
- disabledLayout.addWidget(disabledLabel)
- layout.addWidget(disabledWidget)
- importWidget = QtGui.QWidget(page)
- importWidget.setObjectName(obj_prefix + u'ImportWidget')
- layout.addWidget(importWidget)
- setattr(self, prefix + u'Layout', layout)
- setattr(self, prefix + u'DisabledWidget', disabledWidget)
- setattr(self, prefix + u'DisabledLayout', disabledLayout)
- setattr(self, prefix + u'DisabledLabel', disabledLabel)
- setattr(self, prefix + u'ImportWidget', importWidget)
- return importWidget
diff --git a/openlp/plugins/songs/forms/songmaintenanceform.py b/openlp/plugins/songs/forms/songmaintenanceform.py
index c964c5192..cd10dca9b 100644
--- a/openlp/plugins/songs/forms/songmaintenanceform.py
+++ b/openlp/plugins/songs/forms/songmaintenanceform.py
@@ -23,15 +23,19 @@
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
+import logging
from PyQt4 import QtGui, QtCore
from sqlalchemy.sql import and_
from openlp.core.lib import Receiver, translate
+from openlp.core.ui import criticalErrorMessageBox
from openlp.plugins.songs.forms import AuthorsForm, TopicsForm, SongBookForm
from openlp.plugins.songs.lib.db import Author, Book, Topic, Song
from songmaintenancedialog import Ui_SongMaintenanceDialog
+log = logging.getLogger(__name__)
+
class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
"""
Class documentation goes here.
@@ -87,15 +91,14 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
if item_id != -1:
item = self.manager.get_object(item_class, item_id)
if item and len(item.songs) == 0:
- if QtGui.QMessageBox.warning(self, dlg_title, del_text,
- QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
- QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.Yes:
+ if criticalErrorMessageBox(title=dlg_title, message=del_text,
+ parent=self, question=True) == QtGui.QMessageBox.Yes:
self.manager.delete_object(item_class, item.id)
reset_func()
else:
- QtGui.QMessageBox.critical(self, dlg_title, err_text)
+ criticalErrorMessageBox(dlg_title, err_text)
else:
- QtGui.QMessageBox.critical(self, dlg_title, sel_text)
+ criticalErrorMessageBox(dlg_title, sel_text)
def resetAuthors(self):
"""
@@ -229,14 +232,12 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
if self.manager.save_object(author):
self.resetAuthors()
else:
- QtGui.QMessageBox.critical(self,
- translate('SongsPlugin.SongMaintenanceForm', 'Error'),
- translate('SongsPlugin.SongMaintenanceForm',
+ criticalErrorMessageBox(
+ message=translate('SongsPlugin.SongMaintenanceForm',
'Could not add your author.'))
else:
- QtGui.QMessageBox.critical(self,
- translate('SongsPlugin.SongMaintenanceForm', 'Error'),
- translate('SongsPlugin.SongMaintenanceForm',
+ criticalErrorMessageBox(
+ message=translate('SongsPlugin.SongMaintenanceForm',
'This author already exists.'))
def onTopicAddButtonClick(self):
@@ -246,14 +247,12 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
if self.manager.save_object(topic):
self.resetTopics()
else:
- QtGui.QMessageBox.critical(self,
- translate('SongsPlugin.SongMaintenanceForm', 'Error'),
- translate('SongsPlugin.SongMaintenanceForm',
+ criticalErrorMessageBox(
+ message=translate('SongsPlugin.SongMaintenanceForm',
'Could not add your topic.'))
else:
- QtGui.QMessageBox.critical(self,
- translate('SongsPlugin.SongMaintenanceForm', 'Error'),
- translate('SongsPlugin.SongMaintenanceForm',
+ criticalErrorMessageBox(
+ message=translate('SongsPlugin.SongMaintenanceForm',
'This topic already exists.'))
def onBookAddButtonClick(self):
@@ -264,14 +263,12 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
if self.manager.save_object(book):
self.resetBooks()
else:
- QtGui.QMessageBox.critical(self,
- translate('SongsPlugin.SongMaintenanceForm', 'Error'),
- translate('SongsPlugin.SongMaintenanceForm',
+ criticalErrorMessageBox(
+ message=translate('SongsPlugin.SongMaintenanceForm',
'Could not add your book.'))
else:
- QtGui.QMessageBox.critical(self,
- translate('SongsPlugin.SongMaintenanceForm', 'Error'),
- translate('SongsPlugin.SongMaintenanceForm',
+ criticalErrorMessageBox(
+ message=translate('SongsPlugin.SongMaintenanceForm',
'This book already exists.'))
def onAuthorEditButtonClick(self):
@@ -298,20 +295,15 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
self.resetAuthors()
Receiver.send_message(u'songs_load_list')
else:
- QtGui.QMessageBox.critical(self,
- translate('SongsPlugin.SongMaintenanceForm',
- 'Error'),
- translate('SongsPlugin.SongMaintenanceForm',
+ criticalErrorMessageBox(
+ message=translate('SongsPlugin.SongMaintenanceForm',
'Could not save your changes.'))
- elif QtGui.QMessageBox.critical(self,
- translate('SongsPlugin.SongMaintenanceForm', 'Error'),
- unicode(translate('SongsPlugin.SongMaintenanceForm',
- 'The author %s already exists. Would you like to make songs'
- ' with author %s use the existing author %s?')) %
- (author.display_name, temp_display_name,
- author.display_name), QtGui.QMessageBox.StandardButtons(
- QtGui.QMessageBox.No | QtGui.QMessageBox.Yes)) == \
- QtGui.QMessageBox.Yes:
+ elif criticalErrorMessageBox(message=unicode(translate(
+ 'SongsPlugin.SongMaintenanceForm', 'The author %s already '
+ 'exists. Would you like to make songs with author %s use '
+ 'the existing author %s?')) % (author.display_name,
+ temp_display_name, author.display_name),
+ parent=self, question=True) == QtGui.QMessageBox.Yes:
self.mergeAuthors(author)
self.resetAuthors()
Receiver.send_message(u'songs_load_list')
@@ -321,9 +313,8 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
author.first_name = temp_first_name
author.last_name = temp_last_name
author.display_name = temp_display_name
- QtGui.QMessageBox.critical(self,
- translate('SongsPlugin.SongMaintenanceForm', 'Error'),
- translate('SongsPlugin.SongMaintenanceForm',
+ criticalErrorMessageBox(
+ message=translate('SongsPlugin.SongMaintenanceForm',
'Could not save your modified author, because the '
'author already exists.'))
@@ -340,27 +331,22 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
if self.manager.save_object(topic):
self.resetTopics()
else:
- QtGui.QMessageBox.critical(self,
- translate('SongsPlugin.SongMaintenanceForm',
- 'Error'),
- translate('SongsPlugin.SongMaintenanceForm',
+ criticalErrorMessageBox(
+ message=translate('SongsPlugin.SongMaintenanceForm',
'Could not save your changes.'))
- elif QtGui.QMessageBox.critical(self,
- translate('SongsPlugin.SongMaintenanceForm', 'Error'),
- unicode(translate('SongsPlugin.SongMaintenanceForm',
+ elif criticalErrorMessageBox(
+ message=unicode(translate('SongsPlugin.SongMaintenanceForm',
'The topic %s already exists. Would you like to make songs '
'with topic %s use the existing topic %s?')) % (topic.name,
- temp_name, topic.name), QtGui.QMessageBox.StandardButtons(
- QtGui.QMessageBox.No | QtGui.QMessageBox.Yes)) == \
- QtGui.QMessageBox.Yes:
+ temp_name, topic.name),
+ parent=self, question=True) == QtGui.QMessageBox.Yes:
self.mergeTopics(topic)
self.resetTopics()
else:
# We restore the topics's old name.
topic.name = temp_name
- QtGui.QMessageBox.critical(self,
- translate('SongsPlugin.SongMaintenanceForm', 'Error'),
- translate('SongsPlugin.SongMaintenanceForm',
+ criticalErrorMessageBox(
+ message=translate('SongsPlugin.SongMaintenanceForm',
'Could not save your modified topic, because it '
'already exists.'))
@@ -383,19 +369,15 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
if self.manager.save_object(book):
self.resetBooks()
else:
- QtGui.QMessageBox.critical(self,
- translate('SongsPlugin.SongMaintenanceForm',
- 'Error'),
- translate('SongsPlugin.SongMaintenanceForm',
+ criticalErrorMessageBox(
+ message=translate('SongsPlugin.SongMaintenanceForm',
'Could not save your changes.'))
- elif QtGui.QMessageBox.critical(self,
- translate('SongsPlugin.SongMaintenanceForm', 'Error'),
- unicode(translate('SongsPlugin.SongMaintenanceForm',
+ elif criticalErrorMessageBox(
+ message=unicode(translate('SongsPlugin.SongMaintenanceForm',
'The book %s already exists. Would you like to make songs '
'with book %s use the existing book %s?')) % (book.name,
- temp_name, book.name), QtGui.QMessageBox.StandardButtons(
- QtGui.QMessageBox.No | QtGui.QMessageBox.Yes)) == \
- QtGui.QMessageBox.Yes:
+ temp_name, book.name),
+ parent=self, question=True) == QtGui.QMessageBox.Yes:
self.mergeBooks(book)
self.resetBooks()
else:
diff --git a/openlp/plugins/songs/forms/topicsform.py b/openlp/plugins/songs/forms/topicsform.py
index 1ff827423..4ab2b63fa 100644
--- a/openlp/plugins/songs/forms/topicsform.py
+++ b/openlp/plugins/songs/forms/topicsform.py
@@ -27,6 +27,7 @@
from PyQt4 import QtGui
from openlp.core.lib import translate
+from openlp.core.ui import criticalErrorMessageBox
from openlp.plugins.songs.forms.topicsdialog import Ui_TopicsDialog
class TopicsForm(QtGui.QDialog, Ui_TopicsDialog):
@@ -48,10 +49,8 @@ class TopicsForm(QtGui.QDialog, Ui_TopicsDialog):
def accept(self):
if not self.nameEdit.text():
- QtGui.QMessageBox.critical(
- self, translate('SongsPlugin.TopicsForm', 'Error'),
- translate('SongsPlugin.TopicsForm',
- 'You need to type in a topic name.'))
+ criticalErrorMessageBox(message=translate('SongsPlugin.TopicsForm',
+ 'You need to type in a topic name.'))
self.nameEdit.setFocus()
return False
else:
diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py
index 462dac89a..af8b71795 100644
--- a/openlp/plugins/songs/lib/__init__.py
+++ b/openlp/plugins/songs/lib/__init__.py
@@ -48,49 +48,27 @@ class VerseType(object):
``verse_type``
The type to return a string for
"""
- if verse_type == VerseType.Verse:
- return translate('SongsPlugin.VerseType', 'Verse')
- elif verse_type == VerseType.Chorus:
- return translate('SongsPlugin.VerseType', 'Chorus')
- elif verse_type == VerseType.Bridge:
- return translate('SongsPlugin.VerseType', 'Bridge')
- elif verse_type == VerseType.PreChorus:
- return translate('SongsPlugin.VerseType', 'Pre-Chorus')
- elif verse_type == VerseType.Intro:
- return translate('SongsPlugin.VerseType', 'Intro')
- elif verse_type == VerseType.Ending:
- return translate('SongsPlugin.VerseType', 'Ending')
- elif verse_type == VerseType.Other:
- return translate('SongsPlugin.VerseType', 'Other')
-
- @staticmethod
- def expand_string(verse_type):
- """
- Return the VerseType for a given string
-
- ``verse_type``
- The string to return a VerseType for
- """
- verse_type = verse_type.lower()
- if verse_type == \
+ if not isinstance(verse_type, int):
+ verse_type = verse_type.lower()
+ if verse_type == VerseType.Verse or verse_type == \
unicode(VerseType.to_string(VerseType.Verse)).lower()[0]:
return translate('SongsPlugin.VerseType', 'Verse')
- elif verse_type == \
+ elif verse_type == VerseType.Chorus or verse_type == \
unicode(VerseType.to_string(VerseType.Chorus)).lower()[0]:
return translate('SongsPlugin.VerseType', 'Chorus')
- elif verse_type == \
+ elif verse_type == VerseType.Bridge or verse_type == \
unicode(VerseType.to_string(VerseType.Bridge)).lower()[0]:
return translate('SongsPlugin.VerseType', 'Bridge')
- elif verse_type == \
+ elif verse_type == VerseType.PreChorus or verse_type == \
unicode(VerseType.to_string(VerseType.PreChorus)).lower()[0]:
- return translate('SongsPlugin.VerseType', 'PreChorus')
- elif verse_type == \
+ return translate('SongsPlugin.VerseType', 'Pre-Chorus')
+ elif verse_type == VerseType.Intro or verse_type == \
unicode(VerseType.to_string(VerseType.Intro)).lower()[0]:
return translate('SongsPlugin.VerseType', 'Intro')
- elif verse_type == \
+ elif verse_type == VerseType.Ending or verse_type == \
unicode(VerseType.to_string(VerseType.Ending)).lower()[0]:
return translate('SongsPlugin.VerseType', 'Ending')
- elif verse_type == \
+ elif verse_type == VerseType.Other or verse_type == \
unicode(VerseType.to_string(VerseType.Other)).lower()[0]:
return translate('SongsPlugin.VerseType', 'Other')
@@ -163,7 +141,7 @@ def retrieve_windows_encoding(recommendation=None):
translate('SongsPlugin', 'Character Encoding'),
translate('SongsPlugin', 'The codepage setting is responsible\n'
'for the correct character representation.\n'
- 'Usually you are fine with the preselected choise.'),
+ 'Usually you are fine with the preselected choice.'),
[pair[1] for pair in encodings], recommended_index, False)
else:
choice = QtGui.QInputDialog.getItem(None,
diff --git a/openlp/plugins/songs/lib/cclifileimport.py b/openlp/plugins/songs/lib/cclifileimport.py
index 1b8531755..441391d02 100644
--- a/openlp/plugins/songs/lib/cclifileimport.py
+++ b/openlp/plugins/songs/lib/cclifileimport.py
@@ -34,9 +34,6 @@ from songimport import SongImport
log = logging.getLogger(__name__)
-class CCLIFileImportError(Exception):
- pass
-
class CCLIFileImport(SongImport):
"""
The :class:`CCLIFileImport` class provides OpenLP with the ability to
@@ -67,7 +64,7 @@ class CCLIFileImport(SongImport):
"""
log.debug(u'Starting CCLI File Import')
song_total = len(self.filenames)
- self.import_wizard.importProgressBar.setMaximum(song_total)
+ self.import_wizard.progressBar.setMaximum(song_total)
song_count = 1
for filename in self.filenames:
self.import_wizard.incrementProgressBar(unicode(translate(
@@ -152,7 +149,6 @@ class CCLIFileImport(SongImport):
"""
log.debug(u'USR file text: %s', textList)
- lyrics = []
self.set_defaults()
for line in textList:
if line.startswith(u'Title='):
diff --git a/openlp/plugins/songs/lib/db.py b/openlp/plugins/songs/lib/db.py
index fc3aa06d1..838172893 100644
--- a/openlp/plugins/songs/lib/db.py
+++ b/openlp/plugins/songs/lib/db.py
@@ -181,4 +181,4 @@ def init_schema(url):
mapper(Topic, topics_table)
metadata.create_all(checkfirst=True)
- return session
\ No newline at end of file
+ return session
diff --git a/openlp/plugins/songs/lib/easislidesimport.py b/openlp/plugins/songs/lib/easislidesimport.py
new file mode 100644
index 000000000..8685b6934
--- /dev/null
+++ b/openlp/plugins/songs/lib/easislidesimport.py
@@ -0,0 +1,341 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
+# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
+# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
+# Carsten Tinggaard, Frode Woldsund #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU General Public License as published by the Free #
+# Software Foundation; version 2 of the License. #
+# #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
+# more details. #
+# #
+# You should have received a copy of the GNU General Public License along #
+# with this program; if not, write to the Free Software Foundation, Inc., 59 #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+###############################################################################
+
+import logging
+import os
+from lxml import etree, objectify
+from lxml.etree import Error, LxmlError
+import re
+
+from openlp.core.lib import translate
+from openlp.plugins.songs.lib.songimport import SongImport
+
+log = logging.getLogger(__name__)
+
+class EasiSlidesImport(SongImport):
+ """
+ Import songs exported from EasiSlides
+
+ The format example is here:
+ http://wiki.openlp.org/Development:EasiSlides_-_Song_Data_Format
+ """
+ def __init__(self, manager, **kwargs):
+ """
+ Initialise the class.
+ """
+ SongImport.__init__(self, manager)
+ self.filename = kwargs[u'filename']
+ self.song = None
+ self.commit = True
+
+ def do_import(self):
+ """
+ Import either each of the files in self.filenames - each element of
+ which can be either a single opensong file, or a zipfile containing
+ multiple opensong files. If `self.commit` is set False, the
+ import will not be committed to the database (useful for test scripts).
+ """
+ self.import_wizard.progressBar.setMaximum(1)
+ log.info(u'Importing EasiSlides XML file %s', self.filename)
+ parser = etree.XMLParser(remove_blank_text=True)
+ file = etree.parse(self.filename, parser)
+ xml = unicode(etree.tostring(file))
+ song_xml = objectify.fromstring(xml)
+ self.import_wizard.incrementProgressBar(
+ unicode(translate('SongsPlugin.ImportWizardForm',
+ u'Importing %s...')) % os.path.split(self.filename)[-1])
+ self.import_wizard.progressBar.setMaximum(len(song_xml.Item))
+ for song in song_xml.Item:
+ self.import_wizard.incrementProgressBar(
+ unicode(translate('SongsPlugin.ImportWizardForm',
+ u'Importing %s, song %s...')) %
+ (os.path.split(self.filename)[-1], song.Title1))
+ success = self._parse_song(song)
+ if not success or self.stop_import_flag:
+ return False
+ elif self.commit:
+ self.finish()
+ return True
+
+ def _parse_song(self, song):
+ self._success = True
+ self._add_title(song)
+ self._add_alttitle(song)
+ self._add_number(song)
+ self._add_authors(song)
+ self._add_copyright(song)
+ self._add_book(song)
+ self._parse_and_add_lyrics(song)
+ return self._success
+
+ def _add_title(self, song):
+ try:
+ self.title = unicode(song.Title1).strip()
+ except UnicodeDecodeError:
+ log.exception(u'Unicode decode error while decoding Title1')
+ self._success = False
+ except AttributeError:
+ log.exception(u'no Title1')
+ self._success = False
+
+ def _add_alttitle(self, song):
+ try:
+ self.alternate_title = unicode(song.Title2).strip()
+ except UnicodeDecodeError:
+ log.exception(u'Unicode decode error while decoding Title2')
+ self._success = False
+ except AttributeError:
+ pass
+
+ def _add_number(self, song):
+ try:
+ number = unicode(song.SongNumber)
+ if number != u'0':
+ self.song_number = number
+ except UnicodeDecodeError:
+ log.exception(u'Unicode decode error while decoding SongNumber')
+ self._success = False
+ except AttributeError:
+ pass
+
+ def _add_authors(self, song):
+ try:
+ authors = unicode(song.Writer).split(u',')
+ for author in authors:
+ author = author.strip()
+ if len(author) > 0:
+ self.authors.append(author)
+ except UnicodeDecodeError:
+ log.exception(u'Unicode decode error while decoding Writer')
+ self._success = False
+ except AttributeError:
+ pass
+
+ def _add_copyright(self, song):
+ copyright = []
+ try:
+ copyright.append(unicode(song.Copyright).strip())
+ except UnicodeDecodeError:
+ log.exception(u'Unicode decode error while decoding Copyright')
+ self._success = False
+ except AttributeError:
+ pass
+ try:
+ copyright.append(unicode(song.LicenceAdmin1).strip())
+ except UnicodeDecodeError:
+ log.exception(u'Unicode decode error while decoding LicenceAdmin1')
+ self._success = False
+ except AttributeError:
+ pass
+ try:
+ copyright.append(unicode(song.LicenceAdmin2).strip())
+ except UnicodeDecodeError:
+ log.exception(u'Unicode decode error while decoding LicenceAdmin2')
+ self._success = False
+ except AttributeError:
+ pass
+ self.add_copyright(u' '.join(copyright))
+
+ def _add_book(self, song):
+ try:
+ self.song_book_name = unicode(song.BookReference).strip()
+ except UnicodeDecodeError:
+ log.exception(u'Unicode decode error while decoding BookReference')
+ self._success = False
+ except AttributeError:
+ pass
+
+ def _parse_and_add_lyrics(self, song):
+ try:
+ lyrics = unicode(song.Contents).strip()
+ except UnicodeDecodeError:
+ log.exception(u'Unicode decode error while decoding Contents')
+ self._success = False
+ except AttributeError:
+ log.exception(u'no Contents')
+ self._success = False
+ lines = lyrics.split(u'\n')
+ # we go over all lines first, to determine information,
+ # which tells us how to parse verses later
+ regionlines = {}
+ separatorlines = 0
+ for line in lines:
+ line = line.strip()
+ if len(line) == 0:
+ continue
+ elif line[1:7] == u'region':
+ # this is region separator, probably [region 2]
+ region = self._extractRegion(line)
+ if regionlines.has_key(region):
+ regionlines[region] = regionlines[region] + 1
+ else:
+ regionlines[region] = 1
+ elif line[0] == u'[':
+ separatorlines = separatorlines + 1
+ # if the song has separators
+ separators = (separatorlines > 0)
+ # the number of different regions in song - 1
+ if len(regionlines) > 1:
+ log.info(u'EasiSlidesImport: the file contained a song named "%s"'
+ u'with more than two regions, but only two regions are',
+ u'tested, encountered regions were: %s',
+ self.title, u','.join(regionlines.keys()))
+ # if the song has regions
+ regions = (len(regionlines) > 0)
+ # if the regions are inside verses
+ regionsInVerses = (regions and regionlines[regionlines.keys()[0]] > 1)
+ MarkTypes = {
+ u'CHORUS': u'C',
+ u'VERSE': u'V',
+ u'INTRO': u'I',
+ u'ENDING': u'E',
+ u'BRIDGE': u'B',
+ u'PRECHORUS': u'P'}
+ verses = {}
+ # list as [region, versetype, versenum, instance]
+ our_verse_order = []
+ defaultregion = u'1'
+ reg = defaultregion
+ verses[reg] = {}
+ # instance differentiates occurrences of same verse tag
+ vt = u'V'
+ vn = u'1'
+ inst = 1
+
+ for line in lines:
+ line = line.strip()
+ if len(line) == 0:
+ if separators:
+ # separators are used, so empty line means slide break
+ # inside verse
+ if self._listHas(verses, [reg, vt, vn, inst]):
+ inst = inst + 1
+ else:
+ # separators are not used, so empty line starts a new verse
+ vt = u'V'
+ if verses[reg].has_key(vt):
+ vn = len(verses[reg][vt].keys())+1
+ else:
+ vn = u'1'
+ inst = 1
+ elif line[0:7] == u'[region':
+ reg = self._extractRegion(line)
+ if not verses.has_key(reg):
+ verses[reg] = {}
+ if not regionsInVerses:
+ vt = u'V'
+ vn = u'1'
+ inst = 1
+ elif line[0] == u'[':
+ # this is a normal section marker
+ marker = line[1:line.find(u']')].upper()
+ vn = u'1'
+ # have we got any digits?
+ # If so, versenumber is everything from the digits to the end
+ match = re.match(u'(.*)(\d+.*)', marker)
+ if match:
+ marker = match.group(1).strip()
+ vn = match.group(2)
+ if len(marker) == 0:
+ vt = u'V'
+ elif MarkTypes.has_key(marker):
+ vt = MarkTypes[marker]
+ else:
+ vt = u'O'
+ if regionsInVerses:
+ region = defaultregion
+ inst = 1
+ if self._listHas(verses, [reg, vt, vn, inst]):
+ inst = len(verses[reg][vt][vn])+1
+ else:
+ if not [reg, vt, vn, inst] in our_verse_order:
+ our_verse_order.append([reg, vt, vn, inst])
+ if not verses[reg].has_key(vt):
+ verses[reg][vt] = {}
+ if not verses[reg][vt].has_key(vn):
+ verses[reg][vt][vn] = {}
+ if not verses[reg][vt][vn].has_key(inst):
+ verses[reg][vt][vn][inst] = []
+ words = self.tidy_text(line)
+ verses[reg][vt][vn][inst].append(words)
+ # done parsing
+
+ versetags = []
+ # we use our_verse_order to ensure, we insert lyrics in the same order
+ # as these appeared originally in the file
+ for [reg, vt, vn, inst] in our_verse_order:
+ if self._listHas(verses, [reg, vt, vn, inst]):
+ versetag = u'%s%s' % (vt, vn)
+ versetags.append(versetag)
+ lines = u'\n'.join(verses[reg][vt][vn][inst])
+ self.verses.append([versetag, lines])
+
+ SeqTypes = {
+ u'p': u'P1',
+ u'q': u'P2',
+ u'c': u'C1',
+ u't': u'C2',
+ u'b': u'B1',
+ u'w': u'B2',
+ u'e': u'E1'}
+ # Make use of Sequence data, determining the order of verses
+ try:
+ order = unicode(song.Sequence).strip().split(u',')
+ for tag in order:
+ if len(tag) == 0:
+ continue
+ elif tag[0].isdigit():
+ tag = u'V' + tag
+ elif SeqTypes.has_key(tag.lower()):
+ tag = SeqTypes[tag.lower()]
+ else:
+ continue
+
+ if tag in versetags:
+ self.verse_order_list.append(tag)
+ else:
+ log.info(u'Got order item %s, which is not in versetags,'
+ u'dropping item from presentation order', tag)
+ except UnicodeDecodeError:
+ log.exception(u'Unicode decode error while decoding Sequence')
+ self._success = False
+ except AttributeError:
+ pass
+
+ def _listHas(self, lst, subitems):
+ for i in subitems:
+ if type(lst) == type({}) and lst.has_key(i):
+ lst = lst[i]
+ elif type(lst) == type([]) and i in lst:
+ lst = lst[i]
+ else:
+ return False
+ return True
+
+ def _extractRegion(self, line):
+ # this was true already: line[0:7] == u'[region':
+ right_bracket = line.find(u']')
+ return line[7:right_bracket].strip()
diff --git a/openlp/plugins/songs/lib/ewimport.py b/openlp/plugins/songs/lib/ewimport.py
index d74cd284f..312e3b759 100644
--- a/openlp/plugins/songs/lib/ewimport.py
+++ b/openlp/plugins/songs/lib/ewimport.py
@@ -186,7 +186,7 @@ class EasyWorshipSongImport(SongImport):
# There does not appear to be a _reliable_ way of getting the number
# of songs/records, so let's use file blocks for measuring progress.
total_blocks = (db_size - header_size) / (block_size * 1024)
- self.import_wizard.importProgressBar.setMaximum(total_blocks)
+ self.import_wizard.progressBar.setMaximum(total_blocks)
# Read the field description information
db_file.seek(120)
field_info = db_file.read(num_fields * 2)
diff --git a/openlp/plugins/songs/lib/importer.py b/openlp/plugins/songs/lib/importer.py
index 128d80138..91d3d7e6f 100644
--- a/openlp/plugins/songs/lib/importer.py
+++ b/openlp/plugins/songs/lib/importer.py
@@ -23,8 +23,11 @@
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
-
+"""
+The :mod:`importer` modules provides the general song import functionality.
+"""
from opensongimport import OpenSongImport
+from easislidesimport import EasiSlidesImport
from olpimport import OpenLPSongImport
from openlyricsimport import OpenLyricsImport
from wowimport import WowImport
@@ -34,19 +37,19 @@ from songbeamerimport import SongBeamerImport
# Imports that might fail
try:
from olp1import import OpenLP1SongImport
- has_openlp1 = True
+ HAS_OPENLP1 = True
except ImportError:
- has_openlp1 = False
+ HAS_OPENLP1 = False
try:
from sofimport import SofImport
- has_sof = True
+ HAS_SOF = True
except ImportError:
- has_sof = False
+ HAS_SOF = False
try:
from oooimport import OooImport
- has_ooo = True
+ HAS_OOO = True
except ImportError:
- has_ooo = False
+ HAS_OOO = False
class SongFormat(object):
"""
@@ -65,8 +68,9 @@ class SongFormat(object):
SongsOfFellowship = 6
Generic = 7
#CSV = 8
- EasyWorship = 8
- SongBeamer = 9
+ EasiSlides = 8
+ EasyWorship = 9
+ SongBeamer = 10
@staticmethod
def get_class(format):
@@ -92,6 +96,8 @@ class SongFormat(object):
return OooImport
elif format == SongFormat.CCLI:
return CCLIFileImport
+ elif format == SongFormat.EasiSlides:
+ return EasiSlidesImport
elif format == SongFormat.EasyWorship:
return EasyWorshipSongImport
elif format == SongFormat.SongBeamer:
@@ -112,20 +118,28 @@ class SongFormat(object):
SongFormat.CCLI,
SongFormat.SongsOfFellowship,
SongFormat.Generic,
+ SongFormat.EasiSlides,
SongFormat.EasyWorship,
SongFormat.SongBeamer
]
@staticmethod
def set_availability(format, available):
+ """
+ Set the availability for a given song format.
+ """
SongFormat._format_availability[format] = available
@staticmethod
def get_availability(format):
+ """
+ Return the availability of a given song format.
+ """
return SongFormat._format_availability.get(format, True)
-SongFormat.set_availability(SongFormat.OpenLP1, has_openlp1)
-SongFormat.set_availability(SongFormat.SongsOfFellowship, has_sof)
-SongFormat.set_availability(SongFormat.Generic, has_ooo)
+SongFormat.set_availability(SongFormat.OpenLP1, HAS_OPENLP1)
+SongFormat.set_availability(SongFormat.SongsOfFellowship, HAS_SOF)
+SongFormat.set_availability(SongFormat.Generic, HAS_OOO)
+
+__all__ = [u'SongFormat']
-__all__ = [u'SongFormat']
\ No newline at end of file
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 93e40f58a..67021616b 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -194,8 +194,7 @@ class SongMediaItem(MediaManagerItem):
elif search_type == 5:
log.debug(u'Theme Search')
search_results = self.parent.manager.get_all_objects(Song,
- Song.theme_name == search_keywords,
- Song.search_lyrics.asc())
+ Song.theme_name == search_keywords, Song.search_lyrics.asc())
self.displayResultsSong(search_results)
def onSongListLoad(self):
diff --git a/openlp/plugins/songs/lib/olp1import.py b/openlp/plugins/songs/lib/olp1import.py
index ceaee3302..c3e1ca6b4 100644
--- a/openlp/plugins/songs/lib/olp1import.py
+++ b/openlp/plugins/songs/lib/olp1import.py
@@ -78,7 +78,7 @@ class OpenLP1SongImport(SongImport):
cursor.execute(u'SELECT COUNT(songid) FROM songs')
count = cursor.fetchone()[0]
success = True
- self.import_wizard.importProgressBar.setMaximum(count)
+ self.import_wizard.progressBar.setMaximum(count)
# "cache" our list of authors
cursor.execute(u'-- types int, unicode')
cursor.execute(u'SELECT authorid, authorname FROM authors')
diff --git a/openlp/plugins/songs/lib/olpimport.py b/openlp/plugins/songs/lib/olpimport.py
index e366ddf4b..d2a00447f 100644
--- a/openlp/plugins/songs/lib/olpimport.py
+++ b/openlp/plugins/songs/lib/olpimport.py
@@ -146,7 +146,7 @@ class OpenLPSongImport(SongImport):
source_songs = self.source_session.query(OldSong).all()
song_total = len(source_songs)
- self.import_wizard.importProgressBar.setMaximum(song_total)
+ self.import_wizard.progressBar.setMaximum(song_total)
song_count = 1
for song in source_songs:
self.import_wizard.incrementProgressBar(unicode(translate(
diff --git a/openlp/plugins/songs/lib/oooimport.py b/openlp/plugins/songs/lib/oooimport.py
index c5cca4fd6..be33cb8fb 100644
--- a/openlp/plugins/songs/lib/oooimport.py
+++ b/openlp/plugins/songs/lib/oooimport.py
@@ -63,11 +63,11 @@ class OooImport(SongImport):
self.filenames = kwargs[u'filenames']
self.uno_connection_type = u'pipe' #u'socket'
QtCore.QObject.connect(Receiver.get_receiver(),
- QtCore.SIGNAL(u'song_stop_import'), self.stop_import)
+ QtCore.SIGNAL(u'openlp_stop_wizard'), self.stop_import)
def do_import(self):
self.abort = False
- self.import_wizard.importProgressBar.setMaximum(0)
+ self.import_wizard.progressBar.setMaximum(0)
self.start_ooo()
for filename in self.filenames:
if self.abort:
@@ -85,7 +85,7 @@ class OooImport(SongImport):
self.process_doc()
self.close_ooo_file()
self.close_ooo()
- self.import_wizard.importProgressBar.setMaximum(1)
+ self.import_wizard.progressBar.setMaximum(1)
self.import_wizard.incrementProgressBar(u'', 1)
return True
diff --git a/openlp/plugins/songs/lib/openlyricsimport.py b/openlp/plugins/songs/lib/openlyricsimport.py
index c4610dfc0..220160b1d 100644
--- a/openlp/plugins/songs/lib/openlyricsimport.py
+++ b/openlp/plugins/songs/lib/openlyricsimport.py
@@ -60,7 +60,7 @@ class OpenLyricsImport(SongImport):
"""
Imports the songs.
"""
- self.import_wizard.importProgressBar.setMaximum(len(self.import_source))
+ self.import_wizard.progressBar.setMaximum(len(self.import_source))
for file_path in self.import_source:
if self.stop_import_flag:
return False
@@ -68,8 +68,8 @@ class OpenLyricsImport(SongImport):
'SongsPlugin.OpenLyricsImport', 'Importing %s...')) %
os.path.basename(file_path))
parser = etree.XMLParser(remove_blank_text=True)
- file = etree.parse(file_path, parser)
- xml = unicode(etree.tostring(file))
+ parsed_file = etree.parse(file_path, parser)
+ xml = unicode(etree.tostring(parsed_file))
if self.openLyrics.xml_to_song(xml) is None:
log.debug(u'File could not be imported: %s' % file_path)
# Importing this song failed! For now we stop import.
diff --git a/openlp/plugins/songs/lib/opensongimport.py b/openlp/plugins/songs/lib/opensongimport.py
index 6a60fcc6c..eb16f4ba4 100644
--- a/openlp/plugins/songs/lib/opensongimport.py
+++ b/openlp/plugins/songs/lib/opensongimport.py
@@ -129,7 +129,7 @@ class OpenSongImport(SongImport):
else:
numfiles += 1
log.debug(u'Total number of files: %d', numfiles)
- self.import_wizard.importProgressBar.setMaximum(numfiles)
+ self.import_wizard.progressBar.setMaximum(numfiles)
for filename in self.filenames:
if self.stop_import_flag:
success = False
diff --git a/openlp/plugins/songs/lib/sofimport.py b/openlp/plugins/songs/lib/sofimport.py
index 3e6ee8c3a..8475b0824 100644
--- a/openlp/plugins/songs/lib/sofimport.py
+++ b/openlp/plugins/songs/lib/sofimport.py
@@ -89,7 +89,7 @@ class SofImport(OooImport):
self.process_sof_file()
self.close_ooo_file()
self.close_ooo()
- self.import_wizard.importProgressBar.setMaximum(1)
+ self.import_wizard.progressBar.setMaximum(1)
self.import_wizard.incrementProgressBar(u'', 1)
return True
@@ -550,4 +550,4 @@ class SofImport(OooImport):
return 6
if song_number == 1119:
return 7
- return None
\ No newline at end of file
+ return None
diff --git a/openlp/plugins/songs/lib/songbeamerimport.py b/openlp/plugins/songs/lib/songbeamerimport.py
index 12ff53428..47290bfbd 100644
--- a/openlp/plugins/songs/lib/songbeamerimport.py
+++ b/openlp/plugins/songs/lib/songbeamerimport.py
@@ -75,7 +75,6 @@ class SongBeamerImport(SongImport):
The song manager for the running OpenLP installation.
"""
SongImport.__init__(self, master_manager)
- self.master_manager = master_manager
if kwargs.has_key(u'filename'):
self.import_source = kwargs[u'filename']
if kwargs.has_key(u'filenames'):
@@ -84,10 +83,10 @@ class SongBeamerImport(SongImport):
def do_import(self):
"""
- Recieve a single file, or a list of files to import.
+ Receive a single file or a list of files to import.
"""
if isinstance(self.import_source, list):
- self.import_wizard.importProgressBar.setMaximum(
+ self.import_wizard.progressBar.setMaximum(
len(self.import_source))
for file in self.import_source:
# TODO: check that it is a valid SongBeamer file
@@ -95,21 +94,21 @@ class SongBeamerImport(SongImport):
self.current_verse = u''
self.current_verse_type = u'V'
read_verses = False
- self.file_name = os.path.split(file)[1]
+ file_name = os.path.split(file)[1]
self.import_wizard.incrementProgressBar(
- u'Importing %s' % (self.file_name), 0)
+ u'Importing %s' % (file_name), 0)
if os.path.isfile(file):
detect_file = open(file, u'r')
details = chardet.detect(detect_file.read(2048))
detect_file.close()
infile = codecs.open(file, u'r', details['encoding'])
- self.songData = infile.readlines()
+ songData = infile.readlines()
infile.close()
else:
return False
- self.title = self.file_name.split('.sng')[0]
+ self.title = file_name.split('.sng')[0]
read_verses = False
- for line in self.songData:
+ for line in songData:
# Just make sure that the line is of the type 'Unicode'.
line = unicode(line).strip()
if line.startswith(u'#') and not read_verses:
@@ -137,7 +136,7 @@ class SongBeamerImport(SongImport):
self.finish()
self.import_wizard.incrementProgressBar(unicode(translate(
'SongsPlugin.SongBeamerImport', 'Importing %s...')) %
- self.file_name)
+ file_name)
return True
def replace_html_tags(self):
diff --git a/openlp/plugins/songs/lib/songimport.py b/openlp/plugins/songs/lib/songimport.py
index 05ed320a9..3ce271466 100644
--- a/openlp/plugins/songs/lib/songimport.py
+++ b/openlp/plugins/songs/lib/songimport.py
@@ -55,14 +55,13 @@ class SongImport(QtCore.QObject):
self.stop_import_flag = False
self.set_defaults()
QtCore.QObject.connect(Receiver.get_receiver(),
- QtCore.SIGNAL(u'songs_stop_import'), self.stop_import)
+ QtCore.SIGNAL(u'openlp_stop_wizard'), self.stop_import)
def set_defaults(self):
"""
Create defaults for properties - call this before each song
if importing many songs at once to ensure a clean beginning
"""
- self.authors = []
self.title = u''
self.song_number = u''
self.alternate_title = u''
@@ -251,20 +250,15 @@ class SongImport(QtCore.QObject):
def finish(self):
"""
- All fields have been set to this song. Write it away
+ All fields have been set to this song. Write the song to disk.
"""
if not self.authors:
self.authors.append(unicode(translate('SongsPlugin.SongImport',
'Author unknown')))
- self.commit_song()
-
- def commit_song(self):
- """
- Write the song and its fields to disk
- """
log.info(u'commiting song %s to database', self.title)
song = Song()
song.title = self.title
+ song.alternate_title = self.alternate_title
song.search_title = self.remove_punctuation(self.title).lower() \
+ '@' + self.remove_punctuation(self.alternate_title).lower()
song.song_number = self.song_number
@@ -364,4 +358,4 @@ class SongImport(QtCore.QObject):
if self.theme_name:
print u'THEME: ' + self.theme_name
if self.ccli_number:
- print u'CCLI: ' + self.ccli_number
\ No newline at end of file
+ print u'CCLI: ' + self.ccli_number
diff --git a/openlp/plugins/songs/lib/test/test_opensongimport.py b/openlp/plugins/songs/lib/test/test_opensongimport.py
index 27c7cca48..fd1d37e3e 100644
--- a/openlp/plugins/songs/lib/test/test_opensongimport.py
+++ b/openlp/plugins/songs/lib/test/test_opensongimport.py
@@ -35,7 +35,7 @@ logging.basicConfig(filename=LOG_FILENAME,level=logging.INFO)
# Stubs to replace the UI functions for raw testing
class wizard_stub:
def __init__(self):
- self.importProgressBar=progbar_stub()
+ self.progressBar=progbar_stub()
def incrementProgressBar(self, str):
pass
class progbar_stub:
diff --git a/openlp/plugins/songs/lib/wowimport.py b/openlp/plugins/songs/lib/wowimport.py
index 1d5470f9b..b90a47de6 100644
--- a/openlp/plugins/songs/lib/wowimport.py
+++ b/openlp/plugins/songs/lib/wowimport.py
@@ -99,7 +99,6 @@ class WowImport(SongImport):
The song manager for the running OpenLP installation.
"""
SongImport.__init__(self, master_manager)
- self.master_manager = master_manager
if kwargs.has_key(u'filename'):
self.import_source = kwargs[u'filename']
if kwargs.has_key(u'filenames'):
@@ -108,64 +107,60 @@ class WowImport(SongImport):
def do_import(self):
"""
- Recieve a single file, or a list of files to import.
+ Receive a single file or a list of files to import.
"""
-
if isinstance(self.import_source, list):
- self.import_wizard.importProgressBar.setMaximum(
- len(self.import_source))
+ self.import_wizard.progressBar.setMaximum(len(self.import_source))
for file in self.import_source:
- self.author = u''
- self.copyright = u''
- self.file_name = os.path.split(file)[1]
+ author = u''
+ copyright = u''
+ file_name = os.path.split(file)[1]
self.import_wizard.incrementProgressBar(
- u'Importing %s' % (self.file_name), 0)
+ u'Importing %s' % (file_name), 0)
# Get the song title
- self.title = self.file_name.rpartition(u'.')[0]
- self.songData = open(file, 'rb')
- if self.songData.read(19) != u'WoW File\nSong Words':
+ self.title = file_name.rpartition(u'.')[0]
+ songData = open(file, 'rb')
+ if songData.read(19) != u'WoW File\nSong Words':
continue
# Seek to byte which stores number of blocks in the song
- self.songData.seek(56)
- self.no_of_blocks = ord(self.songData.read(1))
+ songData.seek(56)
+ no_of_blocks = ord(songData.read(1))
# Seek to the beging of the first block
- self.songData.seek(82)
- for block in range(self.no_of_blocks):
- self.lines_to_read = ord(self.songData.read(1))
+ songData.seek(82)
+ for block in range(no_of_blocks):
+ self.lines_to_read = ord(songData.read(1))
# Skip 3 nulls to the beginnig of the 1st line
- self.songData.seek(3, os.SEEK_CUR)
- self.block_text = u''
+ songData.seek(3, os.SEEK_CUR)
+ block_text = u''
while self.lines_to_read:
- self.length_of_line = ord(self.songData.read(1))
self.line_text = unicode(
- self.songData.read(self.length_of_line), u'cp1252')
- self.songData.seek(1, os.SEEK_CUR)
- if self.block_text != u'':
- self.block_text += u'\n'
- self.block_text += self.line_text
+ songData.read(ord(songData.read(1))), u'cp1252')
+ songData.seek(1, os.SEEK_CUR)
+ if block_text != u'':
+ block_text += u'\n'
+ block_text += self.line_text
self.lines_to_read -= 1
- self.block_type = BLOCK_TYPES[ord(self.songData.read(1))]
+ block_type = BLOCK_TYPES[ord(songData.read(1))]
# Skip 3 nulls at the end of the block
- self.songData.seek(3, os.SEEK_CUR)
+ songData.seek(3, os.SEEK_CUR)
# Blocks are seperated by 2 bytes, skip them, but not if
# this is the last block!
- if (block + 1) < self.no_of_blocks:
- self.songData.seek(2, os.SEEK_CUR)
- self.add_verse(self.block_text, self.block_type)
- # Now to extact the author
- self.author_length = ord(self.songData.read(1))
- if self.author_length != 0:
- self.author = unicode(
- self.songData.read(self.author_length), u'cp1252')
+ if (block + 1) < no_of_blocks:
+ songData.seek(2, os.SEEK_CUR)
+ self.add_verse(block_text, block_type)
+ # Now to extract the author
+ author_length = ord(songData.read(1))
+ if author_length != 0:
+ author = unicode(songData.read(author_length), u'cp1252')
# Finally the copyright
- self.copyright_length = ord(self.songData.read(1))
- if self.copyright_length != 0:
- self.copyright = unicode(
- self.songData.read(self.copyright_length), u'cp1252')
- self.parse_author(self.author)
- self.add_copyright(self.copyright)
- self.songData.close()
+ copyright_length = ord(songData.read(1))
+ if copyright_length != 0:
+ copyright = unicode(
+ songData.read(copyright_length), u'cp1252')
+ self.parse_author(author)
+ self.add_copyright(copyright)
+ songData.close()
self.finish()
self.import_wizard.incrementProgressBar(
- u'Importing %s' % (self.file_name))
+ u'Importing %s' % (file_name))
return True
diff --git a/openlp/plugins/songs/lib/xml.py b/openlp/plugins/songs/lib/xml.py
index cbe313212..88459b797 100644
--- a/openlp/plugins/songs/lib/xml.py
+++ b/openlp/plugins/songs/lib/xml.py
@@ -435,7 +435,7 @@ class OpenLyrics(object):
text += u'\n'
text += u'\n'.join([unicode(line) for line in lines.line])
verse_name = self._get(verse, u'name')
- verse_type = unicode(VerseType.expand_string(verse_name[0]))[0]
+ verse_type = unicode(VerseType.to_string(verse_name[0]))[0]
verse_number = re.compile(u'[a-zA-Z]*').sub(u'', verse_name)
verse_part = re.compile(u'[0-9]*').sub(u'', verse_name[1:])
# OpenLyrics allows e. g. "c", but we need "c1".