renamed slots to common naming scheme

renamed objects to conform British English (reverted some experimental edit of themewizard.ui)
2010-12-27 22:53:02 +01:00 · 2010-12-27 22:53:02 +01:00 · 9212399ad7
parent 914827c023
commit 9212399ad7
4 changed files with 569 additions and 189 deletions
--- a/openlp/core/ui/themeform.py
+++ b/openlp/core/ui/themeform.py
@ -58,49 +58,49 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
        self.updateThemeAllowed = True
        QtCore.QObject.connect(self.backgroundComboBox,
            QtCore.SIGNAL(u'currentIndexChanged(int)'),
-            self.onBackgroundComboBox)
+            self.onBackgroundComboBoxCurrentIndexChanged)
        QtCore.QObject.connect(self.gradientComboBox,
            QtCore.SIGNAL(u'currentIndexChanged(int)'),
-            self.onGradientComboBox)
+            self.onGradientComboBoxCurrentIndexChanged)
        QtCore.QObject.connect(self.colorButton,
-            QtCore.SIGNAL(u'pressed()'),
+            QtCore.SIGNAL(u'clicked()'),
            self.onColorButtonClicked)
        QtCore.QObject.connect(self.gradientStartButton,
-            QtCore.SIGNAL(u'pressed()'),
+            QtCore.SIGNAL(u'clicked()'),
            self.onGradientStartButtonClicked)
        QtCore.QObject.connect(self.gradientEndButton,
-            QtCore.SIGNAL(u'pressed()'),
+            QtCore.SIGNAL(u'clicked()'),
            self.onGradientEndButtonClicked)
        QtCore.QObject.connect(self.imageBrowseButton,
-            QtCore.SIGNAL(u'pressed()'),
+            QtCore.SIGNAL(u'clicked()'),
            self.onImageBrowseButtonClicked)
        QtCore.QObject.connect(self.mainColorButton,
-            QtCore.SIGNAL(u'pressed()'),
-            self.onMainColourButtonClicked)
+            QtCore.SIGNAL(u'clicked()'),
+            self.onMainColorButtonClicked)
        QtCore.QObject.connect(self.outlineColorButton,
-            QtCore.SIGNAL(u'pressed()'),
-            self.onOutlineColourButtonClicked)
+            QtCore.SIGNAL(u'clicked()'),
+            self.onOutlineColorButtonClicked)
        QtCore.QObject.connect(self.shadowColorButton,
-            QtCore.SIGNAL(u'pressed()'),
-            self.onShadowColourButtonClicked)
+            QtCore.SIGNAL(u'clicked()'),
+            self.onShadowColorButtonClicked)
        QtCore.QObject.connect(self.outlineCheckBox,
            QtCore.SIGNAL(u'stateChanged(int)'),
-            self.onOutlineCheckCheckBoxChanged)
+            self.onOutlineCheckCheckBoxStateChanged)
        QtCore.QObject.connect(self.shadowCheckBox,
            QtCore.SIGNAL(u'stateChanged(int)'),
-            self.onShadowCheckCheckBoxChanged)
+            self.onShadowCheckCheckBoxStateChanged)
        QtCore.QObject.connect(self.footerColorButton,
-            QtCore.SIGNAL(u'pressed()'),
-            self.onFooterColourButtonClicked)
+            QtCore.SIGNAL(u'clicked()'),
+            self.onFooterColorButtonClicked)
        QtCore.QObject.connect(self.mainPositionCheckBox,
            QtCore.SIGNAL(u'stateChanged(int)'),
-            self.onMainPositionCheckBox)
+            self.onMainPositionCheckBoxStateChanged)
        QtCore.QObject.connect(self.footerPositionCheckBox,
            QtCore.SIGNAL(u'stateChanged(int)'),
-            self.onFooterPositionCheckBox)
+            self.onFooterPositionCheckBoxStateChanged)
        QtCore.QObject.connect(self,
            QtCore.SIGNAL(u'currentIdChanged(int)'),
-            self.pageChanged)
+            self.onCurrentIdChanged)
        QtCore.QObject.connect(Receiver.get_receiver(),
            QtCore.SIGNAL(u'theme_line_count'),
            self.updateLinesText)
@ -121,15 +121,6 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
            self.calculateLines)
        QtCore.QObject.connect(self, QtCore.SIGNAL(u'accepted()'), self.accept)

-    def pageChanged(self, pageId):
-        """
-        Detects Page changes and updates as approprate.
-        """
-        if self.page(pageId) == self.previewPage:
-            self.updateTheme()
-            frame = self.thememanager.generateImage(self.theme)
-            self.previewBoxLabel.setPixmap(QtGui.QPixmap.fromImage(frame))
-
    def setDefaults(self):
        """
        Set up display at start of theme edit.
@ -224,7 +215,16 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
        self.mainLineCountLabel.setText(unicode(translate('OpenLP.ThemeForm', \
            '(%d lines per slide)' % int(lines))))

-    def onOutlineCheckCheckBoxChanged(self, state):
+    def onCurrentIdChanged(self, pageId):
+        """
+        Detects Page changes and updates as approprate.
+        """
+        if self.page(pageId) == self.previewPage:
+            self.updateTheme()
+            frame = self.thememanager.generateImage(self.theme)
+            self.previewBoxLabel.setPixmap(QtGui.QPixmap.fromImage(frame))
+
+    def onOutlineCheckCheckBoxStateChanged(self, state):
        """
        Change state as Outline check box changed
        """
@ -236,7 +236,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
        self.outlineSizeSpinBox.setEnabled(self.theme.font_main_outline)
        self.calculateLines()

-    def onShadowCheckCheckBoxChanged(self, state):
+    def onShadowCheckCheckBoxStateChanged(self, state):
        """
        Change state as Shadow check box changed
        """
@ -248,13 +248,13 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
        self.shadowSizeSpinBox.setEnabled(self.theme.font_main_shadow)
        self.calculateLines()

-    def onMainPositionCheckBox(self, value):
+    def onMainPositionCheckBoxStateChanged(self, value):
        """
        Change state as Main Area Position check box changed
        """
        self.theme.font_main_override = (value == QtCore.Qt.Checked)

-    def onFooterPositionCheckBox(self, value):
+    def onFooterPositionCheckBoxStateChanged(self, value):
        """
        Change state as Footer Area Position check box changed
        """
@ -403,14 +403,14 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
        self.themeNameEdit.setReadOnly(len(self.theme.theme_name) != 0)
        self.themeNameEdit.setFrame(len(self.theme.theme_name) == 0)

-    def onBackgroundComboBox(self, index):
+    def onBackgroundComboBoxCurrentIndexChanged(self, index):
        """
        Background style Combo box has changed.
        """
        self.theme.background_type = BackgroundType.to_string(index)
        self.setBackgroundTabValues()

-    def onGradientComboBox(self, index):
+    def onGradientComboBoxCurrentIndexChanged(self, index):
        """
        Background gradient Combo box has changed.
        """
@ -456,22 +456,22 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
            self.theme.background_filename = unicode(filename)
        self.setBackgroundTabValues()

-    def onMainColourButtonClicked(self):
+    def onMainColorButtonClicked(self):
        self.theme.font_main_color = \
            self._colorButton(self.theme.font_main_color)
        self.setMainAreaTabValues()

-    def onOutlineColourButtonClicked(self):
+    def onOutlineColorButtonClicked(self):
        self.theme.font_main_outline_color = \
            self._colorButton(self.theme.font_main_outline_color)
        self.setMainAreaTabValues()

-    def onShadowColourButtonClicked(self):
+    def onShadowColorButtonClicked(self):
        self.theme.font_main_shadow_color = \
            self._colorButton(self.theme.font_main_shadow_color)
        self.setMainAreaTabValues()

-    def onFooterColourButtonClicked(self):
+    def onFooterColorButtonClicked(self):
        self.theme.font_footer_color = \
            self._colorButton(self.theme.font_footer_color)
        self.setFooterAreaTabValues()
@ -573,4 +573,4 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
            QtGui.QColor(field), self)
        if new_color.isValid():
            field = new_color.name()
-        return field
+        return field
--- a/openlp/core/ui/themewizard.py
+++ b/openlp/core/ui/themewizard.py
@ -69,7 +69,7 @@ class Ui_ThemeWizard(object):
            self.backgroundComboBox)
        self.backgroundTypeSpacer =  QtGui.QSpacerItem(10, 0,
            QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum)
-        self.backgroundTypeLayout.setItem(1,QtGui.QFormLayout.LabelRole,
+        self.backgroundTypeLayout.setItem(1, QtGui.QFormLayout.LabelRole,
            self.backgroundTypeSpacer)
        self.backgroundLayout.addLayout(self.backgroundTypeLayout)
        self.backgroundStack = QtGui.QStackedLayout()
@ -84,7 +84,7 @@ class Ui_ThemeWizard(object):
        self.colorButton = QtGui.QPushButton(self.colorWidget)
        self.colorButton.setObjectName(u'ColorButton')
        self.colorLayout.addRow(self.colorLabel, self.colorButton)
-        self.colorSpacer =  QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
+        self.colorSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
            QtGui.QSizePolicy.Minimum)
        self.colorLayout.setItem(1, QtGui.QFormLayout.LabelRole,
            self.colorSpacer)
@ -379,7 +379,6 @@ class Ui_ThemeWizard(object):
        ThemeWizard.addPage(self.previewPage)

        self.retranslateUi(ThemeWizard)
-
        QtCore.QObject.connect(self.backgroundComboBox,
            QtCore.SIGNAL(u'currentIndexChanged(int)'), self.backgroundStack,
            QtCore.SLOT(u'setCurrentIndex(int)'))
--- a/openlp/plugins/bibles/forms/bibleimportform.py
+++ b/openlp/plugins/bibles/forms/bibleimportform.py
@ -96,7 +96,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
        self.selectStack.setCurrentIndex(0)
        QtCore.QObject.connect(self.webSourceComboBox,
            QtCore.SIGNAL(u'currentIndexChanged(int)'),
-            self.onWebSourceComboBoxChanged)
+            self.onWebSourceComboBoxCurrentIndexChanged)
        QtCore.QObject.connect(self.osisBrowseButton,
            QtCore.SIGNAL(u'clicked()'),
            self.onOsisBrowseButtonClicked)
@ -223,7 +223,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
        if self.currentPage() == self.importPage:
            return True

-    def onWebSourceComboBoxChanged(self, index):
+    def onWebSourceComboBoxCurrentIndexChanged(self, index):
        """
        Setup the list of Bibles when you select a different source on the web
        download page.
@ -332,7 +332,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
            QtCore.QVariant(self.copyrightEdit.text()))
        self.setField(u'license_permissions',
            QtCore.QVariant(self.permissionsEdit.text()))
-        self.onWebSourceComboBoxChanged(WebDownload.Crosswalk)
+        self.onWebSourceComboBoxCurrentIndexChanged(WebDownload.Crosswalk)
        settings.endGroup()

    def loadWebBibles(self):
@ -534,4 +534,4 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
        self.importProgressBar.setValue(self.importProgressBar.maximum())
        self.finishButton.setVisible(True)
        self.cancelButton.setVisible(False)
-        Receiver.send_message(u'openlp_process_events')
+        Receiver.send_message(u'openlp_process_events')
--- a/resources/forms/themewizard.ui
+++ b/resources/forms/themewizard.ui
@ -2,6 +2,14 @@
 <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>
@ -15,30 +23,51 @@
   <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="sizePolicy">
-       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
+      <property name="minimumSize">
+       <size>
+        <width>163</width>
+        <height>0</height>
+       </size>
+      </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>6</number>
-      </property>
-      <property name="margin">
-       <number>12</number>
+       <number>8</number>
      </property>
      <item>
       <widget class="QLabel" name="titleLabel">
@ -49,9 +78,6 @@ 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>
@ -73,11 +99,14 @@ 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>
@ -104,127 +133,256 @@ 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="QFormLayout" name="backgroundLayout">
-    <property name="verticalSpacing">
-     <number>6</number>
+   <layout class="QVBoxLayout" name="backgroundLayout">
+    <property name="spacing">
+     <number>8</number>
    </property>
    <property name="margin">
-     <number>12</number>
+     <number>20</number>
    </property>
-    <item row="0" column="0">
-     <widget class="QLabel" name="backgroundTypeLabel">
-      <property name="text">
-       <string>Background type:</string>
+    <item>
+     <layout class="QHBoxLayout" name="backgroundTypeLayout">
+      <property name="spacing">
+       <number>8</number>
      </property>
-     </widget>
-    </item>
-    <item row="0" column="1">
-     <widget class="QComboBox" name="backgroundTypeComboBox">
      <item>
-       <property name="text">
-        <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 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>
+       <widget class="QLabel" name="backgroundTypeLabel">
+        <property name="text">
+         <string>Background type:</string>
        </property>
       </widget>
      </item>
+      <item>
+       <widget class="QComboBox" name="backgroundTypeComboBox">
+        <item>
+         <property name="text">
+          <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="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <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">
@ -235,17 +393,29 @@ 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>6</number>
+     <number>8</number>
    </property>
    <property name="margin">
-     <number>12</number>
+     <number>20</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">
@ -261,10 +431,14 @@ p, li { white-space: pre-wrap; }
    <item row="1" column="1">
     <layout class="QHBoxLayout" name="fontPropertiesLayout">
      <property name="spacing">
-       <number>12</number>
+       <number>24</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">
@ -291,8 +465,26 @@ 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>
@ -343,7 +535,14 @@ 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">
@ -375,6 +574,9 @@ p, li { white-space: pre-wrap; }
        <property name="enabled">
         <bool>true</bool>
        </property>
+        <property name="text">
+         <string/>
+        </property>
       </widget>
      </item>
      <item>
@ -403,17 +605,32 @@ 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>6</number>
+     <number>8</number>
    </property>
    <property name="margin">
-     <number>12</number>
+     <number>20</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">
@ -427,7 +644,11 @@ 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">
@ -438,6 +659,18 @@ 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>
@ -459,21 +692,36 @@ 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>6</number>
+     <number>8</number>
    </property>
    <property name="margin">
-     <number>12</number>
+     <number>20</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>
@ -535,16 +783,31 @@ p, li { white-space: pre-wrap; }
   </property>
   <layout class="QGridLayout" name="areaPositionLayout">
    <property name="margin">
-     <number>12</number>
+     <number>20</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>6</number>
+        <number>8</number>
+       </property>
+       <property name="margin">
+        <number>8</number>
       </property>
       <item row="0" column="1">
        <widget class="QCheckBox" name="mainDefaultPositionCheckBox">
@ -554,10 +817,13 @@ 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="mainXLabel">
+        <widget class="QLabel" name="nainXLabel">
         <property name="text">
          <string>X position:</string>
         </property>
@ -574,6 +840,12 @@ 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>
@ -596,6 +868,12 @@ 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>
@ -622,6 +900,12 @@ 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>
@ -642,6 +926,18 @@ 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>
@ -662,12 +958,24 @@ 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>&amp;Footer Area</string>
+       <string>Footer Area</string>
      </property>
      <layout class="QFormLayout" name="footerPositionLayout">
+       <property name="horizontalSpacing">
+        <number>8</number>
+       </property>
       <property name="verticalSpacing">
-        <number>6</number>
+        <number>8</number>
+       </property>
+       <property name="margin">
+        <number>8</number>
       </property>
       <item row="1" column="0">
        <widget class="QLabel" name="footerXLabel">
@ -681,6 +989,18 @@ 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>
@ -704,6 +1024,18 @@ 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>
@ -727,6 +1059,12 @@ 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>
@ -747,6 +1085,12 @@ 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>
@ -779,18 +1123,33 @@ p, li { white-space: pre-wrap; }
   </property>
   <layout class="QVBoxLayout" name="previewLayout">
    <property name="spacing">
-     <number>6</number>
+     <number>8</number>
    </property>
    <property name="margin">
-     <number>12</number>
+     <number>20</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>
@ -803,6 +1162,9 @@ 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">
@ -810,7 +1172,7 @@ p, li { white-space: pre-wrap; }
        </property>
        <property name="sizeHint" stdset="0">
         <size>
-          <width>40</width>
+          <width>58</width>
          <height>20</height>
         </size>
        </property>
@ -839,6 +1201,9 @@ 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>
@ -851,7 +1216,7 @@ p, li { white-space: pre-wrap; }
        </property>
        <property name="sizeHint" stdset="0">
         <size>
-          <width>40</width>
+          <width>78</width>
          <height>20</height>
         </size>
        </property>
@ -882,5 +1247,21 @@ 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>