diff --git a/openlp/core/lib/plugin.py b/openlp/core/lib/plugin.py index dbd1906a7..16194e65d 100644 --- a/openlp/core/lib/plugin.py +++ b/openlp/core/lib/plugin.py @@ -98,30 +98,6 @@ class Plugin(object): """ return True - def has_settings_tab_item(self): - """ - Tells the PluginManager if the plugin wants to play with settings Tab - """ - return False - - def get_settings_tab_item(self): - """ - Allows the Settings Tab to construct one or more tabs.. - """ - pass - - def load_settings(self): - """ - Hook to allow settings tab and plugin to load settings values from configuration - """ - pass - - def save_settings(self): - """ - Hook to allow settings tab to save settings values from configuration - """ - pass - def get_media_manager_item(self): """ Construct a MediaManagerItem object with all the buttons and things you diff --git a/openlp/core/pluginmanager.py b/openlp/core/pluginmanager.py index 85a33e39f..ec41d4c10 100644 --- a/openlp/core/pluginmanager.py +++ b/openlp/core/pluginmanager.py @@ -107,7 +107,7 @@ class PluginManager(object): mediatoolbox.addItem(media_manager_item, plugin.icon, media_manager_item.title) # TODO: These shouldn't be called here... plugin.initialise() - plugin.load_settings() +# plugin.load_settings() def hook_settings_tabs(self, settingsform=None): """ diff --git a/openlp/core/ui/__init__.py b/openlp/core/ui/__init__.py index 279bc1861..7deffb3ab 100644 --- a/openlp/core/ui/__init__.py +++ b/openlp/core/ui/__init__.py @@ -24,11 +24,10 @@ from alertstab import AlertsTab from generaltab import GeneralTab from themestab import ThemesTab from about import AboutForm -#from alertform import AlertForm -from generalform import GeneralForm +from alertform import AlertForm from settingsform import SettingsForm from servicemanager import ServiceManager from mainwindow import MainWindow __all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', - 'MainWindow', 'SlideController', 'ServiceManager,GeneralForm'] + 'MainWindow', 'SlideController', 'ServiceManager'] diff --git a/openlp/core/ui/about.py b/openlp/core/ui/about.py index c004db604..64ed0cf2c 100644 --- a/openlp/core/ui/about.py +++ b/openlp/core/ui/about.py @@ -19,26 +19,28 @@ Place, Suite 330, Boston, MA 02111-1307 USA """ from PyQt4 import QtCore, QtGui +from PyQt4.QtGui import QDialog +from openlp.core import translate from openlp.core.resources import * -class AboutForm(object): +class AboutForm(QDialog): - def __init__(self): - self.AboutDialog = QtGui.QDialog() - self.setupUi() + def __init__(self, parent=None): + QDialog.__init__(self, parent) + self.setupUi(self) - def setupUi(self): - self.AboutDialog.setObjectName("AboutDialog") - self.AboutDialog.resize(470, 481) + def setupUi(self, AboutForm): + AboutForm.setObjectName("AboutForm") + AboutForm.resize(470, 481) icon = QtGui.QIcon() icon.addPixmap(QtGui.QPixmap(":/icon/openlp.org-icon-32.bmp"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.AboutDialog.setWindowIcon(icon) - self.AboutDialogLayout = QtGui.QVBoxLayout(self.AboutDialog) - self.AboutDialogLayout.setSpacing(8) - self.AboutDialogLayout.setMargin(8) - self.AboutDialogLayout.setObjectName("AboutDialogLayout") - self.Logo = QtGui.QLabel(self.AboutDialog) + AboutForm.setWindowIcon(icon) + AboutFormLayout = QtGui.QVBoxLayout(AboutForm) + AboutFormLayout.setSpacing(8) + AboutFormLayout.setMargin(8) + AboutFormLayout.setObjectName("AboutDialogLayout") + self.Logo = QtGui.QLabel(AboutForm) self.Logo.setAutoFillBackground(False) self.Logo.setStyleSheet("background-color: rgb(255, 255, 255);") self.Logo.setFrameShape(QtGui.QFrame.StyledPanel) @@ -47,8 +49,8 @@ class AboutForm(object): self.Logo.setScaledContents(False) self.Logo.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) self.Logo.setObjectName("Logo") - self.AboutDialogLayout.addWidget(self.Logo) - self.AboutNotebook = QtGui.QTabWidget(self.AboutDialog) + AboutFormLayout.addWidget(self.Logo) + self.AboutNotebook = QtGui.QTabWidget(AboutForm) self.AboutNotebook.setObjectName("AboutNotebook") self.LicenseTab = QtGui.QWidget() self.LicenseTab.setObjectName("LicenseTab") @@ -91,8 +93,8 @@ class AboutForm(object): self.CreditsTextEdit.setObjectName("CreditsTextEdit") self.CreditsTabLayout.addWidget(self.CreditsTextEdit) self.AboutNotebook.addTab(self.CreditsTab, "Credits") - self.AboutDialogLayout.addWidget(self.AboutNotebook) - self.ButtonWidget = QtGui.QWidget(self.AboutDialog) + AboutFormLayout.addWidget(self.AboutNotebook) + self.ButtonWidget = QtGui.QWidget(AboutForm) self.ButtonWidget.setObjectName("ButtonWidget") self.ButtonWidgetLayout = QtGui.QHBoxLayout(self.ButtonWidget) self.ButtonWidgetLayout.setSpacing(8) @@ -106,26 +108,26 @@ class AboutForm(object): self.CloseButton = QtGui.QPushButton(self.ButtonWidget) self.CloseButton.setObjectName("CloseButton") self.ButtonWidgetLayout.addWidget(self.CloseButton) - self.AboutDialogLayout.addWidget(self.ButtonWidget) - self.extContributeItem = QtGui.QAction(self.AboutDialog) + AboutFormLayout.addWidget(self.ButtonWidget) + self.extContributeItem = QtGui.QAction(AboutForm) self.extContributeItem.setObjectName("extContributeItem") - self.retranslateUi() + self.retranslateUi(AboutForm) self.AboutNotebook.setCurrentIndex(0) - QtCore.QObject.connect(self.CloseButton, QtCore.SIGNAL("clicked()"), self.AboutDialog.close) - QtCore.QMetaObject.connectSlotsByName(self.AboutDialog) + QtCore.QObject.connect(self.CloseButton, QtCore.SIGNAL("clicked()"), AboutForm.close) + QtCore.QMetaObject.connectSlotsByName(AboutForm) QtCore.QObject.connect(self.ContributeButton, QtCore.SIGNAL("clicked()"), self.onContributeButtonClicked) - def retranslateUi(self): - self.AboutDialog.setWindowTitle(QtGui.QApplication.translate("AboutDialog", "About openlp.org", None, QtGui.QApplication.UnicodeUTF8)) - self.CopyrightLabel.setText(QtGui.QApplication.translate("AboutDialog", "Copyright © 2004-2008 openlp.org Foundation", None, QtGui.QApplication.UnicodeUTF8)) - self.AboutAuthors.setText(QtGui.QApplication.translate("AboutDialog", "openlp.org is written and maintained by volunteers. If you would like to see more free Christian software being written, please consider contributing by using the button below.", None, QtGui.QApplication.UnicodeUTF8)) - self.License1Label.setText(QtGui.QApplication.translate("AboutDialog", "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.", None, QtGui.QApplication.UnicodeUTF8)) - self.License2Label.setText(QtGui.QApplication.translate("AboutDialog", "You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.", None, QtGui.QApplication.UnicodeUTF8)) - self.License3Label.setText(QtGui.QApplication.translate("AboutDialog", "This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.", None, QtGui.QApplication.UnicodeUTF8)) + def retranslateUi(self, AboutForm): + AboutForm.setWindowTitle(translate("AboutDialog", "About openlp.org",)) + self.CopyrightLabel.setText(translate("AboutDialog", "Copyright © 2004-2009 openlp.org Foundation")) + self.AboutAuthors.setText(translate("AboutDialog", "openlp.org is written and maintained by volunteers. If you would like to see more free Christian software being written, please consider contributing by using the button below.")) + self.License1Label.setText(translate("AboutDialog", "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.")) + self.License2Label.setText(translate("AboutDialog", "You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.")) + self.License3Label.setText(translate("AboutDialog", "This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.")) self.AboutNotebook.setTabText(self.AboutNotebook.indexOf(self.LicenseTab), QtGui.QApplication.translate("AboutDialog", "License", None, QtGui.QApplication.UnicodeUTF8)) - self.CreditsTextEdit.setPlainText(QtGui.QApplication.translate("AboutDialog", "Project Lead\n" + self.CreditsTextEdit.setPlainText(translate("AboutDialog", "Project Lead\n" " Raoul \"superfly\" Snyman\n" "\n" "Developers\n" @@ -134,14 +136,11 @@ class AboutForm(object): " Scott \"sguerrieri\" Guerrieri\n" " Raoul \"superfly\" Snyman\n" " Martin \"mijiti\" Thompson\n" -" Carsten \"catini\" Tingaard", None, QtGui.QApplication.UnicodeUTF8)) - self.AboutNotebook.setTabText(self.AboutNotebook.indexOf(self.CreditsTab), QtGui.QApplication.translate("AboutDialog", "Credits", None, QtGui.QApplication.UnicodeUTF8)) - self.ContributeButton.setText(QtGui.QApplication.translate("AboutDialog", "Contribute", None, QtGui.QApplication.UnicodeUTF8)) - self.CloseButton.setText(QtGui.QApplication.translate("AboutDialog", "Close", None, QtGui.QApplication.UnicodeUTF8)) - self.extContributeItem.setText(QtGui.QApplication.translate("AboutDialog", "&Contribute", None, QtGui.QApplication.UnicodeUTF8)) - - def show(self): - self.AboutDialog.show() +" Carsten \"catini\" Tingaard")) + self.AboutNotebook.setTabText(self.AboutNotebook.indexOf(self.CreditsTab), translate("AboutDialog", "Credits")) + self.ContributeButton.setText(translate("AboutDialog", "Contribute")) + self.CloseButton.setText(translate("AboutDialog", "Close")) + self.extContributeItem.setText(translate("AboutDialog", "&Contribute")) def onContributeButtonClicked(self): ''' This routine will open the default diff --git a/openlp/core/ui/alertform.py b/openlp/core/ui/alertform.py index 3274f4a2d..0446c60a8 100644 --- a/openlp/core/ui/alertform.py +++ b/openlp/core/ui/alertform.py @@ -19,27 +19,28 @@ Place, Suite 330, Boston, MA 02111-1307 USA """ from PyQt4 import QtCore, QtGui +from PyQt4.QtGui import QDialog +from openlp.core import translate from openlp.core.resources import * -from openlp.core.lib import SettingsTabItem -class AlertForm(object): +class AlertForm(QDialog): - def __init__(self): - self.AlertForm = QtGui.QWidget() - self.setupUi() + def __init__(self, parent=None): + QDialog.__init__(self, parent) + self.setupUi(self) - def setupUi(self): - self.AlertForm.setObjectName("AlertForm") - self.AlertForm.resize(370, 105) + def setupUi(self, AlertForm): + AlertForm.setObjectName("AlertForm") + AlertForm.resize(370, 105) icon = QtGui.QIcon() icon.addPixmap(QtGui.QPixmap(":/icon/openlp.org-icon-32.bmp"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.AlertForm.setWindowIcon(icon) - self.AlertFormLayout = QtGui.QVBoxLayout(self.AlertForm) + AlertForm.setWindowIcon(icon) + self.AlertFormLayout = QtGui.QVBoxLayout(AlertForm) self.AlertFormLayout.setSpacing(8) self.AlertFormLayout.setMargin(8) self.AlertFormLayout.setObjectName("AlertFormLayout") - self.AlertEntryWidget = QtGui.QWidget(self.AlertForm) + self.AlertEntryWidget = QtGui.QWidget(AlertForm) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -58,7 +59,7 @@ class AlertForm(object): self.AlertEntryEditItem.setGeometry(QtCore.QRect(0, 20, 353, 21)) self.AlertEntryEditItem.setObjectName("AlertEntryEditItem") self.AlertFormLayout.addWidget(self.AlertEntryWidget) - self.ButtonBoxWidget = QtGui.QWidget(self.AlertForm) + self.ButtonBoxWidget = QtGui.QWidget(AlertForm) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -79,97 +80,20 @@ class AlertForm(object): self.horizontalLayout.addWidget(self.CancelButton) self.AlertFormLayout.addWidget(self.ButtonBoxWidget) - self.retranslateUi() - QtCore.QObject.connect(self.CancelButton, QtCore.SIGNAL("clicked()"), self.AlertForm.close) - QtCore.QMetaObject.connectSlotsByName(self.AlertForm) + self.retranslateUi(AlertForm) + + QtCore.QObject.connect(self.CancelButton, QtCore.SIGNAL("clicked()"), AlertForm.close) + QtCore.QMetaObject.connectSlotsByName(AlertForm) - def retranslateUi(self): - self.AlertForm.setWindowTitle(QtGui.QApplication.translate("AlertForm", "Alert Message", None, QtGui.QApplication.UnicodeUTF8)) - self.AlertEntryLabel.setText(QtGui.QApplication.translate("AlertForm", "Alert Text:", None, QtGui.QApplication.UnicodeUTF8)) - self.DisplayButton.setText(QtGui.QApplication.translate("AlertForm", "Display", None, QtGui.QApplication.UnicodeUTF8)) - self.CancelButton.setText(QtGui.QApplication.translate("AlertForm", "Cancel", None, QtGui.QApplication.UnicodeUTF8)) + def retranslateUi(self, AlertForm): + AlertForm.setWindowTitle(translate("AlertForm", "Alert Message")) + self.AlertEntryLabel.setText(translate("AlertForm", "Alert Text:")) + self.DisplayButton.setText(translate("AlertForm", "Display")) + self.CancelButton.setText(translate("AlertForm", "Cancel")) - def show(self): - self.AlertForm.show() +# def show(self): +# self.AlertForm.show() - def get_settings_tab_item(self): - - self.SettingsTabItem= SettingsTabItem() - - self.Alerts = QtGui.QWidget() - self.Alerts.setObjectName("Alerts") - self.formLayout_2 = QtGui.QFormLayout(self.Alerts) - self.formLayout_2.setObjectName("formLayout_2") - self.AlertGroupBox = QtGui.QGroupBox(self.Alerts) - self.AlertGroupBox.setObjectName("AlertGroupBox") - self.gridLayout = QtGui.QGridLayout(self.AlertGroupBox) - self.gridLayout.setMargin(8) - self.gridLayout.setObjectName("gridLayout") - self.FontLabel = QtGui.QLabel(self.AlertGroupBox) - self.FontLabel.setObjectName("FontLabel") - self.gridLayout.addWidget(self.FontLabel, 0, 0, 1, 1) - self.FontComboBox = QtGui.QFontComboBox(self.AlertGroupBox) - self.FontComboBox.setObjectName("FontComboBox") - self.gridLayout.addWidget(self.FontComboBox, 1, 0, 1, 1) - self.ColorWidget = QtGui.QWidget(self.AlertGroupBox) - self.ColorWidget.setObjectName("ColorWidget") - self.ColorLayout = QtGui.QHBoxLayout(self.ColorWidget) - self.ColorLayout.setSpacing(8) - self.ColorLayout.setMargin(0) - self.ColorLayout.setObjectName("ColorLayout") - self.FontColorLabel = QtGui.QLabel(self.ColorWidget) - self.FontColorLabel.setObjectName("FontColorLabel") - self.ColorLayout.addWidget(self.FontColorLabel) - self.FontColorPanel = QtGui.QGraphicsView(self.ColorWidget) - self.FontColorPanel.setMinimumSize(QtCore.QSize(24, 24)) - self.FontColorPanel.setMaximumSize(QtCore.QSize(24, 24)) - self.FontColorPanel.setObjectName("FontColorPanel") - self.ColorLayout.addWidget(self.FontColorPanel) - spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.ColorLayout.addItem(spacerItem1) - self.BackgroundColorLabel = QtGui.QLabel(self.ColorWidget) - self.BackgroundColorLabel.setObjectName("BackgroundColorLabel") - self.ColorLayout.addWidget(self.BackgroundColorLabel) - self.BackgroundColorPanel = QtGui.QGraphicsView(self.ColorWidget) - self.BackgroundColorPanel.setMinimumSize(QtCore.QSize(24, 24)) - self.BackgroundColorPanel.setMaximumSize(QtCore.QSize(24, 24)) - self.BackgroundColorPanel.setObjectName("BackgroundColorPanel") - self.ColorLayout.addWidget(self.BackgroundColorPanel) - self.gridLayout.addWidget(self.ColorWidget, 2, 0, 1, 1) - self.FontPreview = QtGui.QGraphicsView(self.AlertGroupBox) - self.FontPreview.setMaximumSize(QtCore.QSize(16777215, 64)) - self.FontPreview.setObjectName("FontPreview") - self.gridLayout.addWidget(self.FontPreview, 3, 0, 1, 1) - self.LengthWidget = QtGui.QWidget(self.AlertGroupBox) - self.LengthWidget.setObjectName("LengthWidget") - self.LengthLayout = QtGui.QHBoxLayout(self.LengthWidget) - self.LengthLayout.setSpacing(8) - self.LengthLayout.setMargin(0) - self.LengthLayout.setObjectName("LengthLayout") - self.LengthLabel = QtGui.QLabel(self.LengthWidget) - self.LengthLabel.setObjectName("LengthLabel") - self.LengthLayout.addWidget(self.LengthLabel) - self.LengthSpinBox = QtGui.QSpinBox(self.LengthWidget) - self.LengthSpinBox.setProperty("value", QtCore.QVariant(5)) - self.LengthSpinBox.setMaximum(180) - self.LengthSpinBox.setObjectName("LengthSpinBox") - self.LengthLayout.addWidget(self.LengthSpinBox) - spacerItem2 = QtGui.QSpacerItem(147, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.LengthLayout.addItem(spacerItem2) - 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("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 - def load_settings(self): pass diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index 4e5f1c09d..532fa3dfc 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -3,7 +3,7 @@ """ OpenLP - Open Source Lyrics Projection Copyright (c) 2008 Raoul Snyman -Portions copyright (c) 2008 Martin Thompson, Tim Bentley, +Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley, This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 5c72d5fc9..d08a66bec 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -25,8 +25,8 @@ from PyQt4 import QtCore, QtGui from openlp.core.resources import * -from openlp.core.ui import AboutForm, SettingsForm, \ - SlideController, ServiceManager, GeneralForm +from openlp.core.ui import AboutForm, SettingsForm, AlertForm, \ + SlideController, ServiceManager from openlp.core.lib import Plugin, MediaManagerItem, SettingsTab from openlp.core import PluginManager @@ -38,10 +38,9 @@ class MainWindow(object): def __init__(self): self.main_window = QtGui.QMainWindow() + self.alert_form = AlertForm() self.about_form = AboutForm() - #self.alert_form = AlertForm() 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')) self.plugin_manager = PluginManager(pluginpath) diff --git a/openlp/core/ui/settingsform.py b/openlp/core/ui/settingsform.py index 737180e66..531d8532f 100644 --- a/openlp/core/ui/settingsform.py +++ b/openlp/core/ui/settingsform.py @@ -54,235 +54,3 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog): def onResetButtonClick(self): pass - """ - def setupUi(self, SettingsDialog): - SettingsDialog.setObjectName("SettingsDialog") - SettingsDialog.resize(602, 502) - icon = QtGui.QIcon() - icon.addPixmap(QtGui.QPixmap(":/icon/openlp.org-icon-32.bmp"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - SettingsDialog.setWindowIcon(icon) - self.SettingsTabWidget = QtGui.QTabWidget(SettingsDialog) - self.SettingsTabWidget.setGeometry(QtCore.QRect(0, 0, 669, 500)) - self.SettingsTabWidget.setObjectName("SettingsTabWidget") - self.ThemesTab = QtGui.QWidget() - self.ThemesTab.setObjectName("ThemesTab") - self.ThemesTabLayout = QtGui.QHBoxLayout(self.ThemesTab) - self.ThemesTabLayout.setSpacing(8) - self.ThemesTabLayout.setMargin(8) - self.ThemesTabLayout.setObjectName("ThemesTabLayout") - self.GlobalGroupBox = QtGui.QGroupBox(self.ThemesTab) - self.GlobalGroupBox.setObjectName("GlobalGroupBox") - self.GlobalGroupBoxLayout = QtGui.QVBoxLayout(self.GlobalGroupBox) - self.GlobalGroupBoxLayout.setSpacing(8) - self.GlobalGroupBoxLayout.setMargin(8) - self.GlobalGroupBoxLayout.setObjectName("GlobalGroupBoxLayout") - self.DefaultComboBox = QtGui.QComboBox(self.GlobalGroupBox) - self.DefaultComboBox.setObjectName("DefaultComboBox") - self.DefaultComboBox.addItem(QtCore.QString()) - self.DefaultComboBox.addItem(QtCore.QString()) - self.DefaultComboBox.addItem(QtCore.QString()) - self.GlobalGroupBoxLayout.addWidget(self.DefaultComboBox) - self.DefaultListView = QtGui.QListView(self.GlobalGroupBox) - self.DefaultListView.setObjectName("DefaultListView") - self.GlobalGroupBoxLayout.addWidget(self.DefaultListView) - self.ThemesTabLayout.addWidget(self.GlobalGroupBox) - self.LevelGroupBox = QtGui.QGroupBox(self.ThemesTab) - self.LevelGroupBox.setObjectName("LevelGroupBox") - self.formLayout = QtGui.QFormLayout(self.LevelGroupBox) - self.formLayout.setLabelAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) - self.formLayout.setFormAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) - self.formLayout.setMargin(8) - self.formLayout.setSpacing(8) - self.formLayout.setObjectName("formLayout") - self.SongLevelRadioButton = QtGui.QRadioButton(self.LevelGroupBox) - self.SongLevelRadioButton.setObjectName("SongLevelRadioButton") - self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.SongLevelRadioButton) - self.SongLevelLabel = QtGui.QLabel(self.LevelGroupBox) - self.SongLevelLabel.setWordWrap(True) - self.SongLevelLabel.setObjectName("SongLevelLabel") - self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.SongLevelLabel) - self.ServiceLevelRadioButton = QtGui.QRadioButton(self.LevelGroupBox) - self.ServiceLevelRadioButton.setObjectName("ServiceLevelRadioButton") - self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.ServiceLevelRadioButton) - self.ServiceLevelLabel = QtGui.QLabel(self.LevelGroupBox) - self.ServiceLevelLabel.setWordWrap(True) - self.ServiceLevelLabel.setObjectName("ServiceLevelLabel") - self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.ServiceLevelLabel) - self.GlobalLevelRadioButton = QtGui.QRadioButton(self.LevelGroupBox) - self.GlobalLevelRadioButton.setChecked(True) - self.GlobalLevelRadioButton.setObjectName("GlobalLevelRadioButton") - self.formLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.GlobalLevelRadioButton) - self.GlobalLevelLabel = QtGui.QLabel(self.LevelGroupBox) - self.GlobalLevelLabel.setWordWrap(True) - self.GlobalLevelLabel.setObjectName("GlobalLevelLabel") - self.formLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.GlobalLevelLabel) - self.ThemesTabLayout.addWidget(self.LevelGroupBox) - self.SettingsTabWidget.addTab(self.ThemesTab, "") - - self.SlideTab = QtGui.QWidget() - self.SlideTab.setObjectName("SlideTab") - self.SlideLayout = QtGui.QHBoxLayout(self.SlideTab) - self.SlideLayout.setSpacing(8) - self.SlideLayout.setMargin(8) - self.SlideLayout.setObjectName("SlideLayout") - self.SlideLeftColumn = QtGui.QWidget(self.SlideTab) - self.SlideLeftColumn.setObjectName("SlideLeftColumn") - self.SlideLeftLayout = QtGui.QVBoxLayout(self.SlideLeftColumn) - self.SlideLeftLayout.setSpacing(8) - self.SlideLeftLayout.setMargin(0) - self.SlideLeftLayout.setObjectName("SlideLeftLayout") - spacerItem3 = QtGui.QSpacerItem(20, 94, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.SlideLeftLayout.addItem(spacerItem3) - self.SlideLayout.addWidget(self.SlideLeftColumn) - self.widget = QtGui.QWidget(self.SlideTab) - self.widget.setObjectName("widget") - self.SlideRightLayout = QtGui.QVBoxLayout(self.widget) - self.SlideRightLayout.setSpacing(8) - self.SlideRightLayout.setMargin(0) - self.SlideRightLayout.setObjectName("SlideRightLayout") - self.SongWizardGroupBox = QtGui.QGroupBox(self.widget) - self.SongWizardGroupBox.setObjectName("SongWizardGroupBox") - self.SongWizardLayout = QtGui.QVBoxLayout(self.SongWizardGroupBox) - self.SongWizardLayout.setSpacing(8) - self.SongWizardLayout.setMargin(8) - self.SongWizardLayout.setObjectName("SongWizardLayout") - self.SongWizardCheckBox = QtGui.QCheckBox(self.SongWizardGroupBox) - self.SongWizardCheckBox.setChecked(True) - self.SongWizardCheckBox.setObjectName("SongWizardCheckBox") - self.SongWizardLayout.addWidget(self.SongWizardCheckBox) - self.SlideRightLayout.addWidget(self.SongWizardGroupBox) - self.SlideWrapAroundGroupBox = QtGui.QGroupBox(self.widget) - self.SlideWrapAroundGroupBox.setObjectName("SlideWrapAroundGroupBox") - self.SlideWrapAroundLayout = QtGui.QVBoxLayout(self.SlideWrapAroundGroupBox) - self.SlideWrapAroundLayout.setSpacing(8) - self.SlideWrapAroundLayout.setMargin(8) - self.SlideWrapAroundLayout.setObjectName("SlideWrapAroundLayout") - self.SlideWrapAroundCheckBox = QtGui.QCheckBox(self.SlideWrapAroundGroupBox) - self.SlideWrapAroundCheckBox.setObjectName("SlideWrapAroundCheckBox") - self.SlideWrapAroundLayout.addWidget(self.SlideWrapAroundCheckBox) - self.SlideRightLayout.addWidget(self.SlideWrapAroundGroupBox) - self.TimedCyclingGroupBox = QtGui.QGroupBox(self.widget) - self.TimedCyclingGroupBox.setObjectName("TimedCyclingGroupBox") - self.TimedCyclingLayout = QtGui.QVBoxLayout(self.TimedCyclingGroupBox) - self.TimedCyclingLayout.setSpacing(8) - self.TimedCyclingLayout.setMargin(8) - self.TimedCyclingLayout.setObjectName("TimedCyclingLayout") - self.IntervalWidget = QtGui.QWidget(self.TimedCyclingGroupBox) - self.IntervalWidget.setObjectName("IntervalWidget") - self.IntervalLayout = QtGui.QHBoxLayout(self.IntervalWidget) - self.IntervalLayout.setSpacing(8) - self.IntervalLayout.setMargin(0) - self.IntervalLayout.setObjectName("IntervalLayout") - self.UpdateIntervalLabel = QtGui.QLabel(self.IntervalWidget) - self.UpdateIntervalLabel.setObjectName("UpdateIntervalLabel") - self.IntervalLayout.addWidget(self.UpdateIntervalLabel) - self.IntervalSpinBox = QtGui.QSpinBox(self.IntervalWidget) - self.IntervalSpinBox.setProperty("value", QtCore.QVariant(30)) - self.IntervalSpinBox.setMaximum(600) - self.IntervalSpinBox.setObjectName("IntervalSpinBox") - self.IntervalLayout.addWidget(self.IntervalSpinBox) - spacerItem4 = QtGui.QSpacerItem(139, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.IntervalLayout.addItem(spacerItem4) - self.TimedCyclingLayout.addWidget(self.IntervalWidget) - self.EnabledCyclingCheckBox = QtGui.QCheckBox(self.TimedCyclingGroupBox) - self.EnabledCyclingCheckBox.setObjectName("EnabledCyclingCheckBox") - self.TimedCyclingLayout.addWidget(self.EnabledCyclingCheckBox) - self.SlideRightLayout.addWidget(self.TimedCyclingGroupBox) - self.CCLIGroupBox = QtGui.QGroupBox(self.widget) - self.CCLIGroupBox.setObjectName("CCLIGroupBox") - self.CCLILayout = QtGui.QGridLayout(self.CCLIGroupBox) - self.CCLILayout.setMargin(8) - self.CCLILayout.setSpacing(8) - self.CCLILayout.setObjectName("CCLILayout") - self.NumberLabel = QtGui.QLabel(self.CCLIGroupBox) - self.NumberLabel.setObjectName("NumberLabel") - self.CCLILayout.addWidget(self.NumberLabel, 0, 0, 1, 1) - self.NumberEdit = QtGui.QLineEdit(self.CCLIGroupBox) - self.NumberEdit.setObjectName("NumberEdit") - self.CCLILayout.addWidget(self.NumberEdit, 0, 1, 1, 1) - self.UsernameLabel = QtGui.QLabel(self.CCLIGroupBox) - self.UsernameLabel.setObjectName("UsernameLabel") - self.CCLILayout.addWidget(self.UsernameLabel, 1, 0, 1, 1) - self.UsernameEdit = QtGui.QLineEdit(self.CCLIGroupBox) - self.UsernameEdit.setObjectName("UsernameEdit") - self.CCLILayout.addWidget(self.UsernameEdit, 1, 1, 1, 1) - self.PasswordLabel = QtGui.QLabel(self.CCLIGroupBox) - self.PasswordLabel.setObjectName("PasswordLabel") - self.CCLILayout.addWidget(self.PasswordLabel, 2, 0, 1, 1) - self.PasswordEdit = QtGui.QLineEdit(self.CCLIGroupBox) - self.PasswordEdit.setEchoMode(QtGui.QLineEdit.Password) - self.PasswordEdit.setObjectName("PasswordEdit") - self.CCLILayout.addWidget(self.PasswordEdit, 2, 1, 1, 1) - self.SlideRightLayout.addWidget(self.CCLIGroupBox) - self.SearchGroupBox_3 = QtGui.QGroupBox(self.widget) - self.SearchGroupBox_3.setObjectName("SearchGroupBox_3") - self.verticalLayout_3 = QtGui.QVBoxLayout(self.SearchGroupBox_3) - self.verticalLayout_3.setObjectName("verticalLayout_3") - self.SearchCheckBox_3 = QtGui.QCheckBox(self.SearchGroupBox_3) - self.SearchCheckBox_3.setChecked(True) - self.SearchCheckBox_3.setObjectName("SearchCheckBox_3") - self.verticalLayout_3.addWidget(self.SearchCheckBox_3) - self.SlideRightLayout.addWidget(self.SearchGroupBox_3) - spacerItem5 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.SlideRightLayout.addItem(spacerItem5) - self.SlideLayout.addWidget(self.widget) - self.SettingsTabWidget.addTab(self.SlideTab, "") - - #### Core Code below here - - for plugin in self.plugin_list: - 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) - - self.SaveButton = QtGui.QPushButton(SettingsDialog) - self.SaveButton.setGeometry(QtCore.QRect(490, 470, 81, 26)) - self.SaveButton.setObjectName("SaveButton") - self.CancelButton = QtGui.QPushButton(SettingsDialog) - self.CancelButton.setGeometry(QtCore.QRect(400, 470, 81, 26)) - self.CancelButton.setObjectName("CancelButton") - self.ResetButton = QtGui.QPushButton(SettingsDialog) - self.ResetButton.setGeometry(QtCore.QRect(310, 470, 81, 26)) - self.ResetButton.setObjectName("ResetButton") - - QtCore.QObject.connect(self.CancelButton, QtCore.SIGNAL("clicked()"), self.close) - - self.retranslateUi(SettingsDialog) - self.SettingsTabWidget.setCurrentIndex(5) - QtCore.QMetaObject.connectSlotsByName(SettingsDialog) - - def retranslateUi(self, SettingsDialog): - SettingsDialog.setWindowTitle(QtGui.QApplication.translate("SettingsDialog", "Settings", None, QtGui.QApplication.UnicodeUTF8)) - - self.GlobalGroupBox.setTitle(QtGui.QApplication.translate("SettingsDialog", "Global theme", None, QtGui.QApplication.UnicodeUTF8)) - self.DefaultComboBox.setItemText(0, QtGui.QApplication.translate("SettingsDialog", "African Sunset", None, QtGui.QApplication.UnicodeUTF8)) - self.DefaultComboBox.setItemText(1, QtGui.QApplication.translate("SettingsDialog", "Snowy Mountains", None, QtGui.QApplication.UnicodeUTF8)) - self.DefaultComboBox.setItemText(2, QtGui.QApplication.translate("SettingsDialog", "Wilderness", None, QtGui.QApplication.UnicodeUTF8)) - self.LevelGroupBox.setTitle(QtGui.QApplication.translate("SettingsDialog", "Theme level", None, QtGui.QApplication.UnicodeUTF8)) - self.SongLevelRadioButton.setText(QtGui.QApplication.translate("SettingsDialog", "Song level", None, QtGui.QApplication.UnicodeUTF8)) - self.SongLevelLabel.setText(QtGui.QApplication.translate("SettingsDialog", "Use the theme from each song in the database. If a song doesn\'t have a theme associated with it, then use the service\'s theme. If the service doesn\'t have a theme, then use the global theme.", None, QtGui.QApplication.UnicodeUTF8)) - self.ServiceLevelRadioButton.setText(QtGui.QApplication.translate("SettingsDialog", "Service level", None, QtGui.QApplication.UnicodeUTF8)) - self.ServiceLevelLabel.setText(QtGui.QApplication.translate("SettingsDialog", "Use the theme from the service , overriding any of the individual songs\' themes. If the service doesn\'t have a theme, then use the global theme.", None, QtGui.QApplication.UnicodeUTF8)) - self.GlobalLevelRadioButton.setText(QtGui.QApplication.translate("SettingsDialog", "Global level", None, QtGui.QApplication.UnicodeUTF8)) - self.GlobalLevelLabel.setText(QtGui.QApplication.translate("SettingsDialog", "Use the global theme, overriding any themes associated wither either the service or the songs.", None, QtGui.QApplication.UnicodeUTF8)) - self.SettingsTabWidget.setTabText(self.SettingsTabWidget.indexOf(self.ThemesTab), QtGui.QApplication.translate("SettingsDialog", "Song Theme", None, QtGui.QApplication.UnicodeUTF8)) - self.SongWizardGroupBox.setTitle(QtGui.QApplication.translate("SettingsDialog", "Song Wizard", None, QtGui.QApplication.UnicodeUTF8)) - self.SongWizardCheckBox.setText(QtGui.QApplication.translate("SettingsDialog", "Use the Song Wizard to add songs", None, QtGui.QApplication.UnicodeUTF8)) - self.SlideWrapAroundGroupBox.setTitle(QtGui.QApplication.translate("SettingsDialog", "Slide Wrap Around", None, QtGui.QApplication.UnicodeUTF8)) - self.SlideWrapAroundCheckBox.setText(QtGui.QApplication.translate("SettingsDialog", "Enable slide wrap around", None, QtGui.QApplication.UnicodeUTF8)) - self.TimedCyclingGroupBox.setTitle(QtGui.QApplication.translate("SettingsDialog", "Timed Cycling", None, QtGui.QApplication.UnicodeUTF8)) - self.UpdateIntervalLabel.setText(QtGui.QApplication.translate("SettingsDialog", "Update interval:", None, QtGui.QApplication.UnicodeUTF8)) - self.IntervalSpinBox.setSuffix(QtGui.QApplication.translate("SettingsDialog", "s", None, QtGui.QApplication.UnicodeUTF8)) - self.EnabledCyclingCheckBox.setText(QtGui.QApplication.translate("SettingsDialog", "Enable timed cycling", None, QtGui.QApplication.UnicodeUTF8)) - self.CCLIGroupBox.setTitle(QtGui.QApplication.translate("SettingsDialog", "CCLI Details", None, QtGui.QApplication.UnicodeUTF8)) - self.NumberLabel.setText(QtGui.QApplication.translate("SettingsDialog", "CCLI Number:", None, QtGui.QApplication.UnicodeUTF8)) - self.UsernameLabel.setText(QtGui.QApplication.translate("SettingsDialog", "SongSelect Username:", None, QtGui.QApplication.UnicodeUTF8)) - self.PasswordLabel.setText(QtGui.QApplication.translate("SettingsDialog", "SongSelect Password:", None, QtGui.QApplication.UnicodeUTF8)) - 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.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 dec6b9ecb..68761f27f 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -52,86 +52,6 @@ class BiblePlugin(Plugin, PluginUtils): def get_settings_tab(self): self.BiblesTab = BiblesTab() - """ - 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.BiblesTab def get_media_manager_item(self): diff --git a/openlp/plugins/bibles/forms/bibleeditdialog.py b/openlp/plugins/bibles/forms/bibleeditdialog.py deleted file mode 100644 index 7acaf416c..000000000 --- a/openlp/plugins/bibles/forms/bibleeditdialog.py +++ /dev/null @@ -1,54 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'bibleeditdialog.ui' -# -# Created: Wed Feb 18 06:02:58 2009 -# by: PyQt4 UI code generator 4.4.4 -# -# WARNING! All changes made in this file will be lost! - -from PyQt4 import QtCore, QtGui - -class Ui_dialog(object): - def setupUi(self, dialog): - dialog.setObjectName("dialog") - dialog.resize(400, 300) - icon = QtGui.QIcon() - icon.addPixmap(QtGui.QPixmap(":/icon/openlp.org-icon-32.bmp"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - dialog.setWindowIcon(icon) - self.verticalLayout = QtGui.QVBoxLayout(dialog) - self.verticalLayout.setSpacing(8) - self.verticalLayout.setMargin(8) - self.verticalLayout.setObjectName("verticalLayout") - self.EditGroupBox = QtGui.QGroupBox(dialog) - self.EditGroupBox.setObjectName("EditGroupBox") - self.gridLayout = QtGui.QGridLayout(self.EditGroupBox) - self.gridLayout.setMargin(8) - self.gridLayout.setSpacing(8) - self.gridLayout.setObjectName("gridLayout") - self.VerseTextEdit = QtGui.QPlainTextEdit(self.EditGroupBox) - self.VerseTextEdit.setObjectName("VerseTextEdit") - self.gridLayout.addWidget(self.VerseTextEdit, 0, 0, 1, 1) - self.verticalLayout.addWidget(self.EditGroupBox) - self.ButtonLoayout = QtGui.QHBoxLayout() - self.ButtonLoayout.setSpacing(8) - self.ButtonLoayout.setMargin(8) - self.ButtonLoayout.setObjectName("ButtonLoayout") - self.SaveButton = QtGui.QPushButton(dialog) - self.SaveButton.setObjectName("SaveButton") - self.ButtonLoayout.addWidget(self.SaveButton) - self.CancelButton = QtGui.QPushButton(dialog) - self.CancelButton.setObjectName("CancelButton") - self.ButtonLoayout.addWidget(self.CancelButton) - self.verticalLayout.addLayout(self.ButtonLoayout) - - self.retranslateUi(dialog) - QtCore.QMetaObject.connectSlotsByName(dialog) - dialog.setTabOrder(self.VerseTextEdit, self.SaveButton) - dialog.setTabOrder(self.SaveButton, self.CancelButton) - - def retranslateUi(self, dialog): - dialog.setWindowTitle(QtGui.QApplication.translate("dialog", "Bible Edit Dialog", None, QtGui.QApplication.UnicodeUTF8)) - self.EditGroupBox.setTitle(QtGui.QApplication.translate("dialog", "Edit Verse Text", None, QtGui.QApplication.UnicodeUTF8)) - self.SaveButton.setText(QtGui.QApplication.translate("dialog", "Save", None, QtGui.QApplication.UnicodeUTF8)) - self.CancelButton.setText(QtGui.QApplication.translate("dialog", "Cancel", None, QtGui.QApplication.UnicodeUTF8)) diff --git a/openlp/plugins/bibles/forms/bibleeditdialog.ui b/openlp/plugins/bibles/forms/bibleeditdialog.ui deleted file mode 100644 index 3a947cc17..000000000 --- a/openlp/plugins/bibles/forms/bibleeditdialog.ui +++ /dev/null @@ -1,80 +0,0 @@ - - - dialog - - - - 0 - 0 - 400 - 300 - - - - Bible Edit Dialog - - - - :/icon/openlp.org-icon-32.bmp:/icon/openlp.org-icon-32.bmp - - - - 8 - - - 8 - - - - - Edit Verse Text - - - - 8 - - - 8 - - - - - - - - - - - 8 - - - 8 - - - - - Save - - - - - - - Cancel - - - - - - - - - VerseTextEdit - SaveButton - CancelButton - - - - - - diff --git a/openlp/plugins/bibles/lib/biblestab.py b/openlp/plugins/bibles/lib/biblestab.py index 9632c67fe..3d109404d 100644 --- a/openlp/plugins/bibles/lib/biblestab.py +++ b/openlp/plugins/bibles/lib/biblestab.py @@ -33,3 +33,79 @@ class BiblesTab(SettingsTab): def setupUi(self): self.setObjectName(u'BiblesTab') + + self.formLayout_3 = QtGui.QFormLayout(self) + self.formLayout_3.setObjectName("formLayout_3") + self.VerseDisplayGroupBox = QtGui.QGroupBox(self) + 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) + 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) + + + def retranslateUi(self): + self.VerseDisplayGroupBox.setTitle(translate("SettingsForm", "Verse Display")) + self.VerseRadioButton.setText(translate("SettingsForm", "Verse style")) + self.ParagraphRadioButton.setText(translate("SettingsForm", "Paragraph style")) + self.NewChaptersCheckBox.setText(translate("SettingsForm", "Only show new chapter numbers")) + self.DisplayStyleLabel.setText(translate("SettingsForm", "Display Style:")) + self.DisplayStyleComboBox.setItemText(0, translate("SettingsForm", "No brackets")) + self.DisplayStyleComboBox.setItemText(1, translate("SettingsForm", "( and )")) + self.DisplayStyleComboBox.setItemText(2, translate("SettingsForm", "{ and }")) + self.DisplayStyleComboBox.setItemText(3, translate("SettingsForm", "[ and ]")) + self.ChangeNoteLabel.setText(translate("SettingsForm", "\n" +"\n" +"

Changes don\'t affect verses already in the service

")) + self.SearchGroupBox_2.setTitle(translate("SettingsForm", "Search")) + self.SearchCheckBox_2.setText(translate("SettingsForm", "Enabled search-as-you-type")) diff --git a/openlp/plugins/videos/lib/__init__.py b/openlp/plugins/videos/lib/__init__.py new file mode 100644 index 000000000..24ec7d925 --- /dev/null +++ b/openlp/plugins/videos/lib/__init__.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +""" +OpenLP - Open Source Lyrics Projection +Copyright (c) 2008 Raoul Snyman +Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley + +This program is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free Software +Foundation; version 2 of the License. + +This program is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with +this program; if not, write to the Free Software Foundation, Inc., 59 Temple +Place, Suite 330, Boston, MA 02111-1307 USA +""" + +from videotab import VideoTab + +__all__ = ['VideoTab'] diff --git a/openlp/plugins/videos/lib/videotab.py b/openlp/plugins/videos/lib/videotab.py new file mode 100644 index 000000000..c0d201c6d --- /dev/null +++ b/openlp/plugins/videos/lib/videotab.py @@ -0,0 +1,62 @@ +# -*- coding: utf-8 -*- +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +""" +OpenLP - Open Source Lyrics Projection +Copyright (c) 2008 Raoul Snyman +Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, + +This program is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free Software +Foundation; version 2 of the License. + +This program is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with +this program; if not, write to the Free Software Foundation, Inc., 59 Temple +Place, Suite 330, Boston, MA 02111-1307 USA +""" + +from PyQt4 import QtCore, QtGui + +from openlp.core import translate +from openlp.core.lib import SettingsTab +from openlp.core.resources import * + +class VideoTab(SettingsTab): + """ + VideoTab is the video settings tab in the settings dialog. + """ + def __init__(self): + SettingsTab.__init__(self, u'Video') + + def setupUi(self): + self.setObjectName(u'VideoTab') + + self.VideoLayout = QtGui.QFormLayout(self) + self.VideoLayout.setObjectName("VideoLayout") + + self.VideoModeGroupBox = QtGui.QGroupBox(self) + self.VideoModeGroupBox.setObjectName("VideoModeGroupBox") + self.VideoModeLayout = QtGui.QVBoxLayout(self.VideoModeGroupBox) + self.VideoModeLayout.setSpacing(8) + self.VideoModeLayout.setMargin(8) + self.VideoModeLayout.setObjectName("VideoModeLayout") + self.UseVMRCheckBox = QtGui.QCheckBox(self.VideoModeGroupBox) + self.UseVMRCheckBox.setObjectName("UseVMRCheckBox") + self.VideoModeLayout.addWidget(self.UseVMRCheckBox) + self.UseVMRLabel = QtGui.QLabel(self.VideoModeGroupBox) + self.UseVMRLabel.setObjectName("UseVMRLabel") + self.VideoModeLayout.addWidget(self.UseVMRLabel) + + self.VideoLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.VideoModeGroupBox) + + def retranslateUi(self): + self.VideoModeGroupBox.setTitle(translate("SettingsForm", "Video Mode")) + self.UseVMRCheckBox.setText(translate("SettingsForm", "Use Video Mode Rendering")) + self.UseVMRLabel.setText(translate("SettingsForm", "\n" +"\n" +"

No video preview available with VMR enabled

")) diff --git a/openlp/plugins/videos/videoplugin.py b/openlp/plugins/videos/videoplugin.py index 0f0d3af28..45400ec5f 100644 --- a/openlp/plugins/videos/videoplugin.py +++ b/openlp/plugins/videos/videoplugin.py @@ -22,6 +22,7 @@ from PyQt4 import QtCore, QtGui from openlp.core.resources import * from openlp.core.lib import Plugin, PluginUtils, MediaManagerItem, SettingsTab +from openlp.plugins.videos.lib import VideoTab class VideoPlugin(Plugin, PluginUtils): def __init__(self): @@ -34,41 +35,8 @@ class VideoPlugin(Plugin, PluginUtils): QtGui.QIcon.Normal, QtGui.QIcon.Off) def get_settings_tab(self): - self.VideosTab = SettingsTab(u'Videos') - """ - self.Videos = QtGui.QWidget() - self.Videos.setObjectName("Videos") + self.VideosTab = VideoTab() - self.VideoLayout = QtGui.QFormLayout(self.Videos) - self.VideoLayout.setObjectName("VideoLayout") - - self.VideoModeGroupBox = QtGui.QGroupBox(self.SettingsTabItem) - self.VideoModeGroupBox.setObjectName("VideoModeGroupBox") - self.VideoModeLayout = QtGui.QVBoxLayout(self.VideoModeGroupBox) - self.VideoModeLayout.setSpacing(8) - self.VideoModeLayout.setMargin(8) - self.VideoModeLayout.setObjectName("VideoModeLayout") - self.UseVMRCheckBox = QtGui.QCheckBox(self.VideoModeGroupBox) - self.UseVMRCheckBox.setObjectName("UseVMRCheckBox") - self.VideoModeLayout.addWidget(self.UseVMRCheckBox) - self.UseVMRLabel = QtGui.QLabel(self.VideoModeGroupBox) - self.UseVMRLabel.setObjectName("UseVMRLabel") - self.VideoModeLayout.addWidget(self.UseVMRLabel) - - self.VideoLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.VideoModeGroupBox) - - self.SettingsTabItem.add_items(self.Videos) - - self.SettingsTabItem.setTabText(QtGui.QApplication.translate("SettingsForm", "Videos", None, QtGui.QApplication.UnicodeUTF8)) - - 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" -"

No video preview available with VMR enabled

", None, QtGui.QApplication.UnicodeUTF8)) - """ return self.VideosTab def get_media_manager_item(self): diff --git a/resources/forms/bibleimportdialog.py b/resources/forms/bibleimportdialog.py deleted file mode 100644 index e774f6d82..000000000 --- a/resources/forms/bibleimportdialog.py +++ /dev/null @@ -1,233 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'bibleimportdialog.ui' -# -# Created: Fri Feb 20 05:52:48 2009 -# by: PyQt4 UI code generator 4.4.4 -# -# WARNING! All changes made in this file will be lost! - -from PyQt4 import QtCore, QtGui - -class Ui_BibleImportDialog(object): - def setupUi(self, BibleImportDialog): - BibleImportDialog.setObjectName("BibleImportDialog") - BibleImportDialog.resize(494, 725) - icon = QtGui.QIcon() - icon.addPixmap(QtGui.QPixmap(":/icon/openlp.org-icon-32.bmp"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - BibleImportDialog.setWindowIcon(icon) - self.ImportToolBox = QtGui.QToolBox(BibleImportDialog) - self.ImportToolBox.setGeometry(QtCore.QRect(20, 20, 451, 401)) - self.ImportToolBox.setFrameShape(QtGui.QFrame.StyledPanel) - self.ImportToolBox.setObjectName("ImportToolBox") - self.FileImportPage = QtGui.QWidget() - self.FileImportPage.setGeometry(QtCore.QRect(0, 0, 447, 337)) - self.FileImportPage.setObjectName("FileImportPage") - self.OSISGroupBox = QtGui.QGroupBox(self.FileImportPage) - self.OSISGroupBox.setGeometry(QtCore.QRect(18, 65, 411, 81)) - self.OSISGroupBox.setObjectName("OSISGroupBox") - self.gridLayout_2 = QtGui.QGridLayout(self.OSISGroupBox) - self.gridLayout_2.setMargin(8) - self.gridLayout_2.setSpacing(8) - self.gridLayout_2.setObjectName("gridLayout_2") - self.LocatioLabel = QtGui.QLabel(self.OSISGroupBox) - self.LocatioLabel.setObjectName("LocatioLabel") - self.gridLayout_2.addWidget(self.LocatioLabel, 0, 0, 1, 1) - self.OSISLocationEdit = QtGui.QLineEdit(self.OSISGroupBox) - self.OSISLocationEdit.setObjectName("OSISLocationEdit") - self.gridLayout_2.addWidget(self.OSISLocationEdit, 0, 1, 1, 1) - self.OsisFileButton = QtGui.QPushButton(self.OSISGroupBox) - icon1 = QtGui.QIcon() - icon1.addPixmap(QtGui.QPixmap(":/imports/import_load.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.OsisFileButton.setIcon(icon1) - self.OsisFileButton.setObjectName("OsisFileButton") - self.gridLayout_2.addWidget(self.OsisFileButton, 0, 2, 1, 1) - self.CVSGroupBox = QtGui.QGroupBox(self.FileImportPage) - self.CVSGroupBox.setGeometry(QtCore.QRect(20, 170, 411, 191)) - self.CVSGroupBox.setObjectName("CVSGroupBox") - self.gridLayout = QtGui.QGridLayout(self.CVSGroupBox) - self.gridLayout.setMargin(8) - self.gridLayout.setSpacing(8) - self.gridLayout.setObjectName("gridLayout") - self.BooksLocationLabel = QtGui.QLabel(self.CVSGroupBox) - self.BooksLocationLabel.setObjectName("BooksLocationLabel") - self.gridLayout.addWidget(self.BooksLocationLabel, 0, 0, 1, 1) - self.VerseLocationLabel = QtGui.QLabel(self.CVSGroupBox) - self.VerseLocationLabel.setObjectName("VerseLocationLabel") - self.gridLayout.addWidget(self.VerseLocationLabel, 4, 0, 1, 1) - self.VerseLocationEdit = QtGui.QLineEdit(self.CVSGroupBox) - self.VerseLocationEdit.setObjectName("VerseLocationEdit") - self.gridLayout.addWidget(self.VerseLocationEdit, 4, 1, 1, 1) - self.BooksLocationEdit = QtGui.QLineEdit(self.CVSGroupBox) - self.BooksLocationEdit.setObjectName("BooksLocationEdit") - self.gridLayout.addWidget(self.BooksLocationEdit, 0, 1, 1, 1) - self.BooksFileButton = QtGui.QPushButton(self.CVSGroupBox) - self.BooksFileButton.setIcon(icon1) - self.BooksFileButton.setObjectName("BooksFileButton") - self.gridLayout.addWidget(self.BooksFileButton, 0, 2, 1, 1) - self.VersesFileButton = QtGui.QPushButton(self.CVSGroupBox) - self.VersesFileButton.setIcon(icon1) - self.VersesFileButton.setObjectName("VersesFileButton") - self.gridLayout.addWidget(self.VersesFileButton, 4, 2, 1, 1) - self.BibleNameEdit = QtGui.QLineEdit(self.FileImportPage) - self.BibleNameEdit.setGeometry(QtCore.QRect(100, 20, 280, 28)) - self.BibleNameEdit.setObjectName("BibleNameEdit") - self.BibleNameLabel = QtGui.QLabel(self.FileImportPage) - self.BibleNameLabel.setGeometry(QtCore.QRect(18, 20, 98, 22)) - self.BibleNameLabel.setObjectName("BibleNameLabel") - self.ImportToolBox.addItem(self.FileImportPage, "") - self.WebBiblePage = QtGui.QWidget() - self.WebBiblePage.setGeometry(QtCore.QRect(0, 0, 447, 337)) - self.WebBiblePage.setObjectName("WebBiblePage") - self.WebBibleLayout = QtGui.QVBoxLayout(self.WebBiblePage) - self.WebBibleLayout.setSpacing(8) - self.WebBibleLayout.setMargin(8) - self.WebBibleLayout.setObjectName("WebBibleLayout") - self.OptionsGroupBox = QtGui.QGroupBox(self.WebBiblePage) - self.OptionsGroupBox.setObjectName("OptionsGroupBox") - self.formLayout_2 = QtGui.QFormLayout(self.OptionsGroupBox) - self.formLayout_2.setObjectName("formLayout_2") - self.LocationLabel = QtGui.QLabel(self.OptionsGroupBox) - self.LocationLabel.setObjectName("LocationLabel") - self.formLayout_2.setWidget(0, QtGui.QFormLayout.LabelRole, self.LocationLabel) - self.LocationComboBox = QtGui.QComboBox(self.OptionsGroupBox) - self.LocationComboBox.setObjectName("LocationComboBox") - self.LocationComboBox.addItem(QtCore.QString()) - self.formLayout_2.setWidget(0, QtGui.QFormLayout.FieldRole, self.LocationComboBox) - self.BibleLabel = QtGui.QLabel(self.OptionsGroupBox) - self.BibleLabel.setObjectName("BibleLabel") - self.formLayout_2.setWidget(1, QtGui.QFormLayout.LabelRole, self.BibleLabel) - self.BibleComboBox = QtGui.QComboBox(self.OptionsGroupBox) - self.BibleComboBox.setObjectName("BibleComboBox") - self.BibleComboBox.addItem(QtCore.QString()) - self.BibleComboBox.setItemText(0, "") - self.BibleComboBox.addItem(QtCore.QString()) - self.BibleComboBox.addItem(QtCore.QString()) - self.formLayout_2.setWidget(1, QtGui.QFormLayout.FieldRole, self.BibleComboBox) - self.WebBibleLayout.addWidget(self.OptionsGroupBox) - self.ProxyGroupBox = QtGui.QGroupBox(self.WebBiblePage) - self.ProxyGroupBox.setObjectName("ProxyGroupBox") - self.ProxySettingsLayout = QtGui.QFormLayout(self.ProxyGroupBox) - self.ProxySettingsLayout.setFieldGrowthPolicy(QtGui.QFormLayout.AllNonFixedFieldsGrow) - self.ProxySettingsLayout.setMargin(8) - self.ProxySettingsLayout.setSpacing(8) - self.ProxySettingsLayout.setObjectName("ProxySettingsLayout") - self.AddressLabel = QtGui.QLabel(self.ProxyGroupBox) - self.AddressLabel.setObjectName("AddressLabel") - self.ProxySettingsLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.AddressLabel) - self.AddressEdit = QtGui.QLineEdit(self.ProxyGroupBox) - self.AddressEdit.setObjectName("AddressEdit") - self.ProxySettingsLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.AddressEdit) - self.UsernameLabel = QtGui.QLabel(self.ProxyGroupBox) - self.UsernameLabel.setObjectName("UsernameLabel") - self.ProxySettingsLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.UsernameLabel) - self.UsernameEdit = QtGui.QLineEdit(self.ProxyGroupBox) - self.UsernameEdit.setObjectName("UsernameEdit") - self.ProxySettingsLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.UsernameEdit) - self.PasswordLabel = QtGui.QLabel(self.ProxyGroupBox) - self.PasswordLabel.setObjectName("PasswordLabel") - self.ProxySettingsLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.PasswordLabel) - self.PasswordEdit = QtGui.QLineEdit(self.ProxyGroupBox) - self.PasswordEdit.setObjectName("PasswordEdit") - self.ProxySettingsLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.PasswordEdit) - self.WebBibleLayout.addWidget(self.ProxyGroupBox) - self.ImportToolBox.addItem(self.WebBiblePage, "") - self.LicenceDetailsGroupBox = QtGui.QGroupBox(BibleImportDialog) - self.LicenceDetailsGroupBox.setGeometry(QtCore.QRect(10, 435, 471, 151)) - self.LicenceDetailsGroupBox.setMinimumSize(QtCore.QSize(0, 123)) - self.LicenceDetailsGroupBox.setObjectName("LicenceDetailsGroupBox") - self.formLayout = QtGui.QFormLayout(self.LicenceDetailsGroupBox) - self.formLayout.setMargin(8) - self.formLayout.setHorizontalSpacing(8) - self.formLayout.setObjectName("formLayout") - self.VersionNameLabel = QtGui.QLabel(self.LicenceDetailsGroupBox) - self.VersionNameLabel.setObjectName("VersionNameLabel") - self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.VersionNameLabel) - self.VersionNameEdit = QtGui.QLineEdit(self.LicenceDetailsGroupBox) - self.VersionNameEdit.setObjectName("VersionNameEdit") - self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.VersionNameEdit) - self.CopyrightLabel = QtGui.QLabel(self.LicenceDetailsGroupBox) - self.CopyrightLabel.setObjectName("CopyrightLabel") - self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.CopyrightLabel) - self.CopyrightEdit = QtGui.QLineEdit(self.LicenceDetailsGroupBox) - self.CopyrightEdit.setObjectName("CopyrightEdit") - self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.CopyrightEdit) - self.PermisionLabel = QtGui.QLabel(self.LicenceDetailsGroupBox) - self.PermisionLabel.setObjectName("PermisionLabel") - self.formLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.PermisionLabel) - self.PermisionEdit = QtGui.QLineEdit(self.LicenceDetailsGroupBox) - self.PermisionEdit.setObjectName("PermisionEdit") - self.formLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.PermisionEdit) - self.MessageLabel = QtGui.QLabel(BibleImportDialog) - self.MessageLabel.setGeometry(QtCore.QRect(20, 670, 271, 17)) - self.MessageLabel.setObjectName("MessageLabel") - self.ProgressGroupBox = QtGui.QGroupBox(BibleImportDialog) - self.ProgressGroupBox.setGeometry(QtCore.QRect(10, 600, 471, 70)) - self.ProgressGroupBox.setObjectName("ProgressGroupBox") - self.gridLayout_3 = QtGui.QGridLayout(self.ProgressGroupBox) - self.gridLayout_3.setObjectName("gridLayout_3") - self.ProgressBar = QtGui.QProgressBar(self.ProgressGroupBox) - self.ProgressBar.setProperty("value", QtCore.QVariant(0)) - self.ProgressBar.setInvertedAppearance(False) - self.ProgressBar.setObjectName("ProgressBar") - self.gridLayout_3.addWidget(self.ProgressBar, 0, 0, 1, 1) - self.layoutWidget = QtGui.QWidget(BibleImportDialog) - self.layoutWidget.setGeometry(QtCore.QRect(300, 680, 180, 38)) - self.layoutWidget.setObjectName("layoutWidget") - self.horizontalLayout = QtGui.QHBoxLayout(self.layoutWidget) - self.horizontalLayout.setMargin(6) - self.horizontalLayout.setObjectName("horizontalLayout") - self.ImportButton = QtGui.QPushButton(self.layoutWidget) - self.ImportButton.setObjectName("ImportButton") - self.horizontalLayout.addWidget(self.ImportButton) - self.CancelButton = QtGui.QPushButton(self.layoutWidget) - self.CancelButton.setObjectName("CancelButton") - self.horizontalLayout.addWidget(self.CancelButton) - - self.retranslateUi(BibleImportDialog) - self.ImportToolBox.setCurrentIndex(1) - QtCore.QMetaObject.connectSlotsByName(BibleImportDialog) - BibleImportDialog.setTabOrder(self.BibleNameEdit, self.OSISLocationEdit) - BibleImportDialog.setTabOrder(self.OSISLocationEdit, self.OsisFileButton) - BibleImportDialog.setTabOrder(self.OsisFileButton, self.BooksLocationEdit) - BibleImportDialog.setTabOrder(self.BooksLocationEdit, self.BooksFileButton) - BibleImportDialog.setTabOrder(self.BooksFileButton, self.VerseLocationEdit) - BibleImportDialog.setTabOrder(self.VerseLocationEdit, self.VersesFileButton) - BibleImportDialog.setTabOrder(self.VersesFileButton, self.LocationComboBox) - BibleImportDialog.setTabOrder(self.LocationComboBox, self.BibleComboBox) - BibleImportDialog.setTabOrder(self.BibleComboBox, self.AddressEdit) - BibleImportDialog.setTabOrder(self.AddressEdit, self.UsernameEdit) - BibleImportDialog.setTabOrder(self.UsernameEdit, self.PasswordEdit) - BibleImportDialog.setTabOrder(self.PasswordEdit, self.VersionNameEdit) - BibleImportDialog.setTabOrder(self.VersionNameEdit, self.CopyrightEdit) - BibleImportDialog.setTabOrder(self.CopyrightEdit, self.PermisionEdit) - - def retranslateUi(self, BibleImportDialog): - BibleImportDialog.setWindowTitle(QtGui.QApplication.translate("BibleImportDialog", "Bible Registration", None, QtGui.QApplication.UnicodeUTF8)) - self.OSISGroupBox.setTitle(QtGui.QApplication.translate("BibleImportDialog", "OSIS Bible", None, QtGui.QApplication.UnicodeUTF8)) - self.LocatioLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "File Location:", None, QtGui.QApplication.UnicodeUTF8)) - self.CVSGroupBox.setTitle(QtGui.QApplication.translate("BibleImportDialog", "CVS Bible", None, QtGui.QApplication.UnicodeUTF8)) - self.BooksLocationLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Books Location:", None, QtGui.QApplication.UnicodeUTF8)) - self.VerseLocationLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Verse Location:", None, QtGui.QApplication.UnicodeUTF8)) - self.BibleNameLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Bible Name:", None, QtGui.QApplication.UnicodeUTF8)) - self.ImportToolBox.setItemText(self.ImportToolBox.indexOf(self.FileImportPage), QtGui.QApplication.translate("BibleImportDialog", "File Import Page", None, QtGui.QApplication.UnicodeUTF8)) - self.OptionsGroupBox.setTitle(QtGui.QApplication.translate("BibleImportDialog", "Download Options", None, QtGui.QApplication.UnicodeUTF8)) - self.LocationLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Location:", None, QtGui.QApplication.UnicodeUTF8)) - self.LocationComboBox.setItemText(0, QtGui.QApplication.translate("BibleImportDialog", "Crosswalk", None, QtGui.QApplication.UnicodeUTF8)) - self.BibleLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Bible:", None, QtGui.QApplication.UnicodeUTF8)) - self.BibleComboBox.setItemText(1, QtGui.QApplication.translate("BibleImportDialog", "NIV", None, QtGui.QApplication.UnicodeUTF8)) - self.BibleComboBox.setItemText(2, QtGui.QApplication.translate("BibleImportDialog", "KJV", None, QtGui.QApplication.UnicodeUTF8)) - self.ProxyGroupBox.setTitle(QtGui.QApplication.translate("BibleImportDialog", "Proxy Settings (Optional)", None, QtGui.QApplication.UnicodeUTF8)) - self.AddressLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Proxy Address:", None, QtGui.QApplication.UnicodeUTF8)) - self.UsernameLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Username:", None, QtGui.QApplication.UnicodeUTF8)) - self.PasswordLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Password:", None, QtGui.QApplication.UnicodeUTF8)) - self.ImportToolBox.setItemText(self.ImportToolBox.indexOf(self.WebBiblePage), QtGui.QApplication.translate("BibleImportDialog", "Web Bible Import page", None, QtGui.QApplication.UnicodeUTF8)) - self.LicenceDetailsGroupBox.setTitle(QtGui.QApplication.translate("BibleImportDialog", "Licence Details", None, QtGui.QApplication.UnicodeUTF8)) - self.VersionNameLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Version Name:", None, QtGui.QApplication.UnicodeUTF8)) - self.CopyrightLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Copyright:", None, QtGui.QApplication.UnicodeUTF8)) - self.PermisionLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Permission:", None, QtGui.QApplication.UnicodeUTF8)) - self.ProgressGroupBox.setTitle(QtGui.QApplication.translate("BibleImportDialog", "Import Progress", None, QtGui.QApplication.UnicodeUTF8)) - self.ProgressBar.setFormat(QtGui.QApplication.translate("BibleImportDialog", "%p", None, QtGui.QApplication.UnicodeUTF8)) - self.ImportButton.setText(QtGui.QApplication.translate("BibleImportDialog", "Import", None, QtGui.QApplication.UnicodeUTF8)) - self.CancelButton.setText(QtGui.QApplication.translate("BibleImportDialog", "Cancel", None, QtGui.QApplication.UnicodeUTF8)) - diff --git a/resources/forms/settings2.ui b/resources/forms/settings2.ui deleted file mode 100644 index c673c377a..000000000 --- a/resources/forms/settings2.ui +++ /dev/null @@ -1,967 +0,0 @@ - - - SettingsDialog - - - - 0 - 0 - 602 - 502 - - - - Settings - - - - :/icon/openlp.org-icon-32.bmp:/icon/openlp.org-icon-32.bmp - - - - - 0 - 0 - 669 - 500 - - - - 5 - - - - Song Themes - - - - 8 - - - 8 - - - - - - 8 - - - 0 - - - - - Monitors - - - - 8 - - - 8 - - - - - Select monitor for output display: - - - - - - - - Monitor 1 on X11 Windowing System - - - - - Monitor 2 on X11 Windowing System - - - - - - - - - - - Font Size - - - - 8 - - - 8 - - - - - true - - - Automatically resize font to fit text to slide - - - - - - - Wrap long lines to keep desired font - - - - - - - - - - Song Display - - - - 8 - - - 8 - - - - - true - - - Enable displaying of song credits - - - - - - - - - - Blank Screen - - - - 8 - - - 8 - - - - - Show warning on startup - - - - - - - - - - Auto Open Last Service - - - - - - Automatically open the last service at startup - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - 8 - - - 0 - - - - - - - - - Alerts - - - - - - Alerts - - - - 8 - - - - - Font Name: - - - - - - - - - - - 8 - - - 0 - - - - - Font Color: - - - - - - - - 24 - 24 - - - - - 24 - 24 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Background Color: - - - - - - - - 24 - 24 - - - - - 24 - 24 - - - - - - - - - - - - 16777215 - 64 - - - - - - - - - 8 - - - 0 - - - - - Display length: - - - - - - - 5 - - - s - - - 180 - - - - - - - Qt::Horizontal - - - - 147 - 20 - - - - - - - - - - - - - - - Song Theme - - - - 8 - - - 8 - - - - - Global theme - - - - 8 - - - 8 - - - - - - African Sunset - - - - - Snowy Mountains - - - - - Wilderness - - - - - - - - - - - - - - Theme level - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - 8 - - - 8 - - - 8 - - - - - Song level - - - - - - - Use the theme from each song in the database. If a song doesn't have a theme associated with it, then use the service's theme. If the service doesn't have a theme, then use the global theme. - - - true - - - - - - - Service level - - - - - - - Use the theme from the service , overriding any of the individual songs' themes. If the service doesn't have a theme, then use the global theme. - - - true - - - - - - - true - - - Global level - - - - - - - Use the global theme, overriding any themes associated wither either the service or the songs. - - - true - - - - - - - - - - - Songs - - - - 8 - - - 8 - - - - - - 8 - - - 0 - - - - - Qt::Vertical - - - - 20 - 94 - - - - - - - - - - - - 8 - - - 0 - - - - - Song Wizard - - - - 8 - - - 8 - - - - - true - - - Use the Song Wizard to add songs - - - - - - - - - - Slide Wrap Around - - - - 8 - - - 8 - - - - - Enable slide wrap around - - - - - - - - - - Timed Cycling - - - - 8 - - - 8 - - - - - - 8 - - - 0 - - - - - Update interval: - - - - - - - 30 - - - s - - - 600 - - - - - - - Qt::Horizontal - - - - 139 - 20 - - - - - - - - - - - Enable timed cycling - - - - - - - - - - CCLI Details - - - - 8 - - - 8 - - - - - CCLI Number: - - - - - - - - - - SongSelect Username: - - - - - - - - - - SongSelect Password: - - - - - - - QLineEdit::Password - - - - - - - - - - Search - - - - - - true - - - Enabled search-as-you-type - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - Bibles - - - - - - Verse Display - - - - 8 - - - - - - 8 - - - 0 - - - - - Verse style - - - - - - - true - - - Paragraph style - - - - - - - - - - Only show new chapter numbers - - - - - - - - 8 - - - 0 - - - - - Display Style: - - - - - - - - No brackets - - - - - ( and ) - - - - - { and } - - - - - [ and ] - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Changes don't affect verses already in the service</span></p></body></html> - - - - - - - - - - Search - - - - - - true - - - Enabled search-as-you-type - - - - - - - - - - - Videos - - - - - - Video Mode - - - - 8 - - - 8 - - - - - Use Video Mode Rendering - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">No video preview available with VMR enabled</span></p></body></html> - - - - - - - - - - - - - 490 - 470 - 81 - 26 - - - - Save - - - - - - 400 - 470 - 81 - 26 - - - - Cancel - - - - - - 310 - 470 - 81 - 26 - - - - Reset - - - - - - - -