Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/45780
More cleaning...
--
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/45780
Your team OpenLP Core is requested to review the proposed merge of
lp:~meths/openlp/trivialfixes into lp:openlp.
=== modified file 'openlp/core/ui/displaytagtab.py'
--- openlp/core/ui/displaytagtab.py 2011-01-09 17:17:42 +0000
+++ openlp/core/ui/displaytagtab.py 2011-01-10 22:47:50 +0000
@@ -59,7 +59,7 @@
# cPickle only accepts str not unicode strings
user_expands_string = str(unicode(user_expands).encode(u'utf8'))
if user_expands_string:
- user_tags = cPickle.loads(user_expand_string)
+ user_tags = cPickle.loads(user_expands_string)
# If we have some user ones added them as well
for t in user_tags:
DisplayTags.add_html_tag(t)
=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py 2011-01-09 23:24:55 +0000
+++ openlp/core/ui/servicemanager.py 2011-01-10 22:47:50 +0000
@@ -371,9 +371,9 @@
self.saveFile()
fileName = unicode(QtGui.QFileDialog.getOpenFileName(self.mainwindow,
translate('OpenLP.ServiceManager', 'Open File'),
- SettingsManager.get_last_dir(self.mainwindow.serviceSettingsSection),
- translate('OpenLP.ServiceManager',
- 'OpenLP Service Files (*.osz)')))
+ SettingsManager.get_last_dir(
+ self.mainwindow.serviceSettingsSection),
+ translate('OpenLP.ServiceManager', 'OpenLP Service Files (*.osz)')))
if not fileName:
return False
SettingsManager.set_last_dir(self.mainwindow.serviceSettingsSection,
@@ -461,9 +461,9 @@
"""
fileName = unicode(QtGui.QFileDialog.getSaveFileName(self.mainwindow,
translate('OpenLP.ServiceManager', 'Save Service'),
- SettingsManager.get_last_dir(self.mainwindow.serviceSettingsSection),
- translate('OpenLP.ServiceManager',
- 'OpenLP Service Files (*.osz)')))
+ SettingsManager.get_last_dir(
+ self.mainwindow.serviceSettingsSection),
+ translate('OpenLP.ServiceManager', 'OpenLP Service Files (*.osz)')))
if not fileName:
return False
if os.path.splitext(fileName)[1] == u'':
@@ -482,7 +482,7 @@
zip = None
fileTo = None
try:
- zip = zipfile.ZipFile(unicode(fileName))
+ zip = zipfile.ZipFile(fileName)
for file in zip.namelist():
try:
ucsfile = file.decode(u'utf-8')
@@ -951,7 +951,8 @@
newItem.merge(item[u'service_item'])
item[u'service_item'] = newItem
self.repaintServiceList(itemcount + 1, 0)
- self.mainwindow.liveController.replaceServiceManagerItem(newItem)
+ self.mainwindow.liveController.replaceServiceManagerItem(
+ newItem)
self.setModified(True)
def addServiceItem(self, item, rebuild=False, expand=None, replace=False):
=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py 2011-01-10 16:59:45 +0000
+++ openlp/core/ui/thememanager.py 2011-01-10 22:47:50 +0000
@@ -51,7 +51,8 @@
self.settingsSection = u'themes'
self.themeForm = ThemeForm(self)
self.fileRenameForm = FileRenameForm(self)
- self.serviceComboBox = self.mainwindow.ServiceManagerContents.themeComboBox
+ self.serviceComboBox = \
+ self.mainwindow.ServiceManagerContents.themeComboBox
# start with the layout
self.layout = QtGui.QVBoxLayout(self)
self.layout.setSpacing(0)
@@ -638,7 +639,8 @@
Flag to tell message lines per page need to be generated.
"""
log.debug(u'generateImage \n%s ', themeData)
- return self.mainwindow.renderManager.generate_preview(themeData, forcePage)
+ return self.mainwindow.renderManager.generate_preview(
+ themeData, forcePage)
def getPreviewImage(self, theme):
"""
=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py 2011-01-10 16:02:19 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py 2011-01-10 22:47:50 +0000
@@ -25,7 +25,6 @@
###############################################################################
import logging
-import time
from PyQt4 import QtCore, QtGui
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
