forked from openlp/openlp
r2198
This commit is contained in:
commit
a4f4ef0d7d
@ -536,9 +536,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
||||
Registry().register_function(u'openlp_version_check', self.version_notice)
|
||||
Registry().register_function(u'config_screen_changed', self.screen_changed)
|
||||
self.renderer = Renderer()
|
||||
# Create the displays as all necessary components are loaded.
|
||||
self.preview_controller.screenSizeChanged()
|
||||
self.live_controller.screenSizeChanged()
|
||||
log.info(u'Load data from Settings')
|
||||
if Settings().value(u'advanced/save current plugin'):
|
||||
savedPlugin = Settings().value(u'advanced/current media plugin')
|
||||
|
@ -309,7 +309,7 @@ class MediaController(object):
|
||||
|
||||
def setup_display(self, display, preview):
|
||||
"""
|
||||
After a new display is configured, all media related widget will be
|
||||
After a new display is configured, all media related widgets will be
|
||||
created too
|
||||
|
||||
``display``
|
||||
|
@ -87,6 +87,7 @@ class SlideController(DisplayController):
|
||||
Set up the Slide Controller.
|
||||
"""
|
||||
DisplayController.__init__(self, parent, isLive)
|
||||
Registry().register_function(u'bootstrap_post_set_up', self.screenSizeChanged)
|
||||
self.screens = ScreenList()
|
||||
try:
|
||||
self.ratio = float(self.screens.current[u'size'].width()) / float(self.screens.current[u'size'].height())
|
||||
|
@ -280,8 +280,7 @@ class ThemeManager(QtGui.QWidget):
|
||||
save_to = None
|
||||
save_from = None
|
||||
if theme_data.background_type == u'image':
|
||||
save_to = os.path.join(self.path, new_theme_name,
|
||||
os.path.split(unicode(theme_data.background_filename))[1])
|
||||
save_to = os.path.join(self.path, new_theme_name, os.path.split(unicode(theme_data.background_filename))[1])
|
||||
save_from = theme_data.background_filename
|
||||
theme_data.theme_name = new_theme_name
|
||||
theme_data.extend_image_filename(self.path)
|
||||
@ -407,7 +406,7 @@ class ThemeManager(QtGui.QWidget):
|
||||
theme_file = os.path.join(self.path, theme_file)
|
||||
self.unzip_theme(theme_file, self.path)
|
||||
delete_file(theme_file)
|
||||
files = AppLocation.get_files(self.settingsSection, u'.otz')
|
||||
files = AppLocation.get_files(self.settingsSection, u'.png')
|
||||
# No themes have been found so create one
|
||||
if not files:
|
||||
theme = ThemeXML()
|
||||
|
Loading…
Reference in New Issue
Block a user