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

Added the "lib" module for the Songs plugin.

Browse Source 
bzr-revno: 195
This commit is contained in:
Raoul Snyman 2008-12-07 08:09:59 +00:00
parent 560f8fe1dc
commit 2b0328e011
6 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.eric4project/openlp.org 2.0.e4q
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE UserProject SYSTEM "UserProject-4.0.dtd"> <!DOCTYPE UserProject SYSTEM "UserProject-4.0.dtd">
<!-- eric4 user project file for project openlp.org 2.0 --> <!-- eric4 user project file for project openlp.org 2.0 -->
<!-- Saved: 2008-12-06, 11:29:14 --> <!-- Saved: 2008-12-07, 01:02:37 -->
<!-- Copyright (C) 2008 Raoul Snyman, raoulsnyman@openlp.org --> <!-- Copyright (C) 2008 Raoul Snyman, raoulsnyman@openlp.org -->
<UserProject version="4.0"> <UserProject version="4.0">
</UserProject> </UserProject>

2
.eric4project/openlp.org 2.0.e4t
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Tasks SYSTEM "Tasks-4.2.dtd"> <!DOCTYPE Tasks SYSTEM "Tasks-4.2.dtd">
<!-- eric4 tasks file for project openlp.org 2.0 --> <!-- eric4 tasks file for project openlp.org 2.0 -->
<!-- Saved: 2008-12-06, 11:29:14 --> <!-- Saved: 2008-12-07, 01:02:37 -->
<Tasks version="4.2"> <Tasks version="4.2">
<Task priority="1" completed="False" bugfix="False"> <Task priority="1" completed="False" bugfix="False">
<Summary>TODO: what is the tags for bridge, pre-chorus?</Summary> <Summary>TODO: what is the tags for bridge, pre-chorus?</Summary>

4
openlp.org 2.0.e4p
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Project SYSTEM "Project-4.4.dtd"> <!DOCTYPE Project SYSTEM "Project-4.4.dtd">
<!-- eric4 project file for project openlp.org 2.0 --> <!-- eric4 project file for project openlp.org 2.0 -->
<!-- Saved: 2008-12-06, 11:28:59 --> <!-- Saved: 2008-12-07, 01:02:26 -->
<!-- Copyright (C) 2008 Raoul Snyman, raoulsnyman@openlp.org --> <!-- Copyright (C) 2008 Raoul Snyman, raoulsnyman@openlp.org -->
<Project version="4.4"> <Project version="4.4">
<ProgLanguage mixed="0">Python</ProgLanguage> <ProgLanguage mixed="0">Python</ProgLanguage>
@ -80,11 +80,11 @@
<Source>openlp/plugins/bibles/lib/bibleDBimpl.py</Source> <Source>openlp/plugins/bibles/lib/bibleDBimpl.py</Source>
<Source>openlp/plugins/bibles/lib/bibleOSISimpl.py</Source> <Source>openlp/plugins/bibles/lib/bibleOSISimpl.py</Source>
<Source>openlp/plugins/bibles/lib/bibleHTTPimpl.py</Source> <Source>openlp/plugins/bibles/lib/bibleHTTPimpl.py</Source>
<Source>openlp/plugins/bibles/lib/bibleCommon.py</Source>
<Source>openlp/plugins/bibles/lib/bibleCSVimpl.py</Source> <Source>openlp/plugins/bibles/lib/bibleCSVimpl.py</Source>
<Source>openlp/plugins/bibles/__init__.py</Source> <Source>openlp/plugins/bibles/__init__.py</Source>
<Source>openlp/plugins/bibles/lib/__init__.py</Source> <Source>openlp/plugins/bibles/lib/__init__.py</Source>
<Source>openlp/plugins/bibles/forms/__init__.py</Source> <Source>openlp/plugins/bibles/forms/__init__.py</Source>
<Source>openlp/plugins/bibles/lib/biblecommon.py</Source>
</Sources> </Sources>
<Forms> <Forms>
<Form>resources/forms/bibleimport.ui</Form> <Form>resources/forms/bibleimport.ui</Form>

1
openlp/core/pluginmanager.py
View File

@ -66,7 +66,6 @@ class PluginManager(object):
try: try:
__import__(modulename, globals(), locals(), []) __import__(modulename, globals(), locals(), [])
except ImportError, e: except ImportError, e:
print e.message
log.error("Failed to import module %s on path %s for reason %s", modulename, path, e.message) log.error("Failed to import module %s on path %s for reason %s", modulename, path, e.message)
self.plugin_classes = Plugin.__subclasses__() self.plugin_classes = Plugin.__subclasses__()
self.plugins = [] self.plugins = []

21
openlp/plugins/songs/lib/__init__.py Normal file
View File

@ -0,0 +1,21 @@
# -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
"""
OpenLP - Open Source Lyrics Projection
Copyright (c) 2008 Raoul Snyman
Portions copyright (c) 2008 Martin Thompson, Tim Bentley,
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
"""
from songxml import *

8
openlp/plugins/songs/songxml.py
View File

@ -22,7 +22,7 @@ from types import StringType, ListType, NoneType
sys.path.append(os.path.abspath("./../../..")) sys.path.append(os.path.abspath("./../../.."))
from openlp.core.lib.xmlrootclass import XmlRootClass from openlp.core.lib import XmlRootClass
class SongException(Exception): class SongException(Exception):
pass pass
@ -576,11 +576,11 @@ class Song(XmlRootClass) :
res.extend() res.extend()
# remove formattingincluding themes # remove formattingincluding themes
return res return res
def GetRenderSlide(self, slideNumber): def GetRenderSlide(self, slideNumber):
"""Return the slide to be rendered including the additional """Return the slide to be rendered including the additional
properties properties
slideNumber -- 1 .. numberOfSlides slideNumber -- 1 .. numberOfSlides
Returns a list as: Returns a list as:
[theme (string), [theme (string),
@ -622,3 +622,5 @@ class Song(XmlRootClass) :
# append the correct slide # append the correct slide
return res return res
__all__ = ['SongException', 'SongTitleError', 'SongSlideError', 'SongTypeError',
'Song']