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

Head

This commit is contained in:
Jonathan Corwin 2010-03-22 19:44:06 +00:00
parent 5f2a637b63 19c5c07c54
commit 16c510acf0
189 changed files with 1174 additions and 725 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
copyright.txt
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp.pyw
View File

@ -7,8 +7,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/__init__.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/__init__.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/lib/__init__.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/lib/baselistwithdnd.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/lib/dockwidget.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/lib/eventreceiver.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/lib/mediamanageritem.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/lib/plugin.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/lib/pluginconfig.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/lib/pluginmanager.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/lib/renderer.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/lib/rendermanager.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/lib/serviceitem.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/lib/settingsmanager.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/lib/settingstab.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/lib/songxmlhandler.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/lib/themexmlhandler.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/lib/toolbar.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/lib/xmlrootclass.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

25
openlp/core/test/test_mediamanageritem.py
View File

@ -1,3 +1,28 @@
# -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- #
# 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 logging import logging
import os import os
import sys import sys

25
openlp/core/test/test_plugin_manager.py
View File

@ -1,3 +1,28 @@
# -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- #
# 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 logging import logging
import os import os
import sys import sys

39
openlp/core/test/test_render.py
View File

@ -1,20 +1,27 @@
""" # -*- coding: utf-8 -*-
OpenLP - Open Source Lyrics Projection # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
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 # OpenLP - Open Source Lyrics Projection #
Foundation; version 2 of the License. # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman #
This program is distributed in the hope that it will be useful, but WITHOUT ANY # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
PARTICULAR PURPOSE. See the GNU General Public License for more details. # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- #
You should have received a copy of the GNU General Public License along with # This program is free software; you can redistribute it and/or modify it #
this program; if not, write to the Free Software Foundation, Inc., 59 Temple # under the terms of the GNU General Public License as published by the Free #
Place, Suite 330, Boston, MA 02111-1307 USA # 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 sys import sys
import os import os

39
openlp/core/test/test_render_theme.py
View File

@ -1,20 +1,27 @@
""" # -*- coding: utf-8 -*-
OpenLP - Open Source Lyrics Projection # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
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 # OpenLP - Open Source Lyrics Projection #
Foundation; version 2 of the License. # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman #
This program is distributed in the hope that it will be useful, but WITHOUT ANY # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
PARTICULAR PURPOSE. See the GNU General Public License for more details. # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- #
You should have received a copy of the GNU General Public License along with # This program is free software; you can redistribute it and/or modify it #
this program; if not, write to the Free Software Foundation, Inc., 59 Temple # under the terms of the GNU General Public License as published by the Free #
Place, Suite 330, Boston, MA 02111-1307 USA # 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 sys import sys
import os import os

5
openlp/core/theme/__init__.py
View File

@ -5,8 +5,9 @@
# OpenLP - Open Source Lyrics Projection # # OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Martin Thompson, Tim Bentley, Carsten # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

25
openlp/core/theme/test/test_theme.py
View File

@ -1,3 +1,28 @@
# -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- #
# 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 os import os
import os.path import os.path
import sys import sys

4
openlp/core/theme/theme.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/ui/__init__.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

16
openlp/core/ui/aboutdialog.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #
@ -142,13 +142,17 @@ class Ui_AboutDialog(object):
' Michael "cocooncrash" Gorven\n' ' Michael "cocooncrash" Gorven\n'
' Scott "sguerrieri" Guerrieri\n' ' Scott "sguerrieri" Guerrieri\n'
' Raoul "superfly" Snyman\n' ' Raoul "superfly" Snyman\n'
' Maikel Stuivenberg\n'
' Martin "mijiti" Thompson\n' ' Martin "mijiti" Thompson\n'
' Jon "Meths" Tibble\n' ' Jon "Meths" Tibble\n'
'\n'
'Contributors\n'
' Christian "crichter" Richter\n'
' Maikel Stuivenberg\n'
' Carsten "catini" Tingaard\n' ' Carsten "catini" Tingaard\n'
'\n' '\n'
'Testers\n' 'Testers\n'
' Wesley "wrst" Stout' ' Wesley "wrst" Stout\n'
' Philip "Phill" Ridout'
)) ))
self.AboutNotebook.setTabText( self.AboutNotebook.setTabText(
self.AboutNotebook.indexOf(self.CreditsTab), self.AboutNotebook.indexOf(self.CreditsTab),
@ -158,8 +162,8 @@ class Ui_AboutDialog(object):
'Snyman\n' 'Snyman\n'
'Portions copyright ' + u'\u00a9'.encode('utf8') + ' 2004-2009 ' 'Portions copyright ' + u'\u00a9'.encode('utf8') + ' 2004-2009 '
'Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri, ' 'Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri, '
'Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten ' 'Christian Richter, Maikel Stuivenberg, Martin Thompson, Jon '
'Tinggaard\n' 'Tibble, Carsten Tinggaard\n'
'\n' '\n'
'This program is free software; you can redistribute it and/or ' 'This program is free software; you can redistribute it and/or '
'modify it under the terms of the GNU General Public License as ' 'modify it under the terms of the GNU General Public License as '

4
openlp/core/ui/aboutform.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/ui/amendthemedialog.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/ui/amendthemeform.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/ui/generaltab.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/ui/maindisplay.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/ui/mainwindow.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

6
openlp/core/ui/mediadockmanager.py
View File

@ -6,15 +6,15 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #
# Software Foundation; version 2 of the License. # # Software Foundation; version 2 of the License. #
# # # #
# This program is distributed in the hope that it will be useful, but WITHOUT # # This program is distributed in the hope that it will be useful, but WITHOUT #
# ANY WARRANTY; without even the implied warranty of MERCHANdockILITY or # # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
# more details. # # more details. #
# # # #

4
openlp/core/ui/plugindialog.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/ui/pluginform.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

5
openlp/core/ui/screen.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #
@ -22,6 +22,7 @@
# with this program; if not, write to the Free Software Foundation, Inc., 59 # # with this program; if not, write to the Free Software Foundation, Inc., 59 #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
############################################################################### ###############################################################################
import logging import logging
log = logging.getLogger(__name__) log = logging.getLogger(__name__)

4
openlp/core/ui/serviceitemdialog.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/ui/serviceitemform.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/ui/servicemanager.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/ui/settingsdialog.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/ui/settingsform.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/ui/slidecontroller.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/ui/splashscreen.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

39
openlp/core/ui/test/test_service_manager.py
View File

@ -1,20 +1,27 @@
""" # -*- coding: utf-8 -*-
OpenLP - Open Source Lyrics Projection # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
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 # OpenLP - Open Source Lyrics Projection #
Foundation; version 2 of the License. # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman #
This program is distributed in the hope that it will be useful, but WITHOUT ANY # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
PARTICULAR PURPOSE. See the GNU General Public License for more details. # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- #
You should have received a copy of the GNU General Public License along with # This program is free software; you can redistribute it and/or modify it #
this program; if not, write to the Free Software Foundation, Inc., 59 Temple # under the terms of the GNU General Public License as published by the Free #
Place, Suite 330, Boston, MA 02111-1307 USA # 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 sys import sys
import os import os

4
openlp/core/ui/thememanager.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/ui/themestab.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

32
openlp/core/utils/__init__.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #
@ -44,6 +44,12 @@ class AppLocation(object):
@staticmethod @staticmethod
def get_directory(dir_type): def get_directory(dir_type):
"""
Return the appropriate directory according to the directory type.
``dir_type``
The directory type you want, for instance the data directory.
"""
if dir_type == AppLocation.AppDir: if dir_type == AppLocation.AppDir:
return os.path.abspath(os.path.split(sys.argv[0])[0]) return os.path.abspath(os.path.split(sys.argv[0])[0])
elif dir_type == AppLocation.ConfigDir: elif dir_type == AppLocation.ConfigDir:
@ -89,6 +95,16 @@ class AppLocation(object):
def check_latest_version(config, current_version): def check_latest_version(config, current_version):
"""
Check the latest version of OpenLP against the version file on the OpenLP
site.
``config``
The OpenLP config object.
``current_version``
The current version of OpenLP.
"""
version_string = current_version version_string = current_version
#set to prod in the distribution confif file. #set to prod in the distribution confif file.
last_test = config.get_config(u'last version test', datetime.now().date()) last_test = config.get_config(u'last version test', datetime.now().date())
@ -107,6 +123,18 @@ def check_latest_version(config, current_version):
log.exception(u'Reason for failure: %s', e.reason) log.exception(u'Reason for failure: %s', e.reason)
return version_string return version_string
def variant_to_unicode(variant):
"""
Converts a QVariant to a unicode string.
``variant``
The QVariant instance to convert to unicode.
"""
string = variant.toString()
if not isinstance(string, unicode):
string = unicode(string, u'utf8')
return string
from registry import Registry from registry import Registry
from confighelper import ConfigHelper from confighelper import ConfigHelper

4
openlp/core/utils/confighelper.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/core/utils/registry.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/migration/__init__.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/migration/display.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/migration/migratebibles.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/migration/migratefiles.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/migration/migratesongs.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/plugins/__init__.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/plugins/alerts/__init__.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/plugins/alerts/alertsplugin.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/plugins/alerts/forms/__init__.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

28
openlp/plugins/alerts/forms/alertdialog.py
View File

@ -1,11 +1,27 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
# Form implementation generated from reading ui file 'alertform.ui' ###############################################################################
# # OpenLP - Open Source Lyrics Projection #
# Created: Sat Feb 13 08:19:51 2010 # --------------------------------------------------------------------------- #
# by: PyQt4 UI code generator 4.6.2 # Copyright (c) 2008-2010 Raoul Snyman #
# # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# WARNING! All changes made in this file will be lost! # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- #
# 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 PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui

28
openlp/plugins/alerts/forms/alerteditdialog.py
View File

@ -1,11 +1,27 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
# Form implementation generated from reading ui file 'alerteditdialog.ui' ###############################################################################
# # OpenLP - Open Source Lyrics Projection #
# Created: Sun Feb 14 16:45:10 2010 # --------------------------------------------------------------------------- #
# by: PyQt4 UI code generator 4.6.2 # Copyright (c) 2008-2010 Raoul Snyman #
# # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# WARNING! All changes made in this file will be lost! # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- #
# 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 PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui

4
openlp/plugins/alerts/forms/alerteditform.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/plugins/alerts/forms/alertform.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/plugins/alerts/forms/alertstab.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

5
openlp/plugins/alerts/lib/__init__.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #
@ -22,5 +22,6 @@
# with this program; if not, write to the Free Software Foundation, Inc., 59 # # with this program; if not, write to the Free Software Foundation, Inc., 59 #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
############################################################################### ###############################################################################
from alertsmanager import AlertsManager from alertsmanager import AlertsManager
from manager import DBManager from manager import DBManager

4
openlp/plugins/alerts/lib/alertsmanager.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/plugins/alerts/lib/classes.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/plugins/alerts/lib/manager.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/plugins/alerts/lib/meta.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/plugins/alerts/lib/models.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/plugins/alerts/lib/tables.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/plugins/bibles/__init__.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/plugins/bibles/bibleplugin.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/plugins/bibles/forms/__init__.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/plugins/bibles/forms/bibleimportwizard.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

109
openlp/plugins/bibles/forms/importwizardform.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #
@ -32,7 +32,7 @@ from PyQt4 import QtCore, QtGui
from bibleimportwizard import Ui_BibleImportWizard from bibleimportwizard import Ui_BibleImportWizard
from openlp.core.lib import Receiver from openlp.core.lib import Receiver
from openlp.core.utils import AppLocation from openlp.core.utils import AppLocation, variant_to_unicode
from openlp.plugins.bibles.lib.manager import BibleFormat from openlp.plugins.bibles.lib.manager import BibleFormat
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -60,9 +60,21 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
log.info(u'BibleImportForm loaded') log.info(u'BibleImportForm loaded')
def __init__(self, parent, config, manager, bibleplugin): def __init__(self, parent, config, manager, bibleplugin):
''' """
Constructor Instantiate the wizard, and run any extra setup we need to.
'''
``parent``
The QWidget-derived parent of the wizard.
``config``
The configuration object for storing and retrieving settings.
``manager``
The Bible manager.
``bibleplugin``
The Bible plugin.
"""
QtGui.QWizard.__init__(self, parent) QtGui.QWizard.__init__(self, parent)
self.setupUi(self) self.setupUi(self)
self.registerFields() self.registerFields()
@ -97,10 +109,16 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
self.onCurrentIdChanged) self.onCurrentIdChanged)
def exec_(self): def exec_(self):
"""
Run the wizard.
"""
self.setDefaults() self.setDefaults()
return QtGui.QWizard.exec_(self) return QtGui.QWizard.exec_(self)
def validateCurrentPage(self): def validateCurrentPage(self):
"""
Validate the current page before moving on to the next page.
"""
if self.currentId() == 0: if self.currentId() == 0:
# Welcome page # Welcome page
return True return True
@ -144,7 +162,9 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
return True return True
elif self.currentId() == 2: elif self.currentId() == 2:
# License details # License details
if self.field(u'license_version').toString() == u'': license_version = variant_to_unicode(self.field(u'license_version'))
license_copyright = variant_to_unicode(self.field(u'license_copyright'))
if license_version == u'':
QtGui.QMessageBox.critical(self, QtGui.QMessageBox.critical(self,
self.trUtf8('Empty Version Name'), self.trUtf8('Empty Version Name'),
self.trUtf8('You need to specify a version name for your ' self.trUtf8('You need to specify a version name for your '
@ -152,7 +172,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
self.VersionNameEdit.setFocus() self.VersionNameEdit.setFocus()
return False return False
elif self.field(u'license_copyright').toString() == u'': elif license_copyright == u'':
QtGui.QMessageBox.critical(self, QtGui.QMessageBox.critical(self,
self.trUtf8('Empty Copyright'), self.trUtf8('Empty Copyright'),
self.trUtf8('You need to set a copyright for your Bible! ' self.trUtf8('You need to set a copyright for your Bible! '
@ -161,8 +181,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
self.CopyrightEdit.setFocus() self.CopyrightEdit.setFocus()
return False return False
elif self.manager.exists( elif self.manager.exists(license_version):
self.field(u'license_version').toString()):
QtGui.QMessageBox.critical(self, QtGui.QMessageBox.critical(self,
self.trUtf8('Bible Exists'), self.trUtf8('Bible Exists'),
self.trUtf8('This Bible already exists! Please import ' self.trUtf8('This Bible already exists! Please import '
@ -176,27 +195,49 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
return True return True
def onLocationComboBoxChanged(self, index): def onLocationComboBoxChanged(self, index):
"""
Setup the list of Bibles when you select a different source on the web
download page.
``index``
The index of the combo box.
"""
self.BibleComboBox.clear() self.BibleComboBox.clear()
for bible, abbreviation in self.web_bible_list[index].iteritems(): for bible in self.web_bible_list[index].keys():
self.BibleComboBox.addItem(unicode(self.trUtf8(bible))) self.BibleComboBox.addItem(unicode(self.trUtf8(bible)))
def onOsisFileButtonClicked(self): def onOsisFileButtonClicked(self):
self.getFileName(self.trUtf8('Open OSIS file'), """
Show the file open dialog for the OSIS file.
"""
self.getFileName(self.trUtf8('Open OSIS File'),
self.OSISLocationEdit) self.OSISLocationEdit)
def onBooksFileButtonClicked(self): def onBooksFileButtonClicked(self):
self.getFileName(self.trUtf8('Open Books CSV file'), """
Show the file open dialog for the books CSV file.
"""
self.getFileName(self.trUtf8('Open Books CSV File'),
self.BooksLocationEdit) self.BooksLocationEdit)
def onCsvVersesFileButtonClicked(self): def onCsvVersesFileButtonClicked(self):
self.getFileName(self.trUtf8('Open Verses CSV file'), """
Show the file open dialog for the verses CSV file.
"""
self.getFileName(self.trUtf8('Open Verses CSV File'),
self.CsvVerseLocationEdit) self.CsvVerseLocationEdit)
def onOpenSongBrowseButtonClicked(self): def onOpenSongBrowseButtonClicked(self):
"""
Show the file open dialog for the OpenSong file.
"""
self.getFileName(self.trUtf8('Open OpenSong Bible'), self.getFileName(self.trUtf8('Open OpenSong Bible'),
self.OpenSongFileEdit) self.OpenSongFileEdit)
def onCancelButtonClicked(self, checked): def onCancelButtonClicked(self, checked):
"""
Stop the import on pressing the cancel button.
"""
log.debug('Cancel button pressed!') log.debug('Cancel button pressed!')
if self.currentId() == 3: if self.currentId() == 3:
Receiver.send_message(u'openlpstopimport') Receiver.send_message(u'openlpstopimport')
@ -270,7 +311,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
books_reader = csv.reader(books_file, dialect) books_reader = csv.reader(books_file, dialect)
for line in books_reader: for line in books_reader:
self.web_bible_list[DownloadLocation.Crosswalk][line[0]] = \ self.web_bible_list[DownloadLocation.Crosswalk][line[0]] = \
unicode(line[1], u'utf-8').strip() unicode(line[1], u'utf8').strip()
except: except:
log.exception(u'Crosswalk resources missing') log.exception(u'Crosswalk resources missing')
finally: finally:
@ -315,25 +356,28 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
def performImport(self): def performImport(self):
bible_type = self.field(u'source_format').toInt()[0] bible_type = self.field(u'source_format').toInt()[0]
license_version = variant_to_unicode(self.field(u'license_version'))
license_copyright = variant_to_unicode(self.field(u'license_copyright'))
license_permission = variant_to_unicode(self.field(u'license_permission'))
importer = None importer = None
if bible_type == BibleFormat.OSIS: if bible_type == BibleFormat.OSIS:
# Import an OSIS bible # Import an OSIS bible
importer = self.manager.import_bible(BibleFormat.OSIS, importer = self.manager.import_bible(BibleFormat.OSIS,
name=unicode(self.field(u'license_version').toString()), name=license_version,
filename=unicode(self.field(u'osis_location').toString()) filename=variant_to_unicode(self.field(u'osis_location'))
) )
elif bible_type == BibleFormat.CSV: elif bible_type == BibleFormat.CSV:
# Import a CSV bible # Import a CSV bible
importer = self.manager.import_bible(BibleFormat.CSV, importer = self.manager.import_bible(BibleFormat.CSV,
name=unicode(self.field(u'license_version').toString()), name=license_version,
booksfile=self.field(u'csv_booksfile').toString(), booksfile=variant_to_unicode(self.field(u'csv_booksfile')),
versefile=self.field(u'csv_versefile').toString() versefile=variant_to_unicode(self.field(u'csv_versefile'))
) )
elif bible_type == BibleFormat.OpenSong: elif bible_type == BibleFormat.OpenSong:
# Import an OpenSong bible # Import an OpenSong bible
importer = self.manager.import_bible(BibleFormat.OpenSong, importer = self.manager.import_bible(BibleFormat.OpenSong,
name=unicode(self.field(u'license_version').toString()), name=license_version,
filename=self.field(u'opensong_file').toString() filename=variant_to_unicode(self.field(u'opensong_file'))
) )
elif bible_type == BibleFormat.WebDownload: elif bible_type == BibleFormat.WebDownload:
# Import a bible from the web # Import a bible from the web
@ -344,23 +388,20 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
unicode(self.BibleComboBox.currentText(), u'utf8')] unicode(self.BibleComboBox.currentText(), u'utf8')]
elif download_location == DownloadLocation.BibleGateway: elif download_location == DownloadLocation.BibleGateway:
bible = self.web_bible_list[DownloadLocation.BibleGateway][ bible = self.web_bible_list[DownloadLocation.BibleGateway][
self.BibleComboBox.currentText()] unicode(self.BibleComboBox.currentText(), u'utf8')]
importer = self.manager.import_bible(BibleFormat.WebDownload, importer = self.manager.import_bible(
name=unicode(self.field(u'license_version').toString(), u'utf8'), BibleFormat.WebDownload,
name=license_version,
download_source=DownloadLocation.get_name(download_location), download_source=DownloadLocation.get_name(download_location),
download_name=bible, download_name=bible,
proxy_server=unicode(self.field(u'proxy_server').toString(), u'utf8'), proxy_server=variant_to_unicode(self.field(u'proxy_server')),
proxy_username=unicode(self.field(u'proxy_username').toString(), u'utf8'), proxy_username=variant_to_unicode(self.field(u'proxy_username')),
proxy_password=unicode(self.field(u'proxy_password').toString(), u'utf8') proxy_password=variant_to_unicode(self.field(u'proxy_password'))
) )
success = importer.do_import() success = importer.do_import()
if success: if success:
self.manager.save_meta_data( self.manager.save_meta_data(license_version, license_version,
unicode(self.field(u'license_version').toString()), license_copyright, license_permission)
unicode(self.field(u'license_version').toString()),
unicode(self.field(u'license_copyright').toString()),
unicode(self.field(u'license_permission').toString())
)
self.manager.reload_bibles() self.manager.reload_bibles()
self.ImportProgressLabel.setText(self.trUtf8('Finished import.')) self.ImportProgressLabel.setText(self.trUtf8('Finished import.'))
else: else:

4
openlp/plugins/bibles/lib/__init__.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/plugins/bibles/lib/biblestab.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/plugins/bibles/lib/common.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/plugins/bibles/lib/csvbible.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/plugins/bibles/lib/db.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

104
openlp/plugins/bibles/lib/http.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #
@ -39,10 +39,19 @@ from openlp.plugins.bibles.lib.models import Book
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
class HTTPBooks(object): class HTTPBooks(object):
"""
A wrapper class around a small SQLite database which contains the books,
chapter counts and verse counts for the web download Bibles. This class
contains a singleton "cursor" so that only one connection to the SQLite
database is ever used.
"""
cursor = None cursor = None
@staticmethod @staticmethod
def get_cursor(): def get_cursor():
"""
Return the cursor object. Instantiate one if it doesn't exist yet.
"""
if HTTPBooks.cursor is None: if HTTPBooks.cursor is None:
filepath = os.path.join( filepath = os.path.join(
AppLocation.get_directory(AppLocation.PluginsDir), u'bibles', AppLocation.get_directory(AppLocation.PluginsDir), u'bibles',
@ -53,12 +62,24 @@ class HTTPBooks(object):
@staticmethod @staticmethod
def run_sql(query, parameters=()): def run_sql(query, parameters=()):
"""
Run an SQL query on the database, returning the results.
``query``
The actual SQL query to run.
``parameters``
Any variable parameters to add to the query.
"""
cursor = HTTPBooks.get_cursor() cursor = HTTPBooks.get_cursor()
cursor.execute(query, parameters) cursor.execute(query, parameters)
return cursor.fetchall() return cursor.fetchall()
@staticmethod @staticmethod
def get_books(): def get_books():
"""
Return a list of all the books of the Bible.
"""
books = HTTPBooks.run_sql(u'SELECT id, testament_id, name, ' books = HTTPBooks.run_sql(u'SELECT id, testament_id, name, '
u'abbreviation, chapters FROM books ORDER BY id') u'abbreviation, chapters FROM books ORDER BY id')
book_list = [] book_list = []
@ -74,6 +95,12 @@ class HTTPBooks(object):
@staticmethod @staticmethod
def get_book(name): def get_book(name):
"""
Return a book by name or abbreviation.
``name``
The name or abbreviation of the book.
"""
if not isinstance(name, unicode): if not isinstance(name, unicode):
name = unicode(name) name = unicode(name)
books = HTTPBooks.run_sql(u'SELECT id, testament_id, name, ' books = HTTPBooks.run_sql(u'SELECT id, testament_id, name, '
@ -92,6 +119,15 @@ class HTTPBooks(object):
@staticmethod @staticmethod
def get_chapter(name, chapter): def get_chapter(name, chapter):
"""
Return the chapter details for a specific chapter of a book.
``name``
The name or abbreviation of a book.
``chapter``
The chapter number.
"""
if not isinstance(name, int): if not isinstance(name, int):
chapter = int(chapter) chapter = int(chapter)
book = HTTPBooks.get_book(name) book = HTTPBooks.get_book(name)
@ -109,6 +145,12 @@ class HTTPBooks(object):
@staticmethod @staticmethod
def get_chapter_count(book): def get_chapter_count(book):
"""
Return the number of chapters in a book.
``book``
The name or abbreviation of the book.
"""
details = HTTPBooks.get_book(book) details = HTTPBooks.get_book(book)
if details: if details:
return details[u'chapters'] return details[u'chapters']
@ -116,6 +158,15 @@ class HTTPBooks(object):
@staticmethod @staticmethod
def get_verse_count(book, chapter): def get_verse_count(book, chapter):
"""
Return the number of verses in a chapter.
``book``
The name or abbreviation of the book.
``chapter``
The number of the chapter.
"""
details = HTTPBooks.get_chapter(book, chapter) details = HTTPBooks.get_chapter(book, chapter)
if details: if details:
return details[u'verses'] return details[u'verses']
@ -123,7 +174,9 @@ class HTTPBooks(object):
class BGExtract(BibleCommon): class BGExtract(BibleCommon):
log.info(u'%s BGExtract loaded', __name__) """
Extract verses from BibleGateway
"""
def __init__(self, proxyurl=None): def __init__(self, proxyurl=None):
log.debug(u'init %s', proxyurl) log.debug(u'init %s', proxyurl)
@ -133,7 +186,7 @@ class BGExtract(BibleCommon):
""" """
Access and decode bibles via the BibleGateway website Access and decode bibles via the BibleGateway website
``Version`` ``version``
The version of the bible like 31 for New International version The version of the bible like 31 for New International version
``bookname`` ``bookname``
@ -196,8 +249,10 @@ class BGExtract(BibleCommon):
verse_list[verse_number] = u'' verse_list[verse_number] = u''
continue continue
if isinstance(verse, NavigableString): if isinstance(verse, NavigableString):
if not isinstance(verse, unicode):
verse = unicode(verse, u'utf8')
verse_list[verse_number] = verse_list[verse_number] + \ verse_list[verse_number] = verse_list[verse_number] + \
unescape(unicode(verse, u'utf-8').replace(u' ', u' ')) unescape(verse.replace(u' ', u' '))
# Delete the "0" element, since we don't need it, it's just there for # Delete the "0" element, since we don't need it, it's just there for
# some stupid initial whitespace, courtesy of Bible Gateway. # some stupid initial whitespace, courtesy of Bible Gateway.
del verse_list[0] del verse_list[0]
@ -205,14 +260,15 @@ class BGExtract(BibleCommon):
return SearchResults(bookname, chapter, verse_list) return SearchResults(bookname, chapter, verse_list)
class CWExtract(BibleCommon): class CWExtract(BibleCommon):
log.info(u'%s CWExtract loaded', __name__) """
Extract verses from CrossWalk/BibleStudyTools
"""
def __init__(self, proxyurl=None): def __init__(self, proxyurl=None):
log.debug(u'init %s', proxyurl) log.debug(u'init %s', proxyurl)
self.proxyurl = proxyurl self.proxyurl = proxyurl
def get_bible_chapter(self, version, bookname, chapter): def get_bible_chapter(self, version, bookname, chapter):
log.debug(u'%s %s, %s, %s', __name__, version, bookname, chapter)
""" """
Access and decode bibles via the Crosswalk website Access and decode bibles via the Crosswalk website
@ -227,9 +283,9 @@ class CWExtract(BibleCommon):
""" """
log.debug(u'get_bible_chapter %s,%s,%s', log.debug(u'get_bible_chapter %s,%s,%s',
version, bookname, chapter) version, bookname, chapter)
bookname = bookname.replace(u' ', u'') urlbookname = bookname.replace(u' ', u'-')
chapter_url = u'http://www.biblestudytools.com/%s/%s/%s.html' % \ chapter_url = u'http://www.biblestudytools.com/%s/%s/%s.html' % \
(version, bookname.lower(), chapter) (version, urlbookname.lower(), chapter)
log.debug(u'URL: %s', chapter_url) log.debug(u'URL: %s', chapter_url)
page = urllib2.urlopen(chapter_url) page = urllib2.urlopen(chapter_url)
if not page: if not page:
@ -287,6 +343,10 @@ class HTTPBible(BibleDB):
self.proxy_password = None self.proxy_password = None
def do_import(self): def do_import(self):
"""
Run the import. This method overrides the parent class method. Returns
``True`` on success, ``False`` on failure.
"""
self.wizard.ImportProgressBar.setMaximum(2) self.wizard.ImportProgressBar.setMaximum(2)
self.wizard.incrementProgressBar('Registering bible...') self.wizard.incrementProgressBar('Registering bible...')
self.create_meta(u'download source', self.download_source) self.create_meta(u'download source', self.download_source)
@ -370,17 +430,43 @@ class HTTPBible(BibleDB):
return None return None
def get_books(self): def get_books(self):
"""
Return the list of books.
"""
return [Book.populate(name=book['name']) for book in HTTPBooks.get_books()] return [Book.populate(name=book['name']) for book in HTTPBooks.get_books()]
def lookup_book(self, book): def lookup_book(self, book):
"""
Look up the name of a book.
"""
return HTTPBooks.get_book(book) return HTTPBooks.get_book(book)
def get_chapter_count(self, book): def get_chapter_count(self, book):
"""
Return the number of chapters in a particular book.
"""
return HTTPBooks.get_chapter_count(book) return HTTPBooks.get_chapter_count(book)
def get_verse_count(self, book, chapter): def get_verse_count(self, book, chapter):
"""
Return the number of verses for the specified chapter and book.
``book``
The name of the book.
``chapter``
The chapter whose verses are being counted.
"""
return HTTPBooks.get_verse_count(book, chapter) return HTTPBooks.get_verse_count(book, chapter)
def set_proxy_server(self, server): def set_proxy_server(self, server):
"""
Sets the proxy server.
**Note: This is not actually used.**
``server``
The hostname or IP address of the proxy server.
"""
self.proxy_server = server self.proxy_server = server

12
openlp/plugins/bibles/lib/manager.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #
@ -60,6 +60,9 @@ class BibleFormat(object):
def get_class(id): def get_class(id):
""" """
Return the appropriate imeplementation class. Return the appropriate imeplementation class.
``id``
The Bible format.
""" """
if id == BibleFormat.OSIS: if id == BibleFormat.OSIS:
return OSISBible return OSISBible
@ -74,6 +77,9 @@ class BibleFormat(object):
@staticmethod @staticmethod
def list(): def list():
"""
Return a list of the supported Bible formats.
"""
return [ return [
BibleFormat.OSIS, BibleFormat.OSIS,
BibleFormat.CSV, BibleFormat.CSV,
@ -247,7 +253,7 @@ class BibleManager(object):
""" """
if not isinstance(name, unicode): if not isinstance(name, unicode):
name = unicode(name) name = unicode(name)
for bible, db_object in self.db_cache.iteritems(): for bible in self.db_cache.keys():
log.debug(u'Bible from cache in is_new_bible %s', bible) log.debug(u'Bible from cache in is_new_bible %s', bible)
if not isinstance(bible, unicode): if not isinstance(bible, unicode):
bible = unicode(bible) bible = unicode(bible)

4
openlp/plugins/bibles/lib/mediaitem.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/plugins/bibles/lib/models.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/plugins/bibles/lib/opensong.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

8
openlp/plugins/bibles/lib/osis.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #
@ -65,6 +65,7 @@ class OSISBible(BibleDB):
self.l_regex = re.compile(r'<l (.*?)>') self.l_regex = re.compile(r'<l (.*?)>')
self.w_regex = re.compile(r'<w (.*?)>') self.w_regex = re.compile(r'<w (.*?)>')
self.q_regex = re.compile(r'<q (.*?)>') self.q_regex = re.compile(r'<q (.*?)>')
self.trans_regex = re.compile(r'<transChange(.*?)>(.*?)</transChange>')
self.spaces_regex = re.compile(r'([ ]{2,})') self.spaces_regex = re.compile(r'([ ]{2,})')
self.books = {} self.books = {}
filepath = os.path.join( filepath = os.path.join(
@ -159,10 +160,11 @@ class OSISBible(BibleDB):
verse_text = self.l_regex.sub(u'', verse_text) verse_text = self.l_regex.sub(u'', verse_text)
verse_text = self.w_regex.sub(u'', verse_text) verse_text = self.w_regex.sub(u'', verse_text)
verse_text = self.q_regex.sub(u'', verse_text) verse_text = self.q_regex.sub(u'', verse_text)
verse_text = self.trans_regex.sub(u'', verse_text)
verse_text = verse_text.replace(u'</lb>', u'')\ verse_text = verse_text.replace(u'</lb>', u'')\
.replace(u'</l>', u'').replace(u'<lg>', u'')\ .replace(u'</l>', u'').replace(u'<lg>', u'')\
.replace(u'</lg>', u'').replace(u'</q>', u'')\ .replace(u'</lg>', u'').replace(u'</q>', u'')\
.replace(u'</div>', u'') .replace(u'</div>', u'').replace(u'</w>', u'')
verse_text = self.spaces_regex.sub(u' ', verse_text) verse_text = self.spaces_regex.sub(u' ', verse_text)
self.create_verse(db_book.id, chapter, verse, verse_text) self.create_verse(db_book.id, chapter, verse, verse_text)
Receiver.send_message(u'process_events') Receiver.send_message(u'process_events')

24
openlp/plugins/bibles/test/__init__.py
View File

@ -0,0 +1,24 @@
# -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- #
# 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 #
###############################################################################

39
openlp/plugins/bibles/test/test_bibleManager.py
View File

@ -1,20 +1,27 @@
""" # -*- coding: utf-8 -*-
OpenLP - Open Source Lyrics Projection # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
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 # OpenLP - Open Source Lyrics Projection #
Foundation; version 2 of the License. # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman #
This program is distributed in the hope that it will be useful, but WITHOUT ANY # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
PARTICULAR PURPOSE. See the GNU General Public License for more details. # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- #
You should have received a copy of the GNU General Public License along with # This program is free software; you can redistribute it and/or modify it #
this program; if not, write to the Free Software Foundation, Inc., 59 Temple # under the terms of the GNU General Public License as published by the Free #
Place, Suite 330, Boston, MA 02111-1307 USA # 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 logging import logging
import os import os

39
openlp/plugins/bibles/test/test_bibleManagerAPI.py
View File

@ -1,20 +1,27 @@
""" # -*- coding: utf-8 -*-
OpenLP - Open Source Lyrics Projection # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
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 # OpenLP - Open Source Lyrics Projection #
Foundation; version 2 of the License. # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman #
This program is distributed in the hope that it will be useful, but WITHOUT ANY # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
PARTICULAR PURPOSE. See the GNU General Public License for more details. # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- #
You should have received a copy of the GNU General Public License along with # This program is free software; you can redistribute it and/or modify it #
this program; if not, write to the Free Software Foundation, Inc., 59 Temple # under the terms of the GNU General Public License as published by the Free #
Place, Suite 330, Boston, MA 02111-1307 USA # 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 logging import logging
import os import os

39
openlp/plugins/bibles/test/test_bibleManagerCSV.py
View File

@ -1,20 +1,27 @@
""" # -*- coding: utf-8 -*-
OpenLP - Open Source Lyrics Projection # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
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 # OpenLP - Open Source Lyrics Projection #
Foundation; version 2 of the License. # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman #
This program is distributed in the hope that it will be useful, but WITHOUT ANY # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
PARTICULAR PURPOSE. See the GNU General Public License for more details. # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- #
You should have received a copy of the GNU General Public License along with # This program is free software; you can redistribute it and/or modify it #
this program; if not, write to the Free Software Foundation, Inc., 59 Temple # under the terms of the GNU General Public License as published by the Free #
Place, Suite 330, Boston, MA 02111-1307 USA # 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 logging import logging
import os import os

39
openlp/plugins/bibles/test/test_bibleManagerOSIS.py
View File

@ -1,20 +1,27 @@
""" # -*- coding: utf-8 -*-
OpenLP - Open Source Lyrics Projection # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
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 # OpenLP - Open Source Lyrics Projection #
Foundation; version 2 of the License. # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman #
This program is distributed in the hope that it will be useful, but WITHOUT ANY # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
PARTICULAR PURPOSE. See the GNU General Public License for more details. # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- #
You should have received a copy of the GNU General Public License along with # This program is free software; you can redistribute it and/or modify it #
this program; if not, write to the Free Software Foundation, Inc., 59 Temple # under the terms of the GNU General Public License as published by the Free #
Place, Suite 330, Boston, MA 02111-1307 USA # 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 logging import logging
import os import os

4
openlp/plugins/custom/__init__.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/plugins/custom/customplugin.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/plugins/custom/forms/__init__.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

4
openlp/plugins/custom/forms/editcustomdialog.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #

5
openlp/plugins/custom/forms/editcustomform.py
View File

@ -6,8 +6,8 @@
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2010 Raoul Snyman # # Copyright (c) 2008-2010 Raoul Snyman #
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # # Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
# Carsten Tinggaard # # Thompson, Jon Tibble, Carsten Tinggaard #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #
@ -22,6 +22,7 @@
# with this program; if not, write to the Free Software Foundation, Inc., 59 # # with this program; if not, write to the Free Software Foundation, Inc., 59 #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
############################################################################### ###############################################################################
import logging import logging
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui

Some files were not shown because too many files have changed in this diff Show More