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

Plug item

Browse Source
This commit is contained in:
Tim Bentley 2015-10-16 17:26:01 +01:00
parent a5b8827c96
commit 742e0c912b
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openlp/core/lib/plugin.py
View File

@ -288,13 +288,7 @@ class Plugin(QtCore.QObject, RegistryProperties):
""" """
Perform tasks on application startup Perform tasks on application startup
""" """
# FIXME: Remove after 2.2 release. pass
# This is needed to load the list of media/presentation from the config saved before the settings rewrite.
if self.media_item_class is not None and self.name != 'images':
loaded_list = Settings().get_files_from_config(self)
# Now save the list to the config using our Settings class.
if loaded_list:
Settings().setValue('%s/%s files' % (self.settings_section, self.name), loaded_list)
def uses_theme(self, theme): def uses_theme(self, theme):
""" """

7
openlp/core/lib/serviceitem.py
View File

@ -129,7 +129,7 @@ class ItemCapabilities(object):
OnLoadUpdate = 8 OnLoadUpdate = 8
AddIfNewItem = 9 AddIfNewItem = 9
ProvidesOwnDisplay = 10 ProvidesOwnDisplay = 10
HasDetailedTitleDisplay = 11 #HasDetailedTitleDisplay = 11
HasVariableStartTime = 12 HasVariableStartTime = 12
CanSoftBreak = 13 CanSoftBreak = 13
CanWordSplit = 14 CanWordSplit = 14
@ -415,11 +415,6 @@ class ServiceItem(RegistryProperties):
self.will_auto_start = header.get('will_auto_start', False) self.will_auto_start = header.get('will_auto_start', False)
self.processor = header.get('processor', None) self.processor = header.get('processor', None)
self.has_original_files = True self.has_original_files = True
# TODO: Remove me in 2,3 build phase
if self.is_capable(ItemCapabilities.HasDetailedTitleDisplay):
self.capabilities.remove(ItemCapabilities.HasDetailedTitleDisplay)
self.processor = self.title
self.title = None
if 'background_audio' in header: if 'background_audio' in header:
self.background_audio = [] self.background_audio = []
for filename in header['background_audio']: for filename in header['background_audio']: