openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #02780
[Merge] lp:~meths/openlp/trivialfixes into lp:openlp
Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Cleanups long lines from string changes
--
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/30961
Your team OpenLP Core is requested to review the proposed merge of lp:~meths/openlp/trivialfixes into lp:openlp.
=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py 2010-07-24 22:10:47 +0000
+++ openlp/core/lib/mediamanageritem.py 2010-07-26 15:49:47 +0000
@@ -244,7 +244,8 @@
self.addToolbarButton(
unicode(translate('OpenLP.MediaManagerItem', 'Delete %s')) %
self.PluginNameShort,
- translate('OpenLP.MediaManagerItem', 'Delete the selected item'),
+ translate('OpenLP.MediaManagerItem',
+ 'Delete the selected item'),
u':/general/general_delete.png', self.onDeleteClick)
## Separator Line ##
self.addToolbarSeparator()
@@ -297,7 +298,8 @@
self.listView.addAction(
context_menu_action(
self.listView, u':/general/general_delete.png',
- unicode(translate('OpenLP.MediaManagerItem', '&Delete %s')) %
+ unicode(translate('OpenLP.MediaManagerItem',
+ '&Delete %s')) %
self.pluginNameVisible,
self.onDeleteClick))
self.listView.addAction(context_menu_separator(self.listView))
@@ -509,7 +511,8 @@
service_item = self.parent.serviceManager.getServiceItem()
if not service_item:
QtGui.QMessageBox.information(self,
- translate('OpenLP.MediaManagerItem', 'No Service Item Selected'),
+ translate('OpenLP.MediaManagerItem',
+ 'No Service Item Selected'),
translate('OpenLP.MediaManagerItem',
'You must select an existing service item to add to.'))
elif self.title.lower() == service_item.name.lower():
@@ -519,7 +522,8 @@
else:
#Turn off the remote edit update message indicator
QtGui.QMessageBox.information(self,
- translate('OpenLP.MediaManagerItem', 'Invalid Service Item'),
+ translate('OpenLP.MediaManagerItem',
+ 'Invalid Service Item'),
unicode(translate('OpenLP.MediaManagerItem',
'You must select a %s service item.')) % self.title)
@@ -535,4 +539,4 @@
if self.generateSlideData(service_item, item):
return service_item
else:
- return None
\ No newline at end of file
+ return None
=== modified file 'openlp/core/ui/aboutdialog.py'
--- openlp/core/ui/aboutdialog.py 2010-07-24 22:45:48 +0000
+++ openlp/core/ui/aboutdialog.py 2010-07-26 15:49:47 +0000
@@ -562,5 +562,6 @@
self.aboutNotebook.setTabText(
self.aboutNotebook.indexOf(self.licenseTab),
translate('OpenLP.AboutForm', 'License'))
- self.contributeButton.setText(translate('OpenLP.AboutForm', 'Contribute'))
+ self.contributeButton.setText(translate('OpenLP.AboutForm',
+ 'Contribute'))
self.closeButton.setText(translate('OpenLP.AboutForm', 'Close'))
=== modified file 'openlp/core/ui/advancedtab.py'
--- openlp/core/ui/advancedtab.py 2010-07-24 22:10:47 +0000
+++ openlp/core/ui/advancedtab.py 2010-07-26 15:49:47 +0000
@@ -134,7 +134,8 @@
"""
self.uiGroupBox.setTitle(translate('OpenLP.AdvancedTab', 'UI Settings'))
self.recentLabel.setText(
- translate('OpenLP.AdvancedTab', 'Number of recent files to display:'))
+ translate('OpenLP.AdvancedTab',
+ 'Number of recent files to display:'))
self.mediaPluginCheckBox.setText(translate('OpenLP.AdvancedTab',
'Remember active media manager tab on startup'))
self.doubleClickLiveCheckBox.setText(translate('OpenLP.AdvancedTab',
@@ -188,4 +189,4 @@
"""
self.sharedLabel.setEnabled(checked)
self.sharedTextEdit.setEnabled(checked)
- self.sharedPushButton.setEnabled(checked)
\ No newline at end of file
+ self.sharedPushButton.setEnabled(checked)
=== modified file 'openlp/core/ui/amendthemeform.py'
--- openlp/core/ui/amendthemeform.py 2010-07-24 22:10:47 +0000
+++ openlp/core/ui/amendthemeform.py 2010-07-26 15:49:47 +0000
@@ -222,7 +222,8 @@
images_filter = '%s;;%s (*.*) (*)' % (images_filter,
translate('OpenLP.AmendThemeForm', 'All Files'))
filename = QtGui.QFileDialog.getOpenFileName(self,
- translate('OpenLP.AmendThemeForm', 'Select Image'), u'', images_filter)
+ translate('OpenLP.AmendThemeForm', 'Select Image'), u'',
+ images_filter)
if filename:
self.ImageLineEdit.setText(filename)
self.theme.background_filename = filename
@@ -765,4 +766,4 @@
if self.theme.font_main_width < metrics.maxWidth() * 2 + 64:
self.theme.font_main_width = metrics.maxWidth() * 2 + 64
self.FontMainWidthSpinBox.setValue(self.theme.font_main_width)
- return metrics
\ No newline at end of file
+ return metrics
=== modified file 'openlp/core/ui/generaltab.py'
--- openlp/core/ui/generaltab.py 2010-07-25 08:54:58 +0000
+++ openlp/core/ui/generaltab.py 2010-07-26 15:49:47 +0000
@@ -287,7 +287,8 @@
"""
Translate the general settings tab to the currently selected language
"""
- self.MonitorGroupBox.setTitle(translate('OpenLP.GeneralTab', 'Monitors'))
+ self.MonitorGroupBox.setTitle(translate('OpenLP.GeneralTab',
+ 'Monitors'))
self.MonitorLabel.setText(translate('OpenLP.GeneralTab',
'Select monitor for output display:'))
self.DisplayOnMonitorCheck.setText(
@@ -473,4 +474,4 @@
self.customYValueEdit.setEnabled(checked)
self.customHeightValueEdit.setEnabled(checked)
self.customWidthValueEdit.setEnabled(checked)
- self.override_changed = True
\ No newline at end of file
+ self.override_changed = True
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2010-07-25 11:47:53 +0000
+++ openlp/core/ui/mainwindow.py 2010-07-26 15:49:47 +0000
@@ -498,7 +498,8 @@
self.HelpAboutItem.setText(translate('OpenLP.MainWindow', '&About'))
self.HelpAboutItem.setStatusTip(
translate('OpenLP.MainWindow', 'More information about OpenLP'))
- self.HelpAboutItem.setShortcut(translate('OpenLP.MainWindow', 'Ctrl+F1'))
+ self.HelpAboutItem.setShortcut(translate('OpenLP.MainWindow',
+ 'Ctrl+F1'))
self.HelpOnlineHelpItem.setText(
translate('OpenLP.MainWindow', '&Online Help'))
self.HelpWebSiteItem.setText(
@@ -707,7 +708,8 @@
version_text = unicode(translate('OpenLP.MainWindow',
'Version %s of OpenLP is now available for download (you are '
'currently running version %s). \n\nYou can download the latest '
- 'version from <a href="http://openlp.org/";>http://openlp.org/</a>.'))
+ 'version from '
+ '<a href="http://openlp.org/";>http://openlp.org/</a>.'))
QtGui.QMessageBox.question(self,
translate('OpenLP.MainWindow', 'OpenLP Version Updated'),
version_text % (version, app_version),
@@ -893,7 +895,8 @@
def defaultThemeChanged(self, theme):
self.DefaultThemeLabel.setText(
- unicode(translate('OpenLP.MainWindow', 'Default Theme: %s')) % theme)
+ unicode(translate('OpenLP.MainWindow', 'Default Theme: %s')) %
+ theme)
def toggleMediaManager(self, visible):
if self.MediaManagerDock.isVisible() != visible:
@@ -1016,4 +1019,4 @@
self.recentFiles.insert(0, QtCore.QString(filename))
while self.recentFiles.count() > maxRecentFiles:
# Don't care what API says takeLast works, removeLast doesn't!
- self.recentFiles.takeLast()
\ No newline at end of file
+ self.recentFiles.takeLast()
=== modified file 'openlp/core/ui/serviceitemeditdialog.py'
--- openlp/core/ui/serviceitemeditdialog.py 2010-07-24 22:10:47 +0000
+++ openlp/core/ui/serviceitemeditdialog.py 2010-07-26 15:49:47 +0000
@@ -71,5 +71,6 @@
ServiceItemEditDialog.setWindowTitle(
translate('OpenLP.ServiceItemEditForm', 'Reorder Service Item'))
self.upButton.setText(translate('OpenLP.ServiceItemEditForm', 'Up'))
- self.deleteButton.setText(translate('OpenLP.ServiceItemEditForm', 'Delete'))
+ self.deleteButton.setText(translate('OpenLP.ServiceItemEditForm',
+ 'Delete'))
self.downButton.setText(translate('OpenLP.ServiceItemEditForm', 'Down'))
=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py 2010-07-24 22:10:47 +0000
+++ openlp/core/ui/servicemanager.py 2010-07-26 15:49:47 +0000
@@ -133,8 +133,8 @@
translate('OpenLP.ServiceManager', 'Save this service'),
self.onQuickSaveService)
self.Toolbar.addSeparator()
- self.ThemeLabel = QtGui.QLabel(translate('OpenLP.ServiceManager', 'Theme:'),
- self)
+ self.ThemeLabel = QtGui.QLabel(translate('OpenLP.ServiceManager',
+ 'Theme:'), self)
self.ThemeLabel.setMargin(3)
self.Toolbar.addToolbarWidget(u'ThemeLabel', self.ThemeLabel)
self.ThemeComboBox = QtGui.QComboBox(self.Toolbar)
@@ -846,8 +846,8 @@
else:
QtGui.QMessageBox.critical(self,
translate('OpenLP.ServiceManager', 'Missing Display Handler'),
- translate('OpenLP.ServiceManager', 'Your item cannot be displayed '
- 'as there is no handler to display it'),
+ translate('OpenLP.ServiceManager', 'Your item cannot be '
+ 'displayed as there is no handler to display it'),
QtGui.QMessageBox.StandardButtons(
QtGui.QMessageBox.Ok),
QtGui.QMessageBox.Ok)
@@ -882,8 +882,8 @@
else:
QtGui.QMessageBox.critical(self,
translate('OpenLP.ServiceManager', 'Missing Display Handler'),
- translate('OpenLP.ServiceManager', 'Your item cannot be displayed '
- 'as there is no handler to display it'),
+ translate('OpenLP.ServiceManager', 'Your item cannot be '
+ 'displayed as there is no handler to display it'),
QtGui.QMessageBox.StandardButtons(
QtGui.QMessageBox.Ok),
QtGui.QMessageBox.Ok)
@@ -1031,4 +1031,4 @@
data_item[u'notes'] = unicode(service_item.notes)
data_item[u'selected'] = (item == curitem)
data.append(data_item)
- Receiver.send_message(u'servicemanager_list_response', data)
\ No newline at end of file
+ Receiver.send_message(u'servicemanager_list_response', data)
=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
--- openlp/plugins/presentations/lib/mediaitem.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/presentations/lib/mediaitem.py 2010-07-26 15:49:47 +0000
@@ -164,7 +164,7 @@
self.DisplayTypeComboBox.insertItem(0, self.Automatic)
self.DisplayTypeComboBox.setCurrentIndex(0)
if QtCore.QSettings().value(self.settingsSection + u'/override app',
- QtCore.QVariant(QtCore.Qt.Unchecked)) == QtCore.Qt.Checked:
+ QtCore.QVariant(QtCore.Qt.Unchecked)) == QtCore.Qt.Checked:
self.PresentationWidget.show()
else:
self.PresentationWidget.hide()
@@ -299,4 +299,4 @@
if self.controllers[controller].enabled():
if filetype in self.controllers[controller].alsosupports:
return controller
- return None
\ No newline at end of file
+ return None
=== modified file 'openlp/plugins/presentations/lib/pptviewcontroller.py'
--- openlp/plugins/presentations/lib/pptviewcontroller.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/presentations/lib/pptviewcontroller.py 2010-07-26 15:49:47 +0000
@@ -150,7 +150,8 @@
if self.check_thumbnails():
return
for idx in range(self.get_slide_count()):
- path = u'%s\\slide%s.bmp' % (self.get_temp_folder(), unicode(idx + 1))
+ path = u'%s\\slide%s.bmp' % (self.get_temp_folder(),
+ unicode(idx + 1))
self.convert_thumbnail(path, idx + 1)
def close_presentation(self):
@@ -246,4 +247,4 @@
"""
Triggers the previous slide on the running presentation
"""
- self.controller.process.PrevStep(self.pptid)
\ No newline at end of file
+ self.controller.process.PrevStep(self.pptid)
=== modified file 'openlp/plugins/remotes/lib/remotetab.py'
--- openlp/plugins/remotes/lib/remotetab.py 2010-07-25 08:21:02 +0000
+++ openlp/plugins/remotes/lib/remotetab.py 2010-07-26 15:49:47 +0000
@@ -44,7 +44,8 @@
self.remoteLayout.setObjectName(u'remoteLayout')
self.serverSettingsGroupBox = QtGui.QGroupBox(self)
self.serverSettingsGroupBox.setObjectName(u'serverSettingsGroupBox')
- self.serverSettingsLayout = QtGui.QFormLayout(self.serverSettingsGroupBox)
+ self.serverSettingsLayout = QtGui.QFormLayout(
+ self.serverSettingsGroupBox)
self.serverSettingsLayout.setSpacing(8)
self.serverSettingsLayout.setMargin(8)
self.serverSettingsLayout.setObjectName(u'serverSettingsLayout')
@@ -78,4 +79,4 @@
QtCore.QSettings().setValue(self.settingsSection + u'/port',
QtCore.QVariant(self.portSpinBox.value()))
QtCore.QSettings().setValue(self.settingsSection + u'/ip address',
- QtCore.QVariant(self.addressEdit.text()))
\ No newline at end of file
+ QtCore.QVariant(self.addressEdit.text()))
Follow ups
