From a1bc7f9e8326b8f81c174c595114ea0017dc2724 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul.snyman@saturnlaboratories.co.za>
Date: Thu, 23 Oct 2008 19:41:22 +0000
Subject: [PATCH] Moved some stuff, added some new images, and one or two other
 things.

bzr-revno: 35
---
 openlp.pyw                                |  51 +++++++++-------------
 openlp/core/__init__.py                   |   1 +
 plugin.py => openlp/core/plugin.py        |   0
 openlp/core/settingsmanager.py            |   3 ++
 openlp/resources/images/custom_delete.png | Bin 0 -> 666 bytes
 openlp/resources/images/custom_edit.png   | Bin 0 -> 668 bytes
 openlp/resources/images/custom_new.png    | Bin 0 -> 579 bytes
 openlp/resources/images/openlp-2.qrc      |   6 +++
 8 files changed, 31 insertions(+), 30 deletions(-)
 rename plugin.py => openlp/core/plugin.py (100%)
 create mode 100644 openlp/core/settingsmanager.py
 create mode 100644 openlp/resources/images/custom_delete.png
 create mode 100644 openlp/resources/images/custom_edit.png
 create mode 100644 openlp/resources/images/custom_new.png

diff --git a/openlp.pyw b/openlp.pyw
index 1676459f3..18b4c438e 100755
--- a/openlp.pyw
+++ b/openlp.pyw
@@ -1,40 +1,31 @@
-#!/usr/bin/env pythonw
+#!/usr/bin/env python
+# vim: autoindent shiftwidth=4 expandtab textwidth=80
 
 """
+OpenLP - Open Source Lyrics Projection
+Copyright (c) 2008 Raoul Snyman
+Portions copyright (c) 2008 Martin Thompson, Tim Bennet
 
-Entry point for OpenLP wx.App
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; version 2 of the License.
 
+This program is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
-import wx
-
-from openlp.ui import mainframe
-
-
-class OpenLP(wx.PySimpleApp):
-    def OnInit(self):
-        frame = mainframe.MainFrame(None, title="openlp.org")
-        frame.Show()
-
-        import sys
-        for f in sys.argv[1:]:
-            self.OpenFileMessage(f)
-
-        return True;
-
-
-    def OpenFileMessage(self, filename):
-
-        # TODO: OOS loading here
-        #       rename function, too
-
-        dlg = wx.MessageDialog(None,
-                    "This app was just asked to open:\n%s\n"%filename,
-                    "File Opened", wx.OK|wx.ICON_INFORMATION)
+class OpenLP(object):
+    def __init__(self):
+        pass
 
+    def run(self):
+        pass
 
 if __name__ == '__main__':
     app = OpenLP()
-    app.MainLoop()
-
-# vim: autoindent shiftwidth=4 expandtab textwidth=80
+    app.run()
diff --git a/openlp/core/__init__.py b/openlp/core/__init__.py
index 872865143..761fbb9ec 100644
--- a/openlp/core/__init__.py
+++ b/openlp/core/__init__.py
@@ -1 +1,2 @@
 from openlp.core.render import Renderer
+from openlp.core.settingsmanager import SettingsManager
diff --git a/plugin.py b/openlp/core/plugin.py
similarity index 100%
rename from plugin.py
rename to openlp/core/plugin.py
diff --git a/openlp/core/settingsmanager.py b/openlp/core/settingsmanager.py
new file mode 100644
index 000000000..a7fe51b57
--- /dev/null
+++ b/openlp/core/settingsmanager.py
@@ -0,0 +1,3 @@
+class SettingsManager(object):
+    def __init__(self):
+        pass
diff --git a/openlp/resources/images/custom_delete.png b/openlp/resources/images/custom_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef8e685e2edc2bd322bc20b3930b3b8a4a956692
GIT binary patch
literal 666
zcmV;L0%iS)P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10vAa{K~y-6rIS5q6LA>EpEu1Bn~z?SOH%W3`5?j4Qac<K!Gg62
zHHi>4I15gKU`L5t>eN996dfGWy$GdT78e~1IEWx<ha%WkldEFwsclTj<$8ao3uoFz
z`i%egeSSPI4}W5e;Uu!1$lVWEA(GzQzV&^T<8u9rs~ng6@Zf%Pg-ALUuuLTRC&yl$
z8668oi&^;@QPwicg|pLgJQ$3gzA{~3wm^CS4OmJ}o_8HIw-HN@+Qa!vwJK4*LUhe}
z`9e(`nXtFF8pzD%of@!Y`s@}!X|4XUmK;B42eTm%PT4muw&Y#IpxH#mrZyA|I34)*
z;=Qf`CDTXN7M>Dihex7vOw4eG#$fZhali~XI|dwy2)5q7?kev-7Va?i{8#`0ED~iS
znPE8+jB<w>fgBF#tb?!0r|!;|Uxhh~`JWR^bpU8u7y9}-^q*}IfB~Nq%ySBz{^kAz
z3q)BlA;{zV9S&*>ZND1?U{GxVemB-UgWbmGokGcyqSwMaQBF)n<f)d<32F;2!HXw6
z&lY(va|L`5)E1`x9CBhhE-&!>)gu5F4?Uh4@^Ycw-*5-~sCaop*i?$X&F0Mt&l~Qb
zfY1*WGoB%i7sW@t*o-kS#!v>NY9h9$NM~6&ozmxk>*nk(P@GSvbVZtA)kJKs3`pjz
z2QVQIGtrHEzzyrW3909E+g3AU>}ZYus}ujmzk3qv7);hk;Q#;t07*qoM6N<$f=kC8
Ao&W#<

literal 0
HcmV?d00001

diff --git a/openlp/resources/images/custom_edit.png b/openlp/resources/images/custom_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..d79aa515177ef7252c144f87900e3c77b9449d10
GIT binary patch
literal 668
zcmV;N0%QG&P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10vSm}K~#9!g^)>T6hRb*|LUG4ipy2(4j2_h1WCNe;6X2X7X%do
zV(?;M)I{Slc*r3}BN&7X2BHMqz+m(uxI|I#Af7zvXpe!w2qw53oWa4dt9#~IujopX
zG2m<d{=2IB|K6hn5rInx(W=Z*(o6imI5?XyE7x_`eVU$r?*H*cgkUK2!#nyr_CzvC
zOIliX%mZxO7J&@xU)3rsODNfqTUw$SkVp`(48V-dKP#BU0Co;)S&<t6e{;ovXj4rR
z0U~k0OkflPgtY)*2_4oD6=L~P;`-PqI`{7}`|OKPz}>j3(Zjm~2>bxsHxg#NWw7H(
z^m+3gm;()ZGC7Eq{$uow{KT<N2VF<<CS<zn;+?o6z|?~wEUitUXZSnvr&c2nF525W
zOan6oEqaMh?+;<Qe1YC8-!OJ=4ZN=o4xhMXy3RWh;UB=Gi3?Z}zQ*y(Uod*s!N)l@
zdhczd)9Ge_sTi=e?MGMo_cL@~oWXd18$QgrIMj0ksZ<K4N~IE{l&IJ13~d0AdX(;c
zt;6^3jQE>3t)-Xa+bDm2FIB5m3W9*bFeDYAMx#N6LP2}2R-;_*%uN6`gR>nQ@P7BM
zo#DH;uP8rwfGU*=sZI+3TnylF-|3SRJiWPxRYHi_E$dUCuU<OX+}U*3@;pywk7lm{
zNOG7Z_?5|IoMN$<E0@cY074}Z3G7DE*&CISi0Uu<T=>24!A&6m0000<MNUMnLSTXi
CT_^+q

literal 0
HcmV?d00001

diff --git a/openlp/resources/images/custom_new.png b/openlp/resources/images/custom_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/openlp-2.qrc b/openlp/resources/images/openlp-2.qrc
index 1dd7935d9..32f422ed9 100644
--- a/openlp/resources/images/openlp-2.qrc
+++ b/openlp/resources/images/openlp-2.qrc
@@ -5,6 +5,11 @@
     <file>song_export.png</file>
     <file>song_new.png</file>
   </qresource>
+  <qresource prefix="custom" >
+    <file>custom_new.png</file>
+    <file>custom_edit.png</file>
+    <file>custom_delete.png</file>
+  </qresource>
   <qresource prefix="wizards" >
     <file>wizard_importbible.bmp</file>
   </qresource>
@@ -58,6 +63,7 @@
     <file>tools_alert.png</file>
   </qresource>
   <qresource prefix="themes" >
+    <file>theme_delete.png</file>
     <file>theme_new.png</file>
     <file>theme_edit.png</file>
     <file>theme_export.png</file>