From b7dd528d50e0336a25a37b3103fb491f899d3c19 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Wed, 3 Nov 2010 17:19:44 +0000 Subject: [PATCH 1/3] Cleanups --- openlp/core/ui/shortcutlistform.py | 2 +- openlp/core/utils/actions.py | 6 +++--- openlp/plugins/alerts/alertsplugin.py | 12 ++++-------- openlp/plugins/bibles/bibleplugin.py | 12 ++++-------- openlp/plugins/songs/lib/cclifileimport.py | 18 +++++++++++------- openlp/plugins/songs/lib/mediaitem.py | 5 +++-- openlp/plugins/songusage/songusageplugin.py | 16 +++++++--------- 7 files changed, 33 insertions(+), 38 deletions(-) diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py index 0316b0ee0..e83c2cc7d 100644 --- a/openlp/core/ui/shortcutlistform.py +++ b/openlp/core/ui/shortcutlistform.py @@ -69,7 +69,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog): if event.modifiers() & Qt.AltModifier == Qt.AltModifier: key_string = u'Alt+' + key_string if event.modifiers() & Qt.ShiftModifier == Qt.ShiftModifier: - key_string = u'Shift+' + key_string; + key_string = u'Shift+' + key_string key_sequence = QtGui.QKeySequence(key_string) existing_key = QtGui.QKeySequence("Ctrl+Shift+F8") if key_sequence == existing_key: diff --git a/openlp/core/utils/actions.py b/openlp/core/utils/actions.py index 893e4adba..31afe93d1 100644 --- a/openlp/core/utils/actions.py +++ b/openlp/core/utils/actions.py @@ -79,7 +79,7 @@ class CategoryActionList(object): """ return self.__next__() - def has_key(key): + def has_key(self, key): for weight, action in self.actions: if action.text() == key: return True @@ -144,7 +144,7 @@ class CategoryList(object): return True return False - def append(self, name, actions=[]): + def append(self, name, actions=None): weight = 0 if len(self.categories) > 0: weight = self.categories[-1].weight + 1 @@ -153,7 +153,7 @@ class CategoryList(object): else: self.add(name, weight) - def add(self, name, weight=0, actions=[]): + def add(self, name, weight=0, actions=None): category = ActionCategory(name, weight) if actions: for action in actions: diff --git a/openlp/plugins/alerts/alertsplugin.py b/openlp/plugins/alerts/alertsplugin.py index 15b1ed6f9..fbd51a13a 100644 --- a/openlp/plugins/alerts/alertsplugin.py +++ b/openlp/plugins/alerts/alertsplugin.py @@ -85,7 +85,11 @@ class AlertsPlugin(Plugin): self.liveController.alertTab = self.alertsTab def finalise(self): + """ + Tidy up on exit + """ log.info(u'Alerts Finalising') + self.manager.finalise() Plugin.finalise(self) self.toolsAlertItem.setVisible(False) @@ -117,11 +121,3 @@ class AlertsPlugin(Plugin): self.textStrings[StringContent.VisibleName] = { u'title': translate('AlertsPlugin', 'Alerts') } - - def finalise(self): - """ - Time to tidy up on exit - """ - log.info(u'Alerts Finalising') - self.manager.finalise() - Plugin.finalise(self) diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index 946b4ab93..42976cde6 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -52,7 +52,11 @@ class BiblePlugin(Plugin): self.exportBibleItem.setVisible(True) def finalise(self): + """ + Tidy up on exit + """ log.info(u'Plugin Finalise') + self.manager.finalise() Plugin.finalise(self) self.importBibleItem.setVisible(False) self.exportBibleItem.setVisible(False) @@ -172,11 +176,3 @@ class BiblePlugin(Plugin): u'tooltip': translate('BiblesPlugin', 'Add the selected Bible to the service') } - - def finalise(self): - """ - Time to tidy up on exit - """ - log.info(u'Bible Finalising') - self.manager.finalise() - Plugin.finalise(self) diff --git a/openlp/plugins/songs/lib/cclifileimport.py b/openlp/plugins/songs/lib/cclifileimport.py index 669201325..207756e4b 100755 --- a/openlp/plugins/songs/lib/cclifileimport.py +++ b/openlp/plugins/songs/lib/cclifileimport.py @@ -203,9 +203,9 @@ class CCLIFileImport(SongImport): SongSelect .txt file format:: - Song Title # Contains the song title + Song Title # Contains the song title - Verse type and number # e.g. Verse 1, Chorus 1 + Verse type and number # e.g. Verse 1, Chorus 1 Verse lyrics @@ -213,12 +213,16 @@ class CCLIFileImport(SongImport): Verse lyrics - Song CCLI number # e.g. CCLI Number (e.g.CCLI-Liednummer: 2672885) - Song copyright # e.g. © 1999 Integrity's Hosanna! Music | LenSongs Publishing - Song authors # e.g. Lenny LeBlanc | Paul Baloche - Licencing info # e.g. For use solely with the SongSelect Terms of Use. + Song CCLI number + # e.g. CCLI Number (e.g.CCLI-Liednummer: 2672885) + Song copyright + # e.g. © 1999 Integrity's Hosanna! Music | LenSongs Publishing + Song authors # e.g. Lenny LeBlanc | Paul Baloche + Licencing info + # e.g. For use solely with the SongSelect Terms of Use. All rights Reserved. www.ccli.com - CCLI Licence number of user # e.g. CCL-Liedlizenznummer: 14 / CCLI License No. 14 + CCLI Licence number of user + # e.g. CCL-Liedlizenznummer: 14 / CCLI License No. 14 """ log.debug(u'TXT file text: %s', textList) diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index a211344c2..63496affd 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -389,7 +389,8 @@ class SongMediaItem(MediaManagerItem): service_item.audit = [ song.title, author_audit, song.copyright, unicode(song.ccli_number) ] - service_item.data_string = {u'title':song.search_title, u'authors':author_list} + service_item.data_string = {u'title':song.search_title, + u'authors':author_list} return True def serviceLoad(self, item): @@ -409,7 +410,7 @@ class SongMediaItem(MediaManagerItem): count = 0 for author in song.authors: if author.display_name in author_list: - count += 1 + count += 1 if count == len(author_list): editId = song.id uuid = item._uuid diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py index 124fe2863..a4081a10c 100644 --- a/openlp/plugins/songusage/songusageplugin.py +++ b/openlp/plugins/songusage/songusageplugin.py @@ -29,7 +29,8 @@ from datetime import datetime from PyQt4 import QtCore, QtGui -from openlp.core.lib import Plugin, StringContent, Receiver, build_icon, translate +from openlp.core.lib import Plugin, StringContent, Receiver, build_icon, \ + translate from openlp.core.lib.db import Manager from openlp.plugins.songusage.forms import SongUsageDetailForm, \ SongUsageDeleteForm @@ -123,7 +124,12 @@ class SongUsagePlugin(Plugin): self.SongUsageMenu.menuAction().setVisible(True) def finalise(self): + """ + Tidy up on exit + """ log.info(u'Plugin Finalise') + self.manager.finalise() + Plugin.finalise(self) self.SongUsageMenu.menuAction().setVisible(False) #stop any events being processed self.SongUsageActive = False @@ -176,11 +182,3 @@ class SongUsagePlugin(Plugin): self.textStrings[StringContent.VisibleName] = { u'title': translate('SongUsagePlugin', 'SongUsage') } - - def finalise(self): - """ - Time to tidy up on exit - """ - log.info(u'SongUsage Finalising') - self.manager.finalise() - Plugin.finalise(self) From ddc99e13e8ec3b43fe7edcd2c5840f0fe2402463 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Wed, 3 Nov 2010 17:40:45 +0000 Subject: [PATCH 2/3] Unused imports --- openlp/core/lib/renderer.py | 7 +++---- openlp/core/lib/serviceitem.py | 4 +--- openlp/core/ui/maindisplay.py | 3 +-- openlp/core/ui/slidecontroller.py | 1 - 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index 23d0623c5..708cd7811 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -29,11 +29,10 @@ format it for the output display. """ import logging -from PyQt4 import QtGui, QtCore, QtWebKit - -from openlp.core.lib import resize_image, expand_tags, \ - build_lyrics_format_css, build_lyrics_outline_css, image_to_byte +from PyQt4 import QtWebKit +from openlp.core.lib import expand_tags, build_lyrics_format_css, \ + build_lyrics_outline_css log = logging.getLogger(__name__) diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index 9ca0ed6cb..9e5b6ef6e 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -32,9 +32,7 @@ import logging import os import uuid -from PyQt4 import QtGui - -from openlp.core.lib import build_icon, resize_image, clean_tags, expand_tags +from openlp.core.lib import build_icon, clean_tags, expand_tags log = logging.getLogger(__name__) diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index 2da71e6ef..84b484878 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -30,8 +30,7 @@ import os from PyQt4 import QtCore, QtGui, QtWebKit from PyQt4.phonon import Phonon -from openlp.core.lib import Receiver, resize_image, build_html, ServiceItem, \ - image_to_byte +from openlp.core.lib import Receiver, build_html, ServiceItem, image_to_byte from openlp.core.ui import HideMode log = logging.getLogger(__name__) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 59ae353cc..92fa912fe 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -26,7 +26,6 @@ import logging import os -import time from PyQt4 import QtCore, QtGui from PyQt4.phonon import Phonon From 947e4d41732bb096957f03627c50af1900c894bf Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Wed, 3 Nov 2010 18:03:28 +0000 Subject: [PATCH 3/3] Long lines --- openlp/core/lib/pluginmanager.py | 6 ++++-- openlp/core/lib/theme.py | 7 ++++--- openlp/core/ui/advancedtab.py | 3 ++- openlp/core/ui/filerenamedialog.py | 3 ++- openlp/core/ui/mainwindow.py | 6 ++++-- openlp/core/ui/pluginform.py | 3 ++- openlp/core/ui/servicemanager.py | 8 +++++--- openlp/core/ui/slidecontroller.py | 3 ++- .../plugins/presentations/presentationplugin.py | 5 +++-- openlp/plugins/songs/lib/olp1import.py | 6 ++++-- openlp/plugins/songs/lib/opensongimport.py | 9 ++++++--- openlp/plugins/songs/lib/songimport.py | 3 ++- openlp/plugins/songs/lib/songstab.py | 15 ++++++++++----- 13 files changed, 50 insertions(+), 27 deletions(-) diff --git a/openlp/core/lib/pluginmanager.py b/openlp/core/lib/pluginmanager.py index ff136de54..362d8c197 100644 --- a/openlp/core/lib/pluginmanager.py +++ b/openlp/core/lib/pluginmanager.py @@ -156,9 +156,11 @@ class PluginManager(object): if plugin.settings_tab: log.debug(u'Inserting settings tab item from %s' % visible_title[u'title']) - settingsform.addTab(visible_title[u'title'], plugin.settings_tab) + settingsform.addTab(visible_title[u'title'], + plugin.settings_tab) else: - log.debug(u'No tab settings in %s' % visible_title[u'title']) + log.debug( + u'No tab settings in %s' % visible_title[u'title']) def hook_import_menu(self, import_menu): """ diff --git a/openlp/core/lib/theme.py b/openlp/core/lib/theme.py index cf1859d0b..fcd3c60ab 100644 --- a/openlp/core/lib/theme.py +++ b/openlp/core/lib/theme.py @@ -386,10 +386,11 @@ class ThemeXML(object): for e in element.attrib.iteritems(): if master == u'font_' and e[0] == u'type': master += e[1] + u'_' - elif master == u'display_' and (element.tag == u'shadow' \ - or element.tag == u'outline' ): + elif master == u'display_' and (element.tag == u'shadow' + or element.tag == u'outline'): self._create_attr(master, element.tag, element.text) - self._create_attr(master, element.tag + u'_'+ e[0], e[1]) + self._create_attr(master, element.tag + u'_'+ e[0], + e[1]) else: field = master + e[0] self._create_attr(master, e[0], e[1]) diff --git a/openlp/core/ui/advancedtab.py b/openlp/core/ui/advancedtab.py index f31e4c0ff..ffcade344 100644 --- a/openlp/core/ui/advancedtab.py +++ b/openlp/core/ui/advancedtab.py @@ -83,7 +83,8 @@ class AdvancedTab(SettingsTab): self.uiLayout.addWidget(self.doubleClickLiveCheckBox) self.leftLayout.addWidget(self.uiGroupBox) self.expandServiceItemCheckBox = QtGui.QCheckBox(self.uiGroupBox) - self.expandServiceItemCheckBox.setObjectName(u'expandServiceItemCheckBox') + self.expandServiceItemCheckBox.setObjectName( + u'expandServiceItemCheckBox') self.uiLayout.addWidget(self.expandServiceItemCheckBox) # self.sharedDirGroupBox = QtGui.QGroupBox(self.leftWidget) # self.sharedDirGroupBox.setObjectName(u'sharedDirGroupBox') diff --git a/openlp/core/ui/filerenamedialog.py b/openlp/core/ui/filerenamedialog.py index 897acf02f..02eefe7ed 100644 --- a/openlp/core/ui/filerenamedialog.py +++ b/openlp/core/ui/filerenamedialog.py @@ -34,7 +34,8 @@ class Ui_FileRenameDialog(object): FileRenameDialog.resize(400, 87) self.buttonBox = QtGui.QDialogButtonBox(FileRenameDialog) self.buttonBox.setGeometry(QtCore.QRect(210, 50, 171, 25)) - self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok) + self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel | + QtGui.QDialogButtonBox.Ok) self.buttonBox.setObjectName("buttonBox") self.widget = QtGui.QWidget(FileRenameDialog) self.widget.setGeometry(QtCore.QRect(10, 10, 381, 35)) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 60b1aacf9..c63f3a7fc 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -270,7 +270,8 @@ class Ui_MainWindow(object): self.SettingsPluginListItem.setIcon( build_icon(u':/system/settings_plugin_list.png')) self.SettingsPluginListItem.setObjectName(u'SettingsPluginListItem') - MainWindow.actionList.add_action(self.SettingsPluginListItem, u'Settings') + MainWindow.actionList.add_action(self.SettingsPluginListItem, + u'Settings') #i18n Language Items self.AutoLanguageItem = QtGui.QAction(MainWindow) self.AutoLanguageItem.setObjectName(u'AutoLanguageItem') @@ -296,7 +297,8 @@ class Ui_MainWindow(object): self.SettingsConfigureItem.setIcon( build_icon(u':/system/system_settings.png')) self.SettingsConfigureItem.setObjectName(u'SettingsConfigureItem') - MainWindow.actionList.add_action(self.SettingsShortcutsItem, u'Settings') + MainWindow.actionList.add_action(self.SettingsShortcutsItem, + u'Settings') self.HelpDocumentationItem = QtGui.QAction(MainWindow) self.HelpDocumentationItem.setIcon( build_icon(u':/system/system_help_contents.png')) diff --git a/openlp/core/ui/pluginform.py b/openlp/core/ui/pluginform.py index cbde28ae7..a857caee7 100644 --- a/openlp/core/ui/pluginform.py +++ b/openlp/core/ui/pluginform.py @@ -107,7 +107,8 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog): if self.pluginListWidget.currentItem() is None: self._clearDetails() return - plugin_name_plural = self.pluginListWidget.currentItem().text().split(u' ')[0] + plugin_name_plural = \ + self.pluginListWidget.currentItem().text().split(u' ')[0] self.activePlugin = None for plugin in self.parent.plugin_manager.plugins: name_string = plugin.getString(StringContent.Name) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 629013cc5..3e7feafd3 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -306,7 +306,7 @@ class ServiceManager(QtGui.QWidget): 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)\ and hasattr(serviceItem[u'service_item'], u'editId'): self.editAction.setVisible(True) if serviceItem[u'service_item']\ @@ -441,7 +441,8 @@ class ServiceManager(QtGui.QWidget): if setSelected: setSelected = False serviceIterator.value().setSelected(True) - elif serviceIterator.value() and serviceIterator.value().isSelected(): + elif serviceIterator.value() and \ + serviceIterator.value().isSelected(): serviceIterator.value().setSelected(False) setSelected = True serviceIterator += 1 @@ -761,7 +762,8 @@ 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: diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 92fa912fe..c2312ef97 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -794,7 +794,8 @@ class SlideController(QtGui.QWidget): self.selectedRow = 0 if row > -1 and row < self.PreviewListWidget.rowCount(): if self.serviceItem.is_command() and self.isLive: - Receiver.send_message(u'%s_slide' % self.serviceItem.name.lower(), + Receiver.send_message( + u'%s_slide' % self.serviceItem.name.lower(), [self.serviceItem, self.isLive, row]) self.updatePreview() else: diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py index 780884075..8ee3e2811 100644 --- a/openlp/plugins/presentations/presentationplugin.py +++ b/openlp/plugins/presentations/presentationplugin.py @@ -61,7 +61,8 @@ class PresentationPlugin(Plugin): Create the settings Tab """ visible_name = self.getString(StringContent.VisibleName) - return PresentationTab(self.name, visible_name[u'title'], self.controllers) + return PresentationTab(self.name, visible_name[u'title'], + self.controllers) def initialise(self): """ @@ -188,4 +189,4 @@ class PresentationPlugin(Plugin): u'title': translate('PresentationPlugin', 'Service'), u'tooltip': translate('PresentationPlugin', 'Add the selected Presentation to the service') - } \ No newline at end of file + } diff --git a/openlp/plugins/songs/lib/olp1import.py b/openlp/plugins/songs/lib/olp1import.py index de750cb24..de77fdfde 100644 --- a/openlp/plugins/songs/lib/olp1import.py +++ b/openlp/plugins/songs/lib/olp1import.py @@ -74,7 +74,8 @@ class OpenLP1SongImport(SongImport): decoded = unicode(raw, codec) self.last_encoding = codec except UnicodeDecodeError: - log.exception(u'Error in detecting openlp.org 1.x database encoding.') + log.exception( + u'Error in detecting openlp.org 1.x database encoding.') try: decoded = unicode(raw, self.last_encoding) except UnicodeDecodeError: @@ -152,7 +153,8 @@ class OpenLP1SongImport(SongImport): break for track in tracks: if track[0] == track_id[0]: - self.add_media_file(self.decode_string(track[1], guess)) + self.add_media_file(self.decode_string(track[1], + guess)) break if self.stop_import_flag: success = False diff --git a/openlp/plugins/songs/lib/opensongimport.py b/openlp/plugins/songs/lib/opensongimport.py index f4be0dc87..47f4ecee5 100644 --- a/openlp/plugins/songs/lib/opensongimport.py +++ b/openlp/plugins/songs/lib/opensongimport.py @@ -229,14 +229,16 @@ class OpenSongImport(SongImport): # drop the square brackets right_bracket = thisline.find(u']') content = thisline[1:right_bracket].upper() - # have we got any digits? If so, versenumber is everything from the digits + # have we got any digits? + # If so, versenumber is everything from the digits # to the end (even if there are some alpha chars on the end) match = re.match(u'(.*)(\d+.*)', content) if match is not None: versetype = match.group(1) versenum = match.group(2) else: - # otherwise we assume number 1 and take the whole prefix as versetype + # otherwise we assume number 1 and take the whole prefix as + # the versetype versetype = content versenum = u'1' continue @@ -301,6 +303,7 @@ class OpenSongImport(SongImport): # Assume it's no.1 if there's no digits tag = tag + u'1' if not versetags.has_key(tag): - log.info(u'Got order %s but not in versetags, dropping this item from presentation order', tag) + log.info(u'Got order %s but not in versetags, dropping this' + u'item from presentation order', tag) else: self.verse_order_list.append(tag) diff --git a/openlp/plugins/songs/lib/songimport.py b/openlp/plugins/songs/lib/songimport.py index d2e0698b3..cffb9062a 100644 --- a/openlp/plugins/songs/lib/songimport.py +++ b/openlp/plugins/songs/lib/songimport.py @@ -296,7 +296,8 @@ class SongImport(QtCore.QObject): song.lyrics = unicode(sxml.extract_xml(), u'utf-8') for i, current_verse_tag in enumerate(self.verse_order_list): if verses_changed_to_other.has_key(current_verse_tag): - self.verse_order_list[i] = verses_changed_to_other[current_verse_tag] + self.verse_order_list[i] = \ + verses_changed_to_other[current_verse_tag] song.verse_order = u' '.join(self.verse_order_list) song.copyright = self.copyright song.comments = self.comments diff --git a/openlp/plugins/songs/lib/songstab.py b/openlp/plugins/songs/lib/songstab.py index 03c1e8844..1ffb5bba6 100644 --- a/openlp/plugins/songs/lib/songstab.py +++ b/openlp/plugins/songs/lib/songstab.py @@ -56,8 +56,10 @@ class SongsTab(SettingsTab): self.SongUpdateOnEditCheckBox = QtGui.QCheckBox(self.SongsModeGroupBox) self.SongUpdateOnEditCheckBox.setObjectName(u'SongUpdateOnEditCheckBox') self.SongsModeLayout.addWidget(self.SongUpdateOnEditCheckBox) - self.SongAddFromServiceCheckBox = QtGui.QCheckBox(self.SongsModeGroupBox) - self.SongAddFromServiceCheckBox.setObjectName(u'SongAddFromServiceCheckBox') + self.SongAddFromServiceCheckBox = QtGui.QCheckBox( + self.SongsModeGroupBox) + self.SongAddFromServiceCheckBox.setObjectName( + u'SongAddFromServiceCheckBox') self.SongsModeLayout.addWidget(self.SongAddFromServiceCheckBox) self.SongsLayout.setWidget( 0, QtGui.QFormLayout.LabelRole, self.SongsModeGroupBox) @@ -83,7 +85,8 @@ class SongsTab(SettingsTab): 'Display verses on live tool bar')) self.SongUpdateOnEditCheckBox.setText( translate('SongsPlugin.SongsTab', 'Update service from song edit')) - self.SongAddFromServiceCheckBox.setText(translate('SongsPlugin.SongsTab', + self.SongAddFromServiceCheckBox.setText( + translate('SongsPlugin.SongsTab', 'Add missing songs when opening service')) def onSearchAsTypeCheckBoxChanged(self, check_state): @@ -132,6 +135,8 @@ class SongsTab(SettingsTab): settings.beginGroup(self.settingsSection) settings.setValue(u'search as type', QtCore.QVariant(self.song_search)) settings.setValue(u'display songbar', QtCore.QVariant(self.song_bar)) - settings.setValue(u'update service on edit', QtCore.QVariant(self.update_edit)) - settings.setValue(u'add song from service', QtCore.QVariant(self.update_load)) + settings.setValue(u'update service on edit', + QtCore.QVariant(self.update_edit)) + settings.setValue(u'add song from service', + QtCore.QVariant(self.update_load)) settings.endGroup()