From 66d8a188fedbeddfc888a79338e344bb7770403d Mon Sep 17 00:00:00 2001 From: M2j Date: Thu, 23 Dec 2010 18:44:42 +0100 Subject: [PATCH] Remove most manual formating in the themewizard (regards to bug #686103) --- openlp/core/ui/themeform.py | 11 + openlp/core/ui/themewizard.py | 332 +++++------------ resources/forms/themewizard.ui | 661 +++++++-------------------------- 3 files changed, 242 insertions(+), 762 deletions(-) diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py index 7ed58e943..94a4e858a 100644 --- a/openlp/core/ui/themeform.py +++ b/openlp/core/ui/themeform.py @@ -456,6 +456,17 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard): """ self.theme.background_type = BackgroundType.to_string(index) self.setBackgroundTabValues() + self.colorLabel.setVisible(index == 0) + self.colorButton.setVisible(index == 0) + self.gradientStartLabel.setVisible(index == 1) + self.gradientStartButton.setVisible(index == 1) + self.gradientEndLabel.setVisible(index == 1) + self.gradientEndButton.setVisible(index == 1) + self.gradientTypeLabel.setVisible(index == 1) + self.gradientComboBox.setVisible(index == 1) + self.imageLabel.setVisible(index == 2) + self.imageLineEdit.setVisible(index == 2) + self.imageBrowseButton.setVisible(index == 2) def onGradientComboBox(self, index): """ diff --git a/openlp/core/ui/themewizard.py b/openlp/core/ui/themewizard.py index d86792af4..84ef6c714 100644 --- a/openlp/core/ui/themewizard.py +++ b/openlp/core/ui/themewizard.py @@ -31,24 +31,21 @@ from openlp.core.lib import translate, build_icon class Ui_ThemeWizard(object): def setupUi(self, ThemeWizard): ThemeWizard.setObjectName(u'OpenLP.ThemeWizard') - ThemeWizard.resize(550, 386) ThemeWizard.setModal(True) ThemeWizard.setWizardStyle(QtGui.QWizard.ModernStyle) ThemeWizard.setOptions( QtGui.QWizard.IndependentPages | QtGui.QWizard.NoBackButtonOnStartPage) self.welcomePage = QtGui.QWizardPage() - self.welcomePage.setTitle(u'') - self.welcomePage.setSubTitle(u'') - self.welcomePage.setObjectName(u'welcomePage') self.welcomePage.setPixmap(QtGui.QWizard.WatermarkPixmap, QtGui.QPixmap(u':/wizards/wizard_createtheme.bmp')) + self.welcomePage.setObjectName(u'welcomePage') self.welcomeLayout = QtGui.QHBoxLayout(self.welcomePage) - self.welcomeLayout.setSpacing(8) self.welcomeLayout.setMargin(0) self.welcomeLayout.setObjectName(u'welcomeLayout') self.welcomePageLayout = QtGui.QVBoxLayout() - self.welcomePageLayout.setSpacing(8) + self.welcomePageLayout.setSpacing(6) + self.welcomePageLayout.setMargin(12) self.welcomePageLayout.setObjectName(u'welcomePageLayout') self.titleLabel = QtGui.QLabel(self.welcomePage) self.titleLabel.setObjectName(u'titleLabel') @@ -58,7 +55,6 @@ class Ui_ThemeWizard(object): self.welcomePageLayout.addItem(self.welcomeTopSpacer) self.informationLabel = QtGui.QLabel(self.welcomePage) self.informationLabel.setWordWrap(True) - self.informationLabel.setMargin(10) self.informationLabel.setObjectName(u'informationLabel') self.welcomePageLayout.addWidget(self.informationLabel) self.welcomeBottomSpacer = QtGui.QSpacerItem(20, 40, @@ -68,137 +64,91 @@ class Ui_ThemeWizard(object): ThemeWizard.addPage(self.welcomePage) self.backgroundPage = QtGui.QWizardPage() self.backgroundPage.setObjectName(u'backgroundPage') - self.backgroundLayout = QtGui.QVBoxLayout(self.backgroundPage) - self.backgroundLayout.setSpacing(8) - self.backgroundLayout.setMargin(20) + self.backgroundLayout = QtGui.QFormLayout(self.backgroundPage) + self.backgroundLayout.setMargin(12) + self.backgroundLayout.setVerticalSpacing(6) self.backgroundLayout.setObjectName(u'backgroundLayout') - self.backgroundTypeLayout = QtGui.QHBoxLayout() - self.backgroundTypeLayout.setSpacing(8) - self.backgroundTypeLayout.setObjectName(u'backgroundTypeLayout') self.backgroundTypeLabel = QtGui.QLabel(self.backgroundPage) self.backgroundTypeLabel.setObjectName(u'backgroundTypeLabel') - self.backgroundTypeLayout.addWidget(self.backgroundTypeLabel) + self.backgroundLayout.setWidget(0, QtGui.QFormLayout.LabelRole, + self.backgroundTypeLabel) self.backgroundTypeComboBox = QtGui.QComboBox(self.backgroundPage) + self.backgroundTypeComboBox.addItem(u'') + self.backgroundTypeComboBox.addItem(u'') + self.backgroundTypeComboBox.addItem(u'') self.backgroundTypeComboBox.setObjectName(u'backgroundTypeComboBox') - self.backgroundTypeComboBox.addItem(u'') - self.backgroundTypeComboBox.addItem(u'') - self.backgroundTypeComboBox.addItem(u'') - self.backgroundTypeLayout.addWidget(self.backgroundTypeComboBox) - self.backgroundTypeSpacer = QtGui.QSpacerItem(40, 20, - QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.backgroundTypeLayout.addItem(self.backgroundTypeSpacer) - self.backgroundLayout.addLayout(self.backgroundTypeLayout) - self.backgroundStackedWidget = QtGui.QStackedWidget( - self.backgroundPage) - self.backgroundStackedWidget.setObjectName(u'backgroundStackedWidget') - self.colorPage = QtGui.QWidget() - self.colorPage.setObjectName(u'colorPage') - self.colorLayout = QtGui.QFormLayout(self.colorPage) - self.colorLayout.setMargin(0) - self.colorLayout.setSpacing(8) - self.colorLayout.setObjectName(u'colorLayout') - self.colorLabel = QtGui.QLabel(self.colorPage) - self.colorLabel.setMinimumSize(QtCore.QSize(103, 0)) - self.colorLabel.setAlignment(QtCore.Qt.AlignRight | - QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter) + self.backgroundLayout.setWidget(0, QtGui.QFormLayout.FieldRole, + self.backgroundTypeComboBox) + self.colorLabel = QtGui.QLabel(self.backgroundPage) self.colorLabel.setObjectName(u'colorLabel') - self.colorLayout.setWidget(0, - QtGui.QFormLayout.LabelRole, self.colorLabel) - self.colorButton = QtGui.QPushButton(self.colorPage) - self.colorButton.setText(u'') + self.backgroundLayout.setWidget(1, QtGui.QFormLayout.LabelRole, + self.colorLabel) + self.colorButton = QtGui.QPushButton(self.backgroundPage) self.colorButton.setObjectName(u'colorButton') - self.colorLayout.setWidget(0, - QtGui.QFormLayout.FieldRole, self.colorButton) - self.backgroundStackedWidget.addWidget(self.colorPage) - self.gradientPage = QtGui.QWidget() - self.gradientPage.setObjectName(u'gradientPage') - self.gradientLayout = QtGui.QFormLayout(self.gradientPage) - self.gradientLayout.setMargin(0) - self.gradientLayout.setSpacing(8) - self.gradientLayout.setObjectName(u'gradientLayout') - self.gradientStartLabel = QtGui.QLabel(self.gradientPage) - self.gradientStartLabel.setMinimumSize(QtCore.QSize(103, 0)) - self.gradientStartLabel.setAlignment(QtCore.Qt.AlignRight | - QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter) + self.backgroundLayout.setWidget(1, QtGui.QFormLayout.FieldRole, + self.colorButton) + self.gradientStartLabel = QtGui.QLabel(self.backgroundPage) + self.gradientStartLabel.setVisible(False) self.gradientStartLabel.setObjectName(u'gradientStartLabel') - self.gradientLayout.setWidget(0, - QtGui.QFormLayout.LabelRole, self.gradientStartLabel) - self.gradientStartButton = QtGui.QPushButton(self.gradientPage) - self.gradientStartButton.setText(u'') + self.backgroundLayout.setWidget(2, QtGui.QFormLayout.LabelRole, + self.gradientStartLabel) + self.gradientStartButton = QtGui.QPushButton(self.backgroundPage) + self.gradientStartButton.setVisible(False) self.gradientStartButton.setObjectName(u'gradientStartButton') - self.gradientLayout.setWidget(0, - QtGui.QFormLayout.FieldRole, self.gradientStartButton) - self.gradientEndLabel = QtGui.QLabel(self.gradientPage) - self.gradientEndLabel.setMinimumSize(QtCore.QSize(103, 0)) - self.gradientEndLabel.setAlignment(QtCore.Qt.AlignRight | - QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter) + self.backgroundLayout.setWidget(2, QtGui.QFormLayout.FieldRole, + self.gradientStartButton) + self.gradientEndLabel = QtGui.QLabel(self.backgroundPage) + self.gradientEndLabel.setVisible(False) self.gradientEndLabel.setObjectName(u'gradientEndLabel') - self.gradientLayout.setWidget(1, - QtGui.QFormLayout.LabelRole, self.gradientEndLabel) - self.gradientEndButton = QtGui.QPushButton(self.gradientPage) - self.gradientEndButton.setText(u'') + self.backgroundLayout.setWidget(3, QtGui.QFormLayout.LabelRole, + self.gradientEndLabel) + self.gradientEndButton = QtGui.QPushButton(self.backgroundPage) + self.gradientEndButton.setVisible(False) self.gradientEndButton.setObjectName(u'gradientEndButton') - self.gradientLayout.setWidget(1, - QtGui.QFormLayout.FieldRole, self.gradientEndButton) - self.gradientTypeLabel = QtGui.QLabel(self.gradientPage) - self.gradientTypeLabel.setMinimumSize(QtCore.QSize(103, 0)) - self.gradientTypeLabel.setAlignment(QtCore.Qt.AlignRight | - QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter) + self.backgroundLayout.setWidget(3, QtGui.QFormLayout.FieldRole, + self.gradientEndButton) + self.gradientTypeLabel = QtGui.QLabel(self.backgroundPage) + self.gradientTypeLabel.setVisible(False) self.gradientTypeLabel.setObjectName(u'gradientTypeLabel') - self.gradientLayout.setWidget(2, - QtGui.QFormLayout.LabelRole, self.gradientTypeLabel) - self.gradientComboBox = QtGui.QComboBox(self.gradientPage) + self.backgroundLayout.setWidget(4, QtGui.QFormLayout.LabelRole, + self.gradientTypeLabel) + self.gradientComboBox = QtGui.QComboBox(self.backgroundPage) + self.gradientComboBox.setVisible(False) self.gradientComboBox.setObjectName(u'gradientComboBox') self.gradientComboBox.addItem(u'') self.gradientComboBox.addItem(u'') self.gradientComboBox.addItem(u'') self.gradientComboBox.addItem(u'') self.gradientComboBox.addItem(u'') - self.gradientLayout.setWidget(2, - QtGui.QFormLayout.FieldRole, self.gradientComboBox) - self.backgroundStackedWidget.addWidget(self.gradientPage) - self.imagePage = QtGui.QWidget() - self.imagePage.setObjectName(u'imagePage') - self.imageLayout = QtGui.QFormLayout(self.imagePage) - self.imageLayout.setMargin(0) - self.imageLayout.setSpacing(8) - self.imageLayout.setObjectName(u'imageLayout') - self.imageLabel = QtGui.QLabel(self.imagePage) - self.imageLabel.setMinimumSize(QtCore.QSize(103, 0)) - self.imageLabel.setAlignment(QtCore.Qt.AlignRight | - QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter) + self.backgroundLayout.setWidget(4, QtGui.QFormLayout.FieldRole, + self.gradientComboBox) + self.imageLabel = QtGui.QLabel(self.backgroundPage) + self.imageLabel.setVisible(False) self.imageLabel.setObjectName(u'imageLabel') - self.imageLayout.setWidget(0, - QtGui.QFormLayout.LabelRole, self.imageLabel) + self.backgroundLayout.setWidget(5, QtGui.QFormLayout.LabelRole, + self.imageLabel) self.imageFileLayout = QtGui.QHBoxLayout() - self.imageFileLayout.setSpacing(8) self.imageFileLayout.setObjectName(u'imageFileLayout') - self.imageLineEdit = QtGui.QLineEdit(self.imagePage) + self.imageLineEdit = QtGui.QLineEdit(self.backgroundPage) + self.imageLineEdit.setVisible(False) self.imageLineEdit.setObjectName(u'imageLineEdit') self.imageFileLayout.addWidget(self.imageLineEdit) - self.imageBrowseButton = QtGui.QToolButton(self.imagePage) - self.imageBrowseButton.setText(u'') + self.imageBrowseButton = QtGui.QToolButton(self.backgroundPage) + self.imageBrowseButton.setVisible(False) + self.imageBrowseButton.setObjectName(u'imageBrowseButton') self.imageBrowseButton.setIcon( build_icon(u':/general/general_open.png')) - self.imageBrowseButton.setObjectName(u'imageBrowseButton') self.imageFileLayout.addWidget(self.imageBrowseButton) - self.imageLayout.setLayout(0, - QtGui.QFormLayout.FieldRole, self.imageFileLayout) - self.backgroundStackedWidget.addWidget(self.imagePage) - self.backgroundLayout.addWidget(self.backgroundStackedWidget) + self.backgroundLayout.setLayout(5, QtGui.QFormLayout.FieldRole, + self.imageFileLayout) ThemeWizard.addPage(self.backgroundPage) self.mainAreaPage = QtGui.QWizardPage() self.mainAreaPage.setObjectName(u'mainAreaPage') self.mainAreaLayout = QtGui.QFormLayout(self.mainAreaPage) - self.mainAreaLayout.setFormAlignment(QtCore.Qt.AlignLeading | - QtCore.Qt.AlignLeft | QtCore.Qt.AlignTop) - self.mainAreaLayout.setMargin(20) - self.mainAreaLayout.setSpacing(8) + self.mainAreaLayout.setMargin(12) + self.mainAreaLayout.setVerticalSpacing(6) self.mainAreaLayout.setObjectName(u'mainAreaLayout') self.mainFontLabel = QtGui.QLabel(self.mainAreaPage) - self.mainFontLabel.setMinimumSize(QtCore.QSize(103, 0)) - self.mainFontLabel.setAlignment(QtCore.Qt.AlignRight | - QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter) self.mainFontLabel.setObjectName(u'mainFontLabel') self.mainAreaLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.mainFontLabel) @@ -211,10 +161,9 @@ class Ui_ThemeWizard(object): self.mainAreaLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.mainColorLabel) self.fontPropertiesLayout = QtGui.QHBoxLayout() - self.fontPropertiesLayout.setSpacing(24) + self.fontPropertiesLayout.setSpacing(12) self.fontPropertiesLayout.setObjectName(u'fontPropertiesLayout') self.mainColorPushButton = QtGui.QPushButton(self.mainAreaPage) - self.mainColorPushButton.setText(u'') self.mainColorPushButton.setObjectName(u'mainColorPushButton') self.fontPropertiesLayout.addWidget(self.mainColorPushButton) self.boldCheckBox = QtGui.QCheckBox(self.mainAreaPage) @@ -230,18 +179,8 @@ class Ui_ThemeWizard(object): self.mainAreaLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.mainSizeLabel) self.mainSizeLayout = QtGui.QHBoxLayout() - self.mainSizeLayout.setSpacing(8) - self.mainSizeLayout.setMargin(0) self.mainSizeLayout.setObjectName(u'mainSizeLayout') self.mainSizeSpinBox = QtGui.QSpinBox(self.mainAreaPage) - sizePolicy = QtGui.QSizePolicy( - QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth( - self.mainSizeSpinBox.sizePolicy().hasHeightForWidth()) - self.mainSizeSpinBox.setSizePolicy(sizePolicy) - self.mainSizeSpinBox.setMinimumSize(QtCore.QSize(70, 0)) self.mainSizeSpinBox.setMaximum(999) self.mainSizeSpinBox.setProperty(u'value', 16) self.mainSizeSpinBox.setObjectName(u'mainSizeSpinBox') @@ -268,8 +207,6 @@ class Ui_ThemeWizard(object): self.outlineLayout = QtGui.QHBoxLayout() self.outlineLayout.setObjectName(u'outlineLayout') self.outlineColorPushButton = QtGui.QPushButton(self.mainAreaPage) - self.outlineColorPushButton.setEnabled(True) - self.outlineColorPushButton.setText(u'') self.outlineColorPushButton.setObjectName(u'outlineColorPushButton') self.outlineLayout.addWidget(self.outlineColorPushButton) self.outlineSizeLabel = QtGui.QLabel(self.mainAreaPage) @@ -287,8 +224,6 @@ class Ui_ThemeWizard(object): self.shadowLayout = QtGui.QHBoxLayout() self.shadowLayout.setObjectName(u'shadowLayout') self.shadowColorPushButton = QtGui.QPushButton(self.mainAreaPage) - self.shadowColorPushButton.setEnabled(True) - self.shadowColorPushButton.setText(u'') self.shadowColorPushButton.setObjectName(u'shadowColorPushButton') self.shadowLayout.addWidget(self.shadowColorPushButton) self.shadowSizeLabel = QtGui.QLabel(self.mainAreaPage) @@ -303,15 +238,10 @@ class Ui_ThemeWizard(object): self.footerAreaPage = QtGui.QWizardPage() self.footerAreaPage.setObjectName(u'footerAreaPage') self.footerLayout = QtGui.QFormLayout(self.footerAreaPage) - self.footerLayout.setFieldGrowthPolicy( - QtGui.QFormLayout.ExpandingFieldsGrow) - self.footerLayout.setMargin(20) - self.footerLayout.setSpacing(8) + self.footerLayout.setMargin(12) + self.footerLayout.setVerticalSpacing(6) self.footerLayout.setObjectName(u'footerLayout') self.footerFontLabel = QtGui.QLabel(self.footerAreaPage) - self.footerFontLabel.setMinimumSize(QtCore.QSize(103, 0)) - self.footerFontLabel.setAlignment(QtCore.Qt.AlignRight | - QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter) self.footerFontLabel.setObjectName(u'footerFontLabel') self.footerLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.footerFontLabel) @@ -324,7 +254,6 @@ class Ui_ThemeWizard(object): self.footerLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.footerColorLabel) self.footerColorPushButton = QtGui.QPushButton(self.footerAreaPage) - self.footerColorPushButton.setText(u'') self.footerColorPushButton.setObjectName(u'footerColorPushButton') self.footerLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.footerColorPushButton) @@ -333,14 +262,6 @@ class Ui_ThemeWizard(object): self.footerLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.footerSizeLabel) self.footerSizeSpinBox = QtGui.QSpinBox(self.footerAreaPage) - sizePolicy = QtGui.QSizePolicy( - QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth( - self.footerSizeSpinBox.sizePolicy().hasHeightForWidth()) - self.footerSizeSpinBox.setSizePolicy(sizePolicy) - self.footerSizeSpinBox.setMinimumSize(QtCore.QSize(70, 0)) self.footerSizeSpinBox.setMaximum(999) self.footerSizeSpinBox.setProperty(u'value', 10) self.footerSizeSpinBox.setObjectName(u'footerSizeSpinBox') @@ -350,18 +271,14 @@ class Ui_ThemeWizard(object): self.alignmentPage = QtGui.QWizardPage() self.alignmentPage.setObjectName(u'alignmentPage') self.alignmentLayout = QtGui.QFormLayout(self.alignmentPage) - self.alignmentLayout.setMargin(20) - self.alignmentLayout.setSpacing(8) + self.alignmentLayout.setMargin(12) + self.alignmentLayout.setVerticalSpacing(6) self.alignmentLayout.setObjectName(u'alignmentLayout') self.horizontalLabel = QtGui.QLabel(self.alignmentPage) - self.horizontalLabel.setMinimumSize(QtCore.QSize(103, 0)) - self.horizontalLabel.setAlignment(QtCore.Qt.AlignRight | - QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter) self.horizontalLabel.setObjectName(u'horizontalLabel') self.alignmentLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.horizontalLabel) self.horizontalComboBox = QtGui.QComboBox(self.alignmentPage) - self.horizontalComboBox.setEditable(False) self.horizontalComboBox.setObjectName(u'horizontalComboBox') self.horizontalComboBox.addItem(u'') self.horizontalComboBox.addItem(u'') @@ -387,106 +304,67 @@ class Ui_ThemeWizard(object): self.areaPositionPage = QtGui.QWizardPage() self.areaPositionPage.setObjectName(u'areaPositionPage') self.areaPositionLayout = QtGui.QGridLayout(self.areaPositionPage) - self.areaPositionLayout.setMargin(20) - self.areaPositionLayout.setSpacing(8) self.areaPositionLayout.setObjectName(u'areaPositionLayout') self.mainPositionGroupBox = QtGui.QGroupBox(self.areaPositionPage) - self.mainPositionGroupBox.setMinimumSize(QtCore.QSize(248, 0)) self.mainPositionGroupBox.setObjectName(u'mainPositionGroupBox') self.mainPositionLayout = QtGui.QFormLayout(self.mainPositionGroupBox) - self.mainPositionLayout.setMargin(8) - self.mainPositionLayout.setSpacing(8) + self.mainPositionLayout.setSpacing(6) self.mainPositionLayout.setObjectName(u'mainPositionLayout') self.mainDefaultPositionCheckBox = QtGui.QCheckBox( self.mainPositionGroupBox) self.mainDefaultPositionCheckBox.setChecked(True) - self.mainDefaultPositionCheckBox.setTristate(False) self.mainDefaultPositionCheckBox.setObjectName( u'mainDefaultPositionCheckBox') self.mainPositionLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.mainDefaultPositionCheckBox) - self.nainXLabel = QtGui.QLabel(self.mainPositionGroupBox) - self.nainXLabel.setObjectName(u'nainXLabel') + self.mainXLabel = QtGui.QLabel(self.mainPositionGroupBox) + self.mainXLabel.setObjectName(u'mainXLabel') self.mainPositionLayout.setWidget(1, - QtGui.QFormLayout.LabelRole, self.nainXLabel) + QtGui.QFormLayout.LabelRole, self.mainXLabel) self.mainXSpinBox = QtGui.QSpinBox(self.mainPositionGroupBox) self.mainXSpinBox.setEnabled(False) - sizePolicy = QtGui.QSizePolicy( - QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth( - self.mainXSpinBox.sizePolicy().hasHeightForWidth()) - self.mainXSpinBox.setSizePolicy(sizePolicy) - self.mainXSpinBox.setMinimumSize(QtCore.QSize(78, 0)) self.mainXSpinBox.setMaximum(9999) self.mainXSpinBox.setProperty(u'value', 0) self.mainXSpinBox.setObjectName(u'mainXSpinBox') self.mainPositionLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.mainXSpinBox) - self.mainYSpinBox = QtGui.QSpinBox(self.mainPositionGroupBox) - self.mainYSpinBox.setEnabled(False) - sizePolicy = QtGui.QSizePolicy( - QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth( - self.mainYSpinBox.sizePolicy().hasHeightForWidth()) - self.mainYSpinBox.setSizePolicy(sizePolicy) - self.mainYSpinBox.setMinimumSize(QtCore.QSize(78, 0)) - self.mainYSpinBox.setMaximum(9999) - self.mainYSpinBox.setObjectName(u'mainYSpinBox') - self.mainPositionLayout.setWidget(2, - QtGui.QFormLayout.FieldRole, self.mainYSpinBox) self.mainYLabel = QtGui.QLabel(self.mainPositionGroupBox) self.mainYLabel.setObjectName(u'mainYLabel') self.mainPositionLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.mainYLabel) - self.mainWidthSpinBox = QtGui.QSpinBox(self.mainPositionGroupBox) - self.mainWidthSpinBox.setEnabled(False) - sizePolicy = QtGui.QSizePolicy( - QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth( - self.mainWidthSpinBox.sizePolicy().hasHeightForWidth()) - self.mainWidthSpinBox.setSizePolicy(sizePolicy) - self.mainWidthSpinBox.setMinimumSize(QtCore.QSize(78, 0)) - self.mainWidthSpinBox.setMaximum(9999) - self.mainWidthSpinBox.setObjectName(u'mainWidthSpinBox') - self.mainPositionLayout.setWidget(3, - QtGui.QFormLayout.FieldRole, self.mainWidthSpinBox) + self.mainYSpinBox = QtGui.QSpinBox(self.mainPositionGroupBox) + self.mainYSpinBox.setEnabled(False) + self.mainYSpinBox.setMaximum(9999) + self.mainYSpinBox.setObjectName(u'mainYSpinBox') + self.mainPositionLayout.setWidget(2, + QtGui.QFormLayout.FieldRole, self.mainYSpinBox) self.mainWidthLabel = QtGui.QLabel(self.mainPositionGroupBox) self.mainWidthLabel.setObjectName(u'mainWidthLabel') self.mainPositionLayout.setWidget(3, QtGui.QFormLayout.LabelRole, self.mainWidthLabel) - self.mainHeightSpinBox = QtGui.QSpinBox(self.mainPositionGroupBox) - self.mainHeightSpinBox.setEnabled(False) - sizePolicy = QtGui.QSizePolicy( - QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth( - self.mainHeightSpinBox.sizePolicy().hasHeightForWidth()) - self.mainHeightSpinBox.setSizePolicy(sizePolicy) - self.mainHeightSpinBox.setMinimumSize(QtCore.QSize(78, 0)) - self.mainHeightSpinBox.setMaximum(9999) - self.mainHeightSpinBox.setObjectName(u'mainHeightSpinBox') - self.mainPositionLayout.setWidget(4, - QtGui.QFormLayout.FieldRole, self.mainHeightSpinBox) + self.mainWidthSpinBox = QtGui.QSpinBox(self.mainPositionGroupBox) + self.mainWidthSpinBox.setEnabled(False) + self.mainWidthSpinBox.setMaximum(9999) + self.mainWidthSpinBox.setObjectName(u'mainWidthSpinBox') + self.mainPositionLayout.setWidget(3, + QtGui.QFormLayout.FieldRole, self.mainWidthSpinBox) self.mainHeightLabel = QtGui.QLabel(self.mainPositionGroupBox) self.mainHeightLabel.setObjectName(u'mainHeightLabel') self.mainPositionLayout.setWidget(4, QtGui.QFormLayout.LabelRole, self.mainHeightLabel) + self.mainHeightSpinBox = QtGui.QSpinBox(self.mainPositionGroupBox) + self.mainHeightSpinBox.setEnabled(False) + self.mainHeightSpinBox.setMaximum(9999) + self.mainHeightSpinBox.setObjectName(u'mainHeightSpinBox') + self.mainPositionLayout.setWidget(4, + QtGui.QFormLayout.FieldRole, self.mainHeightSpinBox) self.areaPositionLayout.addWidget( self.mainPositionGroupBox, 1, 0, 1, 1) self.footerPositionGroupBox = QtGui.QGroupBox(self.areaPositionPage) - self.footerPositionGroupBox.setMinimumSize(QtCore.QSize(248, 0)) self.footerPositionGroupBox.setObjectName(u'footerPositionGroupBox') self.footerPositionLayout = QtGui.QFormLayout( self.footerPositionGroupBox) - self.footerPositionLayout.setMargin(8) - self.footerPositionLayout.setSpacing(8) + self.footerPositionLayout.setVerticalSpacing(6) self.footerPositionLayout.setObjectName(u'footerPositionLayout') self.footerXLabel = QtGui.QLabel(self.footerPositionGroupBox) self.footerXLabel.setObjectName(u'footerXLabel') @@ -494,14 +372,6 @@ class Ui_ThemeWizard(object): QtGui.QFormLayout.LabelRole, self.footerXLabel) self.footerXSpinBox = QtGui.QSpinBox(self.footerPositionGroupBox) self.footerXSpinBox.setEnabled(False) - sizePolicy = QtGui.QSizePolicy( - QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth( - self.footerXSpinBox.sizePolicy().hasHeightForWidth()) - self.footerXSpinBox.setSizePolicy(sizePolicy) - self.footerXSpinBox.setMinimumSize(QtCore.QSize(78, 0)) self.footerXSpinBox.setMaximum(9999) self.footerXSpinBox.setProperty(u'value', 0) self.footerXSpinBox.setObjectName(u'footerXSpinBox') @@ -513,14 +383,6 @@ class Ui_ThemeWizard(object): QtGui.QFormLayout.LabelRole, self.footerYLabel) self.footerYSpinBox = QtGui.QSpinBox(self.footerPositionGroupBox) self.footerYSpinBox.setEnabled(False) - sizePolicy = QtGui.QSizePolicy( - QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth( - self.footerYSpinBox.sizePolicy().hasHeightForWidth()) - self.footerYSpinBox.setSizePolicy(sizePolicy) - self.footerYSpinBox.setMinimumSize(QtCore.QSize(78, 0)) self.footerYSpinBox.setMaximum(9999) self.footerYSpinBox.setProperty(u'value', 0) self.footerYSpinBox.setObjectName(u'footerYSpinBox') @@ -561,17 +423,12 @@ class Ui_ThemeWizard(object): self.previewPage = QtGui.QWizardPage() self.previewPage.setObjectName(u'previewPage') self.previewLayout = QtGui.QVBoxLayout(self.previewPage) - self.previewLayout.setSpacing(8) - self.previewLayout.setMargin(20) + self.previewLayout.setSpacing(6) + self.previewLayout.setMargin(12) self.previewLayout.setObjectName(u'previewLayout') self.themeNameLayout = QtGui.QHBoxLayout() - self.themeNameLayout.setSpacing(8) self.themeNameLayout.setObjectName(u'themeNameLayout') self.themeNameLabel = QtGui.QLabel(self.previewPage) - self.themeNameLabel.setMinimumSize(QtCore.QSize(103, 0)) - self.themeNameLabel.setTextFormat(QtCore.Qt.PlainText) - self.themeNameLabel.setAlignment(QtCore.Qt.AlignRight | - QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter) self.themeNameLabel.setObjectName(u'themeNameLabel') self.themeNameLayout.addWidget(self.themeNameLabel) self.themeNameEdit = QtGui.QLineEdit(self.previewPage) @@ -579,9 +436,8 @@ class Ui_ThemeWizard(object): self.themeNameLayout.addWidget(self.themeNameEdit) self.previewLayout.addLayout(self.themeNameLayout) self.previewPaneLayout = QtGui.QHBoxLayout() - self.previewPaneLayout.setSpacing(0) self.previewPaneLayout.setObjectName(u'previewPaneLayout') - self.previewLeftSpacer = QtGui.QSpacerItem(58, 20, + self.previewLeftSpacer = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) self.previewPaneLayout.addItem(self.previewLeftSpacer) self.previewBoxLabel = QtGui.QLabel(self.previewPage) @@ -596,11 +452,10 @@ class Ui_ThemeWizard(object): self.previewBoxLabel.setFrameShape(QtGui.QFrame.WinPanel) self.previewBoxLabel.setFrameShadow(QtGui.QFrame.Sunken) self.previewBoxLabel.setLineWidth(1) - self.previewBoxLabel.setText(u'') self.previewBoxLabel.setScaledContents(True) self.previewBoxLabel.setObjectName(u'previewBoxLabel') self.previewPaneLayout.addWidget(self.previewBoxLabel) - self.previewRightSpacer = QtGui.QSpacerItem(78, 20, + self.previewRightSpacer = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) self.previewPaneLayout.addItem(self.previewRightSpacer) self.previewLayout.addLayout(self.previewPaneLayout) @@ -608,15 +463,10 @@ class Ui_ThemeWizard(object): self.themeNameLabel.setBuddy(self.themeNameEdit) self.retranslateUi(ThemeWizard) - self.backgroundStackedWidget.setCurrentIndex(0) QtCore.QObject.connect( ThemeWizard, QtCore.SIGNAL(u'accepted()'), ThemeWizard.accept) - QtCore.QObject.connect( - self.backgroundTypeComboBox, - QtCore.SIGNAL(u'currentIndexChanged(int)'), - self.backgroundStackedWidget.setCurrentIndex) QtCore.QMetaObject.connectSlotsByName(ThemeWizard) def retranslateUi(self, ThemeWizard): @@ -627,7 +477,7 @@ class Ui_ThemeWizard(object): translate('OpenLP.ThemeWizard', 'Welcome to the Theme Wizard')) self.informationLabel.setText( translate('OpenLP.ThemeWizard', 'This wizard will help you to ' - 'create and edit your themes . Click the next button below to ' + 'create and edit your themes. Click the next button below to ' 'start the process by setting up your background.')) self.backgroundPage.setTitle( translate('OpenLP.ThemeWizard', 'Set Up Background')) @@ -727,7 +577,7 @@ class Ui_ThemeWizard(object): translate('OpenLP.ThemeWizard', '&Main Area')) self.mainDefaultPositionCheckBox.setText( translate('OpenLP.ThemeWizard', '&Use default location')) - self.nainXLabel.setText(translate('OpenLP.ThemeWizard', 'X position:')) + self.mainXLabel.setText(translate('OpenLP.ThemeWizard', 'X position:')) self.mainXSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px')) self.mainYSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px')) self.mainYLabel.setText(translate('OpenLP.ThemeWizard', 'Y position:')) @@ -737,7 +587,7 @@ class Ui_ThemeWizard(object): self.mainHeightLabel.setText( translate('OpenLP.ThemeWizard', 'Height:')) self.footerPositionGroupBox.setTitle( - translate('OpenLP.ThemeWizard', 'Footer Area')) + translate('OpenLP.ThemeWizard', '&Footer Area')) self.footerXLabel.setText( translate('OpenLP.ThemeWizard', 'X position:')) self.footerXSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px')) diff --git a/resources/forms/themewizard.ui b/resources/forms/themewizard.ui index 9e1f8f9e8..f6428cdc7 100644 --- a/resources/forms/themewizard.ui +++ b/resources/forms/themewizard.ui @@ -2,14 +2,6 @@ ThemeWizard - - - 0 - 0 - 550 - 386 - - Theme Wizard @@ -23,51 +15,30 @@ QWizard::IndependentPages|QWizard::NoBackButtonOnStartPage - - - - - - - - 8 - 0 - - - 163 - 0 - - - - - 163 - 16777215 - - - - 0 - - - + + + 0 + 0 + :/wizards/wizard_importbible.bmp - - 0 - - 8 + 6 + + + 12 @@ -78,6 +49,9 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:9pt; 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-size:14pt; font-weight:600;">Welcome to the Theme Wizard</span></p></body></html> + + true + @@ -99,14 +73,11 @@ p, li { white-space: pre-wrap; } - This wizard will help you to maintain Themes . Click the next button below to start the process by setting up your background. + This wizard will help you to maintain Themes. Click the next button below to start the process by setting up your background. true - - 10 - @@ -133,256 +104,127 @@ p, li { white-space: pre-wrap; } Set up your theme's background according to the parameters below. - - - 8 + + + 6 - 20 + 12 - - - - 8 + + + + Background type: + + + + - - - Background type: - - + + Solid Color + - - - - Solid Color - - - - - Gradient - - - - - Image - - - + + Gradient + - - - Qt::Horizontal + + Image + + + + + + + + Color: + + + + + + + + + + Starting color: + + + + + + + + + + Ending color: + + + + + + + + + + Gradient: + + + + + + + + Horizontal + + + + + Vertical + + + + + Circular + + + + + Top Left - Bottom Right + + + + + Bottom Left - Top Right + + + + + + + + Image: + + + + + + + + + + + + + :/general/general_open.png:/general/general_open.png - - - 40 - 20 - - - + - - - - 0 - - - - - 8 - - - 8 - - - 0 - - - - - - 103 - 0 - - - - Color: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - - - - - 8 - - - 8 - - - 0 - - - - - - 103 - 0 - - - - Starting color: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - - - - 103 - 0 - - - - Ending color: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - - - - 103 - 0 - - - - Gradient: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - Horizontal - - - - - Vertical - - - - - Circular - - - - - Top Left - Bottom Right - - - - - Bottom Left - Top Right - - - - - - - - - - 8 - - - 8 - - - 0 - - - - - - 103 - 0 - - - - Image: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - 8 - - - - - - - - - - - - :/general/general_open.png:/general/general_open.png - - - - - - - - - @@ -393,29 +235,17 @@ p, li { white-space: pre-wrap; } Define the font and display characteristics for the Display text - - 8 - - 8 + 6 - 20 + 12 - - - 103 - 0 - - Font: - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - @@ -431,14 +261,10 @@ p, li { white-space: pre-wrap; } - 24 + 12 - - - - - + @@ -465,26 +291,8 @@ p, li { white-space: pre-wrap; } - - 8 - - - 0 - - - - 0 - 0 - - - - - 70 - 0 - - pt @@ -535,14 +343,7 @@ p, li { white-space: pre-wrap; } - - - true - - - - - + @@ -574,9 +375,6 @@ p, li { white-space: pre-wrap; } true - - - @@ -605,32 +403,17 @@ p, li { white-space: pre-wrap; } Define the font and display characteristics for the Footer text - - QFormLayout::ExpandingFieldsGrow - - - 8 - - 8 + 6 - 20 + 12 - - - 103 - 0 - - Font: - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - @@ -644,11 +427,7 @@ p, li { white-space: pre-wrap; } - - - - - + @@ -659,18 +438,6 @@ p, li { white-space: pre-wrap; } - - - 0 - 0 - - - - - 70 - 0 - - pt @@ -692,36 +459,21 @@ p, li { white-space: pre-wrap; } Allows additional display formatting information to be defined - - 8 - - 8 + 6 - 20 + 12 - - - 103 - 0 - - Horizontal Align: - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - Left @@ -783,31 +535,16 @@ p, li { white-space: pre-wrap; } - 20 - - - 8 + 12 - - - 248 - 0 - - &Main Area - - 8 - - 8 - - - 8 + 6 @@ -817,13 +554,10 @@ p, li { white-space: pre-wrap; } true - - false - - + X position: @@ -840,12 +574,6 @@ p, li { white-space: pre-wrap; } 0 - - - 78 - 0 - - px @@ -868,12 +596,6 @@ p, li { white-space: pre-wrap; } 0 - - - 78 - 0 - - px @@ -900,12 +622,6 @@ p, li { white-space: pre-wrap; } 0 - - - 78 - 0 - - px @@ -926,18 +642,6 @@ p, li { white-space: pre-wrap; } false - - - 0 - 0 - - - - - 78 - 0 - - px @@ -958,24 +662,12 @@ p, li { white-space: pre-wrap; } - - - 248 - 0 - - - Footer Area + &Footer Area - - 8 - - 8 - - - 8 + 6 @@ -989,18 +681,6 @@ p, li { white-space: pre-wrap; } false - - - 0 - 0 - - - - - 78 - 0 - - px @@ -1024,18 +704,6 @@ p, li { white-space: pre-wrap; } false - - - 0 - 0 - - - - - 78 - 0 - - px @@ -1059,12 +727,6 @@ p, li { white-space: pre-wrap; } false - - - 78 - 0 - - px @@ -1085,12 +747,6 @@ p, li { white-space: pre-wrap; } false - - - 78 - 0 - - px @@ -1123,33 +779,18 @@ p, li { white-space: pre-wrap; } - 8 + 6 - 20 + 12 - - 8 - - - - 103 - 0 - - Theme name: - - Qt::PlainText - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - themeNameEdit @@ -1162,9 +803,6 @@ p, li { white-space: pre-wrap; } - - 0 - @@ -1172,7 +810,7 @@ p, li { white-space: pre-wrap; } - 58 + 40 20 @@ -1201,9 +839,6 @@ p, li { white-space: pre-wrap; } 1 - - - true @@ -1216,7 +851,7 @@ p, li { white-space: pre-wrap; } - 78 + 40 20 @@ -1247,21 +882,5 @@ p, li { white-space: pre-wrap; } - - backgroundTypeComboBox - currentIndexChanged(int) - backgroundStackedWidget - setCurrentIndex(int) - - - 178 - 78 - - - 249 - 199 - - -