From 5ee12ff1c0c1497199fb80064e8c98642b3cf90a Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Mon, 4 Mar 2013 18:01:57 +0000 Subject: [PATCH 1/2] Fix bug from bootstrap merge --- openlp/core/ui/mainwindow.py | 3 --- openlp/core/ui/media/mediacontroller.py | 2 +- openlp/core/ui/slidecontroller.py | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index d9bd364f9..07e189fda 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -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') diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index 301e48f1a..eaa802c21 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -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`` diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 9287c6f12..5cad8b1cd 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -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()) From bb48e35c5ffbeb74507605a6d3d628ccf590e4a1 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Mon, 4 Mar 2013 19:35:33 +0000 Subject: [PATCH 2/2] Fix theme load bug --- openlp/core/ui/thememanager.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index f2973f2cf..2c0ef310b 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -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()