raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Updated main form, added some more resource images.

Browse Source 
bzr-revno: 16
This commit is contained in:
Raoul Snyman 2008-10-15 19:58:47 +00:00
parent 6140dbe500
commit 059dc37cd1
5 changed files with 256 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

291
openlp/resources/forms/mainwindow.ui
View File

@ -5,8 +5,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>800</width> <width>1087</width>
<height>600</height> <height>847</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy" >
@ -18,35 +18,130 @@
<property name="windowTitle" > <property name="windowTitle" >
<string>openlp.org 2.0</string> <string>openlp.org 2.0</string>
</property> </property>
<widget class="QWidget" name="centralwidget" > <widget class="QWidget" name="MainContent" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" > <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_4" >
<property name="spacing" >
<number>0</number>
</property>
<property name="margin" >
<number>0</number>
</property>
<item>
<widget class="QSplitter" name="ControlSplitter" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<widget class="QWidget" native="1" name="PreviewPane" >
<layout class="QVBoxLayout" name="verticalLayout" >
<property name="spacing" >
<number>0</number>
</property>
<property name="margin" >
<number>0</number>
</property>
<item>
<widget class="QSplitter" name="PreviewSplitter" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<widget class="QScrollArea" name="PreviewController" >
<property name="widgetResizable" >
<bool>true</bool>
</property>
<widget class="QWidget" name="PreviewControllerContents" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>257</width>
<height>536</height>
</rect>
</property>
</widget>
</widget>
<widget class="QGraphicsView" name="PreviewScreen" >
<property name="maximumSize" >
<size>
<width>16777215</width>
<height>250</height>
</size>
</property>
</widget>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" native="1" name="LivePane" >
<layout class="QVBoxLayout" name="verticalLayout_3" >
<property name="spacing" >
<number>0</number>
</property>
<property name="margin" >
<number>0</number>
</property>
<item>
<widget class="QSplitter" name="LiveSplitter" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<widget class="QScrollArea" name="LiveController" >
<property name="widgetResizable" >
<bool>true</bool>
</property>
<widget class="QWidget" name="LiveControllerContents" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>257</width>
<height>536</height>
</rect>
</property>
</widget>
</widget>
<widget class="QGraphicsView" name="LiveScreen" >
<property name="maximumSize" >
<size>
<width>16777215</width>
<height>250</height>
</size>
</property>
</widget>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget> </widget>
<widget class="QMenuBar" name="menubar" > <widget class="QMenuBar" name="MenuBar" >
<property name="geometry" > <property name="geometry" >
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>800</width> <width>1087</width>
<height>27</height> <height>27</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menu_File" > <widget class="QMenu" name="FileMenu" >
<property name="title" > <property name="title" >
<string>&amp;File</string> <string>&amp;File</string>
</property> </property>
<widget class="QMenu" name="menu_Import" > <widget class="QMenu" name="FileImportMenu" >
<property name="title" > <property name="title" >
<string>&amp;Import</string> <string>&amp;Import</string>
</property> </property>
<addaction name="action_Song" /> <addaction name="ImportSongItem" />
<addaction name="action_Bible" /> <addaction name="ImportBibleItem" />
<addaction name="action_Theme" /> <addaction name="ImportThemeItem" />
<addaction name="action_Language" /> <addaction name="ImportLanguageItem" />
</widget> </widget>
<widget class="QMenu" name="menu_Export" > <widget class="QMenu" name="menu_Export" >
<property name="title" > <property name="title" >
@ -57,12 +152,12 @@
<addaction name="action_Theme_2" /> <addaction name="action_Theme_2" />
<addaction name="action_Language_2" /> <addaction name="action_Language_2" />
</widget> </widget>
<addaction name="action_New" /> <addaction name="FileNewItem" />
<addaction name="action_Open" /> <addaction name="FileOpenItem" />
<addaction name="action_Save" /> <addaction name="FileSaveItem" />
<addaction name="actionSave_As" /> <addaction name="FileSaveAsItem" />
<addaction name="separator" /> <addaction name="separator" />
<addaction name="menu_Import" /> <addaction name="FileImportMenu" />
<addaction name="menu_Export" /> <addaction name="menu_Export" />
<addaction name="separator" /> <addaction name="separator" />
<addaction name="actionE_xit" /> <addaction name="actionE_xit" />
@ -100,7 +195,7 @@
<addaction name="action_Web_Site" /> <addaction name="action_Web_Site" />
<addaction name="action_About" /> <addaction name="action_About" />
</widget> </widget>
<addaction name="menu_File" /> <addaction name="FileMenu" />
<addaction name="menu_Options" /> <addaction name="menu_Options" />
<addaction name="menu_Help" /> <addaction name="menu_Help" />
<addaction name="menu_Help_2" /> <addaction name="menu_Help_2" />
@ -146,8 +241,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>311</width> <width>291</width>
<height>445</height> <height>692</height>
</rect> </rect>
</property> </property>
<attribute name="label" > <attribute name="label" >
@ -161,14 +256,11 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QFrame" name="frame" > <widget class="QWidget" native="1" name="widget_2" >
<property name="frameShape" > <layout class="QHBoxLayout" name="horizontalLayout_5" >
<enum>QFrame::StyledPanel</enum> <property name="spacing" >
</property> <number>0</number>
<property name="frameShadow" > </property>
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3" >
<property name="margin" > <property name="margin" >
<number>0</number> <number>0</number>
</property> </property>
@ -258,8 +350,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>311</width> <width>291</width>
<height>445</height> <height>692</height>
</rect> </rect>
</property> </property>
<attribute name="label" > <attribute name="label" >
@ -282,8 +374,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>311</width> <width>291</width>
<height>445</height> <height>692</height>
</rect> </rect>
</property> </property>
<attribute name="label" > <attribute name="label" >
@ -303,10 +395,129 @@
<number>2</number> <number>2</number>
</attribute> </attribute>
<widget class="QWidget" name="OrderOfServiceContents" > <widget class="QWidget" name="OrderOfServiceContents" >
<layout class="QHBoxLayout" name="horizontalLayout_2" > <layout class="QVBoxLayout" name="verticalLayout_4" >
<property name="spacing" >
<number>0</number>
</property>
<property name="margin" > <property name="margin" >
<number>0</number> <number>0</number>
</property> </property>
<item>
<widget class="QWidget" native="1" name="ServiceToolbar" >
<layout class="QHBoxLayout" name="horizontalLayout_2" >
<property name="spacing" >
<number>0</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>2</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<widget class="QToolButton" name="ServiceNewItem" >
<property name="text" >
<string>New Service</string>
</property>
<property name="icon" >
<iconset resource="../images/openlp-2.qrc" >
<normaloff>:/services/services/service_new.png</normaloff>:/services/services/service_new.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="ServiceOpenItem" >
<property name="text" >
<string>Open Service</string>
</property>
<property name="icon" >
<iconset resource="../images/openlp-2.qrc" >
<normaloff>:/services/services/service_open.png</normaloff>:/services/services/service_open.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="ServiceSaveToolbar" >
<property name="text" >
<string>Save Service</string>
</property>
<property name="icon" >
<iconset resource="../images/openlp-2.qrc" >
<normaloff>:/services/services/service_save.png</normaloff>:/services/services/service_save.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="QComboBox" name="comboBox" >
<property name="sizeAdjustPolicy" >
<enum>QComboBox::AdjustToContents</enum>
</property>
<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>
<spacer name="ServiceToolbarLayout" >
<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>
</widget>
</item>
<item> <item>
<widget class="QListView" name="OrderOfServiceListView" /> <widget class="QListView" name="OrderOfServiceListView" />
</item> </item>
@ -334,22 +545,22 @@
</layout> </layout>
</widget> </widget>
</widget> </widget>
<action name="action_New" > <action name="FileNewItem" >
<property name="text" > <property name="text" >
<string>&amp;New</string> <string>&amp;New</string>
</property> </property>
</action> </action>
<action name="action_Open" > <action name="FileOpenItem" >
<property name="text" > <property name="text" >
<string>&amp;Open</string> <string>&amp;Open</string>
</property> </property>
</action> </action>
<action name="action_Save" > <action name="FileSaveItem" >
<property name="text" > <property name="text" >
<string>&amp;Save</string> <string>&amp;Save</string>
</property> </property>
</action> </action>
<action name="actionSave_As" > <action name="FileSaveAsItem" >
<property name="text" > <property name="text" >
<string>Save &amp;As...</string> <string>Save &amp;As...</string>
</property> </property>
@ -359,22 +570,22 @@
<string>E&amp;xit</string> <string>E&amp;xit</string>
</property> </property>
</action> </action>
<action name="action_Song" > <action name="ImportSongItem" >
<property name="text" > <property name="text" >
<string>&amp;Song</string> <string>&amp;Song</string>
</property> </property>
</action> </action>
<action name="action_Bible" > <action name="ImportBibleItem" >
<property name="text" > <property name="text" >
<string>&amp;Bible</string> <string>&amp;Bible</string>
</property> </property>
</action> </action>
<action name="action_Theme" > <action name="ImportThemeItem" >
<property name="text" > <property name="text" >
<string>&amp;Theme</string> <string>&amp;Theme</string>
</property> </property>
</action> </action>
<action name="action_Language" > <action name="ImportLanguageItem" >
<property name="text" > <property name="text" >
<string>&amp;Language</string> <string>&amp;Language</string>
</property> </property>

5
openlp/resources/images/openlp-2.qrc
View File

@ -4,4 +4,9 @@
<file>songs/song_export.png</file> <file>songs/song_export.png</file>
<file>songs/song_new.png</file> <file>songs/song_new.png</file>
</qresource> </qresource>
<qresource prefix="services" >
<file>services/service_new.png</file>
<file>services/service_open.png</file>
<file>services/service_save.png</file>
</qresource>
</RCC> </RCC>

BIN
openlp/resources/images/services/service_new.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 579 B

BIN
openlp/resources/images/services/service_open.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 531 B

BIN
openlp/resources/images/services/service_save.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 563 B