openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #02396
[Merge] lp:~googol-hush/openlp/trivial into lp:openlp
googol has proposed merging lp:~googol-hush/openlp/trivial into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Coding Standard fixes
--
https://code.launchpad.net/~googol-hush/openlp/trivial/+merge/29581
Your team OpenLP Core is requested to review the proposed merge of lp:~googol-hush/openlp/trivial into lp:openlp.
=== modified file 'openlp/core/lib/db.py'
--- openlp/core/lib/db.py 2010-07-05 11:39:48 +0000
+++ openlp/core/lib/db.py 2010-07-09 16:02:40 +0000
@@ -125,7 +125,8 @@
db_file_name)
else:
self.db_url = u'sqlite:///%s/%s.sqlite' % (
- AppLocation.get_section_data_path(plugin_name), plugin_name)
+ AppLocation.get_section_data_path(plugin_name),
+ plugin_name)
else:
self.db_url = u'%s://%s:%s@%s/%s' % (db_type,
unicode(settings.value(u'db username').toString()),
=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py 2010-07-08 09:14:00 +0000
+++ openlp/core/lib/mediamanageritem.py 2010-07-09 16:02:40 +0000
@@ -468,8 +468,8 @@
translate('MediaManagerItem',
'You must select one or more items.'))
else:
- #Is it posssible to process multiple list items to generate multiple
- #service items?
+ #Is it posssible to process multiple list items to generate
+ #multiple service items?
if self.singleServiceItem or self.remoteTriggered:
log.debug(self.PluginNameShort + u' Add requested')
service_item = self.buildServiceItem()
=== modified file 'openlp/core/lib/renderer.py'
--- openlp/core/lib/renderer.py 2010-07-05 11:39:48 +0000
+++ openlp/core/lib/renderer.py 2010-07-09 16:02:40 +0000
@@ -555,7 +555,8 @@
pen = QtGui.QColor(color)
x, y = tlcorner
rowpos = y + metrics.ascent()
- if self._theme.display_outline and outline_size != 0 and not footer:
+ if self._theme.display_outline and outline_size != 0 and not \
+ footer:
path = QtGui.QPainterPath()
path.addText(QtCore.QPointF(x, rowpos), font, line)
self.painter.setBrush(self.painter.pen().brush())
=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py 2010-07-02 18:21:45 +0000
+++ openlp/core/lib/serviceitem.py 2010-07-09 16:02:40 +0000
@@ -138,7 +138,8 @@
self.render_manager.set_override_theme(self.theme)
for slide in self._raw_frames:
before = time.time()
- formated = self.render_manager.format_slide(slide[u'raw_slide'])
+ formated = self.render_manager.format_slide(
+ slide[u'raw_slide'])
for format in formated:
lines = u''
title = u''
=== modified file 'openlp/core/ui/amendthemedialog.py'
--- openlp/core/ui/amendthemedialog.py 2010-07-06 12:58:33 +0000
+++ openlp/core/ui/amendthemedialog.py 2010-07-09 16:02:40 +0000
@@ -368,8 +368,10 @@
self.FontFooterSizeSpinBox.setObjectName(u'FontFooterSizeSpinBox')
self.FooterFontLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
self.FontFooterSizeSpinBox)
- self.FontFooterWeightComboBox = QtGui.QComboBox(self.FooterFontGroupBox)
- self.FontFooterWeightComboBox.setObjectName(u'FontFooterWeightComboBox')
+ self.FontFooterWeightComboBox = QtGui.QComboBox(
+ self.FooterFontGroupBox)
+ self.FontFooterWeightComboBox.setObjectName(
+ u'FontFooterWeightComboBox')
self.FontFooterWeightComboBox.addItem(QtCore.QString())
self.FontFooterWeightComboBox.addItem(QtCore.QString())
self.FontFooterWeightComboBox.addItem(QtCore.QString())
@@ -822,7 +824,8 @@
translate('AmendThemeForm', 'Height:'))
self.FontFooterXSpinBox.setSuffix(translate('AmendThemeForm', 'px'))
self.FontFooterYSpinBox.setSuffix(translate('AmendThemeForm', 'px'))
- self.FontFooterWidthSpinBox.setSuffix(translate('AmendThemeForm', 'px'))
+ self.FontFooterWidthSpinBox.setSuffix(translate('AmendThemeForm',
+ 'px'))
self.FontFooterHeightSpinBox.setSuffix(
translate('AmendThemeForm', 'px'))
self.ThemeTabWidget.setTabText(
=== modified file 'openlp/core/ui/amendthemeform.py'
--- openlp/core/ui/amendthemeform.py 2010-07-06 12:58:33 +0000
+++ openlp/core/ui/amendthemeform.py 2010-07-09 16:02:40 +0000
@@ -62,7 +62,8 @@
QtCore.SIGNAL(u'pressed()'), self.onImageToolButtonClicked)
#Combo boxes
QtCore.QObject.connect(self.BackgroundComboBox,
- QtCore.SIGNAL(u'activated(int)'), self.onBackgroundComboBoxSelected)
+ QtCore.SIGNAL(u'activated(int)'),
+ self.onBackgroundComboBoxSelected)
QtCore.QObject.connect(self.BackgroundTypeComboBox,
QtCore.SIGNAL(u'activated(int)'),
self.onBackgroundTypeComboBoxSelected)
@@ -74,12 +75,14 @@
QtCore.SIGNAL(u'activated(int)'),
self.onFontMainWeightComboBoxSelected)
QtCore.QObject.connect(self.FontFooterComboBox,
- QtCore.SIGNAL(u'activated(int)'), self.onFontFooterComboBoxSelected)
+ QtCore.SIGNAL(u'activated(int)'),
+ self.onFontFooterComboBoxSelected)
QtCore.QObject.connect(self.FontFooterWeightComboBox,
QtCore.SIGNAL(u'activated(int)'),
self.onFontFooterWeightComboBoxSelected)
QtCore.QObject.connect(self.HorizontalComboBox,
- QtCore.SIGNAL(u'activated(int)'), self.onHorizontalComboBoxSelected)
+ QtCore.SIGNAL(u'activated(int)'),
+ self.onHorizontalComboBoxSelected)
QtCore.QObject.connect(self.VerticalComboBox,
QtCore.SIGNAL(u'activated(int)'), self.onVerticalComboBoxSelected)
#Spin boxes
@@ -93,9 +96,11 @@
QtCore.SIGNAL(u'stateChanged(int)'),
self.onFontMainDefaultCheckBoxChanged)
QtCore.QObject.connect(self.FontMainXSpinBox,
- QtCore.SIGNAL(u'editingFinished()'), self.onFontMainXSpinBoxChanged)
+ QtCore.SIGNAL(u'editingFinished()'),
+ self.onFontMainXSpinBoxChanged)
QtCore.QObject.connect(self.FontMainYSpinBox,
- QtCore.SIGNAL(u'editingFinished()'), self.onFontMainYSpinBoxChanged)
+ QtCore.SIGNAL(u'editingFinished()'),
+ self.onFontMainYSpinBoxChanged)
QtCore.QObject.connect(self.FontMainWidthSpinBox,
QtCore.SIGNAL(u'editingFinished()'),
self.onFontMainWidthSpinBoxChanged)
@@ -342,7 +347,8 @@
if new_color.isValid():
self.theme.font_footer_color = new_color.name()
self.FontFooterColorPushButton.setStyleSheet(
- u'background-color: %s' % unicode(self.theme.font_footer_color))
+ u'background-color: %s' % unicode(
+ self.theme.font_footer_color))
self.previewTheme()
def onFontFooterSizeSpinBoxChanged(self):
=== modified file 'openlp/core/ui/displaytab.py'
--- openlp/core/ui/displaytab.py 2010-07-01 15:46:51 +0000
+++ openlp/core/ui/displaytab.py 2010-07-09 16:02:40 +0000
@@ -158,7 +158,8 @@
self.OverrideCheckBox.setObjectName(u'OverrideCheckBox')
QtCore.QMetaObject.connectSlotsByName(self)
QtCore.QObject.connect(self.OverrideCheckBox,
- QtCore.SIGNAL(u'stateChanged(int)'), self.onOverrideCheckBoxChanged)
+ QtCore.SIGNAL(u'stateChanged(int)'),
+ self.onOverrideCheckBoxChanged)
def retranslateUi(self):
"""
@@ -231,9 +232,9 @@
self.postSetUp()
def postSetUp(self):
- self.screens.override[u'size'] = QtCore.QRect(int(self.XposEdit.text()),
- int(self.YposEdit.text()), int(self.WidthEdit.text()),
- int(self.HeightEdit.text()))
+ self.screens.override[u'size'] = QtCore.QRect(
+ int(self.XposEdit.text()), int(self.YposEdit.text()),
+ int(self.WidthEdit.text()), int(self.HeightEdit.text()))
if self.amend_display:
self.screens.set_override_display()
else:
=== modified file 'openlp/core/ui/generaltab.py'
--- openlp/core/ui/generaltab.py 2010-07-01 15:46:51 +0000
+++ openlp/core/ui/generaltab.py 2010-07-09 16:02:40 +0000
@@ -110,7 +110,8 @@
self.SettingsLayout.setMargin(8)
self.SettingsLayout.setObjectName(u'SettingsLayout')
self.SaveCheckServiceCheckBox = QtGui.QCheckBox(self.SettingsGroupBox)
- self.SaveCheckServiceCheckBox.setObjectName(u'SaveCheckServiceCheckBox')
+ self.SaveCheckServiceCheckBox.setObjectName(
+ u'SaveCheckServiceCheckBox')
self.SettingsLayout.addWidget(self.SaveCheckServiceCheckBox)
self.GeneralLeftLayout.addWidget(self.SettingsGroupBox)
self.AutoPreviewCheckBox = QtGui.QCheckBox(self.SettingsGroupBox)
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py 2010-07-08 08:14:10 +0000
+++ openlp/core/ui/maindisplay.py 2010-07-09 16:02:40 +0000
@@ -290,7 +290,8 @@
def setupScene(self):
self.scene = QtGui.QGraphicsScene(self)
- self.scene.setSceneRect(0, 0, self.size().width(), self.size().height())
+ self.scene.setSceneRect(0, 0, self.size().width(),
+ self.size().height())
self.setScene(self.scene)
def setupVideo(self):
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2010-07-07 14:44:22 +0000
+++ openlp/core/ui/mainwindow.py 2010-07-09 16:02:40 +0000
@@ -420,7 +420,8 @@
translate('MainWindow', 'Save Service As'))
self.FileSaveAsItem.setStatusTip(translate('MainWindow',
'Save the current service under a new name.'))
- self.FileSaveAsItem.setShortcut(translate('MainWindow', 'Ctrl+Shift+S'))
+ self.FileSaveAsItem.setShortcut(translate('MainWindow',
+ 'Ctrl+Shift+S'))
self.FileExitItem.setText(translate('MainWindow', 'E&xit'))
self.FileExitItem.setStatusTip(translate('MainWindow', 'Quit OpenLP'))
self.FileExitItem.setShortcut(translate('MainWindow', 'Alt+F4'))
@@ -469,7 +470,8 @@
'&Plugin List'))
self.SettingsPluginListItem.setStatusTip(
translate('MainWindow', 'List the Plugins'))
- self.SettingsPluginListItem.setShortcut(translate('MainWindow', 'Alt+F7'))
+ self.SettingsPluginListItem.setShortcut(translate('MainWindow',
+ 'Alt+F7'))
self.HelpDocumentationItem.setText(
translate('MainWindow', '&User Guide'))
self.HelpAboutItem.setText(translate('MainWindow', '&About'))
=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py 2010-07-08 08:14:10 +0000
+++ openlp/core/ui/servicemanager.py 2010-07-09 16:02:40 +0000
@@ -246,7 +246,8 @@
self.sep1.setSeparator(True)
self.previewAction = self.menu.addAction(
translate('ServiceManager', '&Preview Verse'))
- self.previewAction.setIcon(build_icon(u':/general/general_preview.png'))
+ self.previewAction.setIcon(build_icon(
+ u':/general/general_preview.png'))
self.liveAction = self.menu.addAction(
translate('ServiceManager', '&Live Verse'))
self.liveAction.setIcon(build_icon(u':/general/general_live.png'))
@@ -271,10 +272,11 @@
self.editAction.setVisible(False)
self.maintainAction.setVisible(False)
self.notesAction.setVisible(False)
- if serviceItem[u'service_item'].is_capable(ItemCapabilities.AllowsEdit):
+ if serviceItem[u'service_item'].is_capable(
+ ItemCapabilities.AllowsEdit):
self.editAction.setVisible(True)
- if serviceItem[u'service_item']\
- .is_capable(ItemCapabilities.AllowsMaintain):
+ if serviceItem[u'service_item'].is_capable(
+ ItemCapabilities.AllowsMaintain):
self.maintainAction.setVisible(True)
if item.parent() is None:
self.notesAction.setVisible(True)
@@ -322,7 +324,8 @@
return
selected = self.ServiceManagerList.selectedItems()[0]
lookFor = 0
- serviceIterator = QtGui.QTreeWidgetItemIterator(self.ServiceManagerList)
+ serviceIterator = QtGui.QTreeWidgetItemIterator(
+ self.ServiceManagerList)
while serviceIterator.value():
if lookFor == 1 and serviceIterator.value().parent() is None:
self.ServiceManagerList.setCurrentItem(serviceIterator.value())
@@ -341,7 +344,8 @@
return
selected = self.ServiceManagerList.selectedItems()[0]
prevItem = None
- serviceIterator = QtGui.QTreeWidgetItemIterator(self.ServiceManagerList)
+ serviceIterator = QtGui.QTreeWidgetItemIterator(
+ self.ServiceManagerList)
while serviceIterator.value():
if serviceIterator.value() == selected:
if prevItem:
@@ -372,7 +376,8 @@
Moves the selection up the window
Called by the up arrow
"""
- serviceIterator = QtGui.QTreeWidgetItemIterator(self.ServiceManagerList)
+ serviceIterator = QtGui.QTreeWidgetItemIterator(
+ self.ServiceManagerList)
tempItem = None
setLastItem = False
while serviceIterator:
@@ -397,7 +402,8 @@
Moves the selection down the window
Called by the down arrow
"""
- serviceIterator = QtGui.QTreeWidgetItemIterator(self.ServiceManagerList)
+ serviceIterator = QtGui.QTreeWidgetItemIterator(
+ self.ServiceManagerList)
firstItem = serviceIterator
setSelected = False
while serviceIterator:
@@ -540,7 +546,8 @@
painter.end()
treewidgetitem.setIcon(0, build_icon(icon))
else:
- treewidgetitem.setIcon(0, serviceitem.iconic_representation)
+ treewidgetitem.setIcon(0,
+ serviceitem.iconic_representation)
else:
treewidgetitem.setIcon(0,
build_icon(u':/general/general_delete.png'))
@@ -888,8 +895,8 @@
if self.serviceItems[item][u'service_item']\
.is_capable(ItemCapabilities.AllowsEdit):
Receiver.send_message(u'%s_edit' %
- self.serviceItems[item][u'service_item'].name.lower(), u'L:%s' %
- self.serviceItems[item][u'service_item'].editId )
+ self.serviceItems[item][u'service_item'].name.lower(),
+ u'L:%s' % self.serviceItems[item][u'service_item'].editId)
def findServiceItem(self):
"""
=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py 2010-07-02 05:16:30 +0000
+++ openlp/core/ui/slidecontroller.py 2010-07-09 16:02:40 +0000
@@ -202,15 +202,21 @@
self.Toolbar.addToolbarWidget(u'Hide Menu', self.HideMenu)
self.HideMenu.setMenu(QtGui.QMenu(
translate('SlideController', 'Hide'), self.Toolbar))
- self.BlankScreen = QtGui.QAction(QtGui.QIcon( u':/slides/slide_blank.png'), u'Blank Screen', self.HideMenu)
+ self.BlankScreen = QtGui.QAction(QtGui.QIcon(
+ u':/slides/slide_blank.png'), u'Blank Screen', self.HideMenu)
self.BlankScreen.setCheckable(True)
- QtCore.QObject.connect(self.BlankScreen, QtCore.SIGNAL("triggered(bool)"), self.onBlankDisplay)
- self.ThemeScreen = QtGui.QAction(QtGui.QIcon(u':/slides/slide_theme.png'), u'Blank to Theme', self.HideMenu)
+ QtCore.QObject.connect(self.BlankScreen, QtCore.SIGNAL(
+ "triggered(bool)"), self.onBlankDisplay)
+ self.ThemeScreen = QtGui.QAction(QtGui.QIcon(
+ u':/slides/slide_theme.png'), u'Blank to Theme', self.HideMenu)
self.ThemeScreen.setCheckable(True)
- QtCore.QObject.connect(self.ThemeScreen, QtCore.SIGNAL("triggered(bool)"), self.onThemeDisplay)
- self.DesktopScreen = QtGui.QAction(QtGui.QIcon(u':/slides/slide_desktop.png'), u'Show Desktop', self.HideMenu)
+ QtCore.QObject.connect(self.ThemeScreen, QtCore.SIGNAL(
+ "triggered(bool)"), self.onThemeDisplay)
+ self.DesktopScreen = QtGui.QAction(QtGui.QIcon(
+ u':/slides/slide_desktop.png'), u'Show Desktop', self.HideMenu)
self.DesktopScreen.setCheckable(True)
- QtCore.QObject.connect(self.DesktopScreen, QtCore.SIGNAL("triggered(bool)"), self.onHideDisplay)
+ QtCore.QObject.connect(self.DesktopScreen, QtCore.SIGNAL(
+ "triggered(bool)"), self.onHideDisplay)
self.HideMenu.setDefaultAction(self.BlankScreen)
self.HideMenu.menu().addAction(self.BlankScreen)
self.HideMenu.menu().addAction(self.ThemeScreen)
@@ -380,7 +386,8 @@
QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'config_updated'), self.refreshServiceItem)
QtCore.QObject.connect(Receiver.get_receiver(),
- QtCore.SIGNAL(u'%s_slide_cache' % self.typePrefix), self.slideCache)
+ QtCore.SIGNAL(u'%s_slide_cache' % self.typePrefix),
+ self.slideCache)
def widthChanged(self):
"""
=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py 2010-07-05 16:00:48 +0000
+++ openlp/core/ui/thememanager.py 2010-07-09 16:02:40 +0000
@@ -164,7 +164,8 @@
QtCore.QSettings().setValue(
self.settingsSection + u'/global theme',
QtCore.QVariant(self.global_theme))
- Receiver.send_message(u'theme_update_global', self.global_theme)
+ Receiver.send_message(u'theme_update_global',
+ self.global_theme)
self.pushThemes()
def onAddTheme(self):
@@ -224,7 +225,8 @@
QtGui.QMessageBox.critical(self,
translate('ThemeManager', 'Error'),
unicode(translate('ThemeManager',
- 'Theme %s is use by the service manager.')) % theme)
+ 'Theme %s is use by the service manager.')) %
+ theme)
return
self.themelist.remove(theme)
th = theme + u'.png'
@@ -398,7 +400,8 @@
except UnicodeDecodeError:
QtGui.QMessageBox.critical(
self, translate('ThemeManager', 'Error'),
- translate('ThemeManager', 'File is not a valid theme.\n'
+ translate('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'))
@@ -450,7 +453,8 @@
QtGui.QMessageBox.critical(self,
translate('ThemeManager', 'Error'),
translate('ThemeManager', 'File is not a valid theme.'))
- log.exception(u'Importing theme from zip file failed %s' % filename)
+ log.exception(
+ u'Importing theme from zip file failed %s' % filename)
finally:
if zip:
zip.close()
@@ -514,10 +518,10 @@
vAlignCorrection = 1
elif theme.VerticalAlign == 1:
vAlignCorrection = 2
- newtheme.add_display(unicode(shadow), unicode(theme.ShadowColor.name()),
- unicode(outline), unicode(theme.OutlineColor.name()),
- unicode(theme.HorizontalAlign), unicode(vAlignCorrection),
- unicode(theme.WrapStyle), unicode(0))
+ newtheme.add_display(unicode(shadow),
+ unicode(theme.ShadowColor.name()), unicode(outline),
+ unicode(theme.OutlineColor.name()), unicode(theme.HorizontalAlign),
+ unicode(vAlignCorrection), unicode(theme.WrapStyle), unicode(0))
return newtheme.extract_xml()
def saveTheme(self, name, theme_xml, theme_pretty_xml, image_from,
=== modified file 'openlp/core/utils/__init__.py'
--- openlp/core/utils/__init__.py 2010-06-22 16:17:15 +0000
+++ openlp/core/utils/__init__.py 2010-07-09 16:02:40 +0000
@@ -87,7 +87,8 @@
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')
+ path = os.path.join(os.getenv(u'HOME'), u'.openlp',
+ u'data')
return path
elif dir_type == AppLocation.PluginsDir:
plugin_path = None
=== modified file 'openlp/plugins/alerts/lib/alertstab.py'
--- openlp/plugins/alerts/lib/alertstab.py 2010-07-08 10:26:52 +0000
+++ openlp/plugins/alerts/lib/alertstab.py 2010-07-09 16:02:40 +0000
@@ -250,7 +250,8 @@
def load(self):
settings = QtCore.QSettings()
settings.beginGroup(self.settingsSection)
- self.timeout = settings.value(u'timeout', QtCore.QVariant(5)).toInt()[0]
+ self.timeout = settings.value(u'timeout',
+ QtCore.QVariant(5)).toInt()[0]
self.font_color = unicode(settings.value(
u'font color', QtCore.QVariant(u'#ffffff')).toString())
self.font_size = settings.value(
=== modified file 'openlp/plugins/bibles/forms/bibleimportwizard.py'
--- openlp/plugins/bibles/forms/bibleimportwizard.py 2010-07-09 11:26:31 +0000
+++ openlp/plugins/bibles/forms/bibleimportwizard.py 2010-07-09 16:02:40 +0000
@@ -211,7 +211,8 @@
self.DownloadOptionsLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
self.BibleLabel)
self.BibleComboBox = QtGui.QComboBox(self.DownloadOptionsTab)
- self.BibleComboBox.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToContents)
+ self.BibleComboBox.setSizeAdjustPolicy(
+ QtGui.QComboBox.AdjustToContents)
self.BibleComboBox.setObjectName(u'BibleComboBox')
self.BibleComboBox.addItem(u'')
self.BibleComboBox.addItem(u'')
=== modified file 'openlp/plugins/bibles/forms/importwizardform.py'
--- openlp/plugins/bibles/forms/importwizardform.py 2010-06-22 14:34:03 +0000
+++ openlp/plugins/bibles/forms/importwizardform.py 2010-07-09 16:02:40 +0000
@@ -129,7 +129,8 @@
translate('BiblesPlugin.ImportWizardForm',
'You need to specify a file to import your '
'Bible from.'),
- QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
+ QtGui.QMessageBox.StandardButtons(
+ QtGui.QMessageBox.Ok))
self.OSISLocationEdit.setFocus()
return False
elif self.field(u'source_format').toInt()[0] == BibleFormat.CSV:
@@ -140,7 +141,8 @@
translate('BiblesPlugin.ImportWizardForm',
'You need to specify a file with books of '
'the Bible to use in the import.'),
- QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
+ QtGui.QMessageBox.StandardButtons(
+ QtGui.QMessageBox.Ok))
self.BooksLocationEdit.setFocus()
return False
elif self.field(u'csv_versefile').toString() == u'':
@@ -150,7 +152,8 @@
translate('BiblesPlugin.ImportWizardForm',
'You need to specify a file of Bible '
'verses to import.'),
- QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
+ QtGui.QMessageBox.StandardButtons(
+ QtGui.QMessageBox.Ok))
self.CsvVerseLocationEdit.setFocus()
return False
elif self.field(u'source_format').toInt()[0] == \
@@ -162,13 +165,15 @@
translate('BiblesPlugin.ImportWizardForm',
'You need to specify an OpenSong Bible '
'file to import.'),
- QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
+ QtGui.QMessageBox.StandardButtons(
+ QtGui.QMessageBox.Ok))
self.OpenSongFileEdit.setFocus()
return False
return True
elif self.currentId() == 2:
# License details
- license_version = unicode(self.field(u'license_version').toString())
+ license_version = unicode(self.field(
+ u'license_version').toString())
license_copyright = \
unicode(self.field(u'license_copyright').toString())
if license_version == u'':
@@ -394,9 +399,10 @@
def performImport(self):
bible_type = self.field(u'source_format').toInt()[0]
license_version = unicode(self.field(u'license_version').toString())
- license_copyright = unicode(self.field(u'license_copyright').toString())
- license_permission = \
- unicode(self.field(u'license_permission').toString())
+ license_copyright = unicode(self.field(
+ u'license_copyright').toString())
+ license_permission = unicode(self.field(
+ u'license_permission').toString())
importer = None
if bible_type == BibleFormat.OSIS:
# Import an OSIS bible
@@ -434,9 +440,10 @@
download_source=WebDownload.get_name(download_location),
download_name=bible,
proxy_server=unicode(self.field(u'proxy_server').toString()),
- proxy_username=\
- unicode(self.field(u'proxy_username').toString()),
- proxy_password=unicode(self.field(u'proxy_password').toString())
+ proxy_username=unicode(self.field(
+ u'proxy_username').toString()),
+ proxy_password=unicode(self.field(
+ u'proxy_password').toString())
)
success = importer.do_import()
if success:
=== modified file 'openlp/plugins/bibles/lib/http.py'
--- openlp/plugins/bibles/lib/http.py 2010-06-19 11:53:20 +0000
+++ openlp/plugins/bibles/lib/http.py 2010-07-09 16:02:40 +0000
@@ -214,20 +214,28 @@
# O Bible Gateway, why doth ye such horrific HTML produce?
for verse in verses:
Receiver.send_message(u'openlp_process_events')
- if isinstance(verse, Tag) and verse.name == u'div' and filter(lambda a: a[0] == u'class', verse.attrs)[0][1] == u'footnotes':
+ if isinstance(verse, Tag) and verse.name == u'div' and filter(
+ lambda a: a[0] == u'class', verse.attrs)[0][1] == u'footnotes':
break
- if isinstance(verse, Tag) and verse.name == u'sup' and filter(lambda a: a[0] == u'class', verse.attrs)[0][1] != u'versenum':
- continue
- if isinstance(verse, Tag) and verse.name == u'p' and not verse.contents:
- continue
- if isinstance(verse, Tag) and (verse.name == u'p' or verse.name == u'font') and verse.contents:
+ if isinstance(verse, Tag) and verse.name == u'sup' and filter(
+ lambda a: a[0] == u'class', verse.attrs)[0][1] != u'versenum':
+ continue
+ if isinstance(verse, Tag) and verse.name == u'p' and not \
+ verse.contents:
+ continue
+ if isinstance(verse, Tag) and (verse.name == u'p' or \
+ verse.name == u'font') and verse.contents:
for item in verse.contents:
Receiver.send_message(u'openlp_process_events')
- if isinstance(item, Tag) and (item.name == u'h4' or item.name == u'h5'):
- continue
- if isinstance(item, Tag) and item.name == u'sup' and filter(lambda a: a[0] == u'class', item.attrs)[0][1] != u'versenum':
- continue
- if isinstance(item, Tag) and item.name == u'p' and not item.contents:
+ if isinstance(item, Tag) and (item.name == u'h4' or \
+ item.name == u'h5'):
+ continue
+ if isinstance(item, Tag) and item.name == u'sup' and \
+ filter(lambda a: a[0] == u'class',
+ item.attrs)[0][1] != u'versenum':
+ continue
+ if isinstance(item, Tag) and item.name == u'p' and not \
+ item.contents:
continue
if isinstance(item, Tag) and item.name == u'sup':
verse_number = int(str(item.contents[0]))
@@ -236,19 +244,26 @@
if isinstance(item, Tag) and item.name == u'font':
for subitem in item.contents:
Receiver.send_message(u'openlp_process_events')
- if isinstance(subitem, Tag) and subitem.name == u'sup' and filter(lambda a: a[0] == u'class', subitem.attrs)[0][1] != u'versenum':
- continue
- if isinstance(subitem, Tag) and subitem.name == u'p' and not subitem.contents:
- continue
- if isinstance(subitem, Tag) and subitem.name == u'sup':
+ if isinstance(subitem, Tag) and \
+ subitem.name == u'sup' and filter(
+ lambda a: a[0] == u'class',
+ subitem.attrs)[0][1] != u'versenum':
+ continue
+ if isinstance(subitem, Tag) and \
+ subitem.name == u'p' and not subitem.contents:
+ continue
+ if isinstance(subitem, Tag) and \
+ subitem.name == u'sup':
verse_number = int(str(subitem.contents[0]))
verse_list[verse_number] = u''
continue
if isinstance(subitem, NavigableString):
- verse_list[verse_number] = verse_list[verse_number] + subitem.replace(u' ', u' ')
+ verse_list[verse_number] = verse_list[verse_number] + \
+ subitem.replace(u' ', u' ')
continue
if isinstance(item, NavigableString):
- verse_list[verse_number] = verse_list[verse_number] + item.replace(u' ', u' ')
+ verse_list[verse_number] = verse_list[verse_number] + \
+ item.replace(u' ', u' ')
continue
if isinstance(verse, Tag) and verse.name == u'sup':
verse_number = int(str(verse.contents[0]))
=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py 2010-07-08 13:50:06 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py 2010-07-09 16:02:40 +0000
@@ -171,7 +171,8 @@
self.AdvancedSecondBibleLabel.setObjectName(
u'AdvancedSecondBibleLabel')
self.AdvancedLayout.addWidget(self.AdvancedSecondBibleLabel, 1, 0, 1, 1)
- self.AdvancedSecondBibleComboBox = QtGui.QComboBox(self.AdvancedTab)
+ self.AdvancedSecondBibleComboBox = QtGui.QComboBox(
+ self.AdvancedTab)
self.AdvancedSecondBibleComboBox.setSizeAdjustPolicy(
QtGui.QComboBox.AdjustToMinimumContentsLength)
self.AdvancedSecondBibleComboBox.setObjectName(
=== modified file 'openlp/plugins/custom/forms/editcustomdialog.py'
--- openlp/plugins/custom/forms/editcustomdialog.py 2010-07-08 11:46:03 +0000
+++ openlp/plugins/custom/forms/editcustomdialog.py 2010-07-09 16:02:40 +0000
@@ -159,8 +159,8 @@
translate('CustomPlugin.EditCustomForm', '&Title:'))
self.AddButton.setText(
translate('CustomPlugin.EditCustomForm', 'Add New'))
- self.AddButton.setToolTip(
- translate('CustomPlugin.EditCustomForm', 'Add new slide at bottom'))
+ self.AddButton.setToolTip(translate('CustomPlugin.EditCustomForm',
+ 'Add new slide at bottom'))
self.EditButton.setText(
translate('CustomPlugin.EditCustomForm', 'Edit'))
self.EditButton.setToolTip(
=== modified file 'openlp/plugins/custom/forms/editcustomform.py'
--- openlp/plugins/custom/forms/editcustomform.py 2010-07-03 01:33:40 +0000
+++ openlp/plugins/custom/forms/editcustomform.py 2010-07-09 16:02:40 +0000
@@ -161,7 +161,8 @@
sxml.add_verse_to_lyrics(u'custom', unicode(count),
unicode(self.VerseListView.item(i).text()))
count += 1
- self.customSlide.title = unicode(self.TitleEdit.displayText(), u'utf-8')
+ self.customSlide.title = unicode(self.TitleEdit.displayText(),
+ u'utf-8')
self.customSlide.text = unicode(sxml.extract_xml(), u'utf-8')
self.customSlide.credits = unicode(self.CreditEdit.displayText(),
u'utf-8')
=== modified file 'openlp/plugins/custom/lib/mediaitem.py'
--- openlp/plugins/custom/lib/mediaitem.py 2010-07-08 09:14:00 +0000
+++ openlp/plugins/custom/lib/mediaitem.py 2010-07-09 16:02:40 +0000
@@ -162,7 +162,8 @@
service_item.add_capability(ItemCapabilities.AllowsEdit)
service_item.add_capability(ItemCapabilities.AllowsPreview)
service_item.add_capability(ItemCapabilities.AllowsLoop)
- customSlide = self.parent.custommanager.get_object(CustomSlide, item_id)
+ customSlide = self.parent.custommanager.get_object(CustomSlide,
+ item_id)
title = customSlide.title
credit = customSlide.credits
service_item.editId = item_id
=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py 2010-07-08 09:14:00 +0000
+++ openlp/plugins/images/lib/mediaitem.py 2010-07-09 16:02:40 +0000
@@ -115,8 +115,8 @@
"""
Remove an image item from the list
"""
- if check_item_selected(self.listView, translate('ImagePlugin.MediaItem',
- 'You must select an item to delete.')):
+ if check_item_selected(self.listView, translate(
+ 'ImagePlugin.MediaItem', 'You must select an item to delete.')):
row_list = [item.row() for item in self.listView.selectedIndexes()]
row_list.sort(reverse=True)
for row in row_list:
=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py 2010-07-08 09:14:00 +0000
+++ openlp/plugins/media/lib/mediaitem.py 2010-07-09 16:02:40 +0000
@@ -64,7 +64,8 @@
self.OnNewFileMasks = translate('MediaPlugin.MediaItem',
u'Videos (%s);;'
u'Audio (%s);;'
- u'All files (*)' % (self.parent.video_list, self.parent.audio_list))
+ u'All files (*)' % (self.parent.video_list,
+ self.parent.audio_list))
def requiredIcons(self):
MediaManagerItem.requiredIcons(self)
@@ -132,8 +133,8 @@
"""
Remove a media item from the list
"""
- if check_item_selected(self.listView, translate('MediaPlugin.MediaItem',
- 'You must select an item to delete.')):
+ if check_item_selected(self.listView, translate(
+ 'MediaPlugin.MediaItem', 'You must select an item to delete.')):
row_list = [item.row() for item in self.listView.selectedIndexes()]
row_list.sort(reverse=True)
for row in row_list:
=== modified file 'openlp/plugins/presentations/lib/impresscontroller.py'
--- openlp/plugins/presentations/lib/impresscontroller.py 2010-07-05 22:17:14 +0000
+++ openlp/plugins/presentations/lib/impresscontroller.py 2010-07-09 16:02:40 +0000
@@ -239,7 +239,8 @@
else:
thumbdir = uno.systemPathToFileUrl(self.thumbnailpath)
props = []
- props.append(self.create_property(u'FilterName', u'impress_png_Export'))
+ props.append(self.create_property(u'FilterName',
+ u'impress_png_Export'))
props = tuple(props)
doc = self.document
pages = doc.getDrawPages()
@@ -255,7 +256,8 @@
os.remove(path)
preview.save(path, u'png')
except:
- log.exception(u'%s - Unable to store openoffice preview' % path)
+ log.exception(u'%s - Unable to store openoffice preview' %
+ path)
def create_property(self, name, value):
log.debug(u'create property OpenOffice')
=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
--- openlp/plugins/presentations/lib/mediaitem.py 2010-07-08 09:14:00 +0000
+++ openlp/plugins/presentations/lib/mediaitem.py 2010-07-09 16:02:40 +0000
@@ -200,14 +200,16 @@
if len(items) > 1:
return False
service_item.title = unicode(self.DisplayTypeComboBox.currentText())
- service_item.shortname = unicode(self.DisplayTypeComboBox.currentText())
+ service_item.shortname = unicode(
+ self.DisplayTypeComboBox.currentText())
shortname = service_item.shortname
if shortname:
for item in items:
bitem = self.listView.item(item.row())
filename = unicode(bitem.data(QtCore.Qt.UserRole).toString())
if shortname == self.Automatic:
- service_item.shortname = self.findControllerByType(filename)
+ service_item.shortname = self.findControllerByType(
+ filename)
if not service_item.shortname:
return False
controller = self.controllers[service_item.shortname]
=== modified file 'openlp/plugins/songs/forms/editsongdialog.py'
--- openlp/plugins/songs/forms/editsongdialog.py 2010-06-25 18:14:38 +0000
+++ openlp/plugins/songs/forms/editsongdialog.py 2010-07-09 16:02:40 +0000
@@ -118,12 +118,14 @@
self.AuthorsTabLayout.setMargin(8)
self.AuthorsTabLayout.setObjectName(u'AuthorsTabLayout')
self.AuthorsMaintenanceWidget = QtGui.QWidget(self.AuthorsTab)
- self.AuthorsMaintenanceWidget.setObjectName(u'AuthorsMaintenanceWidget')
+ self.AuthorsMaintenanceWidget.setObjectName(
+ u'AuthorsMaintenanceWidget')
self.AuthorsMaintenanceLayout = QtGui.QVBoxLayout(
self.AuthorsMaintenanceWidget)
self.AuthorsMaintenanceLayout.setSpacing(8)
self.AuthorsMaintenanceLayout.setMargin(0)
- self.AuthorsMaintenanceLayout.setObjectName(u'AuthorsMaintenanceLayout')
+ self.AuthorsMaintenanceLayout.setObjectName(
+ u'AuthorsMaintenanceLayout')
self.AuthorsGroupBox = QtGui.QGroupBox(self.AuthorsMaintenanceWidget)
self.AuthorsGroupBox.setObjectName(u'AuthorsGroupBox')
self.AuthorsLayout = QtGui.QVBoxLayout(self.AuthorsGroupBox)
=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py 2010-07-03 21:50:42 +0000
+++ openlp/plugins/songs/forms/editsongform.py 2010-07-09 16:02:40 +0000
@@ -302,7 +302,8 @@
else:
return
elif item > 0:
- item_id = (self.AuthorsSelectionComboItem.itemData(item)).toInt()[0]
+ item_id = (
+ self.AuthorsSelectionComboItem.itemData(item)).toInt()[0]
author = self.songmanager.get_object(Author, item_id)
self.song.authors.append(author)
author_item = QtGui.QListWidgetItem(unicode(author.display_name))
@@ -448,9 +449,10 @@
tempList = {}
tempId = {}
for row in range(0, self.VerseListWidget.rowCount()):
- tempList[row] = self.VerseListWidget.item(row, 0).text()
- tempId[row] = self.VerseListWidget.item(row, 0).\
- data(QtCore.Qt.UserRole)
+ tempList[row] = self.VerseListWidget.item(
+ row, 0).text()
+ tempId[row] = self.VerseListWidget.item(
+ row, 0).data(QtCore.Qt.UserRole)
self.VerseListWidget.clear()
for row in range (0, len(tempList)):
item = QtGui.QTableWidgetItem(tempList[row], 0)
@@ -607,7 +609,8 @@
The Song is valid so as the plugin to add it to preview to see.
"""
log.debug(u'onPreview')
- if unicode(button.objectName()) == u'previewButton' and self.saveSong():
+ if unicode(button.objectName()) == u'previewButton' and \
+ self.saveSong():
Receiver.send_message(u'songs_preview')
def closePressed(self):
@@ -645,7 +648,8 @@
item = self.VerseListWidget.item(i, 0)
verseId = unicode(item.data(QtCore.Qt.UserRole).toString())
bits = verseId.split(u':')
- sxml.add_verse_to_lyrics(bits[0], bits[1], unicode(item.text()))
+ sxml.add_verse_to_lyrics(bits[0], bits[1], unicode(
+ item.text()))
text = text + re.sub(r'\W+', u' ',
unicode(self.VerseListWidget.item(i, 0).text())) + u' '
if (bits[1] > u'1') and (bits[0][0] not in multiple):
=== modified file 'openlp/plugins/songs/forms/editversedialog.py'
--- openlp/plugins/songs/forms/editversedialog.py 2010-07-08 11:46:03 +0000
+++ openlp/plugins/songs/forms/editversedialog.py 2010-07-09 16:02:40 +0000
@@ -76,10 +76,10 @@
self.EditVerseLayout.addWidget(self.EditButtonBox)
self.retranslateUi(EditVerseDialog)
- QtCore.QObject.connect(self.EditButtonBox, QtCore.SIGNAL(u'accepted()'),
- EditVerseDialog.accept)
- QtCore.QObject.connect(self.EditButtonBox, QtCore.SIGNAL(u'rejected()'),
- EditVerseDialog.reject)
+ QtCore.QObject.connect(self.EditButtonBox, QtCore.SIGNAL(
+ u'accepted()'), EditVerseDialog.accept)
+ QtCore.QObject.connect(self.EditButtonBox, QtCore.SIGNAL(
+ u'rejected()'), EditVerseDialog.reject)
QtCore.QMetaObject.connectSlotsByName(EditVerseDialog)
def retranslateUi(self, EditVerseDialog):
=== modified file 'openlp/plugins/songs/forms/songimportform.py'
--- openlp/plugins/songs/forms/songimportform.py 2010-06-30 22:05:51 +0000
+++ openlp/plugins/songs/forms/songimportform.py 2010-07-09 16:02:40 +0000
@@ -109,7 +109,8 @@
translate('SongsPlugin.ImportWizardForm',
'You need to add at least one OpenLyrics '
'song file to import from.'),
- QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
+ QtGui.QMessageBox.StandardButtons(
+ QtGui.QMessageBox.Ok))
self.OpenLyricsAddButton.setFocus()
return False
elif source_format == SongFormat.OpenSong:
@@ -120,7 +121,8 @@
translate('SongsPlugin.ImportWizardForm',
'You need to add at least one OpenSong '
'song file to import from.'),
- QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
+ QtGui.QMessageBox.StandardButtons(
+ QtGui.QMessageBox.Ok))
self.OpenSongAddButton.setFocus()
return False
elif source_format == SongFormat.CCLI:
@@ -131,7 +133,8 @@
translate('SongsPlugin.ImportWizardForm',
'You need to add at least one CCLI file '
'to import from.'),
- QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
+ QtGui.QMessageBox.StandardButtons(
+ QtGui.QMessageBox.Ok))
self.CCLIAddButton.setFocus()
return False
elif source_format == SongFormat.CSV:
@@ -141,7 +144,8 @@
'No CSV File Selected'),
translate('SongsPlugin.ImportWizardForm',
'You need to specify a CSV file to import from.'),
- QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
+ QtGui.QMessageBox.StandardButtons(
+ QtGui.QMessageBox.Ok))
self.CSVFilenameEdit.setFocus()
return False
return True
@@ -253,4 +257,4 @@
self.ImportProgressBar.setValue(self.ImportProgressBar.maximum())
self.finishButton.setVisible(True)
self.cancelButton.setVisible(False)
- Receiver.send_message(u'process_events')
\ No newline at end of file
+ Receiver.send_message(u'process_events')
=== modified file 'openlp/plugins/songs/forms/songimportwizard.py'
--- openlp/plugins/songs/forms/songimportwizard.py 2010-07-08 11:46:03 +0000
+++ openlp/plugins/songs/forms/songimportwizard.py 2010-07-09 16:02:40 +0000
@@ -103,7 +103,8 @@
self.OpenLyricsLayout.setMargin(0)
self.OpenLyricsLayout.setObjectName(u'OpenLyricsLayout')
self.OpenLyricsFileListWidget = QtGui.QListWidget(self.OpenLyricsPage)
- self.OpenLyricsFileListWidget.setObjectName(u'OpenLyricsFileListWidget')
+ self.OpenLyricsFileListWidget.setObjectName(
+ u'OpenLyricsFileListWidget')
self.OpenLyricsLayout.addWidget(self.OpenLyricsFileListWidget)
self.OpenLyricsButtonLayout = QtGui.QHBoxLayout()
self.OpenLyricsButtonLayout.setSpacing(8)
=== modified file 'openlp/plugins/songs/forms/songmaintenanceform.py'
--- openlp/plugins/songs/forms/songmaintenanceform.py 2010-06-28 13:38:29 +0000
+++ openlp/plugins/songs/forms/songmaintenanceform.py 2010-07-09 16:02:40 +0000
@@ -142,7 +142,8 @@
def onTopicAddButtonClick(self):
if self.topicform.exec_():
- topic = Topic.populate(name=unicode(self.topicform.NameEdit.text()))
+ topic = Topic.populate(name=unicode(
+ self.topicform.NameEdit.text()))
if self.songmanager.save_object(topic):
self.resetTopics()
else:
=== modified file 'openlp/plugins/songs/lib/db.py'
--- openlp/plugins/songs/lib/db.py 2010-06-12 02:14:18 +0000
+++ openlp/plugins/songs/lib/db.py 2010-07-09 16:02:40 +0000
@@ -95,7 +95,8 @@
Column(u'ccli_number', types.Unicode(64)),
Column(u'song_number', types.Unicode(64)),
Column(u'theme_name', types.Unicode(128)),
- Column(u'search_title', types.Unicode(255), index=True, nullable=False),
+ Column(u'search_title', types.Unicode(255), index=True,
+ nullable=False),
Column(u'search_lyrics', types.UnicodeText, index=True, nullable=False)
)
=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py 2010-07-08 10:26:52 +0000
+++ openlp/plugins/songs/lib/mediaitem.py 2010-07-09 16:02:40 +0000
@@ -177,7 +177,8 @@
elif search_type == 2:
log.debug(u'Authors Search')
search_results = self.parent.manager.get_all_objects_filtered(
- Author, Author.display_name.like(u'%' + search_keywords + u'%'),
+ Author,
+ Author.display_name.like(u'%' + search_keywords + u'%'),
Author.display_name.asc())
self.displayResultsAuthor(search_results)
#Called to redisplay the song list screen edith from a search
@@ -270,8 +271,8 @@
"""
Edit a song
"""
- if check_item_selected(self.listView, translate('SongsPlugin.MediaItem',
- 'You must select an item to edit.')):
+ if check_item_selected(self.listView, translate(
+ 'SongsPlugin.MediaItem', 'You must select an item to edit.')):
item = self.listView.currentItem()
item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
self.edit_song_form.loadSong(item_id, False)
@@ -281,8 +282,8 @@
"""
Remove a song from the list and database
"""
- if check_item_selected(self.listView, translate('SongsPlugin.MediaItem',
- 'You must select an item to delete.')):
+ if check_item_selected(self.listView, translate(
+ 'SongsPlugin.MediaItem', 'You must select an item to delete.')):
items = self.listView.selectedIndexes()
if len(items) == 1:
del_message = translate('SongsPlugin.MediaItem',
=== modified file 'openlp/plugins/songs/lib/oooimport.py'
--- openlp/plugins/songs/lib/oooimport.py 2010-06-08 15:38:09 +0000
+++ openlp/plugins/songs/lib/oooimport.py 2010-07-09 16:02:40 +0000
@@ -132,7 +132,8 @@
0, properties)
if not self.document.supportsService(
"com.sun.star.presentation.PresentationDocument") and not \
- self.document.supportsService("com.sun.star.text.TextDocument"):
+ self.document.supportsService(
+ "com.sun.star.text.TextDocument"):
self.close_ooo_file()
except:
pass
=== modified file 'openlp/plugins/songs/lib/sofimport.py'
--- openlp/plugins/songs/lib/sofimport.py 2010-06-26 11:16:59 +0000
+++ openlp/plugins/songs/lib/sofimport.py 2010-07-09 16:02:40 +0000
@@ -320,12 +320,12 @@
for i in range(1, len(textarr)):
# Do not translate these. Fixed strings in SOF song file
if textarr[i] in (u'JESUS', u'CHRIST', u'KING', u'ALMIGHTY',
- u'REDEEMER', u'SHEPHERD', u'SON', u'GOD', u'LORD', u'FATHER',
- u'HOLY', u'SPIRIT', u'LAMB', u'YOU', u'YOUR', u'I', u'I\'VE',
- u'I\'M', u'I\'LL', u'SAVIOUR', u'O', u'YOU\'RE', u'HE', u'HIS',
- u'HIM', u'ZION', u'EMMANUEL', u'MAJESTY', u'JESUS\'', u'JIREH',
- u'JUDAH', u'LION', u'LORD\'S', u'ABRAHAM', u'GOD\'S',
- u'FATHER\'S', u'ELIJAH'):
+ u'REDEEMER', u'SHEPHERD', u'SON', u'GOD', u'LORD', u'FATHER',
+ u'HOLY', u'SPIRIT', u'LAMB', u'YOU', u'YOUR', u'I', u'I\'VE',
+ u'I\'M', u'I\'LL', u'SAVIOUR', u'O', u'YOU\'RE', u'HE', u'HIS',
+ u'HIM', u'ZION', u'EMMANUEL', u'MAJESTY', u'JESUS\'',
+ u'JIREH', u'JUDAH', u'LION', u'LORD\'S', u'ABRAHAM',
+ u'GOD\'S', u'FATHER\'S', u'ELIJAH'):
textarr[i] = textarr[i].capitalize()
else:
textarr[i] = textarr[i].lower()
=== modified file 'openlp/plugins/songs/lib/songxml.py'
--- openlp/plugins/songs/lib/songxml.py 2010-07-03 13:26:29 +0000
+++ openlp/plugins/songs/lib/songxml.py 2010-07-09 16:02:40 +0000
@@ -713,5 +713,5 @@
# append the correct slide
return res
-__all__ = ['SongException', 'SongTitleError', 'SongSlideError', 'SongTypeError',
- 'SongFeatureError', 'Song']
+__all__ = ['SongException', 'SongTitleError', 'SongSlideError',
+ 'SongTypeError', 'SongFeatureError', 'Song']
=== modified file 'openlp/plugins/songusage/lib/manager.py'
--- openlp/plugins/songusage/lib/manager.py 2010-06-29 15:25:24 +0000
+++ openlp/plugins/songusage/lib/manager.py 2010-07-09 16:02:40 +0000
@@ -77,5 +77,6 @@
return True
except InvalidRequestError:
self.session.rollback()
- log.exception(u'Failed to delete all Song Usage items to %s' % date)
+ log.exception(
+ u'Failed to delete all Song Usage items to %s' % date)
return False
=== modified file 'setup.py'
--- setup.py 2010-04-10 15:46:45 +0000
+++ setup.py 2010-07-09 16:02:40 +0000
@@ -43,7 +43,8 @@
if revision_id in tags:
version = u'%s' % tags[revision_id][0]
else:
- version = '%s-bzr%s' % (sorted(b.tags.get_tag_dict().keys())[-1], revno)
+ version = '%s-bzr%s' % (sorted(b.tags.get_tag_dict().keys())[-1],
+ revno)
ver_file = open(VERSION_FILE, u'w')
ver_file.write(version)
ver_file.close()
