From 059dc37cd1f63f52870079ea03c19467ec9c2037 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul.snyman@saturnlaboratories.co.za>
Date: Wed, 15 Oct 2008 19:58:47 +0000
Subject: [PATCH] Updated main form, added some more resource images.

bzr-revno: 16
---
 openlp/resources/forms/mainwindow.ui          | 291 +++++++++++++++---
 openlp/resources/images/openlp-2.qrc          |   5 +
 .../resources/images/services/service_new.png | Bin 0 -> 579 bytes
 .../images/services/service_open.png          | Bin 0 -> 531 bytes
 .../images/services/service_save.png          | Bin 0 -> 563 bytes
 5 files changed, 256 insertions(+), 40 deletions(-)
 create mode 100644 openlp/resources/images/services/service_new.png
 create mode 100644 openlp/resources/images/services/service_open.png
 create mode 100644 openlp/resources/images/services/service_save.png

diff --git a/openlp/resources/forms/mainwindow.ui b/openlp/resources/forms/mainwindow.ui
index 3f5e507ec..1776a6402 100644
--- a/openlp/resources/forms/mainwindow.ui
+++ b/openlp/resources/forms/mainwindow.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>800</width>
-    <height>600</height>
+    <width>1087</width>
+    <height>847</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -18,35 +18,130 @@
   <property name="windowTitle" >
    <string>openlp.org 2.0</string>
   </property>
-  <widget class="QWidget" name="centralwidget" >
+  <widget class="QWidget" name="MainContent" >
    <property name="sizePolicy" >
     <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
      <horstretch>0</horstretch>
      <verstretch>0</verstretch>
     </sizepolicy>
    </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 class="QMenuBar" name="menubar" >
+  <widget class="QMenuBar" name="MenuBar" >
    <property name="geometry" >
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>800</width>
+     <width>1087</width>
      <height>27</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menu_File" >
+   <widget class="QMenu" name="FileMenu" >
     <property name="title" >
      <string>&amp;File</string>
     </property>
-    <widget class="QMenu" name="menu_Import" >
+    <widget class="QMenu" name="FileImportMenu" >
      <property name="title" >
       <string>&amp;Import</string>
      </property>
-     <addaction name="action_Song" />
-     <addaction name="action_Bible" />
-     <addaction name="action_Theme" />
-     <addaction name="action_Language" />
+     <addaction name="ImportSongItem" />
+     <addaction name="ImportBibleItem" />
+     <addaction name="ImportThemeItem" />
+     <addaction name="ImportLanguageItem" />
     </widget>
     <widget class="QMenu" name="menu_Export" >
      <property name="title" >
@@ -57,12 +152,12 @@
      <addaction name="action_Theme_2" />
      <addaction name="action_Language_2" />
     </widget>
-    <addaction name="action_New" />
-    <addaction name="action_Open" />
-    <addaction name="action_Save" />
-    <addaction name="actionSave_As" />
+    <addaction name="FileNewItem" />
+    <addaction name="FileOpenItem" />
+    <addaction name="FileSaveItem" />
+    <addaction name="FileSaveAsItem" />
     <addaction name="separator" />
-    <addaction name="menu_Import" />
+    <addaction name="FileImportMenu" />
     <addaction name="menu_Export" />
     <addaction name="separator" />
     <addaction name="actionE_xit" />
@@ -100,7 +195,7 @@
     <addaction name="action_Web_Site" />
     <addaction name="action_About" />
    </widget>
-   <addaction name="menu_File" />
+   <addaction name="FileMenu" />
    <addaction name="menu_Options" />
    <addaction name="menu_Help" />
    <addaction name="menu_Help_2" />
@@ -146,8 +241,8 @@
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>311</width>
-          <height>445</height>
+          <width>291</width>
+          <height>692</height>
          </rect>
         </property>
         <attribute name="label" >
@@ -161,14 +256,11 @@
           <number>0</number>
          </property>
          <item>
-          <widget class="QFrame" name="frame" >
-           <property name="frameShape" >
-            <enum>QFrame::StyledPanel</enum>
-           </property>
-           <property name="frameShadow" >
-            <enum>QFrame::Raised</enum>
-           </property>
-           <layout class="QHBoxLayout" name="horizontalLayout_3" >
+          <widget class="QWidget" native="1" name="widget_2" >
+           <layout class="QHBoxLayout" name="horizontalLayout_5" >
+            <property name="spacing" >
+             <number>0</number>
+            </property>
             <property name="margin" >
              <number>0</number>
             </property>
@@ -258,8 +350,8 @@
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>311</width>
-          <height>445</height>
+          <width>291</width>
+          <height>692</height>
          </rect>
         </property>
         <attribute name="label" >
@@ -282,8 +374,8 @@
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>311</width>
-          <height>445</height>
+          <width>291</width>
+          <height>692</height>
          </rect>
         </property>
         <attribute name="label" >
@@ -303,10 +395,129 @@
     <number>2</number>
    </attribute>
    <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" >
       <number>0</number>
      </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>
       <widget class="QListView" name="OrderOfServiceListView" />
      </item>
@@ -334,22 +545,22 @@
     </layout>
    </widget>
   </widget>
-  <action name="action_New" >
+  <action name="FileNewItem" >
    <property name="text" >
     <string>&amp;New</string>
    </property>
   </action>
-  <action name="action_Open" >
+  <action name="FileOpenItem" >
    <property name="text" >
     <string>&amp;Open</string>
    </property>
   </action>
-  <action name="action_Save" >
+  <action name="FileSaveItem" >
    <property name="text" >
     <string>&amp;Save</string>
    </property>
   </action>
-  <action name="actionSave_As" >
+  <action name="FileSaveAsItem" >
    <property name="text" >
     <string>Save &amp;As...</string>
    </property>
@@ -359,22 +570,22 @@
     <string>E&amp;xit</string>
    </property>
   </action>
-  <action name="action_Song" >
+  <action name="ImportSongItem" >
    <property name="text" >
     <string>&amp;Song</string>
    </property>
   </action>
-  <action name="action_Bible" >
+  <action name="ImportBibleItem" >
    <property name="text" >
     <string>&amp;Bible</string>
    </property>
   </action>
-  <action name="action_Theme" >
+  <action name="ImportThemeItem" >
    <property name="text" >
     <string>&amp;Theme</string>
    </property>
   </action>
-  <action name="action_Language" >
+  <action name="ImportLanguageItem" >
    <property name="text" >
     <string>&amp;Language</string>
    </property>
diff --git a/openlp/resources/images/openlp-2.qrc b/openlp/resources/images/openlp-2.qrc
index 9c70c1b8f..dcaead135 100644
--- a/openlp/resources/images/openlp-2.qrc
+++ b/openlp/resources/images/openlp-2.qrc
@@ -4,4 +4,9 @@
     <file>songs/song_export.png</file>
     <file>songs/song_new.png</file>
   </qresource>
+  <qresource prefix="services" >
+    <file>services/service_new.png</file>
+    <file>services/service_open.png</file>
+    <file>services/service_save.png</file>
+  </qresource>
 </RCC>
diff --git a/openlp/resources/images/services/service_new.png b/openlp/resources/images/services/service_new.png
new file mode 100644
index 0000000000000000000000000000000000000000..8431237bd374e68931a13df798bc0996452f705f
GIT binary patch
literal 579
zcmV-J0=)f+P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10l-N_K~#9!jgP%+Q&AX)pL24-wn31BQYytc-HelUtAm@nQ@i9p
zXa^CBCDejLhoT@36$j~R7R5cah@l@s(@iDl&4+^$lADj4oY&^y;c$sxKlpLZ8J_2T
zj{+_L^ZYBT+|FFfEM+ferw^-#^>VxXK$hi6FoGM6#-0&DYi+BPO7z*s9d>{0vUq8c
z&G}94mG91_zoj3m9VHsT2!GA?={D6)mHkfz06td>m_bcrSPcMDDeJM*+y>fjK<#^t
z=uU*oi<@Nt)FU+;02V?7_3H~3cIR1VuFMcTS6l_&FA2GV;y{3lgxXDZuxrZSS;?#*
z=QUvpn-9RT!7#-`zX5oG|B7vHE(aR6zHX6znI;PO!UTD_B~KNw&}=sMyujCO=T4U(
z2yTeTTYCpkegjtzCeCEM0NlE6vV;ClKoWLfLST%sZMP!<VlNm2#^Fk(LKucjOiuFZ
z^_zFV5%?@bQ6$}NSNi?F#BnTx!9a$?p%`QAyI3sR_x+8H6JSb2aK#Eboj(d%t(KHZ
zC0WboNAR?Vz2N$p!1Q{(5u6Z=Qm;46+WPvwpPZ}$&H-6K@%zNUk%+`Fo}aJD22oU<
R)06-J002ovPDHLkV1n|I|L_0+

literal 0
HcmV?d00001

diff --git a/openlp/resources/images/services/service_open.png b/openlp/resources/images/services/service_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb211e2332d811f9cfcba08c7b5353298b1b02fe
GIT binary patch
literal 531
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJbFq_W2nPqp?T7vkfLzW3kH})6
z^6MbX=%g{b0w^e1;u=vBoS#-wo>-L1P+nfHmzkGcoSayYs+V7sKKq@G6j0HV0G|-o
z|Ns93nQ-9LaT|o%Z#%Z%R!rHXoV{N;=b&cc5yP})hUKTM>dphjom;PZ)a>)_xfL?`
zL1@dtj0s2brk*HT`lMpTv&t1u>ZWb3o4%!W*5>YQZ>B8WK6U%U8GBwYIQnVfp|?wp
zzFB(g&9Y-}Rvv%1_SD<;r-A7G#xo!GT>iNK+Lr@2K0bc(^x5+l&tJTF`ReuSH*em&
zef##^yLa#3zyAORAHm?$r%#{3;LDdUU%}uT2z>wk{l||VKY#xG_3PK~-@pI-`SbVh
z-+%x90X@i}$DaW7A!kXDUoeBbjh+3kKY#ym=`)D|1$#VQ977}|Sr0mTF$apU9C-Cl
zzp1lBVaFF6xtq+KP1ekLB}U1i9-K1Y4qq^5cyC_3>rTxQ-%05{ar?Kv&3d$_=YFhp
z_Sz3$K3Lu?n>%yrhWkEF&#$N@sHAQ6RC<!c->_J%|MqFV7uRE!|Ni!!d&litp4W03
xB2RwV@}1{G@bb&@4By{A;bNGi!c-u0+<uFW;?)M0_D)cAc)I$ztaD0e0sywU6+8d{

literal 0
HcmV?d00001

diff --git a/openlp/resources/images/services/service_save.png b/openlp/resources/images/services/service_save.png
new file mode 100644
index 0000000000000000000000000000000000000000..8072aea3268164eb2028a0cebfe44da82b4f4aca
GIT binary patch
literal 563
zcmV-30?hr1P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10kBC#K~#9!rISBM!$26tU!vG_tJ=Xj)>XvKK@k7Ytwo{YB(9F?
z;2_0Ku;{F~yQsL?!9iy?1;;|c4%SjZ%{70TwwHKcBH=<E3VpeJm%zQ>J-%EN&+{;d
zhN<MT+3!}%N$l+HLzbdaRiUa16a`Qa+@~i+Xj<&&u2dTJ0hVbcCQ=hvSX_c91AxFN
z3PHs1=i8erR4SE3n80;iXfX}i$Pg|cUZW}eLL*4Am6-wO-1me4E?&CbuAl>(E7P<-
zOhP?!y}wyJm`;b*`kqJvqBiX|nL~L2fd*Ux1d!eYF6Tbg5P<9ZC&&uF5~UDVJ~Kya
z$<v#F88$NWv$7kWWF}VAbpA=;a&SRC+}%c>B9GKW9yGCk1)gXRIvtRXipPk@<6(R{
z10;&Qkze=csdPHpgO1qUX}3Wtm&>>~JBMXkI4Be#D>XTZ+DDB(A$cT#*xhj)kQiey
zO%sM;K-YE1@`TY9(UZv}-m29|6TcYK$LKUNox!$kO4I`&Fl}aA7Py>1;e44jn~%EA
z#v7jv<knU}s@Lm~^<Jw{4m`iSKpj$lAT;pr{0sZi9`+YdPh0>1002ovPDHLkV1jI`
B^11*3

literal 0
HcmV?d00001