Clean ups

This commit is contained in:
Tim Bentley 2012-11-26 17:57:36 +00:00
parent d538a32f49
commit cf0bb94b3f
7 changed files with 10 additions and 10 deletions

View File

@ -109,7 +109,7 @@ class UiStrings(object):
self.NISs = translate('OpenLP.Ui', 'No Item Selected', 'Singular') self.NISs = translate('OpenLP.Ui', 'No Item Selected', 'Singular')
self.NISp = translate('OpenLP.Ui', 'No Items Selected', 'Plural') self.NISp = translate('OpenLP.Ui', 'No Items Selected', 'Plural')
self.OLPV1 = translate('OpenLP.Ui', 'openlp.org 1.x') self.OLPV1 = translate('OpenLP.Ui', 'openlp.org 1.x')
self.OLPV2 = translate('OpenLP.Ui', 'OpenLP 2.0') self.OLPV2 = translate('OpenLP.Ui', 'OpenLP 2.1')
self.OpenLPStart = translate('OpenLP.Ui', 'OpenLP is already running. ' self.OpenLPStart = translate('OpenLP.Ui', 'OpenLP is already running. '
'Do you wish to continue?') 'Do you wish to continue?')
self.OpenService = translate('OpenLP.Ui', 'Open service.') self.OpenService = translate('OpenLP.Ui', 'Open service.')

View File

@ -92,7 +92,7 @@ class MediaController(object):
QtCore.QObject.connect(Receiver.get_receiver(), QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'mediaitem_media_rebuild'), self._set_active_players) QtCore.SIGNAL(u'mediaitem_media_rebuild'), self._set_active_players)
QtCore.QObject.connect(Receiver.get_receiver(), QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'mediaitem_suffexes'), QtCore.SIGNAL(u'mediaitem_suffixes'),
self._generate_extensions_lists) self._generate_extensions_lists)
def _set_active_players(self): def _set_active_players(self):

View File

@ -386,7 +386,7 @@ class ServiceManager(QtGui.QWidget):
def resetSupportedSuffixes(self): def resetSupportedSuffixes(self):
""" """
Resets the Suffexes list. Resets the Suffixes list.
""" """
self.suffixes = [] self.suffixes = []

View File

@ -99,7 +99,7 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
""" """
Process the form saving the settings Process the form saving the settings
""" """
self.resetSuffexes = True self.resetSuffixes = True
for tabIndex in range(self.stackedLayout.count()): for tabIndex in range(self.stackedLayout.count()):
self.stackedLayout.widget(tabIndex).save() self.stackedLayout.widget(tabIndex).save()
# Must go after all settings are save # Must go after all settings are save
@ -135,10 +135,10 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
def resetSupportedSuffixes(self): def resetSupportedSuffixes(self):
""" """
Control the resetting of the serviceManager suffex list as can be Control the resetting of the serviceManager suffix list as can be
called by a number of settings tab and only needs to be called once called by a number of settings tab and only needs to be called once
per save. per save.
""" """
if self.resetSuffexes: if self.resetSuffixes:
self.mainWindow.serviceManagerContents.resetSupportedSuffixes() self.mainWindow.serviceManagerContents.resetSupportedSuffixes()
self.resetSuffexes = False self.resetSuffixes = False

View File

@ -100,4 +100,4 @@ class MediaTab(SettingsTab):
if override_changed: if override_changed:
self.parent.resetSupportedSuffixes() self.parent.resetSupportedSuffixes()
Receiver.send_message(u'mediaitem_media_rebuild') Receiver.send_message(u'mediaitem_media_rebuild')
Receiver.send_message(u'mediaitem_suffexes') Receiver.send_message(u'mediaitem_suffixes')

View File

@ -67,7 +67,7 @@ class PresentationMediaItem(MediaManagerItem):
QtCore.SIGNAL(u'mediaitem_presentation_rebuild'), QtCore.SIGNAL(u'mediaitem_presentation_rebuild'),
self.populateDisplayTypes) self.populateDisplayTypes)
QtCore.QObject.connect(Receiver.get_receiver(), QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'mediaitem_suffexes'), self.buildFileMaskString) QtCore.SIGNAL(u'mediaitem_suffixes'), self.buildFileMaskString)
# Allow DnD from the desktop # Allow DnD from the desktop
self.listView.activateDnD() self.listView.activateDnD()

View File

@ -145,7 +145,7 @@ class PresentationTab(SettingsTab):
if changed: if changed:
self.parent.resetSupportedSuffixes() self.parent.resetSupportedSuffixes()
Receiver.send_message(u'mediaitem_presentation_rebuild') Receiver.send_message(u'mediaitem_presentation_rebuild')
Receiver.send_message(u'mediaitem_suffexes') Receiver.send_message(u'mediaitem_suffixes')
def tabVisible(self): def tabVisible(self):
""" """