From 744234a1839488193e62de49e36ecccb39dd319d Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sun, 1 Mar 2009 14:36:49 +0000 Subject: [PATCH] Updated some funky layouts on the settings tabs. bzr-revno: 354 --- .eric4project/openlp.org 2.0.e4q | 2 +- .eric4project/openlp.org 2.0.e4t | 2 +- openlp/core/ui/alertstab.py | 9 +-- openlp/core/ui/generaltab.py | 2 + openlp/plugins/bibles/lib/biblestab.py | 91 ++++++++++++++++---------- 5 files changed, 65 insertions(+), 41 deletions(-) diff --git a/.eric4project/openlp.org 2.0.e4q b/.eric4project/openlp.org 2.0.e4q index 5e8f59e57..0d8d7b414 100644 --- a/.eric4project/openlp.org 2.0.e4q +++ b/.eric4project/openlp.org 2.0.e4q @@ -1,7 +1,7 @@ - + \ No newline at end of file diff --git a/.eric4project/openlp.org 2.0.e4t b/.eric4project/openlp.org 2.0.e4t index 2d0d0797c..87e33d0b6 100644 --- a/.eric4project/openlp.org 2.0.e4t +++ b/.eric4project/openlp.org 2.0.e4t @@ -1,7 +1,7 @@ - + TODO: what is the tags for bridge, pre-chorus? diff --git a/openlp/core/ui/alertstab.py b/openlp/core/ui/alertstab.py index cbd5ea794..1c8644bd7 100644 --- a/openlp/core/ui/alertstab.py +++ b/openlp/core/ui/alertstab.py @@ -104,13 +104,13 @@ class AlertsTab(SettingsTab): QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) self.SlideLeftLayout.addItem(self.SlideLeftSpacer) self.AlertsLayout.addWidget(self.AlertLeftColumn) - self.SlideRightColumn = QtGui.QWidget(self) - self.SlideRightColumn.setObjectName(u'SlideRightColumn') - self.SlideRightLayout = QtGui.QVBoxLayout(self.SlideRightColumn) + self.AlertRightColumn = QtGui.QWidget(self) + self.AlertRightColumn.setObjectName(u'AlertRightColumn') + self.SlideRightLayout = QtGui.QVBoxLayout(self.AlertRightColumn) self.SlideRightLayout.setSpacing(8) self.SlideRightLayout.setMargin(0) self.SlideRightLayout.setObjectName(u'SlideRightLayout') - self.PreviewGroupBox = QtGui.QGroupBox(self.SlideRightColumn) + self.PreviewGroupBox = QtGui.QGroupBox(self.AlertRightColumn) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -129,6 +129,7 @@ class AlertsTab(SettingsTab): self.SlideRightSpacer = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) self.SlideRightLayout.addItem(self.SlideRightSpacer) + self.AlertsLayout.addWidget(self.AlertRightColumn) def retranslateUi(self): self.FontGroupBox.setTitle(translate(u'AlertsTab', u'Font')) diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index 532fa3dfc..6f8e62739 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -41,6 +41,8 @@ class GeneralTab(SettingsTab): self.GeneralLeftWidget.setObjectName(u'GeneralLeftWidget') self.GeneralLeftLayout = QtGui.QVBoxLayout(self.GeneralLeftWidget) self.GeneralLeftLayout.setObjectName(u'GeneralLeftLayout') + self.GeneralLeftLayout.setSpacing(8) + self.GeneralLeftLayout.setMargin(0) self.MonitorGroupBox = QtGui.QGroupBox(self.GeneralLeftWidget) self.MonitorGroupBox.setObjectName(u'MonitorGroupBox') self.MonitorLayout = QtGui.QVBoxLayout(self.MonitorGroupBox) diff --git a/openlp/plugins/bibles/lib/biblestab.py b/openlp/plugins/bibles/lib/biblestab.py index 3d109404d..c239ce9b3 100644 --- a/openlp/plugins/bibles/lib/biblestab.py +++ b/openlp/plugins/bibles/lib/biblestab.py @@ -33,66 +33,87 @@ class BiblesTab(SettingsTab): def setupUi(self): self.setObjectName(u'BiblesTab') - - self.formLayout_3 = QtGui.QFormLayout(self) - self.formLayout_3.setObjectName("formLayout_3") + self.BibleLayout = QtGui.QHBoxLayout(self) + self.BibleLayout.setSpacing(8) + self.BibleLayout.setMargin(8) + self.BibleLayout.setObjectName(u'BibleLayout') + self.BibleLeftWidget = QtGui.QWidget(self) + self.BibleLeftWidget.setObjectName(u'BibleLeftWidget') + self.BibleLeftLayout = QtGui.QVBoxLayout(self.BibleLeftWidget) + self.BibleLeftLayout.setObjectName(u'BibleLeftLayout') + self.BibleLeftLayout.setSpacing(8) + self.BibleLeftLayout.setMargin(0) 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.VerseDisplayGroupBox.setObjectName(u'VerseDisplayGroupBox') + self.VerseDisplayLayout = QtGui.QGridLayout(self.VerseDisplayGroupBox) + self.VerseDisplayLayout.setMargin(8) + self.VerseDisplayLayout.setObjectName(u'VerseDisplayLayout') self.VerseTypeWidget = QtGui.QWidget(self.VerseDisplayGroupBox) - self.VerseTypeWidget.setObjectName("VerseTypeWidget") + self.VerseTypeWidget.setObjectName(u'VerseTypeWidget') self.VerseTypeLayout = QtGui.QHBoxLayout(self.VerseTypeWidget) self.VerseTypeLayout.setSpacing(8) self.VerseTypeLayout.setMargin(0) - self.VerseTypeLayout.setObjectName("VerseTypeLayout") + self.VerseTypeLayout.setObjectName(u'VerseTypeLayout') self.VerseRadioButton = QtGui.QRadioButton(self.VerseTypeWidget) - self.VerseRadioButton.setObjectName("VerseRadioButton") + self.VerseRadioButton.setObjectName(u'VerseRadioButton') self.VerseTypeLayout.addWidget(self.VerseRadioButton) self.ParagraphRadioButton = QtGui.QRadioButton(self.VerseTypeWidget) self.ParagraphRadioButton.setChecked(True) - self.ParagraphRadioButton.setObjectName("ParagraphRadioButton") + self.ParagraphRadioButton.setObjectName(u'ParagraphRadioButton') self.VerseTypeLayout.addWidget(self.ParagraphRadioButton) - self.gridLayout_2.addWidget(self.VerseTypeWidget, 0, 0, 1, 1) + self.VerseDisplayLayout.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.VerseDisplayLayout.addWidget(self.NewChaptersCheckBox, 1, 0, 1, 1) self.DisplayStyleWidget = QtGui.QWidget(self.VerseDisplayGroupBox) - self.DisplayStyleWidget.setObjectName("DisplayStyleWidget") + self.DisplayStyleWidget.setObjectName(u'DisplayStyleWidget') self.DisplayStyleLayout = QtGui.QHBoxLayout(self.DisplayStyleWidget) self.DisplayStyleLayout.setSpacing(8) self.DisplayStyleLayout.setMargin(0) - self.DisplayStyleLayout.setObjectName("DisplayStyleLayout") + self.DisplayStyleLayout.setObjectName(u'DisplayStyleLayout') self.DisplayStyleLabel = QtGui.QLabel(self.DisplayStyleWidget) - self.DisplayStyleLabel.setObjectName("DisplayStyleLabel") + self.DisplayStyleLabel.setObjectName(u'DisplayStyleLabel') self.DisplayStyleLayout.addWidget(self.DisplayStyleLabel) self.DisplayStyleComboBox = QtGui.QComboBox(self.DisplayStyleWidget) - self.DisplayStyleComboBox.setObjectName("DisplayStyleComboBox") + self.DisplayStyleComboBox.setObjectName(u'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.VerseDisplayLayout.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) + self.ChangeNoteLabel.setObjectName(u'ChangeNoteLabel') + self.VerseDisplayLayout.addWidget(self.ChangeNoteLabel, 3, 0, 1, 1) + self.BibleLeftLayout.addWidget(self.VerseDisplayGroupBox) + self.BibleLeftSpacer = QtGui.QSpacerItem(40, 20, + QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.BibleLeftLayout.addItem(self.BibleLeftSpacer) + self.BibleLayout.addWidget(self.BibleLeftWidget) + self.BibleRightWidget = QtGui.QWidget(self) + self.BibleRightWidget.setObjectName(u'BibleRightWidget') + self.BibleRightLayout = QtGui.QVBoxLayout(self.BibleRightWidget) + self.BibleRightLayout.setObjectName(u'BibleRightLayout') + self.BibleRightLayout.setSpacing(8) + self.BibleRightLayout.setMargin(0) + self.BibleSearchGroupBox = QtGui.QGroupBox(self) + self.BibleSearchGroupBox.setObjectName(u'BibleSearchGroupBox') + self.BibleSearchLayout = QtGui.QVBoxLayout(self.BibleSearchGroupBox) + self.BibleSearchLayout.setObjectName(u'BibleSearchLayout') + self.BibleSearchLayout.setSpacing(8) + self.BibleSearchLayout.setMargin(8) + self.BibleSearchCheckBox = QtGui.QCheckBox(self.BibleSearchGroupBox) + self.BibleSearchCheckBox.setChecked(True) + self.BibleSearchCheckBox.setObjectName(u'BibleSearchCheckBox') + self.BibleSearchLayout.addWidget(self.BibleSearchCheckBox) + self.BibleRightLayout.addWidget(self.BibleSearchGroupBox) + self.BibleRightSpacer = QtGui.QSpacerItem(40, 20, + QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.BibleRightLayout.addItem(self.BibleRightSpacer) + self.BibleLayout.addWidget(self.BibleRightWidget) - def retranslateUi(self): + def retranslateUi(self): self.VerseDisplayGroupBox.setTitle(translate("SettingsForm", "Verse Display")) self.VerseRadioButton.setText(translate("SettingsForm", "Verse style")) self.ParagraphRadioButton.setText(translate("SettingsForm", "Paragraph style")) @@ -107,5 +128,5 @@ class BiblesTab(SettingsTab): "p, li { white-space: pre-wrap; }\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")) + self.BibleSearchGroupBox.setTitle(translate("SettingsForm", "Search")) + self.BibleSearchCheckBox.setText(translate("SettingsForm", "Search-as-you-type"))