From 5e67ab6dc97716c13399640022b5bd30b3540963 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 28 Feb 2009 11:18:04 +0000 Subject: [PATCH] Move bible settings to plugin rename settings to settingsform to keep to the standard naming bzr-revno: 349 --- openlp/core/ui/__init__.py | 4 +- openlp/core/ui/alertform.py | 14 +-- openlp/core/ui/generalform.py | 28 +++--- openlp/core/ui/mainwindow.py | 4 +- openlp/core/ui/servicemanager.py | 2 +- .../core/ui/{settings.py => settingsform.py} | 82 +---------------- openlp/plugins/bibles/bibleplugin.py | 89 ++++++++++++++++++- openlp/plugins/videos/videoplugin.py | 8 +- 8 files changed, 117 insertions(+), 114 deletions(-) rename openlp/core/ui/{settings.py => settingsform.py} (74%) diff --git a/openlp/core/ui/__init__.py b/openlp/core/ui/__init__.py index f48deae53..eede4d081 100644 --- a/openlp/core/ui/__init__.py +++ b/openlp/core/ui/__init__.py @@ -23,9 +23,9 @@ from splashscreen import SplashScreen from about import AboutForm from alertform import AlertForm from generalform import GeneralForm -from settings import SettingsDialog +from settingsform import SettingsForm from servicemanager import ServiceManager from mainwindow import MainWindow -__all__ = ['SplashScreen', 'AboutForm', 'AlertForm', 'SettingsDialog', +__all__ = ['SplashScreen', 'AboutForm', 'AlertForm', 'SettingsForm', 'MainWindow', 'SlideController', 'ServiceManager,GeneralForm'] diff --git a/openlp/core/ui/alertform.py b/openlp/core/ui/alertform.py index fda22c799..a0fe90cbb 100644 --- a/openlp/core/ui/alertform.py +++ b/openlp/core/ui/alertform.py @@ -159,13 +159,13 @@ class AlertForm(object): self.gridLayout.addWidget(self.LengthWidget, 4, 0, 1, 1) self.formLayout_2.setWidget(0, QtGui.QFormLayout.LabelRole, self.AlertGroupBox) - self.AlertGroupBox.setTitle(QtGui.QApplication.translate("SettingsDialog", "Alerts", None, QtGui.QApplication.UnicodeUTF8)) - self.FontLabel.setText(QtGui.QApplication.translate("SettingsDialog", "Font Name:", None, QtGui.QApplication.UnicodeUTF8)) - self.FontColorLabel.setText(QtGui.QApplication.translate("SettingsDialog", "Font Color:", None, QtGui.QApplication.UnicodeUTF8)) - self.BackgroundColorLabel.setText(QtGui.QApplication.translate("SettingsDialog", "Background Color:", None, QtGui.QApplication.UnicodeUTF8)) - self.LengthLabel.setText(QtGui.QApplication.translate("SettingsDialog", "Display length:", None, QtGui.QApplication.UnicodeUTF8)) - self.LengthSpinBox.setSuffix(QtGui.QApplication.translate("SettingsDialog", "s", None, QtGui.QApplication.UnicodeUTF8)) - self.SettingsTabItem.setTabText(QtGui.QApplication.translate("SettingsDialog", "Alerts", None, QtGui.QApplication.UnicodeUTF8)) + self.AlertGroupBox.setTitle(QtGui.QApplication.translate("SettingsForm", "Alerts", None, QtGui.QApplication.UnicodeUTF8)) + self.FontLabel.setText(QtGui.QApplication.translate("SettingsForm", "Font Name:", None, QtGui.QApplication.UnicodeUTF8)) + self.FontColorLabel.setText(QtGui.QApplication.translate("SettingsForm", "Font Color:", None, QtGui.QApplication.UnicodeUTF8)) + self.BackgroundColorLabel.setText(QtGui.QApplication.translate("SettingsForm", "Background Color:", None, QtGui.QApplication.UnicodeUTF8)) + self.LengthLabel.setText(QtGui.QApplication.translate("SettingsForm", "Display length:", None, QtGui.QApplication.UnicodeUTF8)) + self.LengthSpinBox.setSuffix(QtGui.QApplication.translate("SettingsForm", "s", None, QtGui.QApplication.UnicodeUTF8)) + self.SettingsTabItem.setTabText(QtGui.QApplication.translate("SettingsForm", "Alerts", None, QtGui.QApplication.UnicodeUTF8)) self.SettingsTabItem.add_items(self.Alerts) return self.SettingsTabItem diff --git a/openlp/core/ui/generalform.py b/openlp/core/ui/generalform.py index f931a6e69..09ea02230 100644 --- a/openlp/core/ui/generalform.py +++ b/openlp/core/ui/generalform.py @@ -116,21 +116,21 @@ class GeneralForm(object): self.RightColumnLayout.setObjectName("RightColumnLayout") self.DisplayTabLayout.addWidget(self.RightColumn) - self.MonitorGroupBox.setTitle(QtGui.QApplication.translate("SettingsDialog", "Monitors", None, QtGui.QApplication.UnicodeUTF8)) - self.MonitorLabel.setText(QtGui.QApplication.translate("SettingsDialog", "Select monitor for output display:", None, QtGui.QApplication.UnicodeUTF8)) - self.MonitorComboBox.setItemText(0, QtGui.QApplication.translate("SettingsDialog", "Monitor 1 on X11 Windowing System", None, QtGui.QApplication.UnicodeUTF8)) - self.MonitorComboBox.setItemText(1, QtGui.QApplication.translate("SettingsDialog", "Monitor 2 on X11 Windowing System", None, QtGui.QApplication.UnicodeUTF8)) - self.FontSizeGroupBox.setTitle(QtGui.QApplication.translate("SettingsDialog", "Font Size", None, QtGui.QApplication.UnicodeUTF8)) - self.AutoResizeRadioButton.setText(QtGui.QApplication.translate("SettingsDialog", "Automatically resize font to fit text to slide", None, QtGui.QApplication.UnicodeUTF8)) - self.WrapLinesRadioButton.setText(QtGui.QApplication.translate("SettingsDialog", "Wrap long lines to keep desired font", None, QtGui.QApplication.UnicodeUTF8)) - self.SongDisplayGroupBox.setTitle(QtGui.QApplication.translate("SettingsDialog", "Song Display", None, QtGui.QApplication.UnicodeUTF8)) - self.EnableCreditsCheckBox.setText(QtGui.QApplication.translate("SettingsDialog", "Enable displaying of song credits", None, QtGui.QApplication.UnicodeUTF8)) - self.BlankScreenGroupBox.setTitle(QtGui.QApplication.translate("SettingsDialog", "Blank Screen", None, QtGui.QApplication.UnicodeUTF8)) - self.WarningCheckBox.setText(QtGui.QApplication.translate("SettingsDialog", "Show warning on startup", None, QtGui.QApplication.UnicodeUTF8)) - self.AutoOpenGroupBox.setTitle(QtGui.QApplication.translate("SettingsDialog", "Auto Open Last Service", None, QtGui.QApplication.UnicodeUTF8)) - self.AutoOpenCheckBox.setText(QtGui.QApplication.translate("SettingsDialog", "Automatically open the last service at startup", None, QtGui.QApplication.UnicodeUTF8)) + self.MonitorGroupBox.setTitle(QtGui.QApplication.translate("SettingsForm", "Monitors", None, QtGui.QApplication.UnicodeUTF8)) + self.MonitorLabel.setText(QtGui.QApplication.translate("SettingsForm", "Select monitor for output display:", None, QtGui.QApplication.UnicodeUTF8)) + self.MonitorComboBox.setItemText(0, QtGui.QApplication.translate("SettingsForm", "Monitor 1 on X11 Windowing System", None, QtGui.QApplication.UnicodeUTF8)) + self.MonitorComboBox.setItemText(1, QtGui.QApplication.translate("SettingsForm", "Monitor 2 on X11 Windowing System", None, QtGui.QApplication.UnicodeUTF8)) + self.FontSizeGroupBox.setTitle(QtGui.QApplication.translate("SettingsForm", "Font Size", None, QtGui.QApplication.UnicodeUTF8)) + self.AutoResizeRadioButton.setText(QtGui.QApplication.translate("SettingsForm", "Automatically resize font to fit text to slide", None, QtGui.QApplication.UnicodeUTF8)) + self.WrapLinesRadioButton.setText(QtGui.QApplication.translate("SettingsForm", "Wrap long lines to keep desired font", None, QtGui.QApplication.UnicodeUTF8)) + self.SongDisplayGroupBox.setTitle(QtGui.QApplication.translate("SettingsForm", "Song Display", None, QtGui.QApplication.UnicodeUTF8)) + self.EnableCreditsCheckBox.setText(QtGui.QApplication.translate("SettingsForm", "Enable displaying of song credits", None, QtGui.QApplication.UnicodeUTF8)) + self.BlankScreenGroupBox.setTitle(QtGui.QApplication.translate("SettingsForm", "Blank Screen", None, QtGui.QApplication.UnicodeUTF8)) + self.WarningCheckBox.setText(QtGui.QApplication.translate("SettingsForm", "Show warning on startup", None, QtGui.QApplication.UnicodeUTF8)) + self.AutoOpenGroupBox.setTitle(QtGui.QApplication.translate("SettingsForm", "Auto Open Last Service", None, QtGui.QApplication.UnicodeUTF8)) + self.AutoOpenCheckBox.setText(QtGui.QApplication.translate("SettingsForm", "Automatically open the last service at startup", None, QtGui.QApplication.UnicodeUTF8)) - self.SettingsTabItem.setTabText(QtGui.QApplication.translate("SettingsDialog", "General", None, QtGui.QApplication.UnicodeUTF8)) + self.SettingsTabItem.setTabText(QtGui.QApplication.translate("SettingsForm", "General", None, QtGui.QApplication.UnicodeUTF8)) self.SettingsTabItem.add_items(self.DisplayTab) return self.SettingsTabItem diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index e1f37a38a..29afdb11b 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -26,7 +26,7 @@ from PyQt4 import QtCore, QtGui from openlp.core.resources import * from openlp.core.ui import SlideController, ServiceManager -from openlp.core.ui import AboutForm, AlertForm, SettingsDialog, SlideController, GeneralForm +from openlp.core.ui import AboutForm, AlertForm, SettingsForm, SlideController, GeneralForm from openlp.core.lib import Plugin, MediaManagerItem, SettingsTab from openlp.core import PluginManager @@ -40,7 +40,7 @@ class MainWindow(object): self.main_window = QtGui.QMainWindow() self.about_form = AboutForm() self.alert_form = AlertForm() - self.settings_form = SettingsDialog() + self.settings_form = SettingsForm() self.general_form = GeneralForm() pluginpath = os.path.split(os.path.abspath(__file__))[0] pluginpath = os.path.abspath(os.path.join(pluginpath, '..', '..','plugins')) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 691fa9f65..64c0bc7dc 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -24,7 +24,7 @@ from PyQt4 import * from PyQt4 import QtCore, QtGui from PyQt4.QtGui import * # from openlp.core.resources import * -# from openlp.core.ui import AboutForm, AlertForm, SettingsDialog, SlideController +# from openlp.core.ui import AboutForm, AlertForm, SettingsForm, SlideController from openlp.core.lib import OpenLPToolbar # from openlp.core import PluginManager diff --git a/openlp/core/ui/settings.py b/openlp/core/ui/settingsform.py similarity index 74% rename from openlp/core/ui/settings.py rename to openlp/core/ui/settingsform.py index 3052039dc..52051f691 100644 --- a/openlp/core/ui/settings.py +++ b/openlp/core/ui/settingsform.py @@ -25,7 +25,7 @@ from openlp.core.lib import SettingsTab from openlp.core.resources import * from openlp.core.ui import AlertForm -class SettingsDialog(QDialog): +class SettingsForm(QDialog): def __init__(self, parent=None): QDialog.__init__(self, parent) @@ -237,70 +237,9 @@ class SettingsDialog(QDialog): self.SlideLayout.addWidget(self.widget) self.SettingsTabWidget.addTab(self.SlideTab, "") - self.Bibles = QtGui.QWidget() - self.Bibles.setObjectName("Bibles") - self.formLayout_3 = QtGui.QFormLayout(self.Bibles) - self.formLayout_3.setObjectName("formLayout_3") - self.VerseDisplayGroupBox = QtGui.QGroupBox(self.Bibles) - self.VerseDisplayGroupBox.setObjectName("VerseDisplayGroupBox") - self.gridLayout_2 = QtGui.QGridLayout(self.VerseDisplayGroupBox) - self.gridLayout_2.setMargin(8) - self.gridLayout_2.setObjectName("gridLayout_2") - self.VerseTypeWidget = QtGui.QWidget(self.VerseDisplayGroupBox) - self.VerseTypeWidget.setObjectName("VerseTypeWidget") - self.VerseTypeLayout = QtGui.QHBoxLayout(self.VerseTypeWidget) - self.VerseTypeLayout.setSpacing(8) - self.VerseTypeLayout.setMargin(0) - self.VerseTypeLayout.setObjectName("VerseTypeLayout") - self.VerseRadioButton = QtGui.QRadioButton(self.VerseTypeWidget) - self.VerseRadioButton.setObjectName("VerseRadioButton") - self.VerseTypeLayout.addWidget(self.VerseRadioButton) - self.ParagraphRadioButton = QtGui.QRadioButton(self.VerseTypeWidget) - self.ParagraphRadioButton.setChecked(True) - self.ParagraphRadioButton.setObjectName("ParagraphRadioButton") - self.VerseTypeLayout.addWidget(self.ParagraphRadioButton) - self.gridLayout_2.addWidget(self.VerseTypeWidget, 0, 0, 1, 1) - self.NewChaptersCheckBox = QtGui.QCheckBox(self.VerseDisplayGroupBox) - self.NewChaptersCheckBox.setObjectName("NewChaptersCheckBox") - self.gridLayout_2.addWidget(self.NewChaptersCheckBox, 1, 0, 1, 1) - self.DisplayStyleWidget = QtGui.QWidget(self.VerseDisplayGroupBox) - self.DisplayStyleWidget.setObjectName("DisplayStyleWidget") - self.DisplayStyleLayout = QtGui.QHBoxLayout(self.DisplayStyleWidget) - self.DisplayStyleLayout.setSpacing(8) - self.DisplayStyleLayout.setMargin(0) - self.DisplayStyleLayout.setObjectName("DisplayStyleLayout") - self.DisplayStyleLabel = QtGui.QLabel(self.DisplayStyleWidget) - self.DisplayStyleLabel.setObjectName("DisplayStyleLabel") - self.DisplayStyleLayout.addWidget(self.DisplayStyleLabel) - self.DisplayStyleComboBox = QtGui.QComboBox(self.DisplayStyleWidget) - self.DisplayStyleComboBox.setObjectName("DisplayStyleComboBox") - self.DisplayStyleComboBox.addItem(QtCore.QString()) - self.DisplayStyleComboBox.addItem(QtCore.QString()) - self.DisplayStyleComboBox.addItem(QtCore.QString()) - self.DisplayStyleComboBox.addItem(QtCore.QString()) - self.DisplayStyleLayout.addWidget(self.DisplayStyleComboBox) - spacerItem6 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.DisplayStyleLayout.addItem(spacerItem6) - self.gridLayout_2.addWidget(self.DisplayStyleWidget, 2, 0, 1, 1) - self.ChangeNoteLabel = QtGui.QLabel(self.VerseDisplayGroupBox) - self.ChangeNoteLabel.setObjectName("ChangeNoteLabel") - self.gridLayout_2.addWidget(self.ChangeNoteLabel, 3, 0, 1, 1) - self.formLayout_3.setWidget(0, QtGui.QFormLayout.LabelRole, self.VerseDisplayGroupBox) - self.SearchGroupBox_2 = QtGui.QGroupBox(self.Bibles) - self.SearchGroupBox_2.setObjectName("SearchGroupBox_2") - self.verticalLayout_2 = QtGui.QVBoxLayout(self.SearchGroupBox_2) - self.verticalLayout_2.setObjectName("verticalLayout_2") - self.SearchCheckBox_2 = QtGui.QCheckBox(self.SearchGroupBox_2) - self.SearchCheckBox_2.setChecked(True) - self.SearchCheckBox_2.setObjectName("SearchCheckBox_2") - self.verticalLayout_2.addWidget(self.SearchCheckBox_2) - self.formLayout_3.setWidget(1, QtGui.QFormLayout.LabelRole, self.SearchGroupBox_2) - self.SettingsTabWidget.addTab(self.Bibles, "") - #### Core Code below here for plugin in self.plugin_list: - print plugin settings_tab_item = plugin.get_settings_tab_item() if settings_tab_item is not None: self.SettingsTabWidget.addTab(settings_tab_item, settings_tab_item.tabText) @@ -351,24 +290,7 @@ class SettingsDialog(QDialog): self.SearchGroupBox_3.setTitle(QtGui.QApplication.translate("SettingsDialog", "Search", None, QtGui.QApplication.UnicodeUTF8)) self.SearchCheckBox_3.setText(QtGui.QApplication.translate("SettingsDialog", "Enabled search-as-you-type", None, QtGui.QApplication.UnicodeUTF8)) self.SettingsTabWidget.setTabText(self.SettingsTabWidget.indexOf(self.SlideTab), QtGui.QApplication.translate("SettingsDialog", "Songs", None, QtGui.QApplication.UnicodeUTF8)) - self.VerseDisplayGroupBox.setTitle(QtGui.QApplication.translate("SettingsDialog", "Verse Display", None, QtGui.QApplication.UnicodeUTF8)) - self.VerseRadioButton.setText(QtGui.QApplication.translate("SettingsDialog", "Verse style", None, QtGui.QApplication.UnicodeUTF8)) - self.ParagraphRadioButton.setText(QtGui.QApplication.translate("SettingsDialog", "Paragraph style", None, QtGui.QApplication.UnicodeUTF8)) - self.NewChaptersCheckBox.setText(QtGui.QApplication.translate("SettingsDialog", "Only show new chapter numbers", None, QtGui.QApplication.UnicodeUTF8)) - self.DisplayStyleLabel.setText(QtGui.QApplication.translate("SettingsDialog", "Display Style:", None, QtGui.QApplication.UnicodeUTF8)) - self.DisplayStyleComboBox.setItemText(0, QtGui.QApplication.translate("SettingsDialog", "No brackets", None, QtGui.QApplication.UnicodeUTF8)) - self.DisplayStyleComboBox.setItemText(1, QtGui.QApplication.translate("SettingsDialog", "( and )", None, QtGui.QApplication.UnicodeUTF8)) - self.DisplayStyleComboBox.setItemText(2, QtGui.QApplication.translate("SettingsDialog", "{ and }", None, QtGui.QApplication.UnicodeUTF8)) - self.DisplayStyleComboBox.setItemText(3, QtGui.QApplication.translate("SettingsDialog", "[ and ]", None, QtGui.QApplication.UnicodeUTF8)) - self.ChangeNoteLabel.setText(QtGui.QApplication.translate("SettingsDialog", "\n" -"\n" -"

Changes don\'t affect verses already in the service

", None, QtGui.QApplication.UnicodeUTF8)) - self.SearchGroupBox_2.setTitle(QtGui.QApplication.translate("SettingsDialog", "Search", None, QtGui.QApplication.UnicodeUTF8)) - self.SearchCheckBox_2.setText(QtGui.QApplication.translate("SettingsDialog", "Enabled search-as-you-type", None, QtGui.QApplication.UnicodeUTF8)) - self.SettingsTabWidget.setTabText(self.SettingsTabWidget.indexOf(self.Bibles), QtGui.QApplication.translate("SettingsDialog", "Bibles", None, QtGui.QApplication.UnicodeUTF8)) - + self.SaveButton.setText(QtGui.QApplication.translate("SettingsDialog", "Save", None, QtGui.QApplication.UnicodeUTF8)) self.CancelButton.setText(QtGui.QApplication.translate("SettingsDialog", "Cancel", None, QtGui.QApplication.UnicodeUTF8)) self.ResetButton.setText(QtGui.QApplication.translate("SettingsDialog", "Reset", None, QtGui.QApplication.UnicodeUTF8)) diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index 4353684b2..70edde70c 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -24,7 +24,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * from openlp.core.resources import * -from openlp.core.lib import Plugin,PluginUtils, MediaManagerItem, Receiver +from openlp.core.lib import Plugin,PluginUtils, MediaManagerItem, Receiver, SettingsTab from openlp.plugins.bibles.lib import BibleManager from openlp.plugins.bibles.forms import BibleImportForm @@ -50,11 +50,92 @@ class BiblePlugin(Plugin, PluginUtils): QtCore.QObject.connect(Receiver().get_receiver(),QtCore.SIGNAL("openlpreloadbibles"),self.reload_bibles) def has_settings_tab_item(self): - return False + return True def get_settings_tab_item(self): - a = 1 - return a + + self.SettingsTabItem= SettingsTab() + + self.Bibles = QtGui.QWidget() + self.Bibles.setObjectName("Bibles") + self.formLayout_3 = QtGui.QFormLayout(self.Bibles) + self.formLayout_3.setObjectName("formLayout_3") + self.VerseDisplayGroupBox = QtGui.QGroupBox(self.Bibles) + self.VerseDisplayGroupBox.setObjectName("VerseDisplayGroupBox") + self.gridLayout_2 = QtGui.QGridLayout(self.VerseDisplayGroupBox) + self.gridLayout_2.setMargin(8) + self.gridLayout_2.setObjectName("gridLayout_2") + self.VerseTypeWidget = QtGui.QWidget(self.VerseDisplayGroupBox) + self.VerseTypeWidget.setObjectName("VerseTypeWidget") + self.VerseTypeLayout = QtGui.QHBoxLayout(self.VerseTypeWidget) + self.VerseTypeLayout.setSpacing(8) + self.VerseTypeLayout.setMargin(0) + self.VerseTypeLayout.setObjectName("VerseTypeLayout") + self.VerseRadioButton = QtGui.QRadioButton(self.VerseTypeWidget) + self.VerseRadioButton.setObjectName("VerseRadioButton") + self.VerseTypeLayout.addWidget(self.VerseRadioButton) + self.ParagraphRadioButton = QtGui.QRadioButton(self.VerseTypeWidget) + self.ParagraphRadioButton.setChecked(True) + self.ParagraphRadioButton.setObjectName("ParagraphRadioButton") + self.VerseTypeLayout.addWidget(self.ParagraphRadioButton) + self.gridLayout_2.addWidget(self.VerseTypeWidget, 0, 0, 1, 1) + self.NewChaptersCheckBox = QtGui.QCheckBox(self.VerseDisplayGroupBox) + self.NewChaptersCheckBox.setObjectName("NewChaptersCheckBox") + self.gridLayout_2.addWidget(self.NewChaptersCheckBox, 1, 0, 1, 1) + self.DisplayStyleWidget = QtGui.QWidget(self.VerseDisplayGroupBox) + self.DisplayStyleWidget.setObjectName("DisplayStyleWidget") + self.DisplayStyleLayout = QtGui.QHBoxLayout(self.DisplayStyleWidget) + self.DisplayStyleLayout.setSpacing(8) + self.DisplayStyleLayout.setMargin(0) + self.DisplayStyleLayout.setObjectName("DisplayStyleLayout") + self.DisplayStyleLabel = QtGui.QLabel(self.DisplayStyleWidget) + self.DisplayStyleLabel.setObjectName("DisplayStyleLabel") + self.DisplayStyleLayout.addWidget(self.DisplayStyleLabel) + self.DisplayStyleComboBox = QtGui.QComboBox(self.DisplayStyleWidget) + self.DisplayStyleComboBox.setObjectName("DisplayStyleComboBox") + self.DisplayStyleComboBox.addItem(QtCore.QString()) + self.DisplayStyleComboBox.addItem(QtCore.QString()) + self.DisplayStyleComboBox.addItem(QtCore.QString()) + self.DisplayStyleComboBox.addItem(QtCore.QString()) + self.DisplayStyleLayout.addWidget(self.DisplayStyleComboBox) + spacerItem6 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.DisplayStyleLayout.addItem(spacerItem6) + self.gridLayout_2.addWidget(self.DisplayStyleWidget, 2, 0, 1, 1) + self.ChangeNoteLabel = QtGui.QLabel(self.VerseDisplayGroupBox) + self.ChangeNoteLabel.setObjectName("ChangeNoteLabel") + self.gridLayout_2.addWidget(self.ChangeNoteLabel, 3, 0, 1, 1) + self.formLayout_3.setWidget(0, QtGui.QFormLayout.LabelRole, self.VerseDisplayGroupBox) + self.SearchGroupBox_2 = QtGui.QGroupBox(self.Bibles) + self.SearchGroupBox_2.setObjectName("SearchGroupBox_2") + self.verticalLayout_2 = QtGui.QVBoxLayout(self.SearchGroupBox_2) + self.verticalLayout_2.setObjectName("verticalLayout_2") + self.SearchCheckBox_2 = QtGui.QCheckBox(self.SearchGroupBox_2) + self.SearchCheckBox_2.setChecked(True) + self.SearchCheckBox_2.setObjectName("SearchCheckBox_2") + self.verticalLayout_2.addWidget(self.SearchCheckBox_2) + self.formLayout_3.setWidget(1, QtGui.QFormLayout.LabelRole, self.SearchGroupBox_2) + + self.VerseDisplayGroupBox.setTitle(QtGui.QApplication.translate("SettingsForm", "Verse Display", None, QtGui.QApplication.UnicodeUTF8)) + self.VerseRadioButton.setText(QtGui.QApplication.translate("SettingsForm", "Verse style", None, QtGui.QApplication.UnicodeUTF8)) + self.ParagraphRadioButton.setText(QtGui.QApplication.translate("SettingsForm", "Paragraph style", None, QtGui.QApplication.UnicodeUTF8)) + self.NewChaptersCheckBox.setText(QtGui.QApplication.translate("SettingsForm", "Only show new chapter numbers", None, QtGui.QApplication.UnicodeUTF8)) + self.DisplayStyleLabel.setText(QtGui.QApplication.translate("SettingsForm", "Display Style:", None, QtGui.QApplication.UnicodeUTF8)) + self.DisplayStyleComboBox.setItemText(0, QtGui.QApplication.translate("SettingsForm", "No brackets", None, QtGui.QApplication.UnicodeUTF8)) + self.DisplayStyleComboBox.setItemText(1, QtGui.QApplication.translate("SettingsForm", "( and )", None, QtGui.QApplication.UnicodeUTF8)) + self.DisplayStyleComboBox.setItemText(2, QtGui.QApplication.translate("SettingsForm", "{ and }", None, QtGui.QApplication.UnicodeUTF8)) + self.DisplayStyleComboBox.setItemText(3, QtGui.QApplication.translate("SettingsForm", "[ and ]", None, QtGui.QApplication.UnicodeUTF8)) + self.ChangeNoteLabel.setText(QtGui.QApplication.translate("SettingsForm", "\n" +"\n" +"

Changes don\'t affect verses already in the service

", None, QtGui.QApplication.UnicodeUTF8)) + self.SearchGroupBox_2.setTitle(QtGui.QApplication.translate("SettingsForm", "Search", None, QtGui.QApplication.UnicodeUTF8)) + self.SearchCheckBox_2.setText(QtGui.QApplication.translate("SettingsForm", "Enabled search-as-you-type", None, QtGui.QApplication.UnicodeUTF8)) + + self.SettingsTabItem.add_items(self.Bibles) + self.SettingsTabItem.setTabText(QtGui.QApplication.translate("SettingsForm", "Bibles", None, QtGui.QApplication.UnicodeUTF8)) + + return self.SettingsTabItem def get_media_manager_item(self): # Create the MediaManagerItem object diff --git a/openlp/plugins/videos/videoplugin.py b/openlp/plugins/videos/videoplugin.py index 20c06b8b8..68b92311f 100644 --- a/openlp/plugins/videos/videoplugin.py +++ b/openlp/plugins/videos/videoplugin.py @@ -63,11 +63,11 @@ class VideoPlugin(Plugin, PluginUtils): self.SettingsTabItem.add_items(self.Videos) - self.SettingsTabItem.setTabText(QtGui.QApplication.translate("SettingsDialog", "Videos", None, QtGui.QApplication.UnicodeUTF8)) + self.SettingsTabItem.setTabText(QtGui.QApplication.translate("SettingsForm", "Videos", None, QtGui.QApplication.UnicodeUTF8)) - self.VideoModeGroupBox.setTitle(QtGui.QApplication.translate("SettingsDialog", "Video Mode", None, QtGui.QApplication.UnicodeUTF8)) - self.UseVMRCheckBox.setText(QtGui.QApplication.translate("SettingsDialog", "Use Video Mode Rendering", None, QtGui.QApplication.UnicodeUTF8)) - self.UseVMRLabel.setText(QtGui.QApplication.translate("SettingsDialog", "\n" + self.VideoModeGroupBox.setTitle(QtGui.QApplication.translate("SettingsForm", "Video Mode", None, QtGui.QApplication.UnicodeUTF8)) + self.UseVMRCheckBox.setText(QtGui.QApplication.translate("SettingsForm", "Use Video Mode Rendering", None, QtGui.QApplication.UnicodeUTF8)) + self.UseVMRLabel.setText(QtGui.QApplication.translate("SettingsForm", "\n" "\n"