Slide Controller rewrite complete

openlp/core/lib/eventreceiver.py

@@ -29,27 +29,31 @@ class EventReceiver(QtCore.QObject):
 
     ``stop_import``
         Stops the Bible Import
+
     ``pre_load_bibles``
         Triggers the plugin to relaod the bible lists
+
     ``process_events``
         Requests the Application to flush the events queue
-    ``{preview|live}_slide_first``
-        display the first slide on the list
-    ``{preview|live}_slide_previous``
-        display the previous slide on the list
-    ``{preview|live}_slide_next``
-        display the next slide on the list
-    ``{preview|live}_slide_last``
-        display the last slide on the list
+
     ``{plugin}_add_service_item ``
         ask the plugin to push the selected items to the service item
+
     ``update_themes ``
         send out message with new themes
+
     ``update_global_theme ``
         Tell the components we have a new global theme
+
     ``load_song_list``
         Tells the the song plugin to reload the song list
 
+    ``update_spin_delay``
+        Pushes out the Image loop delay
+
+    ``request_spin_delay``
+        Requests a spin delay
+
     """
     global log
     log = logging.getLogger(u'EventReceiver')

openlp/core/lib/settingstab.py

@@ -93,3 +93,9 @@ class SettingsTab(QtGui.QWidget):
         Save settings to disk.
         """
         pass
+
+    def postSetUp(self):
+        """
+        Changes which need to be made after setup of application
+        """
+        pass

openlp/core/ui/mainwindow.py

@@ -313,8 +313,6 @@ class Ui_MainWindow(object):
             translate(u'mainWindow', u'Service Manager'))
         self.ThemeManagerDock.setWindowTitle(
             translate(u'mainWindow', u'Theme Manager'))
-        self.DefaultThemeLabel.setText(MainWindow.defaultThemeText + \
-            self.ThemeManagerContents.getDefault())
         self.FileNewItem.setText(translate(u'mainWindow', u'&New'))
         self.FileNewItem.setToolTip(translate(u'mainWindow', u'New Service'))
         self.FileNewItem.setStatusTip(
@@ -492,6 +490,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         # Once all components are initialised load the Themes
         log.info(u'Load Themes')
         self.ThemeManagerContents.loadThemes()
+        log.info(u'Load data from Settings')
+        self.settingsForm.postSetUp()
 
     def getMonitorNumber(self):
         """

openlp/core/ui/settingsform.py

@@ -51,3 +51,7 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
         for tab_index in range(0, self.SettingsTabWidget.count()):
             self.SettingsTabWidget.widget(tab_index).save()
         return QtGui.QDialog.accept(self)
+
+    def postSetUp(self):
+        for tab_index in range(0, self.SettingsTabWidget.count()):
+            self.SettingsTabWidget.widget(tab_index).postSetUp()

openlp/core/ui/slidecontroller.py

@@ -139,7 +139,6 @@ class SlideController(QtGui.QWidget):
                 self.onStopLoop)
             self.DelaySpinBox = QtGui.QSpinBox()
             self.Toolbar.addToolbarWidget(u'Image SpinBox', self.DelaySpinBox)
-            #self.DelaySpinBox.setValue(self.parent.parent.ImageTab.loop_delay)
             self.DelaySpinBox.setSuffix(translate(u'SlideController', u's'))
 
         self.ControllerLayout.addWidget(self.Toolbar)
@@ -182,11 +181,18 @@ class SlideController(QtGui.QWidget):
             QtCore.SIGNAL(u'clicked(QModelIndex)'), self.onSlideSelected)
         QtCore.QObject.connect(self.PreviewListWidget,
             QtCore.SIGNAL(u'activated(QModelIndex)'), self.onSlideSelected)
+        if isLive:
+            QtCore.QObject.connect(Receiver.get_receiver(),
+                QtCore.SIGNAL(u'update_spin_delay'), self.receiveSpinDelay)
+            Receiver().send_message(u'request_spin_delay')
         if isLive:
             self.Toolbar.makeWidgetsInvisible(self.image_list)
         else:
             pass
 
+    def receiveSpinDelay(self, value):
+        self.DelaySpinBox.setValue(int(value))
+
     def enableToolBar(self, item):
         """
         Allows the toolbars to be reconfigured based on Controller Type

openlp/core/ui/thememanager.py

@@ -85,9 +85,6 @@ class ThemeManager(QtGui.QWidget):
         self.servicePath = self.config.get_data_path()
         self.global_theme = unicode(self.config.get_config(u'theme global theme', u''))
 
-    def getDefault(self):
-        return self.global_theme
-
     def changeGlobalFromTab(self, themeName):
         log.debug(u'changeGlobalFromTab %s', themeName)
         for count in range (0,  self.ThemeListWidget.count()):

openlp/core/ui/themestab.py

@@ -124,6 +124,9 @@ class ThemesTab(SettingsTab):
         self.config.set_config(u'theme global theme',self.global_theme)
         Receiver().send_message(u'update_global_theme',  self.global_theme )
 
+    def postSetUp(self):
+        Receiver().send_message(u'update_global_theme',  self.global_theme )
+
     def onSongLevelButtonPressed(self):
         self.global_style= u'Song'
         self.parent.RenderManager.set_global_theme(self.global_theme, self.global_style)

openlp/plugins/images/lib/imagetab.py

@@ -20,7 +20,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SettingsTab,  str_to_bool,  translate
+from openlp.core.lib import SettingsTab,  str_to_bool,  translate,  Receiver
 
 class ImageTab(SettingsTab):
     """
@@ -67,3 +67,7 @@ class ImageTab(SettingsTab):
 
     def save(self):
         self.config.set_config(u'loop delay', self.loop_delay)
+        Receiver().send_message(u'update_spin_delay',  self.loop_delay )
+
+    def postSetUp(self):
+        Receiver().send_message(u'update_spin_delay',  self.loop_delay )