raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Documentation

Browse Source
This commit is contained in:
Tim Bentley 2012-11-01 16:54:37 +00:00
parent b01fd0b293
commit a91dc027d2
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openlp/core/ui/media/mediacontroller.py
View File

@ -47,6 +47,14 @@ class MediaController(object):
""" """
The implementation of the Media Controller. The Media Controller adds an own The implementation of the Media Controller. The Media Controller adds an own
class for every Player. Currently these are QtWebkit, Phonon and Vlc. 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): def __init__(self, parent):

4
openlp/core/ui/servicemanager.py
View File

@ -709,7 +709,9 @@ class ServiceManager(QtGui.QWidget):
directory = unicode(SettingsManager.get_last_dir( directory = unicode(SettingsManager.get_last_dir(
self.mainwindow.serviceManagerSettingsSection)) self.mainwindow.serviceManagerSettingsSection))
path = os.path.join(directory, default_filename) 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( fileName = unicode(QtGui.QFileDialog.getSaveFileName(
self.mainwindow, UiStrings().SaveService, path, self.mainwindow, UiStrings().SaveService, path,
translate('OpenLP.ServiceManager', translate('OpenLP.ServiceManager',