openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/bug-789046 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #789046 in OpenLP: "If global theme level, theme combo box in service manager should be hidden"
  https://bugs.launchpad.net/openlp/+bug/789046

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/bug-789046/+merge/64314

Fixed bug #789046 and cleaned up one or two other things.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/bug-789046/+merge/64314
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/bug-789046 into lp:openlp.

=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py	2011-06-09 22:03:30 +0000
+++ openlp/core/ui/mainwindow.py	2011-06-11 21:08:36 +0000
@@ -483,7 +483,7 @@
         pluginpath = AppLocation.get_directory(AppLocation.PluginsDir)
         self.pluginManager = PluginManager(pluginpath)
         self.pluginHelpers = {}
-        self.image_manager = ImageManager()
+        self.imageManager = ImageManager()
         # Set up the interface
         self.setupUi(self)
         # Load settings after setupUi so default UI sizes are overwritten
@@ -552,7 +552,7 @@
         # warning cyclic dependency
         # renderer needs to call ThemeManager and
         # ThemeManager needs to call Renderer
-        self.renderer = Renderer(self.image_manager, self.themeManagerContents)
+        self.renderer = Renderer(self.imageManager, self.themeManagerContents)
         # Define the media Dock Manager
         self.mediaDockManager = MediaDockManager(self.mediaToolBox)
         log.info(u'Load Plugins')
@@ -598,6 +598,9 @@
         # Once all components are initialised load the Themes
         log.info(u'Load Themes')
         self.themeManagerContents.loadThemes(True)
+        # Hide/show the theme combobox on the service manager
+        Receiver.send_message(u'theme_update_global')
+        # Reset the cursor
         Receiver.send_message(u'cursor_normal')
 
     def setAutoLanguage(self, value):
@@ -652,13 +655,14 @@
             self.modeLiveItem.setChecked(True)
 
     def appStartup(self):
-        # Give all the plugins a chance to perform some tasks at startup
+        """
+        Give all the plugins a chance to perform some tasks at startup
+        """
         Receiver.send_message(u'openlp_process_events')
         for plugin in self.pluginManager.plugins:
             if plugin.isActive():
-                Receiver.send_message(u'openlp_process_events')
                 plugin.appStartup()
-        Receiver.send_message(u'openlp_process_events')
+                Receiver.send_message(u'openlp_process_events')
 
     def firstTime(self):
         # Import themes if first time
@@ -809,7 +813,7 @@
         """
         log.debug(u'screenChanged')
         Receiver.send_message(u'cursor_busy')
-        self.image_manager.update_display()
+        self.imageManager.update_display()
         self.renderer.update_display()
         self.previewController.screenSizeChanged()
         self.liveController.screenSizeChanged()

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2011-06-08 21:39:07 +0000
+++ openlp/core/ui/slidecontroller.py	2011-06-11 21:08:36 +0000
@@ -63,7 +63,7 @@
         self.screens = ScreenList.get_instance()
         self.ratio = float(self.screens.current[u'size'].width()) / \
             float(self.screens.current[u'size'].height())
-        self.image_manager = self.parent().image_manager
+        self.imageManager = self.parent().imageManager
         self.loopList = [
             u'Play Slides Menu',
             u'Loop Separator',
@@ -425,7 +425,7 @@
         # rebuild display as screen size changed
         if self.display:
             self.display.close()
-        self.display = MainDisplay(self, self.image_manager, self.isLive)
+        self.display = MainDisplay(self, self.imageManager, self.isLive)
         self.display.alertTab = self.alertTab
         self.display.setup()
         if self.isLive:
@@ -632,8 +632,8 @@
                     # If current slide set background to image
                     if framenumber == slideno:
                         self.serviceItem.bg_image_bytes = \
-                            self.image_manager.get_image_bytes(frame[u'title'])
-                    image = self.image_manager.get_image(frame[u'title'])
+                            self.imageManager.get_image_bytes(frame[u'title'])
+                    image = self.imageManager.get_image(frame[u'title'])
                 label.setPixmap(QtGui.QPixmap.fromImage(image))
                 self.previewListWidget.setCellWidget(framenumber, 0, label)
                 slideHeight = width * self.parent().renderer.screen_ratio