This commit is contained in:
Tim Bentley 2010-12-06 19:39:04 +00:00
commit 04b4cdaf9f
6 changed files with 871 additions and 684 deletions

View File

@ -62,12 +62,15 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
QtCore.QObject.connect(self.gradientComboBox, QtCore.QObject.connect(self.gradientComboBox,
QtCore.SIGNAL(u'currentIndexChanged(int)'), QtCore.SIGNAL(u'currentIndexChanged(int)'),
self.onGradientComboBox) self.onGradientComboBox)
QtCore.QObject.connect(self.color1PushButton, QtCore.QObject.connect(self.colorButton,
QtCore.SIGNAL(u'pressed()'), QtCore.SIGNAL(u'pressed()'),
self.onColor1PushButtonClicked) self.onColorButtonClicked)
QtCore.QObject.connect(self.color2PushButton, QtCore.QObject.connect(self.gradientStartButton,
QtCore.SIGNAL(u'pressed()'), QtCore.SIGNAL(u'pressed()'),
self.onColor2PushButtonClicked) self.onGradientStartButtonClicked)
QtCore.QObject.connect(self.gradientEndButton,
QtCore.SIGNAL(u'pressed()'),
self.onGradientEndButtonClicked)
QtCore.QObject.connect(self.imageBrowseButton, QtCore.QObject.connect(self.imageBrowseButton,
QtCore.SIGNAL(u'pressed()'), QtCore.SIGNAL(u'pressed()'),
self.onImageBrowseButtonClicked) self.onImageBrowseButtonClicked)
@ -158,9 +161,11 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
self.backgroundPage.registerField( self.backgroundPage.registerField(
u'background_type', self.backgroundTypeComboBox) u'background_type', self.backgroundTypeComboBox)
self.backgroundPage.registerField( self.backgroundPage.registerField(
u'color_1', self.color1PushButton) u'color', self.colorButton)
self.backgroundPage.registerField( self.backgroundPage.registerField(
u'color_2', self.color2PushButton) u'grandient_start', self.gradientStartButton)
self.backgroundPage.registerField(
u'grandient_end', self.gradientEndButton)
self.backgroundPage.registerField( self.backgroundPage.registerField(
u'background_image', self.imageLineEdit) u'background_image', self.imageLineEdit)
self.backgroundPage.registerField( self.backgroundPage.registerField(
@ -280,13 +285,15 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
self.footerHeightSpinBox.setEnabled(self.theme.font_footer_override) self.footerHeightSpinBox.setEnabled(self.theme.font_footer_override)
self.footerWidthSpinBox.setEnabled(self.theme.font_footer_override) self.footerWidthSpinBox.setEnabled(self.theme.font_footer_override)
def exec_(self): def exec_(self, edit=False):
""" """
Run the wizard. Run the wizard.
""" """
self.updateThemeAllowed = False self.updateThemeAllowed = False
self.setDefaults() self.setDefaults()
self.updateThemeAllowed = True self.updateThemeAllowed = True
if edit:
self.next()
return QtGui.QWizard.exec_(self) return QtGui.QWizard.exec_(self)
def initializePage(self, id): def initializePage(self, id):
@ -312,54 +319,19 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
""" """
if self.theme.background_type == \ if self.theme.background_type == \
BackgroundType.to_string(BackgroundType.Solid): BackgroundType.to_string(BackgroundType.Solid):
self.setField(u'background_type', QtCore.QVariant(0)) self.colorButton.setStyleSheet(u'background-color: %s' %
self.color1PushButton.setVisible(True)
self.color1Label.setVisible(True)
self.color1PushButton.setStyleSheet(u'background-color: %s' %
self.theme.background_color) self.theme.background_color)
self.color1Label.setText( self.setField(u'background_type', QtCore.QVariant(0))
translate('OpenLP.ThemeForm', 'Color:'))
self.color2PushButton.setVisible(False)
self.color2Label.setVisible(False)
self.gradientLabel.setVisible(False)
self.gradientComboBox.setVisible(False)
self.imageLabel.setVisible(False)
self.imageLineEdit.setVisible(False)
self.imageBrowseButton.setVisible(False)
self.imageLineEdit.setText(u'')
elif self.theme.background_type == \ elif self.theme.background_type == \
BackgroundType.to_string(BackgroundType.Gradient): BackgroundType.to_string(BackgroundType.Gradient):
self.setField(u'background_type', QtCore.QVariant(1)) self.gradientStartButton.setStyleSheet(u'background-color: %s' %
self.color1PushButton.setVisible(True)
self.color1Label.setVisible(True)
self.color1PushButton.setStyleSheet(u'background-color: %s' %
self.theme.background_start_color) self.theme.background_start_color)
self.color1Label.setText( self.gradientEndButton.setStyleSheet(u'background-color: %s' %
translate('OpenLP.ThemeForm', 'First color:'))
self.color2PushButton.setVisible(True)
self.color2Label.setVisible(True)
self.color2PushButton.setStyleSheet(u'background-color: %s' %
self.theme.background_end_color) self.theme.background_end_color)
self.color2Label.setText( self.setField(u'background_type', QtCore.QVariant(1))
translate('OpenLP.ThemeForm', 'Second color:'))
self.gradientLabel.setVisible(True)
self.gradientComboBox.setVisible(True)
self.imageLabel.setVisible(False)
self.imageLineEdit.setVisible(False)
self.imageBrowseButton.setVisible(False)
self.imageLineEdit.setText(u'')
else: else:
self.setField(u'background_type', QtCore.QVariant(2))
self.color1PushButton.setVisible(False)
self.color1Label.setVisible(False)
self.color2PushButton.setVisible(False)
self.color2Label.setVisible(False)
self.gradientLabel.setVisible(False)
self.gradientComboBox.setVisible(False)
self.imageLineEdit.setVisible(True)
self.imageLabel.setVisible(True)
self.imageBrowseButton.setVisible(True)
self.imageLineEdit.setText(self.theme.background_filename) self.imageLineEdit.setText(self.theme.background_filename)
self.setField(u'background_type', QtCore.QVariant(2))
if self.theme.background_direction == \ if self.theme.background_direction == \
BackgroundGradientType.to_string(BackgroundGradientType.Horizontal): BackgroundGradientType.to_string(BackgroundGradientType.Horizontal):
self.setField(u'gradient', QtCore.QVariant(0)) self.setField(u'gradient', QtCore.QVariant(0))
@ -492,20 +464,23 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
BackgroundGradientType.to_string(index) BackgroundGradientType.to_string(index)
self.setBackgroundTabValues() self.setBackgroundTabValues()
def onColor1PushButtonClicked(self): def onColorButtonClicked(self):
""" """
Background / Gradient 1 Color button pushed. Background / Gradient 1 Color button pushed.
""" """
if self.theme.background_type == \
BackgroundType.to_string(BackgroundType.Solid):
self.theme.background_color = \ self.theme.background_color = \
self._colorButton(self.theme.background_color) self._colorButton(self.theme.background_color)
else: self.setBackgroundTabValues()
def onGradientStartButtonClicked(self):
"""
Gradient 2 Color button pushed.
"""
self.theme.background_start_color = \ self.theme.background_start_color = \
self._colorButton(self.theme.background_start_color) self._colorButton(self.theme.background_start_color)
self.setBackgroundTabValues() self.setBackgroundTabValues()
def onColor2PushButtonClicked(self): def onGradientEndButtonClicked(self):
""" """
Gradient 2 Color button pushed. Gradient 2 Color button pushed.
""" """

View File

@ -280,7 +280,7 @@ class ThemeManager(QtGui.QWidget):
self.saveThemeName = unicode( self.saveThemeName = unicode(
item.data(QtCore.Qt.UserRole).toString()) item.data(QtCore.Qt.UserRole).toString())
self.themeForm.theme = theme self.themeForm.theme = theme
self.themeForm.exec_() self.themeForm.exec_(True)
def onDeleteTheme(self): def onDeleteTheme(self):
""" """

File diff suppressed because it is too large Load Diff

View File

@ -133,30 +133,26 @@ p, li { white-space: pre-wrap; }
<property name="subTitle"> <property name="subTitle">
<string>Set up your theme's background according to the parameters below.</string> <string>Set up your theme's background according to the parameters below.</string>
</property> </property>
<layout class="QFormLayout" name="backgroundLayout"> <layout class="QVBoxLayout" name="backgroundLayout">
<property name="fieldGrowthPolicy"> <property name="spacing">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<property name="labelAlignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="horizontalSpacing">
<number>8</number>
</property>
<property name="verticalSpacing">
<number>8</number> <number>8</number>
</property> </property>
<property name="margin"> <property name="margin">
<number>20</number> <number>20</number>
</property> </property>
<item row="0" column="0"> <item>
<layout class="QHBoxLayout" name="backgroundTypeLayout">
<property name="spacing">
<number>8</number>
</property>
<item>
<widget class="QLabel" name="backgroundTypeLabel"> <widget class="QLabel" name="backgroundTypeLabel">
<property name="text"> <property name="text">
<string>Background type:</string> <string>Background type:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item>
<widget class="QComboBox" name="backgroundTypeComboBox"> <widget class="QComboBox" name="backgroundTypeComboBox">
<item> <item>
<property name="text"> <property name="text">
@ -175,70 +171,136 @@ p, li { white-space: pre-wrap; }
</item> </item>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item>
<widget class="QLabel" name="color1Label"> <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"> <property name="text">
<string>&lt;Color1&gt;</string> <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> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QPushButton" name="color1PushButton"> <widget class="QPushButton" name="gradientEndButton">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="color2Label"> <widget class="QLabel" name="gradientTypeLabel">
<property name="minimumSize">
<size>
<width>103</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>&lt;Color2&gt;</string> <string>Gradient:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QPushButton" name="color2PushButton">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="imageLabel">
<property name="text">
<string>Image:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<layout class="QHBoxLayout" name="imageLayout">
<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>
<item row="4" column="0">
<widget class="QLabel" name="gradientLabel">
<property name="text">
<string>Gradient:</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QComboBox" name="gradientComboBox"> <widget class="QComboBox" name="gradientComboBox">
<item> <item>
<property name="text"> <property name="text">
@ -269,6 +331,60 @@ p, li { white-space: pre-wrap; }
</item> </item>
</layout> </layout>
</widget> </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"> <widget class="QWizardPage" name="mainAreaPage">
<property name="title"> <property name="title">
<string>Main Area Font Details</string> <string>Main Area Font Details</string>
@ -276,30 +392,30 @@ p, li { white-space: pre-wrap; }
<property name="subTitle"> <property name="subTitle">
<string>Define the font and display characteristics for the Display text</string> <string>Define the font and display characteristics for the Display text</string>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="mainAreaLayout">
<property name="formAlignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="horizontalSpacing"> <property name="horizontalSpacing">
<number>8</number> <number>8</number>
</property> </property>
<property name="verticalSpacing"> <property name="verticalSpacing">
<number>8</number> <number>8</number>
</property> </property>
<property name="topMargin"> <property name="margin">
<number>20</number>
</property>
<property name="rightMargin">
<number>20</number>
</property>
<property name="bottomMargin">
<number>20</number> <number>20</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="mainFontLabel"> <widget class="QLabel" name="mainFontLabel">
<property name="minimumSize">
<size>
<width>103</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Font:</string> <string>Font:</string>
</property> </property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
@ -313,12 +429,33 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<layout class="QHBoxLayout" name="fontPropertiesLayout">
<property name="spacing">
<number>24</number>
</property>
<item>
<widget class="QPushButton" name="mainColorPushButton"> <widget class="QPushButton" name="mainColorPushButton">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QCheckBox" name="boldCheckBox">
<property name="text">
<string>Bold</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="italicsCheckBox">
<property name="text">
<string>Italic</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="mainSizeLabel"> <widget class="QLabel" name="mainSizeLabel">
<property name="text"> <property name="text">
@ -458,20 +595,6 @@ p, li { white-space: pre-wrap; }
</item> </item>
</layout> </layout>
</item> </item>
<item row="6" column="1">
<widget class="QCheckBox" name="boldCheckBox">
<property name="text">
<string>Bold Display</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QCheckBox" name="italicsCheckBox">
<property name="text">
<string>Italic Display</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWizardPage" name="footerAreaPage"> <widget class="QWizardPage" name="footerAreaPage">
@ -491,23 +614,23 @@ p, li { white-space: pre-wrap; }
<property name="verticalSpacing"> <property name="verticalSpacing">
<number>8</number> <number>8</number>
</property> </property>
<property name="leftMargin"> <property name="margin">
<number>50</number>
</property>
<property name="topMargin">
<number>20</number>
</property>
<property name="rightMargin">
<number>20</number>
</property>
<property name="bottomMargin">
<number>20</number> <number>20</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="footerFontLabel"> <widget class="QLabel" name="footerFontLabel">
<property name="minimumSize">
<size>
<width>103</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Font:</string> <string>Font:</string>
</property> </property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
@ -569,14 +692,29 @@ p, li { white-space: pre-wrap; }
<string>Allows additional display formatting information to be defined</string> <string>Allows additional display formatting information to be defined</string>
</property> </property>
<layout class="QFormLayout" name="formLayout_2"> <layout class="QFormLayout" name="formLayout_2">
<property name="horizontalSpacing">
<number>8</number>
</property>
<property name="verticalSpacing">
<number>8</number>
</property>
<property name="margin"> <property name="margin">
<number>20</number> <number>20</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="horizontalLabel"> <widget class="QLabel" name="horizontalLabel">
<property name="minimumSize">
<size>
<width>103</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Horizontal Align:</string> <string>Horizontal Align:</string>
</property> </property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
@ -643,7 +781,7 @@ p, li { white-space: pre-wrap; }
<property name="subTitle"> <property name="subTitle">
<string>Allows you to change and move the Main and Footer areas.</string> <string>Allows you to change and move the Main and Footer areas.</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="areaPositionLayout">
<property name="margin"> <property name="margin">
<number>20</number> <number>20</number>
</property> </property>
@ -983,14 +1121,25 @@ p, li { white-space: pre-wrap; }
<property name="subTitle"> <property name="subTitle">
<string>View the theme and save it replacing the current one or change the name to create a new theme</string> <string>View the theme and save it replacing the current one or change the name to create a new theme</string>
</property> </property>
<layout class="QVBoxLayout" name="previewLayout">
<property name="spacing">
<number>8</number>
</property>
<property name="margin">
<number>20</number>
</property>
<item>
<layout class="QHBoxLayout" name="themeNameLayout">
<property name="spacing">
<number>8</number>
</property>
<item>
<widget class="QLabel" name="themeNameLabel"> <widget class="QLabel" name="themeNameLabel">
<property name="geometry"> <property name="minimumSize">
<rect> <size>
<x>20</x> <width>103</width>
<y>10</y> <height>0</height>
<width>82</width> </size>
<height>16</height>
</rect>
</property> </property>
<property name="text"> <property name="text">
<string>Theme name:</string> <string>Theme name:</string>
@ -998,49 +1147,24 @@ p, li { white-space: pre-wrap; }
<property name="textFormat"> <property name="textFormat">
<enum>Qt::PlainText</enum> <enum>Qt::PlainText</enum>
</property> </property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy"> <property name="buddy">
<cstring>themeNameEdit</cstring> <cstring>themeNameEdit</cstring>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="previewLabel"> </item>
<property name="geometry"> <item>
<rect> <widget class="QLineEdit" name="themeNameEdit"/>
<x>250</x> </item>
<y>60</y> </layout>
<width>48</width> </item>
<height>16</height> <item>
</rect> <layout class="QHBoxLayout" name="previewPaneLayout">
<property name="spacing">
<number>0</number>
</property> </property>
<property name="text">
<string>Preview</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
<widget class="QLineEdit" name="themeNameEdit">
<property name="geometry">
<rect>
<x>117</x>
<y>4</y>
<width>351</width>
<height>23</height>
</rect>
</property>
</widget>
<widget class="QGroupBox" name="groupBox">
<property name="geometry">
<rect>
<x>40</x>
<y>80</y>
<width>464</width>
<height>214</height>
</rect>
</property>
<property name="title">
<string/>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<spacer name="leftSpacer"> <spacer name="leftSpacer">
<property name="orientation"> <property name="orientation">
@ -1064,8 +1188,8 @@ p, li { white-space: pre-wrap; }
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>300</width> <width>100</width>
<height>200</height> <height>150</height>
</size> </size>
</property> </property>
<property name="frameShape"> <property name="frameShape">
@ -1099,13 +1223,12 @@ p, li { white-space: pre-wrap; }
</spacer> </spacer>
</item> </item>
</layout> </layout>
</widget> </item>
</layout>
</widget> </widget>
</widget> </widget>
<resources> <resources>
<include location="../images/openlp-2.qrc"/> <include location="../images/openlp-2.qrc"/>
<include location="../images/openlp-2.qrc"/>
<include location="Projects/OpenLP/trunk/resources/images/openlp-2.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>
@ -1124,5 +1247,21 @@ p, li { white-space: pre-wrap; }
</hint> </hint>
</hints> </hints>
</connection> </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> </connections>
</ui> </ui>

View File

@ -81,6 +81,7 @@
<qresource prefix="wizards"> <qresource prefix="wizards">
<file>wizard_importsong.bmp</file> <file>wizard_importsong.bmp</file>
<file>wizard_importbible.bmp</file> <file>wizard_importbible.bmp</file>
<file>wizard_createtheme.bmp</file>
</qresource> </qresource>
<qresource prefix="services"> <qresource prefix="services">
<file>service_collapse_all.png</file> <file>service_collapse_all.png</file>

Binary file not shown.

After

Width:  |  Height:  |  Size: 168 KiB