From a91dc027d23d97166eae515c380c9cfe95bd26bd Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Thu, 1 Nov 2012 16:54:37 +0000 Subject: [PATCH] Documentation --- openlp/core/ui/media/mediacontroller.py | 8 ++++++++ openlp/core/ui/servicemanager.py | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index 0f41eb8fb..3ef662fa2 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -47,6 +47,14 @@ class MediaController(object): """ The implementation of the Media Controller. The Media Controller adds an own class for every Player. Currently these are QtWebkit, Phonon and Vlc. + + displayControllers are an array of controllers keyed on the + slidecontroller or plugin which built them. ControllerType is the class + containing the keys. + + mediaPlayers are an array of media players keyed on player name + + currentMediaPlayer is an array of player instances keyed on fix me. """ def __init__(self, parent): diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 9ea908f0c..109b86ac9 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -709,7 +709,9 @@ class ServiceManager(QtGui.QWidget): directory = unicode(SettingsManager.get_last_dir( self.mainwindow.serviceManagerSettingsSection)) path = os.path.join(directory, default_filename) - if self._fileName.endswith(u'oszl'): + # SaveAs from osz to oszl is not valid as the files will be deleted + # on exit which is not sensible or usable in the long term. + if self._fileName.endswith(u'oszl') or not self._fileName: fileName = unicode(QtGui.QFileDialog.getSaveFileName( self.mainwindow, UiStrings().SaveService, path, translate('OpenLP.ServiceManager',