openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #07427
[Merge] lp:~raoul-snyman/openlp/copyright into lp:openlp
Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/copyright into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/copyright/+merge/54762
Updated the copyright information and the contributors.
--
https://code.launchpad.net/~raoul-snyman/openlp/copyright/+merge/54762
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/copyright into lp:openlp.
=== modified file 'copyright.txt'
--- copyright.txt 2011-02-24 05:47:38 +0000
+++ copyright.txt 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp.pyw'
--- openlp.pyw 2011-03-20 16:56:01 +0000
+++ openlp.pyw 2011-03-24 19:07:44 +0000
@@ -7,9 +7,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/__init__.py'
--- openlp/__init__.py 2011-02-24 05:47:38 +0000
+++ openlp/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/__init__.py'
--- openlp/core/__init__.py 2011-02-24 05:47:38 +0000
+++ openlp/core/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/lib/__init__.py'
--- openlp/core/lib/__init__.py 2011-03-11 15:13:10 +0000
+++ openlp/core/lib/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/lib/db.py'
--- openlp/core/lib/db.py 2011-02-25 17:27:06 +0000
+++ openlp/core/lib/db.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/lib/displaytags.py'
--- openlp/core/lib/displaytags.py 2011-02-24 05:47:38 +0000
+++ openlp/core/lib/displaytags.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/lib/dockwidget.py'
--- openlp/core/lib/dockwidget.py 2011-02-24 05:47:38 +0000
+++ openlp/core/lib/dockwidget.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/lib/eventreceiver.py'
--- openlp/core/lib/eventreceiver.py 2011-02-24 05:47:38 +0000
+++ openlp/core/lib/eventreceiver.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/lib/htmlbuilder.py'
--- openlp/core/lib/htmlbuilder.py 2011-02-24 05:47:38 +0000
+++ openlp/core/lib/htmlbuilder.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/lib/imagemanager.py'
--- openlp/core/lib/imagemanager.py 2011-02-24 05:47:38 +0000
+++ openlp/core/lib/imagemanager.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/lib/listwidgetwithdnd.py'
--- openlp/core/lib/listwidgetwithdnd.py 2011-02-24 05:47:38 +0000
+++ openlp/core/lib/listwidgetwithdnd.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py 2011-03-08 07:38:25 +0000
+++ openlp/core/lib/mediamanageritem.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/lib/plugin.py'
--- openlp/core/lib/plugin.py 2011-03-10 19:17:05 +0000
+++ openlp/core/lib/plugin.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/lib/pluginmanager.py'
--- openlp/core/lib/pluginmanager.py 2011-03-12 17:35:27 +0000
+++ openlp/core/lib/pluginmanager.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/lib/renderer.py'
--- openlp/core/lib/renderer.py 2011-02-24 05:47:38 +0000
+++ openlp/core/lib/renderer.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/lib/rendermanager.py'
--- openlp/core/lib/rendermanager.py 2011-03-03 21:10:55 +0000
+++ openlp/core/lib/rendermanager.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/lib/searchedit.py'
--- openlp/core/lib/searchedit.py 2011-02-24 05:47:38 +0000
+++ openlp/core/lib/searchedit.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py 2011-03-19 16:11:52 +0000
+++ openlp/core/lib/serviceitem.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/lib/settingsmanager.py'
--- openlp/core/lib/settingsmanager.py 2011-02-25 17:05:01 +0000
+++ openlp/core/lib/settingsmanager.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/lib/settingstab.py'
--- openlp/core/lib/settingstab.py 2011-02-24 05:47:38 +0000
+++ openlp/core/lib/settingstab.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/lib/spelltextedit.py'
--- openlp/core/lib/spelltextedit.py 2011-02-24 05:47:38 +0000
+++ openlp/core/lib/spelltextedit.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/lib/theme.py'
--- openlp/core/lib/theme.py 2011-02-25 17:27:06 +0000
+++ openlp/core/lib/theme.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/lib/toolbar.py'
--- openlp/core/lib/toolbar.py 2011-03-12 17:02:24 +0000
+++ openlp/core/lib/toolbar.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/lib/ui.py'
--- openlp/core/lib/ui.py 2011-02-26 16:36:48 +0000
+++ openlp/core/lib/ui.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/resources.py'
--- openlp/core/resources.py 2011-03-09 16:16:40 +0000
+++ openlp/core/resources.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/theme/__init__.py'
--- openlp/core/theme/__init__.py 2011-02-24 05:47:38 +0000
+++ openlp/core/theme/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/theme/theme.py'
--- openlp/core/theme/theme.py 2011-02-25 17:05:01 +0000
+++ openlp/core/theme/theme.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/__init__.py'
--- openlp/core/ui/__init__.py 2011-03-02 17:44:33 +0000
+++ openlp/core/ui/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/aboutdialog.py'
--- openlp/core/ui/aboutdialog.py 2011-03-10 20:49:53 +0000
+++ openlp/core/ui/aboutdialog.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
@@ -112,32 +112,32 @@
u'Andreas "googol" Preikschat', u'Raoul "superfly" Snyman',
u'Martin "mijiti" Thompson', u'Jon "Meths" Tibble']
contributors = [u'Scott "sguerrieri" Guerrieri',
- u'Meinert "m2j" Jordan', u'Armin "orangeshirt" K\xf6hler',
+ u'Matthias "matthub" Hub', u'Meinert "m2j" Jordan',
+ u'Armin "orangeshirt" K\xf6hler', u'Mattias "mahfiaz" P\xf5ldaru',
u'Christian "crichter" Richter', u'Philip "Phill" Ridout',
u'Jeffrey "whydoubt" Smith', u'Maikel Stuivenberg',
- u'Carsten "catini" Tingaard', u'Frode "frodus" Woldsund']
+ u'Frode "frodus" Woldsund']
testers = [u'Philip "Phill" Ridout', u'Wesley "wrst" Stout',
u'John "jseagull1" Cegalis (lead)']
packagers = ['Thomas "tabthorpe" Abthorpe (FreeBSD)',
u'Tim "TRB143" Bentley (Fedora)',
- u'Michael "cocooncrash" Gorven (Ubuntu)',
u'Matthias "matthub" Hub (Mac OS X)',
- u'Raoul "superfly" Snyman (Windows, Ubuntu)']
+ u'Stevan "StevanP" Pettit (Windows)',
+ u'Raoul "superfly" Snyman (Ubuntu)']
translators = {
u'af': [u'Johan "nuvolari" Mynhardt'],
u'de': [u'Patrick "madmuffin" Br\xfcckner',
- u'Meinert "m2j" Jordan',
- u'Andreas "googol" Preikschat',
+ u'Meinert "m2j" Jordan', u'Andreas "googol" Preikschat',
u'Christian "crichter" Richter'],
u'en_GB': [u'Tim "TRB143" Bentley', u'Jonathan "gushie" Corwin'],
u'en_ZA': [u'Raoul "superfly" Snyman'],
u'et': [u'Mattias "mahfiaz" P\xf5ldaru'],
u'fr': [u'Stephan\xe9 "stbrunner" Brunner'],
- u'hu': [u'Gyuris Gellért'],
+ u'hu': [u'Gyuris Gell\xe9t'],
u'ja': [u'Kunio "Kunio" Nakamaru'],
u'nb': [u'Atle "pendlaren" Weibell', u'Frode "frodus" Woldsund'],
u'nl': [u'Arjen "typovar" van Voorst'],
- u'pt_BR': [u'Rafael "rafaellerm" Lerm'],
+ u'pt_BR': [u'Rafael "rafaellerm" Lerm', u'Gustavo Bim'],
u'ru': [u'Sergey "ratz" Ratz']
}
documentors = [u'Wesley "wrst" Stout',
=== modified file 'openlp/core/ui/aboutform.py'
--- openlp/core/ui/aboutform.py 2011-02-24 05:47:38 +0000
+++ openlp/core/ui/aboutform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/advancedtab.py'
--- openlp/core/ui/advancedtab.py 2011-02-24 05:47:38 +0000
+++ openlp/core/ui/advancedtab.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/displaytagdialog.py'
--- openlp/core/ui/displaytagdialog.py 2011-03-04 21:39:31 +0000
+++ openlp/core/ui/displaytagdialog.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/displaytagform.py'
--- openlp/core/ui/displaytagform.py 2011-02-25 17:05:01 +0000
+++ openlp/core/ui/displaytagform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/exceptiondialog.py'
--- openlp/core/ui/exceptiondialog.py 2011-02-24 05:47:38 +0000
+++ openlp/core/ui/exceptiondialog.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/exceptionform.py'
--- openlp/core/ui/exceptionform.py 2011-02-24 05:47:38 +0000
+++ openlp/core/ui/exceptionform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/filerenamedialog.py'
--- openlp/core/ui/filerenamedialog.py 2011-02-24 05:47:38 +0000
+++ openlp/core/ui/filerenamedialog.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/filerenameform.py'
--- openlp/core/ui/filerenameform.py 2011-02-24 05:47:38 +0000
+++ openlp/core/ui/filerenameform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/firsttimeform.py'
--- openlp/core/ui/firsttimeform.py 2011-03-21 11:51:14 +0000
+++ openlp/core/ui/firsttimeform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/firsttimelanguagedialog.py'
--- openlp/core/ui/firsttimelanguagedialog.py 2011-03-15 01:07:40 +0000
+++ openlp/core/ui/firsttimelanguagedialog.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/firsttimelanguageform.py'
--- openlp/core/ui/firsttimelanguageform.py 2011-03-15 01:07:40 +0000
+++ openlp/core/ui/firsttimelanguageform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/firsttimewizard.py'
--- openlp/core/ui/firsttimewizard.py 2011-03-21 08:03:05 +0000
+++ openlp/core/ui/firsttimewizard.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/generaltab.py'
--- openlp/core/ui/generaltab.py 2011-03-17 19:02:12 +0000
+++ openlp/core/ui/generaltab.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py 2011-03-19 22:52:56 +0000
+++ openlp/core/ui/maindisplay.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2011-03-15 20:53:36 +0000
+++ openlp/core/ui/mainwindow.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/mediadockmanager.py'
--- openlp/core/ui/mediadockmanager.py 2011-02-24 05:47:38 +0000
+++ openlp/core/ui/mediadockmanager.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/plugindialog.py'
--- openlp/core/ui/plugindialog.py 2011-02-24 05:47:38 +0000
+++ openlp/core/ui/plugindialog.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/pluginform.py'
--- openlp/core/ui/pluginform.py 2011-02-24 05:47:38 +0000
+++ openlp/core/ui/pluginform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/printservicedialog.py'
--- openlp/core/ui/printservicedialog.py 2011-02-24 15:54:21 +0000
+++ openlp/core/ui/printservicedialog.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/printserviceform.py'
--- openlp/core/ui/printserviceform.py 2011-02-24 15:54:21 +0000
+++ openlp/core/ui/printserviceform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/screen.py'
--- openlp/core/ui/screen.py 2011-03-04 14:44:21 +0000
+++ openlp/core/ui/screen.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/serviceitemeditdialog.py'
--- openlp/core/ui/serviceitemeditdialog.py 2011-02-24 05:47:38 +0000
+++ openlp/core/ui/serviceitemeditdialog.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/serviceitemeditform.py'
--- openlp/core/ui/serviceitemeditform.py 2011-02-24 05:47:38 +0000
+++ openlp/core/ui/serviceitemeditform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py 2011-03-15 19:55:49 +0000
+++ openlp/core/ui/servicemanager.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
@@ -1256,4 +1256,4 @@
Print a Service Order Sheet.
"""
settingDialog = PrintServiceForm(self.mainwindow, self)
- settingDialog.exec_()
\ No newline at end of file
+ settingDialog.exec_()
=== modified file 'openlp/core/ui/servicenoteform.py'
--- openlp/core/ui/servicenoteform.py 2011-02-24 05:47:38 +0000
+++ openlp/core/ui/servicenoteform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/settingsdialog.py'
--- openlp/core/ui/settingsdialog.py 2011-02-24 05:47:38 +0000
+++ openlp/core/ui/settingsdialog.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/settingsform.py'
--- openlp/core/ui/settingsform.py 2011-03-02 17:44:01 +0000
+++ openlp/core/ui/settingsform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/shortcutlistdialog.py'
--- openlp/core/ui/shortcutlistdialog.py 2011-02-24 05:47:38 +0000
+++ openlp/core/ui/shortcutlistdialog.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/shortcutlistform.py'
--- openlp/core/ui/shortcutlistform.py 2011-02-24 05:47:38 +0000
+++ openlp/core/ui/shortcutlistform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py 2011-03-20 14:11:24 +0000
+++ openlp/core/ui/slidecontroller.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/splashscreen.py'
--- openlp/core/ui/splashscreen.py 2011-02-24 05:47:38 +0000
+++ openlp/core/ui/splashscreen.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/starttimedialog.py'
--- openlp/core/ui/starttimedialog.py 2011-02-24 05:47:38 +0000
+++ openlp/core/ui/starttimedialog.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/starttimeform.py'
--- openlp/core/ui/starttimeform.py 2011-02-24 05:47:38 +0000
+++ openlp/core/ui/starttimeform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/themeform.py'
--- openlp/core/ui/themeform.py 2011-02-24 05:47:38 +0000
+++ openlp/core/ui/themeform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py 2011-03-19 15:51:03 +0000
+++ openlp/core/ui/thememanager.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/themestab.py'
--- openlp/core/ui/themestab.py 2011-02-24 05:47:38 +0000
+++ openlp/core/ui/themestab.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/themewizard.py'
--- openlp/core/ui/themewizard.py 2011-02-24 05:47:38 +0000
+++ openlp/core/ui/themewizard.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/ui/wizard.py'
--- openlp/core/ui/wizard.py 2011-02-24 05:47:38 +0000
+++ openlp/core/ui/wizard.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/utils/__init__.py'
--- openlp/core/utils/__init__.py 2011-03-17 04:59:21 +0000
+++ openlp/core/utils/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/utils/actions.py'
--- openlp/core/utils/actions.py 2011-02-24 05:47:38 +0000
+++ openlp/core/utils/actions.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/core/utils/languagemanager.py'
--- openlp/core/utils/languagemanager.py 2011-03-11 23:41:44 +0000
+++ openlp/core/utils/languagemanager.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/__init__.py'
--- openlp/plugins/__init__.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/alerts/__init__.py'
--- openlp/plugins/alerts/__init__.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/alerts/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/alerts/alertsplugin.py'
--- openlp/plugins/alerts/alertsplugin.py 2011-03-10 19:17:05 +0000
+++ openlp/plugins/alerts/alertsplugin.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/alerts/forms/__init__.py'
--- openlp/plugins/alerts/forms/__init__.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/alerts/forms/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/alerts/forms/alertdialog.py'
--- openlp/plugins/alerts/forms/alertdialog.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/alerts/forms/alertdialog.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/alerts/forms/alertform.py'
--- openlp/plugins/alerts/forms/alertform.py 2011-03-02 06:03:33 +0000
+++ openlp/plugins/alerts/forms/alertform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/alerts/lib/__init__.py'
--- openlp/plugins/alerts/lib/__init__.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/alerts/lib/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/alerts/lib/alertsmanager.py'
--- openlp/plugins/alerts/lib/alertsmanager.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/alerts/lib/alertsmanager.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/alerts/lib/alertstab.py'
--- openlp/plugins/alerts/lib/alertstab.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/alerts/lib/alertstab.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/alerts/lib/db.py'
--- openlp/plugins/alerts/lib/db.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/alerts/lib/db.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/bibles/__init__.py'
--- openlp/plugins/bibles/__init__.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/bibles/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/bibles/bibleplugin.py'
--- openlp/plugins/bibles/bibleplugin.py 2011-03-15 20:53:36 +0000
+++ openlp/plugins/bibles/bibleplugin.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/bibles/forms/__init__.py'
--- openlp/plugins/bibles/forms/__init__.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/bibles/forms/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/bibles/forms/bibleimportform.py'
--- openlp/plugins/bibles/forms/bibleimportform.py 2011-03-05 17:14:13 +0000
+++ openlp/plugins/bibles/forms/bibleimportform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/bibles/lib/__init__.py'
--- openlp/plugins/bibles/lib/__init__.py 2011-03-20 20:50:19 +0000
+++ openlp/plugins/bibles/lib/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/bibles/lib/biblestab.py'
--- openlp/plugins/bibles/lib/biblestab.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/bibles/lib/biblestab.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/bibles/lib/csvbible.py'
--- openlp/plugins/bibles/lib/csvbible.py 2011-03-04 13:57:39 +0000
+++ openlp/plugins/bibles/lib/csvbible.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/bibles/lib/db.py'
--- openlp/plugins/bibles/lib/db.py 2011-03-10 16:05:12 +0000
+++ openlp/plugins/bibles/lib/db.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/bibles/lib/http.py'
--- openlp/plugins/bibles/lib/http.py 2011-03-14 19:26:38 +0000
+++ openlp/plugins/bibles/lib/http.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
@@ -255,7 +255,7 @@
if isinstance(part.next, Tag) and part.next.name == u'div':
# Run out of verses so stop.
break
- part = part.next
+ part = part.next
verse_list[clean_verse_num] = unicode(verse_text)
if not verse_list:
log.debug(u'No content found in the BibleGateway response.')
=== modified file 'openlp/plugins/bibles/lib/manager.py'
--- openlp/plugins/bibles/lib/manager.py 2011-03-13 15:58:27 +0000
+++ openlp/plugins/bibles/lib/manager.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py 2011-03-20 21:00:41 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/bibles/lib/openlp1.py'
--- openlp/plugins/bibles/lib/openlp1.py 2011-03-04 13:57:39 +0000
+++ openlp/plugins/bibles/lib/openlp1.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/bibles/lib/opensong.py'
--- openlp/plugins/bibles/lib/opensong.py 2011-03-04 13:57:39 +0000
+++ openlp/plugins/bibles/lib/opensong.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/bibles/lib/osis.py'
--- openlp/plugins/bibles/lib/osis.py 2011-03-04 13:57:39 +0000
+++ openlp/plugins/bibles/lib/osis.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/bibles/lib/versereferencelist.py'
--- openlp/plugins/bibles/lib/versereferencelist.py 2011-03-22 06:43:31 +0000
+++ openlp/plugins/bibles/lib/versereferencelist.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/custom/__init__.py'
--- openlp/plugins/custom/__init__.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/custom/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/custom/customplugin.py'
--- openlp/plugins/custom/customplugin.py 2011-03-10 19:17:05 +0000
+++ openlp/plugins/custom/customplugin.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/custom/forms/__init__.py'
--- openlp/plugins/custom/forms/__init__.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/custom/forms/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/custom/forms/editcustomdialog.py'
--- openlp/plugins/custom/forms/editcustomdialog.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/custom/forms/editcustomdialog.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/custom/forms/editcustomform.py'
--- openlp/plugins/custom/forms/editcustomform.py 2011-03-18 20:31:55 +0000
+++ openlp/plugins/custom/forms/editcustomform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/custom/forms/editcustomslidedialog.py'
--- openlp/plugins/custom/forms/editcustomslidedialog.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/custom/forms/editcustomslidedialog.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/custom/forms/editcustomslideform.py'
--- openlp/plugins/custom/forms/editcustomslideform.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/custom/forms/editcustomslideform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/custom/lib/__init__.py'
--- openlp/plugins/custom/lib/__init__.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/custom/lib/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/custom/lib/customtab.py'
--- openlp/plugins/custom/lib/customtab.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/custom/lib/customtab.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/custom/lib/customxmlhandler.py'
--- openlp/plugins/custom/lib/customxmlhandler.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/custom/lib/customxmlhandler.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/custom/lib/db.py'
--- openlp/plugins/custom/lib/db.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/custom/lib/db.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/custom/lib/mediaitem.py'
--- openlp/plugins/custom/lib/mediaitem.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/custom/lib/mediaitem.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/images/__init__.py'
--- openlp/plugins/images/__init__.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/images/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/images/imageplugin.py'
--- openlp/plugins/images/imageplugin.py 2011-03-10 19:17:05 +0000
+++ openlp/plugins/images/imageplugin.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/images/lib/__init__.py'
--- openlp/plugins/images/lib/__init__.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/images/lib/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/images/lib/mediaitem.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/media/__init__.py'
--- openlp/plugins/media/__init__.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/media/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/media/lib/__init__.py'
--- openlp/plugins/media/lib/__init__.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/media/lib/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py 2011-03-19 22:52:56 +0000
+++ openlp/plugins/media/lib/mediaitem.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
@@ -36,7 +36,7 @@
from PyQt4.phonon import Phonon
log = logging.getLogger(__name__)
-
+
class MediaMediaItem(MediaManagerItem):
"""
This is the custom media manager item for Media Slides.
@@ -137,7 +137,7 @@
# This will be corrected in 1.9.6
critical_error_message_box(
translate('PresentationPlugin.MediaItem', 'Unsupported File'),
- unicode(translate('PresentationPlugin.MediaItem',
+ unicode(translate('PresentationPlugin.MediaItem',
'Unsupported File')))
return False
# File too big for processing
@@ -150,7 +150,7 @@
# This will be corrected in 1.9.6
self.mediaObject.stop()
critical_error_message_box(
- translate('PresentationPlugin.MediaItem',
+ translate('PresentationPlugin.MediaItem',
'Unsupported File'),
unicode(translate('PresentationPlugin.MediaItem',
'Unsupported File')))
@@ -172,7 +172,7 @@
def mediaStateWait(self, mediaState):
"""
Wait for the video to change its state
- Wait no longer than 5 seconds.
+ Wait no longer than 5 seconds.
"""
start = datetime.now()
while self.mediaObject.state() != mediaState:
@@ -182,7 +182,7 @@
if (datetime.now() - start).seconds > 5:
return False
return True
-
+
def initialise(self):
self.listView.clear()
self.listView.setIconSize(QtCore.QSize(88, 50))
=== modified file 'openlp/plugins/media/lib/mediatab.py'
--- openlp/plugins/media/lib/mediatab.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/media/lib/mediatab.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/media/mediaplugin.py'
--- openlp/plugins/media/mediaplugin.py 2011-03-17 10:28:49 +0000
+++ openlp/plugins/media/mediaplugin.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/presentations/__init__.py'
--- openlp/plugins/presentations/__init__.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/presentations/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/presentations/lib/__init__.py'
--- openlp/plugins/presentations/lib/__init__.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/presentations/lib/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/presentations/lib/impresscontroller.py'
--- openlp/plugins/presentations/lib/impresscontroller.py 2011-02-25 17:05:01 +0000
+++ openlp/plugins/presentations/lib/impresscontroller.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
--- openlp/plugins/presentations/lib/mediaitem.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/presentations/lib/mediaitem.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/presentations/lib/messagelistener.py'
--- openlp/plugins/presentations/lib/messagelistener.py 2011-03-15 00:10:40 +0000
+++ openlp/plugins/presentations/lib/messagelistener.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/presentations/lib/powerpointcontroller.py'
--- openlp/plugins/presentations/lib/powerpointcontroller.py 2011-03-16 23:37:16 +0000
+++ openlp/plugins/presentations/lib/powerpointcontroller.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/presentations/lib/pptviewcontroller.py'
--- openlp/plugins/presentations/lib/pptviewcontroller.py 2011-03-15 07:47:23 +0000
+++ openlp/plugins/presentations/lib/pptviewcontroller.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/presentations/lib/pptviewlib/README.TXT'
--- openlp/plugins/presentations/lib/pptviewlib/README.TXT 2010-09-14 18:18:47 +0000
+++ openlp/plugins/presentations/lib/pptviewlib/README.TXT 2011-03-24 19:07:44 +0000
@@ -1,17 +1,17 @@
PPTVIEWLIB - Control PowerPoint Viewer 2003/2007 (for openlp.org)
-Copyright (C) 2008 Jonathan Corwin (j@xxxxxxxxxxxx)
-
-This library wrappers the free Microsoft PowerPoint Viewer (2003/2007) program,
-allowing it to be more easily controlled from another program.
-
-The PowerPoint Viewer must already be installed on the destination machine, and is
+Copyright (C) 2008-2011 Jonathan Corwin (j@xxxxxxxxxxxx)
+
+This library wrappers the free Microsoft PowerPoint Viewer (2003/2007) program,
+allowing it to be more easily controlled from another program.
+
+The PowerPoint Viewer must already be installed on the destination machine, and is
freely available at microsoft.com.
The full Microsoft Office PowerPoint and PowerPoint Viewer 97 have a COM interface allowing
automation. This ability was removed from the 2003+ viewer offerings.
-To developers: I am not a C/C++ or Win32 API programmer as you can probably tell.
+To developers: I am not a C/C++ or Win32 API programmer as you can probably tell.
The code and API of this DLL could certainly do with some tidying up, and the
error trapping, where it exists, is very basic. I'll happily accept patches!
@@ -28,94 +28,94 @@
USAGE
-----
BOOL CheckInstalled(void);
- Returns TRUE if PowerPointViewer is installed. FALSE if not.
+ Returns TRUE if PowerPointViewer is installed. FALSE if not.
int OpenPPT(char *filename, HWND hParentWnd, RECT rect, char *previewpath);
- Opens the PowerPoint file, counts the number of slides, sizes and positions accordingly
- and creates preview images of each slide. Note PowerPoint Viewer only allows the
- slideshow to be resized whilst it is being loaded. It can be moved at any time however.
-
- The only way to count the number of slides is to step through the entire show. Therefore
- there will be a delay whilst opening large presentations for the first time.
- For pre XP/2003 systems, the slideshow will flicker as the screen snapshots are taken.
-
- filename: The PowerPoint file to be opened. Full path
- hParentWnd: The window which will become the parent of the slideshow window.
- Can be NULL.
- rect: The location/dimensions of the slideshow window.
- If all properties of this structure are zero, the dimensions of the hParentWnd
- are used.
- previewpath If specified, the prefix to use for snapshot images of each slide, in the
- form: previewpath + n + ".bmp", where n is the slide number.
- A file called previewpath + "info.txt" will also be created containing information
- about the PPT file, to speed up future openings of the unmodified file.
- Note it is up the calling program to directly access these images if they
- are required.
-
- RETURNS: An unique identifier to pass to other methods in this library.
- If < 0, then the PPT failed to open.
- If >=0, ClosePPT must be called when the PPT is no longer being used
- or when the calling program is closed to release resources/hooks.
-
+ Opens the PowerPoint file, counts the number of slides, sizes and positions accordingly
+ and creates preview images of each slide. Note PowerPoint Viewer only allows the
+ slideshow to be resized whilst it is being loaded. It can be moved at any time however.
+
+ The only way to count the number of slides is to step through the entire show. Therefore
+ there will be a delay whilst opening large presentations for the first time.
+ For pre XP/2003 systems, the slideshow will flicker as the screen snapshots are taken.
+
+ filename: The PowerPoint file to be opened. Full path
+ hParentWnd: The window which will become the parent of the slideshow window.
+ Can be NULL.
+ rect: The location/dimensions of the slideshow window.
+ If all properties of this structure are zero, the dimensions of the hParentWnd
+ are used.
+ previewpath If specified, the prefix to use for snapshot images of each slide, in the
+ form: previewpath + n + ".bmp", where n is the slide number.
+ A file called previewpath + "info.txt" will also be created containing information
+ about the PPT file, to speed up future openings of the unmodified file.
+ Note it is up the calling program to directly access these images if they
+ are required.
+
+ RETURNS: An unique identifier to pass to other methods in this library.
+ If < 0, then the PPT failed to open.
+ If >=0, ClosePPT must be called when the PPT is no longer being used
+ or when the calling program is closed to release resources/hooks.
+
void ClosePPT(int id);
- Closes the presentation, releasing any resources and hooks.
-
- id: The value returned from OpenPPT.
-
+ Closes the presentation, releasing any resources and hooks.
+
+ id: The value returned from OpenPPT.
+
int GetCurrentSlide(int id);
- Returns the current slide number (from 1)
+ Returns the current slide number (from 1)
- id: The value returned from OpenPPT.
+ id: The value returned from OpenPPT.
int GetSlideCount(int id);
- Returns the total number of slides.
+ Returns the total number of slides.
- id: The value returned from OpenPPT.
+ id: The value returned from OpenPPT.
void NextStep(int id);
- Advances one step (animation) through the slideshow.
+ Advances one step (animation) through the slideshow.
- id: The value returned from OpenPPT.
+ id: The value returned from OpenPPT.
void PrevStep(int id);
- Goes backwards one step (animation) through the slideshow.
+ Goes backwards one step (animation) through the slideshow.
- id: The value returned from OpenPPT.
+ id: The value returned from OpenPPT.
void GotoSlide(int id, int slideno);
- Goes directly to a specific slide in the slideshow
-
- id: The value returned from OpenPPT.
- slideno: The number of the slide (from 1) to go directly to.
-
- If the slide has already been displayed, then the completed slide with animations performed
- will be shown. This is how the PowerPoint Viewer works so have no control over this.
+ Goes directly to a specific slide in the slideshow
+
+ id: The value returned from OpenPPT.
+ slideno: The number of the slide (from 1) to go directly to.
+
+ If the slide has already been displayed, then the completed slide with animations performed
+ will be shown. This is how the PowerPoint Viewer works so have no control over this.
void RestartShow(int id);
- Restarts the show from the beginning. To reset animations, behind the scenes it
- has to travel to the end and step backwards though the entire show. Therefore
- for large presentations there might be a delay.
+ Restarts the show from the beginning. To reset animations, behind the scenes it
+ has to travel to the end and step backwards though the entire show. Therefore
+ for large presentations there might be a delay.
- id: The value returned from OpenPPT.
+ id: The value returned from OpenPPT.
void Blank(int id);
- Blanks the screen, colour black.
+ Blanks the screen, colour black.
- id: The value returned from OpenPPT.
+ id: The value returned from OpenPPT.
void Unblank(int id)
- Unblanks the screen, restoring it to it's pre-blank state.
-
- id: The value returned from OpenPPT.
+ Unblanks the screen, restoring it to it's pre-blank state.
+
+ id: The value returned from OpenPPT.
void Stop(int id)
- Moves the slideshow off the screen. (There is no concept of stop show in the PowerPoint Viewer)
+ Moves the slideshow off the screen. (There is no concept of stop show in the PowerPoint Viewer)
- id: The value returned from OpenPPT.
+ id: The value returned from OpenPPT.
void Resume(int id)
- Moves the slideshow display back onto the screen following a Stop()
+ Moves the slideshow display back onto the screen following a Stop()
- id: The value returned from OpenPPT.
+ id: The value returned from OpenPPT.
=== modified file 'openlp/plugins/presentations/lib/pptviewlib/ppttest.py'
--- openlp/plugins/presentations/lib/pptviewlib/ppttest.py 2011-03-16 23:22:11 +0000
+++ openlp/plugins/presentations/lib/pptviewlib/ppttest.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
@@ -78,7 +78,7 @@
grid.addWidget(self.widthEdit, row, 1)
grid.addWidget(height_label, row, 2)
grid.addWidget(self.heightEdit, row, 3)
- row = row + 1
+ row = row + 1
grid.addWidget(ppt_label, row, 0)
grid.addWidget(self.pptEdit, row, 1)
grid.addWidget(ppt_dlg_btn, row, 2)
@@ -121,14 +121,14 @@
app.processEvents()
def nextClick(self):
- if self.pptid < 0:
+ if self.pptid < 0:
return
self.pptdll.NextStep(self.pptid)
self.updateCurrSlide()
app.processEvents()
def blankClick(self):
- if self.pptid < 0:
+ if self.pptid < 0:
return
self.pptdll.Blank(self.pptid)
app.processEvents()
@@ -140,14 +140,14 @@
app.processEvents()
def restartClick(self):
- if self.pptid < 0:
+ if self.pptid < 0:
return
self.pptdll.RestartShow(self.pptid)
self.updateCurrSlide()
app.processEvents()
def stopClick(self):
- if self.pptid < 0:
+ if self.pptid < 0:
return
self.pptdll.Stop(self.pptid)
app.processEvents()
@@ -159,7 +159,7 @@
app.processEvents()
def closeClick(self):
- if self.pptid < 0:
+ if self.pptid < 0:
return
self.pptdll.ClosePPT(self.pptid)
self.pptid = -1
@@ -167,10 +167,10 @@
def openClick(self):
oldid = self.pptid;
- rect = RECT(int(self.xEdit.text()), int(self.yEdit.text()),
+ rect = RECT(int(self.xEdit.text()), int(self.yEdit.text()),
int(self.widthEdit.text()), int(self.heightEdit.text()))
- filename = str(self.pptEdit.text().replace(u'/', u'\\'))
- folder = str(self.folderEdit.text().replace(u'/', u'\\'))
+ filename = str(self.pptEdit.text().replace(u'/', u'\\'))
+ folder = str(self.folderEdit.text().replace(u'/', u'\\'))
print filename, folder
self.pptid = self.pptdll.OpenPPT(filename, None, rect, folder)
print u'id: ' + unicode(self.pptid)
@@ -182,7 +182,7 @@
self.updateCurrSlide()
def updateCurrSlide(self):
- if self.pptid < 0:
+ if self.pptid < 0:
return
slide = unicode(self.pptdll.GetCurrentSlide(self.pptid))
print u'currslide: ' + slide
@@ -190,7 +190,7 @@
app.processEvents()
def gotoClick(self):
- if self.pptid < 0:
+ if self.pptid < 0:
return
print self.slideEdit.text()
self.pptdll.GotoSlide(self.pptid, int(self.slideEdit.text()))
@@ -198,7 +198,7 @@
app.processEvents()
def openDialog(self):
- self.pptEdit.setText(QtGui.QFileDialog.getOpenFileName(self,
+ self.pptEdit.setText(QtGui.QFileDialog.getOpenFileName(self,
u'Open file'))
if __name__ == '__main__':
=== modified file 'openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp'
--- openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp 2011-03-16 23:37:16 +0000
+++ openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp 2011-03-24 19:07:44 +0000
@@ -4,9 +4,9 @@
* --------------------------------------------------------------------------- *
* Copyright (c) 2008-2011 Raoul Snyman *
* Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael *
-* Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, *
-* Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon *
-* Tibble, Carsten Tinggaard, Frode Woldsund *
+* Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, *
+* Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, *
+* Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund *
* --------------------------------------------------------------------------- *
* 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 *
@@ -22,7 +22,7 @@
* Temple Place, Suite 330, Boston, MA 02111-1307 USA *
******************************************************************************/
-#define WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <string.h>
#include <stdlib.h>
@@ -32,13 +32,13 @@
#include <sys/stat.h>
#include "pptviewlib.h"
-// Because of the callbacks used by SetWindowsHookEx, the memory used needs to
-// be sharable across processes (the callbacks are done from a different
+// Because of the callbacks used by SetWindowsHookEx, the memory used needs to
+// be sharable across processes (the callbacks are done from a different
// process) Therefore use data_seg with RWS memory.
//
// See http://msdn.microsoft.com/en-us/library/aa366551(VS.85).aspx for
// alternative method of holding memory, removing fixed limits which would allow
-// dynamic number of items, rather than a fixed number. Use a Local\ mapping,
+// dynamic number of items, rather than a fixed number. Use a Local\ mapping,
// since global has UAC issues in Vista.
#pragma data_seg(".PPTVIEWLIB")
@@ -50,7 +50,7 @@
HINSTANCE hInstance = NULL;
-BOOL APIENTRY DllMain(HMODULE hModule, DWORD ulReasonForCall,
+BOOL APIENTRY DllMain(HMODULE hModule, DWORD ulReasonForCall,
LPVOID lpReserved)
{
hInstance = (HINSTANCE)hModule;
@@ -66,7 +66,7 @@
//DEBUG("THREAD_DETACH\n");
break;
case DLL_PROCESS_DETACH:
- // Clean up... hopefully there is only the one process attached?
+ // Clean up... hopefully there is only the one process attached?
// We'll find out soon enough during tests!
DEBUG("PROCESS_DETACH\n");
for (int i = 0; i < MAX_PPTS; i++)
@@ -94,10 +94,10 @@
// Open the PointPoint, count the slides and take a snapshot of each slide
// for use in previews
// previewpath is a prefix for the location to put preview images of each slide.
-// "<n>.bmp" will be appended to complete the path. E.g. "c:\temp\slide" would
+// "<n>.bmp" will be appended to complete the path. E.g. "c:\temp\slide" would
// create "c:\temp\slide1.bmp" slide2.bmp, slide3.bmp etc.
// It will also create a *info.txt containing information about the ppt
-DllExport int OpenPPT(char *filename, HWND hParentWnd, RECT rect,
+DllExport int OpenPPT(char *filename, HWND hParentWnd, RECT rect,
char *previewPath)
{
STARTUPINFO si;
@@ -106,7 +106,7 @@
int id;
DEBUG("OpenPPT start: %s; %s\n", filename, previewPath);
- DEBUG("OpenPPT start: %u; %i, %i, %i, %i\n", hParentWnd, rect.top,
+ DEBUG("OpenPPT start: %u; %i, %i, %i, %i\n", hParentWnd, rect.top,
rect.left, rect.bottom, rect.right);
if (GetPPTViewerPath(cmdLine, sizeof(cmdLine)) == FALSE)
{
@@ -166,9 +166,9 @@
memset(&si, 0, sizeof(si));
memset(&pi, 0, sizeof(pi));
BOOL gotInfo = GetPPTInfo(id);
- /*
- * I'd really like to just hook on the new threadid. However this always
- * gives error 87. Perhaps I'm hooking to soon? No idea... however can't
+ /*
+ * I'd really like to just hook on the new threadid. However this always
+ * gives error 87. Perhaps I'm hooking to soon? No idea... however can't
* wait since I need to ensure I pick up the WM_CREATE as this is the only
* time the window can be resized in such away the content scales correctly
*
@@ -186,7 +186,7 @@
return -1;
}
pptView[id].state = PPT_STARTED;
- Sleep(10);
+ Sleep(10);
if (!CreateProcess(NULL, cmdLine, NULL, NULL, FALSE, 0, 0, NULL, &si, &pi))
{
DEBUG("OpenPPT: CreateProcess failed\n");
@@ -218,24 +218,24 @@
DEBUG("OpenPPT: Step %d/%d\n", steps, pptView[id].steps);
steps++;
NextStep(id);
- }
+ }
Sleep(10);
}
DEBUG("OpenPPT: Slides %d, Steps %d, first slide steps %d\n",
- pptView[id].slideCount, pptView[id].steps,
+ pptView[id].slideCount, pptView[id].steps,
pptView[id].firstSlideSteps);
for(int i = 1; i <= pptView[id].slideCount; i++)
{
DEBUG("OpenPPT: Slide %d = %d\n", i, pptView[id].slideNos[i]);
}
SavePPTInfo(id);
- if (pptView[id].state == PPT_CLOSING
+ if (pptView[id].state == PPT_CLOSING
|| pptView[id].slideCount <= 0)
{
ClosePPT(id);
id=-1;
}
- else
+ else
{
RestartShow(id);
}
@@ -278,14 +278,14 @@
return FALSE;
}
fgets(buf, 100, pFile); // version == 1
- fgets(buf, 100, pFile);
+ fgets(buf, 100, pFile);
if (fileStats.st_mtime != atoi(buf))
{
DEBUG("GetPPTInfo: date changed\n");
fclose (pFile);
return FALSE;
}
- fgets(buf, 100, pFile);
+ fgets(buf, 100, pFile);
if (fileStats.st_size != atoi(buf))
{
DEBUG("GetPPTInfo: size changed\n");
@@ -350,13 +350,13 @@
LRESULT lResult;
DEBUG("GetPPTViewerPath: start\n");
- if ((RegOpenKeyEx(HKEY_CLASSES_ROOT,
+ if ((RegOpenKeyEx(HKEY_CLASSES_ROOT,
"PowerPointViewer.Show.12\\shell\\Show\\command", 0, KEY_READ, &hKey)
!= ERROR_SUCCESS)
- && (RegOpenKeyEx(HKEY_CLASSES_ROOT,
+ && (RegOpenKeyEx(HKEY_CLASSES_ROOT,
"Applications\\PPTVIEW.EXE\\shell\\open\\command", 0, KEY_READ, &hKey)
!= ERROR_SUCCESS)
- && (RegOpenKeyEx(HKEY_CLASSES_ROOT,
+ && (RegOpenKeyEx(HKEY_CLASSES_ROOT,
"Applications\\PPTVIEW.EXE\\shell\\Show\\command", 0, KEY_READ, &hKey)
!= ERROR_SUCCESS))
{
@@ -364,7 +364,7 @@
}
dwType = REG_SZ;
dwSize = (DWORD)stringSize;
- lResult = RegQueryValueEx(hKey, NULL, NULL, &dwType, (LPBYTE)pptViewerPath,
+ lResult = RegQueryValueEx(hKey, NULL, NULL, &dwType, (LPBYTE)pptViewerPath,
&dwSize);
RegCloseKey(hKey);
if (lResult != ERROR_SUCCESS)
@@ -372,16 +372,16 @@
return FALSE;
}
// remove "%1" from end of key value
- pptViewerPath[strlen(pptViewerPath) - 4] = '\0';
+ pptViewerPath[strlen(pptViewerPath) - 4] = '\0';
DEBUG("GetPPTViewerPath: exit ok\n");
return TRUE;
}
-// Unhook the Windows hook
+// Unhook the Windows hook
void Unhook(int id)
{
DEBUG("Unhook: start %d\n", id);
- if (pptView[id].hook != NULL)
+ if (pptView[id].hook != NULL)
{
UnhookWindowsHookEx(pptView[id].hook);
}
@@ -418,18 +418,18 @@
DllExport void Resume(int id)
{
DEBUG("Resume: %d\n", id);
- MoveWindow(pptView[id].hWnd, pptView[id].rect.left,
- pptView[id].rect.top,
- pptView[id].rect.right - pptView[id].rect.left,
+ MoveWindow(pptView[id].hWnd, pptView[id].rect.left,
+ pptView[id].rect.top,
+ pptView[id].rect.right - pptView[id].rect.left,
pptView[id].rect.bottom - pptView[id].rect.top, TRUE);
- Unblank(id);
+ Unblank(id);
}
// Moves the show off the screen so it can't be seen
DllExport void Stop(int id)
{
DEBUG("Stop:%d\n", id);
- MoveWindow(pptView[id].hWnd, -32000, -32000,
- pptView[id].rect.right - pptView[id].rect.left,
+ MoveWindow(pptView[id].hWnd, -32000, -32000,
+ pptView[id].rect.right - pptView[id].rect.left,
pptView[id].rect.bottom - pptView[id].rect.top, TRUE);
}
@@ -461,7 +461,7 @@
}
}
-// Take a step forwards through the show
+// Take a step forwards through the show
DllExport void NextStep(int id)
{
DEBUG("NextStep:%d (%d)\n", id, pptView[id].currentSlide);
@@ -470,11 +470,11 @@
{
pptView[id].guess = pptView[id].currentSlide + 1;
}
- PostMessage(pptView[id].hWnd2, WM_MOUSEWHEEL, MAKEWPARAM(0, -WHEEL_DELTA),
+ PostMessage(pptView[id].hWnd2, WM_MOUSEWHEEL, MAKEWPARAM(0, -WHEEL_DELTA),
0);
}
-// Take a step backwards through the show
+// Take a step backwards through the show
DllExport void PrevStep(int id)
{
DEBUG("PrevStep:%d (%d)\n", id, pptView[id].currentSlide);
@@ -482,16 +482,16 @@
{
pptView[id].guess = pptView[id].currentSlide - 1;
}
- PostMessage(pptView[id].hWnd2, WM_MOUSEWHEEL, MAKEWPARAM(0, WHEEL_DELTA),
+ PostMessage(pptView[id].hWnd2, WM_MOUSEWHEEL, MAKEWPARAM(0, WHEEL_DELTA),
0);
}
// Blank the show (black screen)
DllExport void Blank(int id)
-{
+{
// B just toggles blank on/off. However pressing any key unblanks.
- // So send random unmapped letter first (say 'A'), then we can
- // better guarantee B will blank instead of trying to guess
+ // So send random unmapped letter first (say 'A'), then we can
+ // better guarantee B will blank instead of trying to guess
// whether it was already blank or not.
DEBUG("Blank:%d\n", id);
HWND h1 = GetForegroundWindow();
@@ -499,7 +499,7 @@
SetForegroundWindow(pptView[id].hWnd);
SetFocus(pptView[id].hWnd);
// slight pause, otherwise event triggering this call may grab focus back!
- Sleep(50);
+ Sleep(50);
keybd_event((int)'A', 0, 0, 0);
keybd_event((int)'A', 0, KEYEVENTF_KEYUP, 0);
keybd_event((int)'B', 0, 0, 0);
@@ -507,21 +507,21 @@
SetForegroundWindow(h1);
SetFocus(h2);
}
-// Unblank the show
+// Unblank the show
DllExport void Unblank(int id)
-{
+{
DEBUG("Unblank:%d\n", id);
- // Pressing any key resumes.
+ // Pressing any key resumes.
// For some reason SendMessage works for unblanking, but not blanking.
SendMessage(pptView[id].hWnd2, WM_CHAR, 'A', 0);
}
// Go directly to a slide
DllExport void GotoSlide(int id, int slideNo)
-{
+{
DEBUG("GotoSlide %i %i:\n", id, slideNo);
// Did try WM_KEYDOWN/WM_CHAR/WM_KEYUP with SendMessage but didn't work
- // perhaps I was sending to the wrong window? No idea.
+ // perhaps I was sending to the wrong window? No idea.
// Anyway fall back to keybd_event, which is OK as long we makesure
// the slideshow has focus first
char ch[10];
@@ -534,7 +534,7 @@
SetForegroundWindow(pptView[id].hWnd);
SetFocus(pptView[id].hWnd);
// slight pause, otherwise event triggering this call may grab focus back!
- Sleep(50);
+ Sleep(50);
for (int i=0; i<10; i++)
{
if (ch[i] == '\0') break;
@@ -550,11 +550,11 @@
// Restart the show from the beginning
DllExport void RestartShow(int id)
{
- // If we just go direct to slide one, then it remembers that all other
- // slides have been animated, so ends up just showing the completed slides
- // of those slides that have been animated next time we advance.
- // Only way I've found to get around this is to step backwards all the way
- // through. Lets move the window out of the way first so the audience
+ // If we just go direct to slide one, then it remembers that all other
+ // slides have been animated, so ends up just showing the completed slides
+ // of those slides that have been animated next time we advance.
+ // Only way I've found to get around this is to step backwards all the way
+ // through. Lets move the window out of the way first so the audience
// doesn't see this.
DEBUG("RestartShow:%d\n", id);
Stop(id);
@@ -604,20 +604,20 @@
{
pptView[id].hWnd2 = hCurrWnd;
}
- else
+ else
{
pptView[id].hWnd = hCurrWnd;
CBT_CREATEWND* cw = (CBT_CREATEWND*)lParam;
- if (pptView[id].hParentWnd != NULL)
+ if (pptView[id].hParentWnd != NULL)
{
cw->lpcs->hwndParent = pptView[id].hParentWnd;
}
- cw->lpcs->cy = pptView[id].rect.bottom
+ cw->lpcs->cy = pptView[id].rect.bottom
- pptView[id].rect.top;
cw->lpcs->cx = pptView[id].rect.right
- pptView[id].rect.left;
- cw->lpcs->y = -32000;
- cw->lpcs->x = -32000;
+ cw->lpcs->y = -32000;
+ cw->lpcs->x = -32000;
}
if ((pptView[id].hWnd != NULL) && (pptView[id].hWnd2 != NULL))
{
@@ -633,12 +633,12 @@
}
}
}
- return CallNextHookEx(hook, nCode, wParam, lParam);
+ return CallNextHookEx(hook, nCode, wParam, lParam);
}
// This hook exists whilst the slideshow is loading but only listens on the
// slideshows thread. It listens out for mousewheel events
-LRESULT CALLBACK GetMsgProc(int nCode, WPARAM wParam, LPARAM lParam)
+LRESULT CALLBACK GetMsgProc(int nCode, WPARAM wParam, LPARAM lParam)
{
HHOOK hook = NULL;
MSG *pMSG = (MSG *)lParam;
@@ -653,7 +653,7 @@
break;
}
}
- if (id >= 0 && nCode == HC_ACTION && wParam == PM_REMOVE
+ if (id >= 0 && nCode == HC_ACTION && wParam == PM_REMOVE
&& pMSG->message == WM_MOUSEWHEEL)
{
if (pptView[id].state != PPT_LOADED)
@@ -697,24 +697,24 @@
&& (pptView[id].previewPath != NULL
&& strlen(pptView[id].previewPath) > 0))
{
- sprintf_s(filename, MAX_PATH, "%s%i.bmp",
- pptView[id].previewPath,
+ sprintf_s(filename, MAX_PATH, "%s%i.bmp",
+ pptView[id].previewPath,
pptView[id].currentSlide);
CaptureAndSaveWindow(cwp->hwnd, filename);
}
- if (((cwp->wParam == 0)
+ if (((cwp->wParam == 0)
|| (pptView[id].slideNos[1] == cwp->wParam))
&& (pptView[id].currentSlide > 0))
{
pptView[id].state = PPT_LOADED;
pptView[id].currentSlide = pptView[id].slideCount + 1;
- }
- else
+ }
+ else
{
- if (cwp->wParam > 0)
+ if (cwp->wParam > 0)
{
pptView[id].currentSlide = pptView[id].currentSlide + 1;
- pptView[id].slideNos[pptView[id].currentSlide]
+ pptView[id].slideNos[pptView[id].currentSlide]
= cwp->wParam;
pptView[id].slideCount = pptView[id].currentSlide;
pptView[id].lastSlideSteps = 0;
@@ -723,9 +723,9 @@
}
else
{
- if (cwp->wParam > 0)
+ if (cwp->wParam > 0)
{
- if(pptView[id].guess > 0
+ if(pptView[id].guess > 0
&& pptView[id].slideNos[pptView[id].guess] == 0)
{
pptView[id].currentSlide = 0;
@@ -744,7 +744,7 @@
pptView[id].currentSlide = pptView[id].guess;
}
pptView[id].guess = 0;
- }
+ }
}
}
if ((pptView[id].state != PPT_CLOSED)
@@ -754,13 +754,13 @@
pptView[id].state = PPT_CLOSING;
}
}
- return CallNextHookEx(hook, nCode, wParam, lParam);
+ return CallNextHookEx(hook, nCode, wParam, lParam);
}
VOID CaptureAndSaveWindow(HWND hWnd, CHAR* filename)
{
HBITMAP hBmp;
- if ((hBmp = CaptureWindow(hWnd)) == NULL)
+ if ((hBmp = CaptureWindow(hWnd)) == NULL)
{
return;
}
@@ -769,13 +769,13 @@
UINT uiBytesPerRow = 3 * client.right; // RGB takes 24 bits
UINT uiRemainderForPadding;
- if ((uiRemainderForPadding = uiBytesPerRow % sizeof(DWORD)) > 0)
+ if ((uiRemainderForPadding = uiBytesPerRow % sizeof(DWORD)) > 0)
uiBytesPerRow += (sizeof(DWORD) - uiRemainderForPadding);
UINT uiBytesPerAllRows = uiBytesPerRow * client.bottom;
PBYTE pDataBits;
- if ((pDataBits = new BYTE[uiBytesPerAllRows]) != NULL)
+ if ((pDataBits = new BYTE[uiBytesPerAllRows]) != NULL)
{
BITMAPINFOHEADER bmi = {0};
BITMAPFILEHEADER bmf = {0};
@@ -801,13 +801,13 @@
// Writing:
FILE* pFile;
int err = fopen_s(&pFile, filename, "wb");
- if (err == 0)
+ if (err == 0)
{
fwrite(&bmf, sizeof(bmf), 1, pFile);
fwrite(&bmi, sizeof(bmi), 1, pFile);
fwrite(pDataBits, sizeof(BYTE), uiBytesPerAllRows, pFile);
fclose(pFile);
- }
+ }
delete [] pDataBits;
}
DeleteObject(hBmp);
@@ -822,25 +822,25 @@
RECT rcClient;
GetClientRect(hWnd, &rcClient);
if ((hImage = CreateCompatibleBitmap(hDC, rcClient.right, rcClient.bottom))
- != NULL)
+ != NULL)
{
HDC hMemDC;
HBITMAP hDCBmp;
- if ((hMemDC = CreateCompatibleDC(hDC)) != NULL)
+ if ((hMemDC = CreateCompatibleDC(hDC)) != NULL)
{
hDCBmp = (HBITMAP)SelectObject(hMemDC, hImage);
HMODULE hLib = LoadLibrary("User32");
// PrintWindow works for windows outside displayable area
- // but was only introduced in WinXP. BitBlt requires the window to
+ // but was only introduced in WinXP. BitBlt requires the window to
// be topmost and within the viewable area of the display
if (GetProcAddress(hLib, "PrintWindow") == NULL)
{
- SetWindowPos(hWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE);
- BitBlt(hMemDC, 0, 0, rcClient.right, rcClient.bottom, hDC, 0,
+ SetWindowPos(hWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE);
+ BitBlt(hMemDC, 0, 0, rcClient.right, rcClient.bottom, hDC, 0,
0, SRCCOPY);
- SetWindowPos(hWnd, HWND_NOTOPMOST, -32000, -32000, 0, 0,
- SWP_NOSIZE);
+ SetWindowPos(hWnd, HWND_NOTOPMOST, -32000, -32000, 0, 0,
+ SWP_NOSIZE);
}
else
{
@@ -852,9 +852,9 @@
}
}
ReleaseDC(hWnd, hDC);
- if (!bOk)
+ if (!bOk)
{
- if (hImage)
+ if (hImage)
{
DeleteObject(hImage);
hImage = NULL;
=== modified file 'openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h'
--- openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h 2011-03-16 23:37:16 +0000
+++ openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h 2011-03-24 19:07:44 +0000
@@ -4,9 +4,9 @@
* --------------------------------------------------------------------------- *
* Copyright (c) 2008-2011 Raoul Snyman *
* Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael *
-* Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, *
-* Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon *
-* Tibble, Carsten Tinggaard, Frode Woldsund *
+* Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, *
+* Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, *
+* Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund *
* --------------------------------------------------------------------------- *
* 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 *
@@ -22,14 +22,14 @@
* Temple Place, Suite 330, Boston, MA 02111-1307 USA *
******************************************************************************/
-#define DllExport extern "C" __declspec( dllexport )
+#define DllExport extern "C" __declspec( dllexport )
#define DEBUG(...) if (debug) printf(__VA_ARGS__)
-enum PPTVIEWSTATE {PPT_CLOSED, PPT_STARTED, PPT_OPENED, PPT_LOADED,
+enum PPTVIEWSTATE {PPT_CLOSED, PPT_STARTED, PPT_OPENED, PPT_LOADED,
PPT_CLOSING};
-DllExport int OpenPPT(char *filename, HWND hParentWnd, RECT rect,
+DllExport int OpenPPT(char *filename, HWND hParentWnd, RECT rect,
char *previewPath);
DllExport BOOL CheckInstalled();
DllExport void ClosePPT(int id);
@@ -59,7 +59,7 @@
#define MAX_PPTS 16
#define MAX_SLIDES 256
-struct PPTVIEW
+struct PPTVIEW
{
HHOOK hook;
HHOOK msgHook;
=== modified file 'openlp/plugins/presentations/lib/presentationcontroller.py'
--- openlp/plugins/presentations/lib/presentationcontroller.py 2011-02-25 17:05:01 +0000
+++ openlp/plugins/presentations/lib/presentationcontroller.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/presentations/lib/presentationtab.py'
--- openlp/plugins/presentations/lib/presentationtab.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/presentations/lib/presentationtab.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/presentations/presentationplugin.py'
--- openlp/plugins/presentations/presentationplugin.py 2011-03-10 19:17:05 +0000
+++ openlp/plugins/presentations/presentationplugin.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/remotes/__init__.py'
--- openlp/plugins/remotes/__init__.py 2011-03-03 20:18:10 +0000
+++ openlp/plugins/remotes/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/remotes/html/index.html'
--- openlp/plugins/remotes/html/index.html 2011-03-16 10:59:23 +0000
+++ openlp/plugins/remotes/html/index.html 2011-03-24 19:07:44 +0000
@@ -1,5 +1,29 @@
<!DOCTYPE html>
<html>
+<!--
+###############################################################################
+# OpenLP - Open Source Lyrics Projection #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
+# --------------------------------------------------------------------------- #
+# 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 #
+###############################################################################
+-->
<head>
<meta charset="utf-8" />
<title>OpenLP 2.0 Remote</title>
=== modified file 'openlp/plugins/remotes/html/openlp.css'
--- openlp/plugins/remotes/html/openlp.css 2011-03-06 20:05:42 +0000
+++ openlp/plugins/remotes/html/openlp.css 2011-03-24 19:07:44 +0000
@@ -3,8 +3,9 @@
* ------------------------------------------------------------------------- *
* 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 *
+ * Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, *
+ * Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, *
+ * Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund *
* ------------------------------------------------------------------------- *
* 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 *
=== modified file 'openlp/plugins/remotes/html/openlp.js'
--- openlp/plugins/remotes/html/openlp.js 2011-03-16 10:59:23 +0000
+++ openlp/plugins/remotes/html/openlp.js 2011-03-24 19:07:44 +0000
@@ -3,8 +3,9 @@
* ------------------------------------------------------------------------- *
* 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 *
+ * Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, *
+ * Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, *
+ * Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund *
* ------------------------------------------------------------------------- *
* 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 *
=== modified file 'openlp/plugins/remotes/lib/__init__.py'
--- openlp/plugins/remotes/lib/__init__.py 2011-02-24 16:36:28 +0000
+++ openlp/plugins/remotes/lib/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/remotes/lib/httpserver.py'
--- openlp/plugins/remotes/lib/httpserver.py 2011-03-16 12:27:52 +0000
+++ openlp/plugins/remotes/lib/httpserver.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
@@ -53,7 +53,7 @@
``/api/alert``
Sends an alert message to the alerts plugin. This method expects a
JSON-encoded dict like this::
-
+
{"request": {"text": "<your alert text>"}}
``/api/controller/{live|preview}/{action}``
@@ -358,7 +358,7 @@
def display(self, action):
"""
Hide or show the display screen.
-
+
``action``
This is the action, either ``hide`` or ``show``.
"""
=== modified file 'openlp/plugins/remotes/lib/remotetab.py'
--- openlp/plugins/remotes/lib/remotetab.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/remotes/lib/remotetab.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/remotes/remoteplugin.py'
--- openlp/plugins/remotes/remoteplugin.py 2011-03-10 19:17:05 +0000
+++ openlp/plugins/remotes/remoteplugin.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/__init__.py'
--- openlp/plugins/songs/__init__.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songs/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/forms/__init__.py'
--- openlp/plugins/songs/forms/__init__.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songs/forms/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/forms/authorsdialog.py'
--- openlp/plugins/songs/forms/authorsdialog.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songs/forms/authorsdialog.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/forms/authorsform.py'
--- openlp/plugins/songs/forms/authorsform.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songs/forms/authorsform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/forms/editsongdialog.py'
--- openlp/plugins/songs/forms/editsongdialog.py 2011-03-18 19:15:45 +0000
+++ openlp/plugins/songs/forms/editsongdialog.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py 2011-03-18 19:15:45 +0000
+++ openlp/plugins/songs/forms/editsongform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/forms/editversedialog.py'
--- openlp/plugins/songs/forms/editversedialog.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songs/forms/editversedialog.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/forms/editverseform.py'
--- openlp/plugins/songs/forms/editverseform.py 2011-03-03 20:18:17 +0000
+++ openlp/plugins/songs/forms/editverseform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/forms/songbookdialog.py'
--- openlp/plugins/songs/forms/songbookdialog.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songs/forms/songbookdialog.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/forms/songbookform.py'
--- openlp/plugins/songs/forms/songbookform.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songs/forms/songbookform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/forms/songexportform.py'
--- openlp/plugins/songs/forms/songexportform.py 2011-03-04 14:44:21 +0000
+++ openlp/plugins/songs/forms/songexportform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/forms/songimportform.py'
--- openlp/plugins/songs/forms/songimportform.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songs/forms/songimportform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/forms/songmaintenancedialog.py'
--- openlp/plugins/songs/forms/songmaintenancedialog.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songs/forms/songmaintenancedialog.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/forms/songmaintenanceform.py'
--- openlp/plugins/songs/forms/songmaintenanceform.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songs/forms/songmaintenanceform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/forms/topicsdialog.py'
--- openlp/plugins/songs/forms/topicsdialog.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songs/forms/topicsdialog.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/forms/topicsform.py'
--- openlp/plugins/songs/forms/topicsform.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songs/forms/topicsform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/lib/__init__.py'
--- openlp/plugins/songs/lib/__init__.py 2011-03-19 16:06:04 +0000
+++ openlp/plugins/songs/lib/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/lib/cclifileimport.py'
--- openlp/plugins/songs/lib/cclifileimport.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songs/lib/cclifileimport.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/lib/db.py'
--- openlp/plugins/songs/lib/db.py 2011-03-11 18:03:16 +0000
+++ openlp/plugins/songs/lib/db.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/lib/easislidesimport.py'
--- openlp/plugins/songs/lib/easislidesimport.py 2011-02-25 17:05:01 +0000
+++ openlp/plugins/songs/lib/easislidesimport.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/lib/ewimport.py'
--- openlp/plugins/songs/lib/ewimport.py 2011-02-25 17:27:06 +0000
+++ openlp/plugins/songs/lib/ewimport.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/lib/foilpresenterimport.py'
--- openlp/plugins/songs/lib/foilpresenterimport.py 2011-03-15 18:38:56 +0000
+++ openlp/plugins/songs/lib/foilpresenterimport.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/lib/importer.py'
--- openlp/plugins/songs/lib/importer.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songs/lib/importer.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py 2011-03-19 16:06:04 +0000
+++ openlp/plugins/songs/lib/mediaitem.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/lib/olp1import.py'
--- openlp/plugins/songs/lib/olp1import.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songs/lib/olp1import.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/lib/olpimport.py'
--- openlp/plugins/songs/lib/olpimport.py 2011-03-15 19:33:11 +0000
+++ openlp/plugins/songs/lib/olpimport.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/lib/oooimport.py'
--- openlp/plugins/songs/lib/oooimport.py 2011-03-11 08:33:22 +0000
+++ openlp/plugins/songs/lib/oooimport.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/lib/openlyricsexport.py'
--- openlp/plugins/songs/lib/openlyricsexport.py 2011-03-10 16:05:12 +0000
+++ openlp/plugins/songs/lib/openlyricsexport.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/lib/openlyricsimport.py'
--- openlp/plugins/songs/lib/openlyricsimport.py 2011-02-24 15:54:21 +0000
+++ openlp/plugins/songs/lib/openlyricsimport.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/lib/opensongimport.py'
--- openlp/plugins/songs/lib/opensongimport.py 2011-02-25 17:27:06 +0000
+++ openlp/plugins/songs/lib/opensongimport.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/lib/sofimport.py'
--- openlp/plugins/songs/lib/sofimport.py 2011-03-19 16:06:04 +0000
+++ openlp/plugins/songs/lib/sofimport.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/lib/songbeamerimport.py'
--- openlp/plugins/songs/lib/songbeamerimport.py 2011-03-18 05:56:18 +0000
+++ openlp/plugins/songs/lib/songbeamerimport.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/lib/songimport.py'
--- openlp/plugins/songs/lib/songimport.py 2011-03-19 16:06:04 +0000
+++ openlp/plugins/songs/lib/songimport.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/lib/songshowplusimport.py'
--- openlp/plugins/songs/lib/songshowplusimport.py 2011-03-19 16:06:04 +0000
+++ openlp/plugins/songs/lib/songshowplusimport.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/lib/songstab.py'
--- openlp/plugins/songs/lib/songstab.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songs/lib/songstab.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/lib/test/test_import_file.py'
--- openlp/plugins/songs/lib/test/test_import_file.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songs/lib/test/test_import_file.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/lib/test/test_importing_lots.py'
--- openlp/plugins/songs/lib/test/test_importing_lots.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songs/lib/test/test_importing_lots.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/lib/test/test_opensongimport.py'
--- openlp/plugins/songs/lib/test/test_opensongimport.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songs/lib/test/test_opensongimport.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/lib/ui.py'
--- openlp/plugins/songs/lib/ui.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songs/lib/ui.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/lib/wowimport.py'
--- openlp/plugins/songs/lib/wowimport.py 2011-02-24 15:54:21 +0000
+++ openlp/plugins/songs/lib/wowimport.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/lib/xml.py'
--- openlp/plugins/songs/lib/xml.py 2011-03-18 18:43:26 +0000
+++ openlp/plugins/songs/lib/xml.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songs/songsplugin.py'
--- openlp/plugins/songs/songsplugin.py 2011-03-15 17:52:42 +0000
+++ openlp/plugins/songs/songsplugin.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songusage/__init__.py'
--- openlp/plugins/songusage/__init__.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songusage/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songusage/forms/__init__.py'
--- openlp/plugins/songusage/forms/__init__.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songusage/forms/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songusage/forms/songusagedeletedialog.py'
--- openlp/plugins/songusage/forms/songusagedeletedialog.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songusage/forms/songusagedeletedialog.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songusage/forms/songusagedeleteform.py'
--- openlp/plugins/songusage/forms/songusagedeleteform.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songusage/forms/songusagedeleteform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songusage/forms/songusagedetaildialog.py'
--- openlp/plugins/songusage/forms/songusagedetaildialog.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songusage/forms/songusagedetaildialog.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songusage/forms/songusagedetailform.py'
--- openlp/plugins/songusage/forms/songusagedetailform.py 2011-03-11 19:20:31 +0000
+++ openlp/plugins/songusage/forms/songusagedetailform.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songusage/lib/__init__.py'
--- openlp/plugins/songusage/lib/__init__.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songusage/lib/__init__.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songusage/lib/db.py'
--- openlp/plugins/songusage/lib/db.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/songusage/lib/db.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'openlp/plugins/songusage/songusageplugin.py'
--- openlp/plugins/songusage/songusageplugin.py 2011-03-10 19:17:05 +0000
+++ openlp/plugins/songusage/songusageplugin.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'resources/osx/build.py'
--- resources/osx/build.py 2011-02-14 21:55:38 +0000
+++ resources/osx/build.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
@@ -46,31 +46,31 @@
To install PyInstaller, first checkout trunk from Subversion. The
easiest way is to do a
-
+
svn co http://svn.pyinstaller.org/trunk
Then you need to copy the two hook-*.py files from the "pyinstaller"
subdirectory in OpenLP's "resources" directory into PyInstaller's
"hooks" directory.
-
+
openlp.cfg
The configuration file contains settings of the version string to include
in the bundle as well as directory and file settings for different
purposes (e.g. PyInstaller location or installer background image)
-
-To start the build process do a
+
+To start the build process do a
make
inside the resources/osx directory. The result should be a {openlp_dmgname}.dmg
file in the same directory. If something went wrong - this sometimes happen
-with the graphical commands in the Apple script - do a
+with the graphical commands in the Apple script - do a
make clean
-
+
and start the build process again. If you want to execute only parts of the
build process you can specify different make targets
-
+
make view -- runs the Apple scripts to set the icons
make package -- creates the dmg file and copies the application files
make bundle -- compresses the dmg file and sets the dmg file icon
@@ -98,12 +98,12 @@
logging.error('[%s] The pyinstaller build reported an error, cannot \
continue!', script_name)
sys.exit(1)
-
+
logging.info('[%s] copying the qt_menu files...', script_name)
# see http://www.pyinstaller.org/ticket/157
result = os.system('cp -R %(qt_menu_directory)s \
%(application_directory)s/Contents/Resources' \
- % { 'qt_menu_directory' : settings['qt_menu_basedir'],
+ % { 'qt_menu_directory' : settings['qt_menu_basedir'],
'application_directory' : app_dir })
if (result != 0):
logging.error('[%s] could not copy the qt_menu files, cannot \
@@ -115,7 +115,7 @@
logging.info('[%s] copying the new plugins...', script_name)
result = os.system('cp -R %(openlp_directory)s/openlp/plugins \
%(application_directory)s/Contents/MacOS' \
- % { 'openlp_directory' : settings['openlp_basedir'],
+ % { 'openlp_directory' : settings['openlp_basedir'],
'application_directory' : app_dir })
if (result != 0):
logging.error('[%s] could not copy plugins, dmg creation failed!',
@@ -126,7 +126,7 @@
script_name)
result = os.system('cp %(icon_file)s \
%(application_directory)s/Contents/Resources' \
- % { 'icon_file' : settings['openlp_icon_file'],
+ % { 'icon_file' : settings['openlp_icon_file'],
'application_directory' : app_dir })
if (result != 0):
logging.error('[%s] could not copy the icon, dmg creation failed!',
@@ -135,16 +135,16 @@
logging.info('[%s] copying the version file...', script_name)
result = os.system('CpMac %s/.version %s/Contents/MacOS' % (os.getcwd(),
- app_dir))
+ app_dir))
if (result != 0):
logging.error('[%s] could not copy the version file, dmg creation \
failed!', script_name)
sys.exit(1)
-
+
logging.info('[%s] copying the new Info.plist...', script_name)
result = os.system('cp %(target_directory)s/Info.plist \
%(application_directory)s/Contents' \
- % { 'target_directory' : os.getcwd(),
+ % { 'target_directory' : os.getcwd(),
'application_directory' : app_dir })
if (result != 0):
logging.error('[%s] could not copy the info file, dmg creation \
@@ -162,7 +162,7 @@
def create_dmg(settings):
logging.info('[%s] creating the dmg...', script_name)
- dmg_file = os.getcwd() + '/' + settings['openlp_dmgname'] + '.dmg'
+ dmg_file = os.getcwd() + '/' + settings['openlp_dmgname'] + '.dmg'
result = os.system('hdiutil create %(dmg_file)s~ -ov -megabytes \
%(vol_size)s -fs HFS+ -volname %(vol_name)s' \
% { 'dmg_file' : dmg_file,
@@ -204,7 +204,7 @@
logging.error('[%s] could not copy the background image, dmg creation\
failed!', script_name)
sys.exit(1)
-
+
return (volume_basedir, dmg_file)
def unmount_dmg(settings, volume_basedir):
@@ -282,7 +282,7 @@
do_create_dmg = True
do_compress_dmg = True
do_deploy_qt = True
-
+
parser = optparse.OptionParser()
parser.add_option('-c', '--config', dest='config', help='config file',
metavar='CONFIG')
@@ -301,9 +301,9 @@
parser.add_option('-b', '--basedir', dest='basedir',
help='volume basedir like /Volumes/OpenLP', metavar='BASEDIR',
default='/Volumes/OpenLP')
-
+
(options, args) = parser.parse_args()
-
+
# if an option is set, false all
if (options.package_view is True or options.compress_view is True
or options.package is True or options.compress is True):
@@ -323,10 +323,10 @@
'%a, %d %b %Y %H:%M:%S'))
logging.getLogger().addHandler(logHandler)
logging.getLogger().setLevel(logging.DEBUG)
-
+
config = ConfigParser.RawConfigParser()
config.readfp(open(options.config, 'r'))
-
+
if not config.has_section('openlp'):
logging.error('[%s] config file "%s" lacks an [openlp] section',
script_name, options.config)
@@ -386,7 +386,7 @@
if (do_deploy_qt is True):
deploy_qt(settings)
-
+
if (do_create_dmg is True):
(volume_basedir, dmg_file) = create_dmg(settings)
else:
=== modified file 'resources/osx/expander.py'
--- resources/osx/expander.py 2011-02-14 21:26:49 +0000
+++ resources/osx/expander.py 2011-03-24 19:07:44 +0000
@@ -1,9 +1,33 @@
#!/usr/bin/python
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
+# --------------------------------------------------------------------------- #
+# 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 #
+###############################################################################
# TODOs:
# - defaults for non-supplied expansions:
-# template contains
+# template contains
import ConfigParser
import logging
@@ -20,7 +44,7 @@
# - %(dog=cat) --- if there is an expansion for dog, dog will be used;
# otherwise "cat" will be used
# re_conf = re.compile(r'(?<!%)%\((?P<key>[^\(]+?)\)s')
-re_conf = re.compile(r'(?P<verbatim>%?)%\((?P<key>[^+=:&\)]+?)'
+re_conf = re.compile(r'(?P<verbatim>%?)%\((?P<key>[^+=:&\)]+?)'
+ '(?:(?P<kind>[+=:&])(?P<default>[^\)]+))?\)(?P<type>s|d)')
def expand_variable(match, expansions, errors):
@@ -65,7 +89,7 @@
if key in expansions:
return expansions[key]
-
+
if not match.group(0) in errors:
errors.append(match.group(0))
@@ -122,7 +146,7 @@
for override in args:
if not '=' in override:
continue
-
+
(k, v) = override.split('=', 2)
expansions[k] = v
@@ -136,7 +160,7 @@
# closure to capture expansions and errors variable
errors = []
expanded = []
-
+
try:
# try to expand the template
line = 0
@@ -148,7 +172,7 @@
def _expand(m):
return expand_variable(m, expansions = expansions, errors = errors)
-
+
for l in raw:
line += 1
exp = re_conf.sub(_expand, l)
@@ -196,7 +220,7 @@
logging.info('[expander] expanded "%s" to "%s"',
options.template, options.expanded)
-
+
except:
pass
=== modified file 'resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py'
--- resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py 2011-02-24 05:47:38 +0000
+++ resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'resources/pyinstaller/hook-openlp.py'
--- resources/pyinstaller/hook-openlp.py 2011-02-24 05:47:38 +0000
+++ resources/pyinstaller/hook-openlp.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'scripts/openlp-remoteclient.py'
--- scripts/openlp-remoteclient.py 2011-02-24 05:47:38 +0000
+++ scripts/openlp-remoteclient.py 2011-03-24 19:07:44 +0000
@@ -7,9 +7,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'scripts/resources.patch'
--- scripts/resources.patch 2011-02-24 05:47:38 +0000
+++ scripts/resources.patch 2011-03-24 19:07:44 +0000
@@ -14,9 +14,9 @@
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-+# Tibble, Carsten Tinggaard, Frode Woldsund #
++# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
++# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
++# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
+# --------------------------------------------------------------------------- #
+# 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 #
=== modified file 'scripts/translation_utils.py'
--- scripts/translation_utils.py 2011-02-24 05:47:38 +0000
+++ scripts/translation_utils.py 2011-03-24 19:07:44 +0000
@@ -7,9 +7,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'scripts/windows-builder.py'
--- scripts/windows-builder.py 2011-03-18 15:28:51 +0000
+++ scripts/windows-builder.py 2011-03-24 19:07:44 +0000
@@ -6,9 +6,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
=== modified file 'setup.py'
--- setup.py 2011-03-19 07:20:20 +0000
+++ setup.py 2011-03-24 19:07:44 +0000
@@ -7,9 +7,9 @@
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
-# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
-# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
-# Tibble, Carsten Tinggaard, Frode Woldsund #
+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 #
Follow ups
