Added a basic ThemeWizard, added more images, updated SettingsForm

bzr-revno: 19
This commit is contained in:
Raoul Snyman 2008-10-17 13:29:36 +00:00
parent ad11730e87
commit da9c26a6d5
11 changed files with 467 additions and 80 deletions

View File

@ -59,8 +59,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>90</width>
<height>545</height>
<width>268</width>
<height>542</height>
</rect>
</property>
</widget>
@ -99,8 +99,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>90</width>
<height>545</height>
<width>268</width>
<height>542</height>
</rect>
</property>
</widget>
@ -261,7 +261,7 @@
<item>
<widget class="QToolBox" name="MediaToolBox" >
<property name="currentIndex" >
<number>2</number>
<number>4</number>
</property>
<property name="tabSpacing" >
<number>0</number>
@ -271,7 +271,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>457</width>
<width>237</width>
<height>652</height>
</rect>
</property>
@ -466,7 +466,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>457</width>
<width>237</width>
<height>652</height>
</rect>
</property>
@ -579,7 +579,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>457</width>
<width>237</width>
<height>652</height>
</rect>
</property>
@ -692,7 +692,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>457</width>
<width>237</width>
<height>652</height>
</rect>
</property>
@ -724,8 +724,21 @@
<property name="toolTip" >
<string>Load Video</string>
</property>
<property name="statusTip" >
<string>Load a video</string>
</property>
<property name="text" >
<string>LI</string>
<string>Load Video</string>
</property>
<property name="icon" >
<iconset resource="../images/openlp-2.qrc" >
<normaloff>:/videos/video_load.png</normaloff>:/videos/video_load.png</iconset>
</property>
<property name="iconSize" >
<size>
<width>22</width>
<height>22</height>
</size>
</property>
</widget>
</item>
@ -739,7 +752,13 @@
</property>
<property name="icon" >
<iconset resource="../images/openlp-2.qrc" >
<normaloff>:/songs/song_delete.png</normaloff>:/songs/song_delete.png</iconset>
<normaloff>:/videos/video_delete.png</normaloff>:/videos/video_delete.png</iconset>
</property>
<property name="iconSize" >
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="autoRaise" >
<bool>true</bool>
@ -825,7 +844,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>457</width>
<width>237</width>
<height>652</height>
</rect>
</property>
@ -836,6 +855,141 @@
<iconset resource="../images/openlp-2.qrc" >
<normaloff>:/media/media_image.png</normaloff>:/media/media_image.png</iconset>
</attribute>
<layout class="QVBoxLayout" name="ImagesLayout" >
<property name="spacing" >
<number>0</number>
</property>
<property name="margin" >
<number>0</number>
</property>
<item>
<widget class="QWidget" native="1" name="ImagesToolbar" >
<layout class="QHBoxLayout" name="ImagesToolbarLayout" >
<property name="spacing" >
<number>0</number>
</property>
<property name="margin" >
<number>0</number>
</property>
<item>
<widget class="QToolButton" name="ImagesLoadItem" >
<property name="toolTip" >
<string>Load Video</string>
</property>
<property name="statusTip" >
<string>Load a video</string>
</property>
<property name="text" >
<string>Load Image</string>
</property>
<property name="icon" >
<iconset resource="../images/openlp-2.qrc" >
<normaloff>:/images/image_load.png</normaloff>:/images/image_load.png</iconset>
</property>
<property name="iconSize" >
<size>
<width>22</width>
<height>22</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="ImagesDeleteItem" >
<property name="toolTip" >
<string>Remove Video</string>
</property>
<property name="text" >
<string>Delete Image</string>
</property>
<property name="icon" >
<iconset resource="../images/openlp-2.qrc" >
<normaloff>:/images/image_delete.png</normaloff>:/images/image_delete.png</iconset>
</property>
<property name="iconSize" >
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="autoRaise" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="Line" name="ImagesLine" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="ImagesLiveItem" >
<property name="toolTip" >
<string>Go Live!</string>
</property>
<property name="text" >
<string/>
</property>
<property name="icon" >
<iconset resource="../images/openlp-2.qrc" >
<normaloff>:/system/system_live.png</normaloff>:/system/system_live.png</iconset>
</property>
<property name="iconSize" >
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="autoRaise" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="ImagesAddItem" >
<property name="toolTip" >
<string>Add to Order of Service</string>
</property>
<property name="text" >
<string/>
</property>
<property name="icon" >
<iconset resource="../images/openlp-2.qrc" >
<normaloff>:/system/system_add.png</normaloff>:/system/system_add.png</iconset>
</property>
<property name="iconSize" >
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="autoRaise" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="ImagesToolbarSpacer" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>105</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QTableWidget" name="ImagesList" />
</item>
</layout>
</widget>
</widget>
</item>

View File

@ -1,85 +1,208 @@
<ui version="4.0" >
<class>Dialog</class>
<widget class="QDialog" name="Dialog" >
<class>SettingsDialog</class>
<widget class="QDialog" name="SettingsDialog" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>599</width>
<height>409</height>
<width>607</width>
<height>344</height>
</rect>
</property>
<property name="windowTitle" >
<string>Settings</string>
</property>
<widget class="QDialogButtonBox" name="buttonBox" >
<property name="geometry" >
<rect>
<x>430</x>
<y>370</y>
<width>160</width>
<height>28</height>
</rect>
<layout class="QVBoxLayout" name="SettingsLayout" >
<property name="spacing" >
<number>8</number>
</property>
<property name="maximumSize" >
<size>
<width>341</width>
<height>16777215</height>
</size>
<property name="margin" >
<number>8</number>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons" >
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
<widget class="QTabWidget" name="tabWidget" >
<property name="geometry" >
<rect>
<x>10</x>
<y>10</y>
<width>581</width>
<height>351</height>
</rect>
</property>
<property name="currentIndex" >
<number>0</number>
</property>
<widget class="QWidget" name="ThemesTab" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>577</width>
<height>323</height>
</rect>
</property>
<attribute name="title" >
<string>Tab 1</string>
</attribute>
</widget>
<widget class="QWidget" name="DisplayTab" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>577</width>
<height>323</height>
</rect>
</property>
<attribute name="title" >
<string>Tab 2</string>
</attribute>
</widget>
</widget>
<item>
<widget class="QTabWidget" name="SettingsTabWidget" >
<property name="currentIndex" >
<number>0</number>
</property>
<widget class="QWidget" name="ThemesTab" >
<attribute name="title" >
<string>Themes</string>
</attribute>
<layout class="QHBoxLayout" name="ThemesTabLayout" >
<property name="spacing" >
<number>8</number>
</property>
<property name="margin" >
<number>8</number>
</property>
<item>
<widget class="QGroupBox" name="DefaultGroupBox" >
<property name="title" >
<string>Default theme</string>
</property>
<layout class="QVBoxLayout" name="DefaultGroupBoxLayout" >
<property name="spacing" >
<number>8</number>
</property>
<property name="margin" >
<number>8</number>
</property>
<item>
<widget class="QComboBox" name="DefaultComboBox" >
<item>
<property name="text" >
<string>African Sunset</string>
</property>
</item>
<item>
<property name="text" >
<string>Snowy Mountains</string>
</property>
</item>
<item>
<property name="text" >
<string>Wilderness</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QListView" name="DefaultListView" />
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="LevelGroupBox" >
<property name="title" >
<string>Theme level</string>
</property>
<layout class="QFormLayout" name="formLayout" >
<property name="labelAlignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="formAlignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="horizontalSpacing" >
<number>8</number>
</property>
<property name="verticalSpacing" >
<number>8</number>
</property>
<property name="margin" >
<number>8</number>
</property>
<item row="0" column="0" >
<widget class="QRadioButton" name="radioButton" >
<property name="text" >
<string>RadioButton</string>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QLabel" name="label" >
<property name="text" >
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QRadioButton" name="radioButton_2" >
<property name="text" >
<string>RadioButton</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QRadioButton" name="radioButton_3" >
<property name="text" >
<string>RadioButton</string>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>TextLabel</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="DisplayTab" >
<attribute name="title" >
<string>Display</string>
</attribute>
</widget>
<widget class="QWidget" name="GeneralTab" >
<attribute name="title" >
<string>General</string>
</attribute>
</widget>
</widget>
</item>
<item>
<widget class="QWidget" native="1" name="ButtonsBar" >
<layout class="QHBoxLayout" name="ButtonsLayout" >
<property name="spacing" >
<number>0</number>
</property>
<property name="margin" >
<number>0</number>
</property>
<item>
<spacer name="ButtonsSpacer" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QDialogButtonBox" name="ButtonsBox" >
<property name="maximumSize" >
<size>
<width>341</width>
<height>16777215</height>
</size>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons" >
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<resources/>
<resources>
<include location="../images/openlp-2.qrc" />
</resources>
<connections>
<connection>
<sender>buttonBox</sender>
<sender>ButtonsBox</sender>
<signal>accepted()</signal>
<receiver>Dialog</receiver>
<receiver>SettingsDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
@ -93,9 +216,9 @@
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<sender>ButtonsBox</sender>
<signal>rejected()</signal>
<receiver>Dialog</receiver>
<receiver>SettingsDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >

View File

@ -0,0 +1,95 @@
<ui version="4.0" >
<class>ThemeWizard</class>
<widget class="QWizard" name="ThemeWizard" >
<property name="windowModality" >
<enum>Qt::ApplicationModal</enum>
</property>
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>576</width>
<height>397</height>
</rect>
</property>
<property name="windowTitle" >
<string>Theme Wizard</string>
</property>
<property name="modal" >
<bool>true</bool>
</property>
<property name="wizardStyle" >
<enum>QWizard::ModernStyle</enum>
</property>
<property name="options" >
<set>QWizard::DisabledBackButtonOnLastPage|QWizard::IndependentPages|QWizard::NoBackButtonOnStartPage|QWizard::NoCancelButton</set>
</property>
<widget class="QWizardPage" name="WelcomePage" >
<property name="title" >
<string>Welcome</string>
</property>
<property name="subTitle" >
<string/>
</property>
<widget class="QLabel" name="WelcomeLabel" >
<property name="geometry" >
<rect>
<x>20</x>
<y>100</y>
<width>341</width>
<height>31</height>
</rect>
</property>
<property name="text" >
<string>Welcome to the Theme Wizard. This wizard will guide you through the process of creating a new theme.</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
</widget>
</widget>
<widget class="QWizardPage" name="NamePage" >
<property name="title" >
<string>Theme Name</string>
</property>
<property name="subTitle" >
<string>Choose a name for your theme</string>
</property>
<widget class="QLabel" name="NameLabel" >
<property name="geometry" >
<rect>
<x>100</x>
<y>130</y>
<width>91</width>
<height>17</height>
</rect>
</property>
<property name="text" >
<string>Theme Name:</string>
</property>
</widget>
<widget class="QLineEdit" name="NameEdit" >
<property name="geometry" >
<rect>
<x>200</x>
<y>127</y>
<width>261</width>
<height>22</height>
</rect>
</property>
</widget>
</widget>
<widget class="QWizardPage" name="BackgroundPage" >
<property name="title" >
<string>Select Background</string>
</property>
<property name="subTitle" >
<string>Select a background type and configure your background</string>
</property>
</widget>
</widget>
<resources>
<include location="../images/openlp-2.qrc" />
</resources>
<connections/>
</ui>

Binary file not shown.

After

Width:  |  Height:  |  Size: 666 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 531 B

View File

@ -5,6 +5,21 @@
<file>song_export.png</file>
<file>song_new.png</file>
</qresource>
<qresource prefix="wizards" >
<file>wizard_importbible.bmp</file>
</qresource>
<qresource prefix="presentations" >
<file>presentation_delete.png</file>
<file>presentation_load.png</file>
</qresource>
<qresource prefix="videos" >
<file>video_delete.png</file>
<file>video_load.png</file>
</qresource>
<qresource prefix="images" >
<file>image_delete.png</file>
<file>image_load.png</file>
</qresource>
<qresource prefix="services" >
<file>service_bottom.png</file>
<file>service_down.png</file>

Binary file not shown.

After

Width:  |  Height:  |  Size: 666 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 531 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 666 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 531 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 168 KiB