openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/random-regression-bugs into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol/openlp/random-regression-bugs/+merge/155175

- fixed regression in bible manager
- fixed wrong Registry usage
- fixed method/argument renames
-- 
https://code.launchpad.net/~googol/openlp/random-regression-bugs/+merge/155175
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/random-regression-bugs into lp:openlp.

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2013-03-10 20:19:42 +0000
+++ openlp/core/ui/maindisplay.py	2013-03-25 07:18:28 +0000
@@ -175,7 +175,7 @@
         We need to rebuild the CSS on the live display.
         """
         for plugin in self.plugin_manager.plugins:
-            plugin.refreshCss(self.frame)
+            plugin.refresh_css(self.frame)
 
     def retranslateUi(self):
         """

=== modified file 'openlp/plugins/alerts/alertsplugin.py'
--- openlp/plugins/alerts/alertsplugin.py	2013-03-19 19:43:22 +0000
+++ openlp/plugins/alerts/alertsplugin.py	2013-03-25 07:18:28 +0000
@@ -225,7 +225,7 @@
         ``frame``
             The Web frame holding the page.
         """
-        align = VerticalType.Names[self.settingsTab.location]
+        align = VerticalType.Names[self.settings_tab.location]
         frame.evaluateJavaScript(u'update_css("%s", "%s", "%s", "%s", "%s")' %
-            (align, self.settingsTab.font_face, self.settingsTab.font_size,
-            self.settingsTab.font_color, self.settingsTab.background_color))
+            (align, self.settings_tab.font_face, self.settings_tab.font_size,
+            self.settings_tab.font_color, self.settings_tab.background_color))

=== modified file 'openlp/plugins/alerts/lib/alertsmanager.py'
--- openlp/plugins/alerts/lib/alertsmanager.py	2013-02-16 10:40:05 +0000
+++ openlp/plugins/alerts/lib/alertsmanager.py	2013-03-25 07:18:28 +0000
@@ -87,7 +87,7 @@
         if not self.alert_list:
             return
         text = self.alert_list.pop(0)
-        alertTab = self.parent().settingsTab
+        alertTab = self.parent().settings_tab
         self.live_controller.display.alert(text, alertTab.location)
         # Check to see if we have a timer running.
         if self.timer_id == 0:
@@ -103,7 +103,7 @@
         """
         log.debug(u'timer event')
         if event.timerId() == self.timer_id:
-            alertTab = self.parent().settingsTab
+            alertTab = self.parent().settings_tab
             self.live_controller.display.alert(u'', alertTab.location)
         self.killTimer(self.timer_id)
         self.timer_id = 0

=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py	2013-03-19 22:00:50 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py	2013-03-25 07:18:28 +0000
@@ -516,13 +516,13 @@
     def onQuickStyleComboBoxChanged(self):
         self.settings.layout_style = self.quickStyleComboBox.currentIndex()
         self.advancedStyleComboBox.setCurrentIndex(self.settings.layout_style)
-        self.settings.layoutStyleComboBox.setCurrentIndex(self.settings.layout_style)
+        self.settings.layout_style_combo_box.setCurrentIndex(self.settings.layout_style)
         Settings().setValue(self.settings_section + u'/verse layout style', self.settings.layout_style)
 
     def onAdvancedStyleComboBoxChanged(self):
         self.settings.layout_style = self.advancedStyleComboBox.currentIndex()
         self.quickStyleComboBox.setCurrentIndex(self.settings.layout_style)
-        self.settings.layoutStyleComboBox.setCurrentIndex(self.settings.layout_style)
+        self.settings.layout_style_combo_box.setCurrentIndex(self.settings.layout_style)
         Settings().setValue(self.settings_section + u'/verse layout style', self.settings.layout_style)
 
     def onAdvancedVersionComboBox(self):

=== modified file 'openlp/plugins/media/mediaplugin.py'
--- openlp/plugins/media/mediaplugin.py	2013-03-19 20:05:13 +0000
+++ openlp/plugins/media/mediaplugin.py	2013-03-25 07:18:28 +0000
@@ -127,6 +127,7 @@
         Plugin.app_startup(self)
         settings = Settings()
         settings.beginGroup(self.settings_section)
+        # FIXME: Probably broken due to Settings rewrite.
         if settings.contains(u'use phonon'):
             log.info(u'Found old Phonon setting')
             players = self.media_controller.mediaPlayers.keys()
@@ -139,7 +140,7 @@
                 new_players.insert(0, u'phonon')
                 self.media_controller.mediaPlayers[u'phonon'].is_active = True
                 settings.setValue(u'players', u','.join(new_players))
-                self.settingsTab.load()
+                self.settings_tab.load()
             settings.remove(u'use phonon')
         settings.endGroup()
 

=== modified file 'openlp/plugins/remotes/lib/remotetab.py'
--- openlp/plugins/remotes/lib/remotetab.py	2013-03-16 20:52:59 +0000
+++ openlp/plugins/remotes/lib/remotetab.py	2013-03-25 07:18:28 +0000
@@ -150,7 +150,7 @@
         Settings().setValue(self.settings_section + u'/ip address', self.address_edit.text())
         Settings().setValue(self.settings_section + u'/twelve hour', self.twelve_hour)
         if changed:
-            Registry().register_function(u'remotes_config_updated')
+            Registry().execute(u'remotes_config_updated')
 
     def onTwelveHourCheckBoxChanged(self, check_state):
         self.twelve_hour = False