From 5f228a69d101b83d404989b86fb8e8d9e6985ce0 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Wed, 13 Apr 2011 06:12:31 +0100
Subject: [PATCH] Minor fixes and Bible Label corrections

---
 openlp/core/lib/ui.py                  | 3 ++-
 openlp/plugins/bibles/lib/biblestab.py | 3 +--
 openlp/plugins/bibles/lib/mediaitem.py | 7 ++-----
 openlp/plugins/remotes/remoteplugin.py | 3 ++-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/openlp/core/lib/ui.py b/openlp/core/lib/ui.py
index 4f6951d13..fa0bc8afa 100644
--- a/openlp/core/lib/ui.py
+++ b/openlp/core/lib/ui.py
@@ -62,6 +62,7 @@ class UiStrings(object):
     Hours = translate('OpenLP.Ui', 'h', 'The abbreviated unit for hours')
     Image = translate('OpenLP.Ui', 'Image')
     Import = translate('OpenLP.Ui', 'Import')
+    LayoutStyle = translate('OpenLP.Ui', 'Layout style:')
     LengthTime = unicode(translate('OpenLP.Ui', 'Length %s'))
     Live = translate('OpenLP.Ui', 'Live')
     LiveBGError = translate('OpenLP.Ui', 'Live Background Error')
@@ -335,4 +336,4 @@ def find_and_set_in_combo_box(combo_box, value_to_find):
     if index == -1:
         # Not Found.
         index = 0
-    combo_box.setCurrentIndex(index)
\ No newline at end of file
+    combo_box.setCurrentIndex(index)
diff --git a/openlp/plugins/bibles/lib/biblestab.py b/openlp/plugins/bibles/lib/biblestab.py
index c2e05363e..1d87d20cb 100644
--- a/openlp/plugins/bibles/lib/biblestab.py
+++ b/openlp/plugins/bibles/lib/biblestab.py
@@ -118,8 +118,7 @@ class BiblesTab(SettingsTab):
         self.newChaptersCheckBox.setText(
             translate('BiblesPlugin.BiblesTab',
             'Only show new chapter numbers'))
-        self.layoutStyleLabel.setText(
-            translate('BiblesPlugin.BiblesTab', 'Layout style:'))
+        self.layoutStyleLabel.setText(UiStrings.LayoutStyle)
         self.displayStyleLabel.setText(UiStrings.DisplayStyle)
         self.bibleThemeLabel.setText(
             translate('BiblesPlugin.BiblesTab', 'Bible theme:'))
diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 73ed0c9bd..89ca69e33 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -279,7 +279,7 @@ class BibleMediaItem(MediaManagerItem):
             translate('BiblesPlugin.MediaItem', 'Clear'))
         self.advancedClearComboBox.addItem(
             translate('BiblesPlugin.MediaItem', 'Keep'))
-        self.quickLayoutLabel.setText(UiStrings.DisplayStyle)
+        self.quickLayoutLabel.setText(UiStrings.LayoutStyle)
         self.quickLayoutComboBox.setItemText(LayoutStyle.VersePerSlide,
             UiStrings.VersePerSlide)
         self.quickLayoutComboBox.setItemText(LayoutStyle.VersePerLine,
@@ -835,9 +835,6 @@ class BibleMediaItem(MediaManagerItem):
         return u'{su}%s{/su}' % verse_text
 
     def onlayoutStyleComboBoxChanged(self):
-        self.settings.layout_style = self.quickLayoutComboBox.currentIndex()
-        self.settings.layoutStyleComboBox.setCurrentIndex(
-            self.settings.layout_style)
         QtCore.QSettings().setValue(
             self.settingsSection + u'/verse layout style',
-            QtCore.QVariant(self.settings.layout_style))
\ No newline at end of file
+            QtCore.QVariant(self.settings.layout_style))
diff --git a/openlp/plugins/remotes/remoteplugin.py b/openlp/plugins/remotes/remoteplugin.py
index fea9e5170..d3b50e36b 100644
--- a/openlp/plugins/remotes/remoteplugin.py
+++ b/openlp/plugins/remotes/remoteplugin.py
@@ -38,7 +38,8 @@ class RemotesPlugin(Plugin):
         """
         remotes constructor
         """
-        Plugin.__init__(self, u'Remotes', plugin_helpers)
+        Plugin.__init__(self, u'Remotes', plugin_helpers,
+            settings_tab_class=RemoteTab)
         self.icon_path = u':/plugins/plugin_remote.png'
         self.icon = build_icon(self.icon_path)
         self.weight = -1