From 564b2e41ae84d3455bb008e15fb203e68ed1ff74 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Mon, 10 Dec 2012 06:15:42 +0000 Subject: [PATCH] Style Fixes --- openlp/core/lib/serviceitem.py | 45 +++++-------- openlp/core/ui/servicemanager.py | 93 ++++++++++----------------- openlp/plugins/media/lib/mediaitem.py | 92 ++++++++++---------------- openlp/plugins/media/lib/mediatab.py | 28 +++----- openlp/plugins/media/mediaplugin.py | 17 ++--- 5 files changed, 96 insertions(+), 179 deletions(-) diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index 2b0bfa582..3f2730e61 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 ############################################################################### # OpenLP - Open Source Lyrics Projection # @@ -37,8 +37,7 @@ import logging import os import uuid -from openlp.core.lib import build_icon, clean_tags, expand_tags, translate, \ - ImageSource +from openlp.core.lib import build_icon, clean_tags, expand_tags, translate, ImageSource log = logging.getLogger(__name__) @@ -247,12 +246,10 @@ class ServiceItem(object): previous_pages = {} for slide in self._raw_frames: verse_tag = slide[u'verseTag'] - if verse_tag in previous_pages and \ - previous_pages[verse_tag][0] == slide[u'raw_slide']: + if verse_tag in previous_pages and previous_pages[verse_tag][0] == slide[u'raw_slide']: pages = previous_pages[verse_tag][1] else: - pages = \ - self.renderer.format_slide(slide[u'raw_slide'], self) + pages = self.renderer.format_slide(slide[u'raw_slide'], self) previous_pages[verse_tag] = (slide[u'raw_slide'], pages) for page in pages: page = page.replace(u'
', u'{br}') @@ -263,8 +260,7 @@ class ServiceItem(object): u'html': html.replace(u' ', u' '), u'verseTag': verse_tag }) - elif self.service_item_type == ServiceItemType.Image or \ - self.service_item_type == ServiceItemType.Command: + elif self.service_item_type == ServiceItemType.Image or self.service_item_type == ServiceItemType.Command: pass else: log.error(u'Invalid value renderer: %s' % self.service_item_type) @@ -290,8 +286,7 @@ class ServiceItem(object): self.image_border = background self.service_item_type = ServiceItemType.Image self._raw_frames.append({u'title': title, u'path': path}) - self.renderer.image_manager.addImage( - path, ImageSource.ImagePlugin, self.image_border) + self.renderer.image_manager.addImage(path, ImageSource.ImagePlugin, self.image_border) self._new_item() def add_from_text(self, raw_slide, verse_tag=None): @@ -305,8 +300,7 @@ class ServiceItem(object): verse_tag = verse_tag.upper() self.service_item_type = ServiceItemType.Text title = raw_slide[:30].split(u'\n')[0] - self._raw_frames.append( - {u'title': title, u'raw_slide': raw_slide, u'verseTag': verse_tag}) + self._raw_frames.append({u'title': title, u'raw_slide': raw_slide, u'verseTag': verse_tag}) self._new_item() def add_from_command(self, path, file_name, image): @@ -323,8 +317,7 @@ class ServiceItem(object): The command of/for the slide. """ self.service_item_type = ServiceItemType.Command - self._raw_frames.append( - {u'title': file_name, u'image': image, u'path': path}) + self._raw_frames.append({u'title': file_name, u'image': image, u'path': path}) self._new_item() def get_service_repr(self, lite_save): @@ -360,15 +353,12 @@ class ServiceItem(object): elif self.service_item_type == ServiceItemType.Image: if lite_save: for slide in self._raw_frames: - service_data.append( - {u'title': slide[u'title'], u'path': slide[u'path']}) + service_data.append({u'title': slide[u'title'], u'path': slide[u'path']}) else: service_data = [slide[u'title'] for slide in self._raw_frames] elif self.service_item_type == ServiceItemType.Command: for slide in self._raw_frames: - service_data.append( - {u'title': slide[u'title'], u'image': slide[u'image'], - u'path': slide[u'path']}) + service_data.append({u'title': slide[u'title'], u'image': slide[u'image'], u'path': slide[u'path']}) return {u'header': service_header, u'data': service_data} def set_from_service(self, serviceitem, path=None): @@ -421,17 +411,13 @@ class ServiceItem(object): self.add_from_image(filename, text_image) else: for text_image in serviceitem[u'serviceitem'][u'data']: - self.add_from_image(text_image[u'path'], - text_image[u'title']) + self.add_from_image(text_image[u'path'], text_image[u'title']) elif self.service_item_type == ServiceItemType.Command: for text_image in serviceitem[u'serviceitem'][u'data']: if path: - self.add_from_command( - path, text_image[u'title'], text_image[u'image']) + self.add_from_command(path, text_image[u'title'], text_image[u'image']) else: - self.add_from_command( - text_image[u'path'], text_image[u'title'], - text_image[u'image']) + self.add_from_command(text_image[u'path'], text_image[u'title'], text_image[u'image']) self._new_item() @@ -505,8 +491,7 @@ class ServiceItem(object): """ Confirms if the ServiceItem uses a file """ - return self.service_item_type == ServiceItemType.Image or \ - self.service_item_type == ServiceItemType.Command + return self.service_item_type == ServiceItemType.Image or self.service_item_type == ServiceItemType.Command def is_text(self): """ @@ -573,7 +558,7 @@ class ServiceItem(object): def remove_frame(self, frame): """ - Remove the soecified frame from the item + Remove the specified frame from the item """ if frame in self._raw_frames: self._raw_frames.remove(frame) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 42d82c7bb..b7312683b 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 ############################################################################### # OpenLP - Open Source Lyrics Projection # @@ -39,17 +39,14 @@ log = logging.getLogger(__name__) from PyQt4 import QtCore, QtGui -from openlp.core.lib import OpenLPToolbar, ServiceItem, Receiver, build_icon, \ - ItemCapabilities, SettingsManager, translate, str_to_bool, \ - check_directory_exists +from openlp.core.lib import OpenLPToolbar, ServiceItem, Receiver, build_icon, ItemCapabilities, SettingsManager, \ + translate, str_to_bool, check_directory_exists from openlp.core.lib.theme import ThemeLevel from openlp.core.lib.settings import Settings -from openlp.core.lib.ui import UiStrings, critical_error_message_box, \ - create_widget_action, find_and_set_in_combo_box +from openlp.core.lib.ui import UiStrings, critical_error_message_box, create_widget_action, find_and_set_in_combo_box from openlp.core.ui import ServiceNoteForm, ServiceItemEditForm, StartTimeForm from openlp.core.ui.printserviceform import PrintServiceForm -from openlp.core.utils import AppLocation, delete_file, split_filename, \ - format_time +from openlp.core.utils import AppLocation, delete_file, split_filename, format_time from openlp.core.utils.actions import ActionList, CategoryOrder class ServiceManagerList(QtGui.QTreeWidget): @@ -127,30 +124,21 @@ class ServiceManager(QtGui.QWidget): self.layout.setMargin(0) # Create the top toolbar self.toolbar = OpenLPToolbar(self) - self.toolbar.addToolbarAction(u'newService', - text=UiStrings().NewService, icon=u':/general/general_new.png', - tooltip=UiStrings().CreateService, - triggers=self.onNewServiceClicked) - self.toolbar.addToolbarAction(u'openService', - text=UiStrings().OpenService, icon=u':/general/general_open.png', - tooltip=translate('OpenLP.ServiceManager', - 'Load an existing service.'), triggers=self.onLoadServiceClicked) - self.toolbar.addToolbarAction(u'saveService', - text=UiStrings().SaveService, icon=u':/general/general_save.png', - tooltip=translate('OpenLP.ServiceManager', 'Save this service.'), - triggers=self.decideSaveMethod) + self.toolbar.addToolbarAction(u'newService', text=UiStrings().NewService, icon=u':/general/general_new.png', + tooltip=UiStrings().CreateService, triggers=self.onNewServiceClicked) + self.toolbar.addToolbarAction(u'openService', text=UiStrings().OpenService, icon=u':/general/general_open.png', + tooltip=translate('OpenLP.ServiceManager', 'Load an existing service.'), triggers=self.onLoadServiceClicked) + self.toolbar.addToolbarAction(u'saveService', text=UiStrings().SaveService, icon=u':/general/general_save.png', + tooltip=translate('OpenLP.ServiceManager', 'Save this service.'), triggers=self.decideSaveMethod) self.toolbar.addSeparator() self.themeLabel = QtGui.QLabel(u'%s:' % UiStrings().Theme, self) self.themeLabel.setMargin(3) self.themeLabel.setObjectName(u'themeLabel') self.toolbar.addToolbarWidget(self.themeLabel) self.themeComboBox = QtGui.QComboBox(self.toolbar) - self.themeComboBox.setToolTip(translate('OpenLP.ServiceManager', - 'Select a theme for the service.')) - self.themeComboBox.setSizeAdjustPolicy( - QtGui.QComboBox.AdjustToMinimumContentsLength) - self.themeComboBox.setSizePolicy( - QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) + self.themeComboBox.setToolTip(translate('OpenLP.ServiceManager', 'Select a theme for the service.')) + self.themeComboBox.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToMinimumContentsLength) + self.themeComboBox.setSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) self.themeComboBox.setObjectName(u'themeComboBox') self.toolbar.addToolbarWidget(self.themeComboBox) self.toolbar.setObjectName(u'toolbar') @@ -161,15 +149,12 @@ class ServiceManager(QtGui.QWidget): QtGui.QAbstractItemView.CurrentChanged | QtGui.QAbstractItemView.DoubleClicked | QtGui.QAbstractItemView.EditKeyPressed) - self.serviceManagerList.setDragDropMode( - QtGui.QAbstractItemView.DragDrop) + self.serviceManagerList.setDragDropMode(QtGui.QAbstractItemView.DragDrop) self.serviceManagerList.setAlternatingRowColors(True) self.serviceManagerList.setHeaderHidden(True) self.serviceManagerList.setExpandsOnDoubleClick(False) - self.serviceManagerList.setContextMenuPolicy( - QtCore.Qt.CustomContextMenu) - QtCore.QObject.connect(self.serviceManagerList, - QtCore.SIGNAL('customContextMenuRequested(QPoint)'), + self.serviceManagerList.setContextMenuPolicy(QtCore.Qt.CustomContextMenu) + QtCore.QObject.connect(self.serviceManagerList, QtCore.SIGNAL('customContextMenuRequested(QPoint)'), self.contextMenu) self.serviceManagerList.setObjectName(u'serviceManagerList') # enable drop @@ -253,36 +238,24 @@ class ServiceManager(QtGui.QWidget): category=UiStrings().Service, triggers=self.makeLive) self.layout.addWidget(self.orderToolbar) # Connect up our signals and slots - QtCore.QObject.connect(self.themeComboBox, - QtCore.SIGNAL(u'activated(int)'), self.onThemeComboBoxSelected) - QtCore.QObject.connect(self.serviceManagerList, - QtCore.SIGNAL(u'doubleClicked(QModelIndex)'), self.onMakeLive) - QtCore.QObject.connect(self.serviceManagerList, - QtCore.SIGNAL(u'itemCollapsed(QTreeWidgetItem*)'), self.collapsed) - QtCore.QObject.connect(self.serviceManagerList, - QtCore.SIGNAL(u'itemExpanded(QTreeWidgetItem*)'), self.expanded) - QtCore.QObject.connect(Receiver.get_receiver(), - QtCore.SIGNAL(u'theme_update_list'), self.updateThemeList) - QtCore.QObject.connect(Receiver.get_receiver(), - QtCore.SIGNAL(u'servicemanager_preview_live'), self.previewLive) - QtCore.QObject.connect(Receiver.get_receiver(), - QtCore.SIGNAL(u'servicemanager_next_item'), self.nextItem) - QtCore.QObject.connect(Receiver.get_receiver(), - QtCore.SIGNAL(u'servicemanager_previous_item'), self.previousItem) - QtCore.QObject.connect(Receiver.get_receiver(), - QtCore.SIGNAL(u'servicemanager_set_item'), self.onSetItem) - QtCore.QObject.connect(Receiver.get_receiver(), - QtCore.SIGNAL(u'config_updated'), self.configUpdated) - QtCore.QObject.connect(Receiver.get_receiver(), - QtCore.SIGNAL(u'config_screen_changed'), + QtCore.QObject.connect(self.themeComboBox, QtCore.SIGNAL(u'activated(int)'), self.onThemeComboBoxSelected) + QtCore.QObject.connect(self.serviceManagerList, QtCore.SIGNAL(u'doubleClicked(QModelIndex)'), self.onMakeLive) + QtCore.QObject.connect(self.serviceManagerList, QtCore.SIGNAL(u'itemCollapsed(QTreeWidgetItem*)'), + self.collapsed) + QtCore.QObject.connect(self.serviceManagerList, QtCore.SIGNAL(u'itemExpanded(QTreeWidgetItem*)'), self.expanded) + QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'theme_update_list'), self.updateThemeList) + QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'servicemanager_preview_live'), self.previewLive) + QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'servicemanager_next_item'), self.nextItem) + QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'servicemanager_previous_item'), + self.previousItem) + QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'servicemanager_set_item'), self.onSetItem) + QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'config_updated'), self.configUpdated) + QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'config_screen_changed'), self.regenerateServiceItems) - QtCore.QObject.connect(Receiver.get_receiver(), - QtCore.SIGNAL(u'theme_update_global'), self.themeChange) - QtCore.QObject.connect(Receiver.get_receiver(), - QtCore.SIGNAL(u'service_item_update'), self.serviceItemUpdate) + QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'theme_update_global'), self.themeChange) + QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'service_item_update'), self.serviceItemUpdate) # Last little bits of setting up - self.service_theme = unicode(Settings().value( - self.mainwindow.serviceManagerSettingsSection + u'/service theme', + self.service_theme = unicode(Settings().value(self.mainwindow.serviceManagerSettingsSection + u'/service theme', QtCore.QVariant(u'')).toString()) self.servicePath = AppLocation.get_section_data_path(u'servicemanager') # build the drag and drop context menu diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index 1ab36ff45..85b8b648f 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 ############################################################################### # OpenLP - Open Source Lyrics Projection # @@ -32,12 +32,10 @@ import os from PyQt4 import QtCore, QtGui -from openlp.core.lib import MediaManagerItem, build_icon, ItemCapabilities, \ - SettingsManager, translate, check_item_selected, Receiver, MediaType, \ - ServiceItem, build_html, ServiceItemContext +from openlp.core.lib import MediaManagerItem, build_icon, ItemCapabilities, SettingsManager, translate, \ + check_item_selected, Receiver, MediaType, ServiceItem, build_html, ServiceItemContext from openlp.core.lib.settings import Settings -from openlp.core.lib.ui import UiStrings, critical_error_message_box, \ - create_horizontal_adjusting_combo_box +from openlp.core.lib.ui import UiStrings, critical_error_message_box, create_horizontal_adjusting_combo_box from openlp.core.ui import DisplayController, Display, DisplayControllerType from openlp.core.ui.media import get_media_players, set_media_players from openlp.core.utils import locale_compare @@ -67,25 +65,17 @@ class MediaMediaItem(MediaManagerItem): self.displayController = DisplayController(parent) self.displayController.controllerLayout = QtGui.QVBoxLayout() self.plugin.mediaController.register_controller(self.displayController) - self.plugin.mediaController.set_controls_visible(self.displayController, - False) - self.displayController.previewDisplay = Display(self.displayController, - False, self.displayController) + self.plugin.mediaController.set_controls_visible(self.displayController, False) + self.displayController.previewDisplay = Display(self.displayController, False, self.displayController) self.displayController.previewDisplay.hide() - self.displayController.previewDisplay.setGeometry( - QtCore.QRect(0, 0, 300, 300)) - self.displayController.previewDisplay.screen = \ - {u'size':self.displayController.previewDisplay.geometry()} + self.displayController.previewDisplay.setGeometry(QtCore.QRect(0, 0, 300, 300)) + self.displayController.previewDisplay.screen = {u'size':self.displayController.previewDisplay.geometry()} self.displayController.previewDisplay.setup() - self.plugin.mediaController.setup_display( - self.displayController.previewDisplay, False) + self.plugin.mediaController.setup_display(self.displayController.previewDisplay, False) QtCore.QObject.connect(Receiver.get_receiver(), - QtCore.SIGNAL(u'video_background_replaced'), - self.videobackgroundReplaced) - QtCore.QObject.connect(Receiver.get_receiver(), - QtCore.SIGNAL(u'mediaitem_media_rebuild'), self.rebuild_players) - QtCore.QObject.connect(Receiver.get_receiver(), - QtCore.SIGNAL(u'config_screen_changed'), self.displaySetup) + QtCore.SIGNAL(u'video_background_replaced'), self.videobackgroundReplaced) + QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'mediaitem_media_rebuild'), self.rebuild_players) + QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'config_screen_changed'), self.displaySetup) # Allow DnD from the desktop self.listView.activateDnD() @@ -96,8 +86,7 @@ class MediaMediaItem(MediaManagerItem): self.resetAction.setText(UiStrings().ResetBG) self.resetAction.setToolTip(UiStrings().ResetLiveBG) self.automatic = UiStrings().Automatic - self.displayTypeLabel.setText( - translate('MediaPlugin.MediaItem', 'Use Player:')) + self.displayTypeLabel.setText(translate('MediaPlugin.MediaItem', 'Use Player:')) self.rebuild_players() def requiredIcons(self): @@ -112,11 +101,10 @@ class MediaMediaItem(MediaManagerItem): def addEndHeaderBar(self): # Replace backgrounds do not work at present so remove functionality. - self.replaceAction = self.toolbar.addToolbarAction(u'replaceAction', - icon=u':/slides/slide_blank.png', triggers=self.onReplaceClick) - self.resetAction = self.toolbar.addToolbarAction(u'resetAction', - icon=u':/system/system_close.png', visible=False, - triggers=self.onResetClick) + self.replaceAction = self.toolbar.addToolbarAction(u'replaceAction', icon=u':/slides/slide_blank.png', + triggers=self.onReplaceClick) + self.resetAction = self.toolbar.addToolbarAction(u'resetAction', icon=u':/system/system_close.png', + visible=False, triggers=self.onResetClick) self.mediaWidget = QtGui.QWidget(self) self.mediaWidget.setObjectName(u'mediaWidget') self.displayLayout = QtGui.QFormLayout(self.mediaWidget) @@ -124,15 +112,12 @@ class MediaMediaItem(MediaManagerItem): self.displayLayout.setObjectName(u'displayLayout') self.displayTypeLabel = QtGui.QLabel(self.mediaWidget) self.displayTypeLabel.setObjectName(u'displayTypeLabel') - self.displayTypeComboBox = create_horizontal_adjusting_combo_box( - self.mediaWidget, u'displayTypeComboBox') + self.displayTypeComboBox = create_horizontal_adjusting_combo_box(self.mediaWidget, u'displayTypeComboBox') self.displayTypeLabel.setBuddy(self.displayTypeComboBox) - self.displayLayout.addRow(self.displayTypeLabel, - self.displayTypeComboBox) + self.displayLayout.addRow(self.displayTypeLabel, self.displayTypeComboBox) # Add the Media widget to the page layout self.pageLayout.addWidget(self.mediaWidget) - QtCore.QObject.connect(self.displayTypeComboBox, - QtCore.SIGNAL(u'currentIndexChanged (int)'), + QtCore.QObject.connect(self.displayTypeComboBox, QtCore.SIGNAL(u'currentIndexChanged (int)'), self.overridePlayerChanged) def overridePlayerChanged(self, index): @@ -171,19 +156,16 @@ class MediaMediaItem(MediaManagerItem): service_item.shortname = service_item.title (path, name) = os.path.split(filename) service_item.add_from_command(path, name,CLAPPERBOARD) - if self.plugin.liveController.mediaController.video( - DisplayControllerType.Live, service_item, + if self.plugin.liveController.mediaController.video(DisplayControllerType.Live, service_item, videoBehindText=True): self.resetAction.setVisible(True) else: critical_error_message_box(UiStrings().LiveBGError, - translate('MediaPlugin.MediaItem', - 'There was no display item to amend.')) + translate('MediaPlugin.MediaItem', 'There was no display item to amend.')) else: critical_error_message_box(UiStrings().LiveBGError, unicode(translate('MediaPlugin.MediaItem', - 'There was a problem replacing your background, ' - 'the media file "%s" no longer exists.')) % filename) + 'There was a problem replacing your background, the media file "%s" no longer exists.')) % filename) def generateSlideData(self, service_item, item=None, xmlVersion=False, remote=False, context=ServiceItemContext.Live): @@ -197,8 +179,7 @@ class MediaMediaItem(MediaManagerItem): # File is no longer present critical_error_message_box( translate('MediaPlugin.MediaItem', 'Missing Media File'), - unicode(translate('MediaPlugin.MediaItem', - 'The file %s no longer exists.')) % filename) + unicode(translate('MediaPlugin.MediaItem', 'The file %s no longer exists.')) % filename) return False service_item.title = unicode(self.displayTypeComboBox.currentText()) service_item.shortname = service_item.title @@ -213,8 +194,7 @@ class MediaMediaItem(MediaManagerItem): service_item.add_capability(ItemCapabilities.RequiresMedia) service_item.add_capability(ItemCapabilities.HasDetailedTitleDisplay) if Settings().value(self.settingsSection + u'/media auto start', - QtCore.QVariant(QtCore.Qt.Unchecked)).toInt()[0]\ - == QtCore.Qt.Checked: + QtCore.QVariant(QtCore.Qt.Unchecked)).toInt()[0] == QtCore.Qt.Checked: service_item.will_auto_start = True # force a non-existent theme service_item.theme = -1 @@ -232,22 +212,19 @@ class MediaMediaItem(MediaManagerItem): the settings """ self.populateDisplayTypes() - self.onNewFileMasks = unicode(translate('MediaPlugin.MediaItem', - 'Videos (%s);;Audio (%s);;%s (*)')) % ( + self.onNewFileMasks = unicode(translate('MediaPlugin.MediaItem', 'Videos (%s);;Audio (%s);;%s (*)')) % ( u' '.join(self.plugin.mediaController.video_extensions_list), - u' '.join(self.plugin.mediaController.audio_extensions_list), - UiStrings().AllFiles) + u' '.join(self.plugin.mediaController.audio_extensions_list), UiStrings().AllFiles) def displaySetup(self): - self.plugin.mediaController.setup_display( - self.displayController.previewDisplay, False) + self.plugin.mediaController.setup_display(self.displayController.previewDisplay, False) def populateDisplayTypes(self): """ Load the combobox with the enabled media players, allowing user to select a specific player if settings allow """ - # block signals to avoid unnecessary overridePlayerChanged Signales + # block signals to avoid unnecessary overridePlayerChanged Signals # while combo box creation self.displayTypeComboBox.blockSignals(True) self.displayTypeComboBox.clear() @@ -273,7 +250,7 @@ class MediaMediaItem(MediaManagerItem): Remove a media item from the list. """ if check_item_selected(self.listView, translate('MediaPlugin.MediaItem', - 'You must select a media file to delete.')): + 'You must select a media file to delete.')): row_list = [item.row() for item in self.listView.selectedIndexes()] row_list.sort(reverse=True) for row in row_list: @@ -284,8 +261,7 @@ class MediaMediaItem(MediaManagerItem): def loadList(self, media): # Sort the media by its filename considering language specific # characters. - media.sort(cmp=locale_compare, - key=lambda filename: os.path.split(unicode(filename))[1]) + media.sort(cmp=locale_compare, key=lambda filename: os.path.split(unicode(filename))[1]) for track in media: track_info = QtCore.QFileInfo(track) if not os.path.exists(track): @@ -296,8 +272,7 @@ class MediaMediaItem(MediaManagerItem): elif track_info.isFile(): filename = os.path.split(unicode(track))[1] item_name = QtGui.QListWidgetItem(filename) - if u'*.%s' % (filename.split(u'.')[-1].lower()) in \ - self.plugin.mediaController.audio_extensions_list: + if u'*.%s' % (filename.split(u'.')[-1].lower()) in self.plugin.mediaController.audio_extensions_list: item_name.setIcon(AUDIO) else: item_name.setIcon(VIDEO) @@ -312,8 +287,7 @@ class MediaMediaItem(MediaManagerItem): def getList(self, type=MediaType.Audio): media = SettingsManager.load_list(self.settingsSection, u'media') - media.sort(cmp=locale_compare, - key=lambda filename: os.path.split(unicode(filename))[1]) + media.sort(cmp=locale_compare, key=lambda filename: os.path.split(unicode(filename))[1]) ext = [] if type == MediaType.Audio: ext = self.plugin.mediaController.audio_extensions_list diff --git a/openlp/plugins/media/lib/mediatab.py b/openlp/plugins/media/lib/mediatab.py index 8de5171e7..934737afd 100644 --- a/openlp/plugins/media/lib/mediatab.py +++ b/openlp/plugins/media/lib/mediatab.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 ############################################################################### # OpenLP - Open Source Lyrics Projection # @@ -69,34 +69,24 @@ class MediaTab(SettingsTab): def retranslateUi(self): self.advancedGroupBox.setTitle(UiStrings().Advanced) - self.overridePlayerCheckBox.setText( - translate('MediaPlugin.MediaTab', - 'Allow media player to be overridden')) - self.autoStartCheckBox.setText( - translate('MediaPlugin.MediaTab', - 'Start Live items automatically')) + self.overridePlayerCheckBox.setText(translate('MediaPlugin.MediaTab', 'Allow media player to be overridden')) + self.autoStartCheckBox.setText(translate('MediaPlugin.MediaTab', 'Start Live items automatically')) def load(self): - self.overridePlayerCheckBox.setChecked(Settings().value( - self.settingsSection + u'/override player', + self.overridePlayerCheckBox.setChecked(Settings().value(self.settingsSection + u'/override player', QtCore.QVariant(QtCore.Qt.Unchecked)).toInt()[0]) - self.autoStartCheckBox.setChecked(Settings().value( - self.settingsSection + u'/media auto start', + self.autoStartCheckBox.setChecked(Settings().value(self.settingsSection + u'/media auto start', QtCore.QVariant(QtCore.Qt.Unchecked)).toInt()[0]) def save(self): override_changed = False setting_key = self.settingsSection + u'/override player' - if Settings().value(setting_key).toInt()[0] != \ - self.overridePlayerCheckBox.checkState(): - Settings().setValue(setting_key, - QtCore.QVariant(self.overridePlayerCheckBox.checkState())) + if Settings().value(setting_key).toInt()[0] != self.overridePlayerCheckBox.checkState(): + Settings().setValue(setting_key, QtCore.QVariant(self.overridePlayerCheckBox.checkState())) override_changed = True setting_key = self.settingsSection + u'/media auto start' - if Settings().value(setting_key).toInt()[0] !=\ - self.autoStartCheckBox.checkState(): - Settings().setValue(setting_key, - QtCore.QVariant(self.autoStartCheckBox.checkState())) + if Settings().value(setting_key).toInt()[0] != self.autoStartCheckBox.checkState(): + Settings().setValue(setting_key, QtCore.QVariant(self.autoStartCheckBox.checkState())) if override_changed: self.parent.resetSupportedSuffixes() Receiver.send_message(u'mediaitem_media_rebuild') diff --git a/openlp/plugins/media/mediaplugin.py b/openlp/plugins/media/mediaplugin.py index a143756b2..2c8a77259 100644 --- a/openlp/plugins/media/mediaplugin.py +++ b/openlp/plugins/media/mediaplugin.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 ############################################################################### # OpenLP - Open Source Lyrics Projection # @@ -41,8 +41,7 @@ class MediaPlugin(Plugin): log.info(u'%s MediaPlugin loaded', __name__) def __init__(self, plugin_helpers): - Plugin.__init__(self, u'media', plugin_helpers, - MediaMediaItem) + Plugin.__init__(self, u'media', plugin_helpers, MediaMediaItem) self.weight = -6 self.iconPath = u':/plugins/plugin_media.png' self.icon = build_icon(self.iconPath) @@ -54,8 +53,7 @@ class MediaPlugin(Plugin): Create the settings Tab """ visible_name = self.getString(StringContent.VisibleName) - self.settingsTab = MediaTab(parent, self.name, visible_name[u'title'], - self.iconPath) + self.settingsTab = MediaTab(parent, self.name, visible_name[u'title'], self.iconPath) def about(self): about_text = translate('MediaPlugin', 'Media Plugin' @@ -84,8 +82,7 @@ class MediaPlugin(Plugin): u'delete': translate('MediaPlugin', 'Delete the selected media.'), u'preview': translate('MediaPlugin', 'Preview the selected media.'), u'live': translate('MediaPlugin', 'Send the selected media live.'), - u'service': translate('MediaPlugin', - 'Add the selected media to the service.') + u'service': translate('MediaPlugin', 'Add the selected media to the service.') } self.setPluginUiTextStrings(tooltips) @@ -131,12 +128,10 @@ class MediaPlugin(Plugin): log.debug(u'Converting old setting to new setting') new_players = [] if players: - new_players = [player for player in players \ - if player != u'phonon'] + new_players = [player for player in players if player != u'phonon'] new_players.insert(0, u'phonon') self.mediaController.mediaPlayers[u'phonon'].isActive = True - settings.setValue(u'players', \ - QtCore.QVariant(u','.join(new_players))) + settings.setValue(u'players', QtCore.QVariant(u','.join(new_players))) self.settingsTab.load() settings.remove(u'use phonon') settings.endGroup()