Remove most manual formating in the themewizard (regards to bug #686103)

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):
         """

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 = QtGui.QFormLayout(self.backgroundPage)
-        self.backgroundLayout.setSpacing(8)
+        self.backgroundLayout.setMargin(12)
-        self.backgroundLayout.setMargin(20)
+        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.backgroundLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
-        self.backgroundTypeComboBox.addItem(u'')
+            self.backgroundTypeComboBox)
-        self.backgroundTypeComboBox.addItem(u'')
+        self.colorLabel = QtGui.QLabel(self.backgroundPage)
-        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.colorLabel.setObjectName(u'colorLabel')
-        self.colorLayout.setWidget(0,
+        self.backgroundLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
-            QtGui.QFormLayout.LabelRole, self.colorLabel)
+            self.colorLabel)
-        self.colorButton = QtGui.QPushButton(self.colorPage)
+        self.colorButton = QtGui.QPushButton(self.backgroundPage)
-        self.colorButton.setText(u'')
         self.colorButton.setObjectName(u'colorButton')
-        self.colorLayout.setWidget(0,
+        self.backgroundLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
-            QtGui.QFormLayout.FieldRole, self.colorButton)
+            self.colorButton)
-        self.backgroundStackedWidget.addWidget(self.colorPage)
+        self.gradientStartLabel = QtGui.QLabel(self.backgroundPage)
-        self.gradientPage = QtGui.QWidget()
+        self.gradientStartLabel.setVisible(False)
-        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.gradientStartLabel.setObjectName(u'gradientStartLabel')
-        self.gradientLayout.setWidget(0,
+        self.backgroundLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
-            QtGui.QFormLayout.LabelRole, self.gradientStartLabel)
+            self.gradientStartLabel)
-        self.gradientStartButton = QtGui.QPushButton(self.gradientPage)
+        self.gradientStartButton = QtGui.QPushButton(self.backgroundPage)
-        self.gradientStartButton.setText(u'')
+        self.gradientStartButton.setVisible(False)
         self.gradientStartButton.setObjectName(u'gradientStartButton')
-        self.gradientLayout.setWidget(0,
+        self.backgroundLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
-            QtGui.QFormLayout.FieldRole, self.gradientStartButton)
+            self.gradientStartButton)
-        self.gradientEndLabel = QtGui.QLabel(self.gradientPage)
+        self.gradientEndLabel = QtGui.QLabel(self.backgroundPage)
-        self.gradientEndLabel.setMinimumSize(QtCore.QSize(103, 0))
+        self.gradientEndLabel.setVisible(False)
-        self.gradientEndLabel.setAlignment(QtCore.Qt.AlignRight |
-            QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter)
         self.gradientEndLabel.setObjectName(u'gradientEndLabel')
-        self.gradientLayout.setWidget(1,
+        self.backgroundLayout.setWidget(3, QtGui.QFormLayout.LabelRole,
-            QtGui.QFormLayout.LabelRole, self.gradientEndLabel)
+            self.gradientEndLabel)
-        self.gradientEndButton = QtGui.QPushButton(self.gradientPage)
+        self.gradientEndButton = QtGui.QPushButton(self.backgroundPage)
-        self.gradientEndButton.setText(u'')
+        self.gradientEndButton.setVisible(False)
         self.gradientEndButton.setObjectName(u'gradientEndButton')
-        self.gradientLayout.setWidget(1,
+        self.backgroundLayout.setWidget(3, QtGui.QFormLayout.FieldRole,
-            QtGui.QFormLayout.FieldRole, self.gradientEndButton)
+            self.gradientEndButton)
-        self.gradientTypeLabel = QtGui.QLabel(self.gradientPage)
+        self.gradientTypeLabel = QtGui.QLabel(self.backgroundPage)
-        self.gradientTypeLabel.setMinimumSize(QtCore.QSize(103, 0))
+        self.gradientTypeLabel.setVisible(False)
-        self.gradientTypeLabel.setAlignment(QtCore.Qt.AlignRight |
-            QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter)
         self.gradientTypeLabel.setObjectName(u'gradientTypeLabel')
-        self.gradientLayout.setWidget(2,
+        self.backgroundLayout.setWidget(4, QtGui.QFormLayout.LabelRole,
-            QtGui.QFormLayout.LabelRole, self.gradientTypeLabel)
+            self.gradientTypeLabel)
-        self.gradientComboBox = QtGui.QComboBox(self.gradientPage)
+        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,
+        self.backgroundLayout.setWidget(4, QtGui.QFormLayout.FieldRole,
-            QtGui.QFormLayout.FieldRole, self.gradientComboBox)
+            self.gradientComboBox)
-        self.backgroundStackedWidget.addWidget(self.gradientPage)
+        self.imageLabel = QtGui.QLabel(self.backgroundPage)
-        self.imagePage = QtGui.QWidget()
+        self.imageLabel.setVisible(False)
-        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.imageLabel.setObjectName(u'imageLabel')
-        self.imageLayout.setWidget(0,
+        self.backgroundLayout.setWidget(5, QtGui.QFormLayout.LabelRole,
-            QtGui.QFormLayout.LabelRole, self.imageLabel)
+            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 = QtGui.QToolButton(self.backgroundPage)
-        self.imageBrowseButton.setText(u'')
+        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,
+        self.backgroundLayout.setLayout(5, QtGui.QFormLayout.FieldRole,
-            QtGui.QFormLayout.FieldRole, self.imageFileLayout)
+            self.imageFileLayout)
-        self.backgroundStackedWidget.addWidget(self.imagePage)
-        self.backgroundLayout.addWidget(self.backgroundStackedWidget)
         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 |
+        self.mainAreaLayout.setMargin(12)
-            QtCore.Qt.AlignLeft | QtCore.Qt.AlignTop)
+        self.mainAreaLayout.setVerticalSpacing(6)
-        self.mainAreaLayout.setMargin(20)
-        self.mainAreaLayout.setSpacing(8)
         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(
+        self.footerLayout.setMargin(12)
-            QtGui.QFormLayout.ExpandingFieldsGrow)
+        self.footerLayout.setVerticalSpacing(6)
-        self.footerLayout.setMargin(20)
-        self.footerLayout.setSpacing(8)
         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.setMargin(12)
-        self.alignmentLayout.setSpacing(8)
+        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(6)
-        self.mainPositionLayout.setSpacing(8)
         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.mainXLabel = QtGui.QLabel(self.mainPositionGroupBox)
-        self.nainXLabel.setObjectName(u'nainXLabel')
+        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.mainYSpinBox = QtGui.QSpinBox(self.mainPositionGroupBox)
-        self.mainWidthSpinBox.setEnabled(False)
+        self.mainYSpinBox.setEnabled(False)
-        sizePolicy = QtGui.QSizePolicy(
+        self.mainYSpinBox.setMaximum(9999)
-            QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
+        self.mainYSpinBox.setObjectName(u'mainYSpinBox')
-        sizePolicy.setHorizontalStretch(0)
+        self.mainPositionLayout.setWidget(2,
-        sizePolicy.setVerticalStretch(0)
+            QtGui.QFormLayout.FieldRole, self.mainYSpinBox)
-        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.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.mainWidthSpinBox = QtGui.QSpinBox(self.mainPositionGroupBox)
-        self.mainHeightSpinBox.setEnabled(False)
+        self.mainWidthSpinBox.setEnabled(False)
-        sizePolicy = QtGui.QSizePolicy(
+        self.mainWidthSpinBox.setMaximum(9999)
-            QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
+        self.mainWidthSpinBox.setObjectName(u'mainWidthSpinBox')
-        sizePolicy.setHorizontalStretch(0)
+        self.mainPositionLayout.setWidget(3,
-        sizePolicy.setVerticalStretch(0)
+            QtGui.QFormLayout.FieldRole, self.mainWidthSpinBox)
-        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.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.setVerticalSpacing(6)
-        self.footerPositionLayout.setSpacing(8)
         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.setSpacing(6)
-        self.previewLayout.setMargin(20)
+        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'))

resources/forms/themewizard.ui

@@ -2,14 +2,6 @@
 <ui version="4.0">
  <class>ThemeWizard</class>
  <widget class="QWizard" name="ThemeWizard">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>550</width>
-    <height>386</height>
-   </rect>
-  </property>
   <property name="windowTitle">
    <string>Theme Wizard</string>
   </property>
@@ -23,51 +15,30 @@
    <set>QWizard::IndependentPages|QWizard::NoBackButtonOnStartPage</set>
   </property>
   <widget class="QWizardPage" name="welcomePage">
-   <property name="title">
-    <string/>
-   </property>
-   <property name="subTitle">
-    <string/>
-   </property>
    <layout class="QHBoxLayout" name="welcomeLayout">
-    <property name="spacing">
-     <number>8</number>
-    </property>
     <property name="margin">
      <number>0</number>
     </property>
     <item>
      <widget class="QLabel" name="importBibleImage">
-      <property name="minimumSize">
+      <property name="sizePolicy">
-       <size>
+       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-        <width>163</width>
+        <horstretch>0</horstretch>
-        <height>0</height>
+        <verstretch>0</verstretch>
-       </size>
+       </sizepolicy>
-      </property>
-      <property name="maximumSize">
-       <size>
-        <width>163</width>
-        <height>16777215</height>
-       </size>
-      </property>
-      <property name="lineWidth">
-       <number>0</number>
-      </property>
-      <property name="text">
-       <string/>
       </property>
       <property name="pixmap">
        <pixmap resource="../images/openlp-2.qrc">:/wizards/wizard_importbible.bmp</pixmap>
       </property>
-      <property name="indent">
-       <number>0</number>
-      </property>
      </widget>
     </item>
     <item>
      <layout class="QVBoxLayout" name="welcomePageLayout">
       <property name="spacing">
-       <number>8</number>
+       <number>6</number>
+      </property>
+      <property name="margin">
+       <number>12</number>
       </property>
       <item>
        <widget class="QLabel" name="titleLabel">
@@ -78,6 +49,9 @@ p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:14pt; font-weight:600;&quot;&gt;Welcome to the Theme Wizard&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item>
@@ -99,14 +73,11 @@ p, li { white-space: pre-wrap; }
       <item>
        <widget class="QLabel" name="informationLabel">
         <property name="text">
-         <string>This wizard will help you to maintain Themes . Click the next button below to start the process by setting up your background.</string>
+         <string>This wizard will help you to maintain Themes. Click the next button below to start the process by setting up your background.</string>
         </property>
         <property name="wordWrap">
          <bool>true</bool>
         </property>
-        <property name="margin">
-         <number>10</number>
-        </property>
        </widget>
       </item>
       <item>
@@ -133,256 +104,127 @@ p, li { white-space: pre-wrap; }
    <property name="subTitle">
     <string>Set up your theme's background according to the parameters below.</string>
    </property>
-   <layout class="QVBoxLayout" name="backgroundLayout">
+   <layout class="QFormLayout" name="backgroundLayout">
-    <property name="spacing">
+    <property name="verticalSpacing">
-     <number>8</number>
+     <number>6</number>
     </property>
     <property name="margin">
-     <number>20</number>
+     <number>12</number>
     </property>
-    <item>
+    <item row="0" column="0">
-     <layout class="QHBoxLayout" name="backgroundTypeLayout">
+     <widget class="QLabel" name="backgroundTypeLabel">
-      <property name="spacing">
+      <property name="text">
-       <number>8</number>
+       <string>Background type:</string>
       </property>
+     </widget>
+    </item>
+    <item row="0" column="1">
+     <widget class="QComboBox" name="backgroundTypeComboBox">
       <item>
-       <widget class="QLabel" name="backgroundTypeLabel">
+       <property name="text">
-        <property name="text">
+        <string>Solid Color</string>
-         <string>Background type:</string>
+       </property>
-        </property>
-       </widget>
       </item>
       <item>
-       <widget class="QComboBox" name="backgroundTypeComboBox">
+       <property name="text">
-        <item>
+        <string>Gradient</string>
-         <property name="text">
+       </property>
-          <string>Solid Color</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Gradient</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Image</string>
-         </property>
-        </item>
-       </widget>
       </item>
       <item>
-       <spacer name="horizontalSpacer">
+       <property name="text">
-        <property name="orientation">
+        <string>Image</string>
-         <enum>Qt::Horizontal</enum>
+       </property>
+      </item>
+     </widget>
+    </item>
+    <item row="1" column="0">
+     <widget class="QLabel" name="colorLabel">
+      <property name="text">
+       <string>Color:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="1">
+     <widget class="QPushButton" name="colorButton"/>
+    </item>
+    <item row="2" column="0">
+     <widget class="QLabel" name="gradientStartLabel">
+      <property name="text">
+       <string>Starting color:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="1">
+     <widget class="QPushButton" name="gradientStartButton"/>
+    </item>
+    <item row="3" column="0">
+     <widget class="QLabel" name="gradientEndLabel">
+      <property name="text">
+       <string>Ending color:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="3" column="1">
+     <widget class="QPushButton" name="gradientEndButton"/>
+    </item>
+    <item row="4" column="0">
+     <widget class="QLabel" name="gradientTypeLabel">
+      <property name="text">
+       <string>Gradient:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="4" column="1">
+     <widget class="QComboBox" name="gradientComboBox">
+      <item>
+       <property name="text">
+        <string>Horizontal</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>Vertical</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>Circular</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>Top Left - Bottom Right</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>Bottom Left - Top Right</string>
+       </property>
+      </item>
+     </widget>
+    </item>
+    <item row="5" column="0">
+     <widget class="QLabel" name="imageLabel">
+      <property name="text">
+       <string>Image:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="5" column="1">
+     <layout class="QHBoxLayout" name="imageFileLayout">
+      <item>
+       <widget class="QLineEdit" name="imageLineEdit"/>
+      </item>
+      <item>
+       <widget class="QToolButton" name="imageBrowseButton">
+        <property name="icon">
+         <iconset resource="../images/openlp-2.qrc">
+          <normaloff>:/general/general_open.png</normaloff>:/general/general_open.png</iconset>
         </property>
-        <property name="sizeHint" stdset="0">
+       </widget>
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
       </item>
      </layout>
     </item>
-    <item>
-     <widget class="QStackedWidget" name="backgroundStackedWidget">
-      <property name="currentIndex">
-       <number>0</number>
-      </property>
-      <widget class="QWidget" name="colorPage">
-       <layout class="QFormLayout" name="colorLayout">
-        <property name="horizontalSpacing">
-         <number>8</number>
-        </property>
-        <property name="verticalSpacing">
-         <number>8</number>
-        </property>
-        <property name="margin">
-         <number>0</number>
-        </property>
-        <item row="0" column="0">
-         <widget class="QLabel" name="colorLabel">
-          <property name="minimumSize">
-           <size>
-            <width>103</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Color:</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="QPushButton" name="colorButton">
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-      <widget class="QWidget" name="gradientPage">
-       <layout class="QFormLayout" name="gradientLayout">
-        <property name="horizontalSpacing">
-         <number>8</number>
-        </property>
-        <property name="verticalSpacing">
-         <number>8</number>
-        </property>
-        <property name="margin">
-         <number>0</number>
-        </property>
-        <item row="0" column="0">
-         <widget class="QLabel" name="gradientStartLabel">
-          <property name="minimumSize">
-           <size>
-            <width>103</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Starting color:</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="QPushButton" name="gradientStartButton">
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="gradientEndLabel">
-          <property name="minimumSize">
-           <size>
-            <width>103</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Ending color:</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="QPushButton" name="gradientEndButton">
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="gradientTypeLabel">
-          <property name="minimumSize">
-           <size>
-            <width>103</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Gradient:</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <widget class="QComboBox" name="gradientComboBox">
-          <item>
-           <property name="text">
-            <string>Horizontal</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Vertical</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Circular</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Top Left - Bottom Right</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Bottom Left - Top Right</string>
-           </property>
-          </item>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-      <widget class="QWidget" name="imagePage">
-       <layout class="QFormLayout" name="imageLayout">
-        <property name="horizontalSpacing">
-         <number>8</number>
-        </property>
-        <property name="verticalSpacing">
-         <number>8</number>
-        </property>
-        <property name="margin">
-         <number>0</number>
-        </property>
-        <item row="0" column="0">
-         <widget class="QLabel" name="imageLabel">
-          <property name="minimumSize">
-           <size>
-            <width>103</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Image:</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <layout class="QHBoxLayout" name="imageFileLayout">
-          <property name="spacing">
-           <number>8</number>
-          </property>
-          <item>
-           <widget class="QLineEdit" name="imageLineEdit"/>
-          </item>
-          <item>
-           <widget class="QToolButton" name="imageBrowseButton">
-            <property name="text">
-             <string/>
-            </property>
-            <property name="icon">
-             <iconset resource="../images/openlp-2.qrc">
-              <normaloff>:/general/general_open.png</normaloff>:/general/general_open.png</iconset>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-       </layout>
-      </widget>
-     </widget>
-    </item>
    </layout>
   </widget>
   <widget class="QWizardPage" name="mainAreaPage">
@@ -393,29 +235,17 @@ p, li { white-space: pre-wrap; }
     <string>Define the font and display characteristics for the Display text</string>
    </property>
    <layout class="QFormLayout" name="mainAreaLayout">
-    <property name="horizontalSpacing">
-     <number>8</number>
-    </property>
     <property name="verticalSpacing">
-     <number>8</number>
+     <number>6</number>
     </property>
     <property name="margin">
-     <number>20</number>
+     <number>12</number>
     </property>
     <item row="0" column="0">
      <widget class="QLabel" name="mainFontLabel">
-      <property name="minimumSize">
-       <size>
-        <width>103</width>
-        <height>0</height>
-       </size>
-      </property>
       <property name="text">
        <string>Font:</string>
       </property>
-      <property name="alignment">
-       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-      </property>
      </widget>
     </item>
     <item row="0" column="1">
@@ -431,14 +261,10 @@ p, li { white-space: pre-wrap; }
     <item row="1" column="1">
      <layout class="QHBoxLayout" name="fontPropertiesLayout">
       <property name="spacing">
-       <number>24</number>
+       <number>12</number>
       </property>
       <item>
-       <widget class="QPushButton" name="mainColorPushButton">
+       <widget class="QPushButton" name="mainColorPushButton"/>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="boldCheckBox">
@@ -465,26 +291,8 @@ p, li { white-space: pre-wrap; }
     </item>
     <item row="2" column="1">
      <layout class="QHBoxLayout" name="mainSizeLayout">
-      <property name="spacing">
-       <number>8</number>
-      </property>
-      <property name="margin">
-       <number>0</number>
-      </property>
       <item>
        <widget class="QSpinBox" name="mainSizeSpinBox">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>70</width>
-          <height>0</height>
-         </size>
-        </property>
         <property name="suffix">
          <string>pt</string>
         </property>
@@ -535,14 +343,7 @@ p, li { white-space: pre-wrap; }
     <item row="4" column="1">
      <layout class="QHBoxLayout" name="outlineLayout">
       <item>
-       <widget class="QPushButton" name="outlineColorPushButton">
+       <widget class="QPushButton" name="outlineColorPushButton"/>
-        <property name="enabled">
-         <bool>true</bool>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
       </item>
       <item>
        <widget class="QLabel" name="outlineSizeLabel">
@@ -574,9 +375,6 @@ p, li { white-space: pre-wrap; }
         <property name="enabled">
          <bool>true</bool>
         </property>
-        <property name="text">
-         <string/>
-        </property>
        </widget>
       </item>
       <item>
@@ -605,32 +403,17 @@ p, li { white-space: pre-wrap; }
     <string>Define the font and display characteristics for the Footer text</string>
    </property>
    <layout class="QFormLayout" name="footerLayout">
-    <property name="fieldGrowthPolicy">
-     <enum>QFormLayout::ExpandingFieldsGrow</enum>
-    </property>
-    <property name="horizontalSpacing">
-     <number>8</number>
-    </property>
     <property name="verticalSpacing">
-     <number>8</number>
+     <number>6</number>
     </property>
     <property name="margin">
-     <number>20</number>
+     <number>12</number>
     </property>
     <item row="0" column="0">
      <widget class="QLabel" name="footerFontLabel">
-      <property name="minimumSize">
-       <size>
-        <width>103</width>
-        <height>0</height>
-       </size>
-      </property>
       <property name="text">
        <string>Font:</string>
       </property>
-      <property name="alignment">
-       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-      </property>
      </widget>
     </item>
     <item row="0" column="1">
@@ -644,11 +427,7 @@ p, li { white-space: pre-wrap; }
      </widget>
     </item>
     <item row="1" column="1">
-     <widget class="QPushButton" name="footerColorPushButton">
+     <widget class="QPushButton" name="footerColorPushButton"/>
-      <property name="text">
-       <string/>
-      </property>
-     </widget>
     </item>
     <item row="2" column="0">
      <widget class="QLabel" name="footerSizeLabel">
@@ -659,18 +438,6 @@ p, li { white-space: pre-wrap; }
     </item>
     <item row="2" column="1">
      <widget class="QSpinBox" name="footerSizeSpinBox">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>70</width>
-        <height>0</height>
-       </size>
-      </property>
       <property name="suffix">
        <string>pt</string>
       </property>
@@ -692,36 +459,21 @@ p, li { white-space: pre-wrap; }
     <string>Allows additional display formatting information to be defined</string>
    </property>
    <layout class="QFormLayout" name="formLayout_2">
-    <property name="horizontalSpacing">
-     <number>8</number>
-    </property>
     <property name="verticalSpacing">
-     <number>8</number>
+     <number>6</number>
     </property>
     <property name="margin">
-     <number>20</number>
+     <number>12</number>
     </property>
     <item row="0" column="0">
      <widget class="QLabel" name="horizontalLabel">
-      <property name="minimumSize">
-       <size>
-        <width>103</width>
-        <height>0</height>
-       </size>
-      </property>
       <property name="text">
        <string>Horizontal Align:</string>
       </property>
-      <property name="alignment">
-       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-      </property>
      </widget>
     </item>
     <item row="0" column="1">
      <widget class="QComboBox" name="horizontalComboBox">
-      <property name="editable">
-       <bool>false</bool>
-      </property>
       <item>
        <property name="text">
         <string>Left</string>
@@ -783,31 +535,16 @@ p, li { white-space: pre-wrap; }
    </property>
    <layout class="QGridLayout" name="areaPositionLayout">
     <property name="margin">
-     <number>20</number>
+     <number>12</number>
-    </property>
-    <property name="spacing">
-     <number>8</number>
     </property>
     <item row="1" column="0">
      <widget class="QGroupBox" name="mainPositionGroupBox">
-      <property name="minimumSize">
-       <size>
-        <width>248</width>
-        <height>0</height>
-       </size>
-      </property>
       <property name="title">
        <string>&amp;Main Area</string>
       </property>
       <layout class="QFormLayout" name="mainPositionLayout">
-       <property name="horizontalSpacing">
-        <number>8</number>
-       </property>
        <property name="verticalSpacing">
-        <number>8</number>
+        <number>6</number>
-       </property>
-       <property name="margin">
-        <number>8</number>
        </property>
        <item row="0" column="1">
         <widget class="QCheckBox" name="mainDefaultPositionCheckBox">
@@ -817,13 +554,10 @@ p, li { white-space: pre-wrap; }
          <property name="checked">
           <bool>true</bool>
          </property>
-         <property name="tristate">
-          <bool>false</bool>
-         </property>
         </widget>
        </item>
        <item row="1" column="0">
-        <widget class="QLabel" name="nainXLabel">
+        <widget class="QLabel" name="mainXLabel">
          <property name="text">
           <string>X position:</string>
          </property>
@@ -840,12 +574,6 @@ p, li { white-space: pre-wrap; }
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="minimumSize">
-          <size>
-           <width>78</width>
-           <height>0</height>
-          </size>
-         </property>
          <property name="suffix">
           <string>px</string>
          </property>
@@ -868,12 +596,6 @@ p, li { white-space: pre-wrap; }
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="minimumSize">
-          <size>
-           <width>78</width>
-           <height>0</height>
-          </size>
-         </property>
          <property name="suffix">
           <string>px</string>
          </property>
@@ -900,12 +622,6 @@ p, li { white-space: pre-wrap; }
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="minimumSize">
-          <size>
-           <width>78</width>
-           <height>0</height>
-          </size>
-         </property>
          <property name="suffix">
           <string>px</string>
          </property>
@@ -926,18 +642,6 @@ p, li { white-space: pre-wrap; }
          <property name="enabled">
           <bool>false</bool>
          </property>
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>78</width>
-           <height>0</height>
-          </size>
-         </property>
          <property name="suffix">
           <string>px</string>
          </property>
@@ -958,24 +662,12 @@ p, li { white-space: pre-wrap; }
     </item>
     <item row="1" column="1">
      <widget class="QGroupBox" name="footerPositionGroupBox">
-      <property name="minimumSize">
-       <size>
-        <width>248</width>
-        <height>0</height>
-       </size>
-      </property>
       <property name="title">
-       <string>Footer Area</string>
+       <string>&amp;Footer Area</string>
       </property>
       <layout class="QFormLayout" name="footerPositionLayout">
-       <property name="horizontalSpacing">
-        <number>8</number>
-       </property>
        <property name="verticalSpacing">
-        <number>8</number>
+        <number>6</number>
-       </property>
-       <property name="margin">
-        <number>8</number>
        </property>
        <item row="1" column="0">
         <widget class="QLabel" name="footerXLabel">
@@ -989,18 +681,6 @@ p, li { white-space: pre-wrap; }
          <property name="enabled">
           <bool>false</bool>
          </property>
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>78</width>
-           <height>0</height>
-          </size>
-         </property>
          <property name="suffix">
           <string>px</string>
          </property>
@@ -1024,18 +704,6 @@ p, li { white-space: pre-wrap; }
          <property name="enabled">
           <bool>false</bool>
          </property>
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>78</width>
-           <height>0</height>
-          </size>
-         </property>
          <property name="suffix">
           <string>px</string>
          </property>
@@ -1059,12 +727,6 @@ p, li { white-space: pre-wrap; }
          <property name="enabled">
           <bool>false</bool>
          </property>
-         <property name="minimumSize">
-          <size>
-           <width>78</width>
-           <height>0</height>
-          </size>
-         </property>
          <property name="suffix">
           <string>px</string>
          </property>
@@ -1085,12 +747,6 @@ p, li { white-space: pre-wrap; }
          <property name="enabled">
           <bool>false</bool>
          </property>
-         <property name="minimumSize">
-          <size>
-           <width>78</width>
-           <height>0</height>
-          </size>
-         </property>
          <property name="suffix">
           <string>px</string>
          </property>
@@ -1123,33 +779,18 @@ p, li { white-space: pre-wrap; }
    </property>
    <layout class="QVBoxLayout" name="previewLayout">
     <property name="spacing">
-     <number>8</number>
+     <number>6</number>
     </property>
     <property name="margin">
-     <number>20</number>
+     <number>12</number>
     </property>
     <item>
      <layout class="QHBoxLayout" name="themeNameLayout">
-      <property name="spacing">
-       <number>8</number>
-      </property>
       <item>
        <widget class="QLabel" name="themeNameLabel">
-        <property name="minimumSize">
-         <size>
-          <width>103</width>
-          <height>0</height>
-         </size>
-        </property>
         <property name="text">
          <string>Theme name:</string>
         </property>
-        <property name="textFormat">
-         <enum>Qt::PlainText</enum>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
         <property name="buddy">
          <cstring>themeNameEdit</cstring>
         </property>
@@ -1162,9 +803,6 @@ p, li { white-space: pre-wrap; }
     </item>
     <item>
      <layout class="QHBoxLayout" name="previewPaneLayout">
-      <property name="spacing">
-       <number>0</number>
-      </property>
       <item>
        <spacer name="leftSpacer">
         <property name="orientation">
@@ -1172,7 +810,7 @@ p, li { white-space: pre-wrap; }
         </property>
         <property name="sizeHint" stdset="0">
          <size>
-          <width>58</width>
+          <width>40</width>
           <height>20</height>
          </size>
         </property>
@@ -1201,9 +839,6 @@ p, li { white-space: pre-wrap; }
         <property name="lineWidth">
          <number>1</number>
         </property>
-        <property name="text">
-         <string/>
-        </property>
         <property name="scaledContents">
          <bool>true</bool>
         </property>
@@ -1216,7 +851,7 @@ p, li { white-space: pre-wrap; }
         </property>
         <property name="sizeHint" stdset="0">
          <size>
-          <width>78</width>
+          <width>40</width>
           <height>20</height>
          </size>
         </property>
@@ -1247,21 +882,5 @@ p, li { white-space: pre-wrap; }
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>backgroundTypeComboBox</sender>
-   <signal>currentIndexChanged(int)</signal>
-   <receiver>backgroundStackedWidget</receiver>
-   <slot>setCurrentIndex(int)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>178</x>
-     <y>78</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>249</x>
-     <y>199</y>
-    </hint>
-   </hints>
-  </connection>
  </connections>
 </ui>