Merge lp:~raoul-snyman/openlp/docstrings into lp:openlp
- docstrings
- Merge into trunk
Proposed by
Raoul Snyman
Status: | Merged |
---|---|
Merged at revision: | not available |
Proposed branch: | lp:~raoul-snyman/openlp/docstrings |
Merge into: | lp:openlp |
Diff against target: | None lines |
To merge this branch: | bzr merge lp:~raoul-snyman/openlp/docstrings |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Bentley | Approve | ||
Review via email: mp+11624@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Raoul Snyman (raoul-snyman) wrote : | # |
- 531. By Jon Tibble
-
Merged in lp:~meths/openlp/trivialfixes
- 532. By Raoul Snyman
-
Merged in lp:~raoul-snyman/openlp/docstrings
- 533. By Jon Tibble
-
Merged in lp:~meths/openlp/trivialfixes
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'cnvdb.py' |
2 | --- cnvdb.py 2009-07-21 18:10:14 +0000 |
3 | +++ cnvdb.py 2009-09-08 19:58:05 +0000 |
4 | @@ -1,23 +1,28 @@ |
5 | #!/usr/bin/env python |
6 | # -*- coding: utf-8 -*- |
7 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
8 | -""" |
9 | -OpenLP - Open Source Lyrics Projection |
10 | -Copyright (c) 2008 Raoul Snyman |
11 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, |
12 | - |
13 | -This program is free software; you can redistribute it and/or modify it under |
14 | -the terms of the GNU General Public License as published by the Free Software |
15 | -Foundation; version 2 of the License. |
16 | - |
17 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
18 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
19 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
20 | - |
21 | -You should have received a copy of the GNU General Public License along with |
22 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
23 | -Place, Suite 330, Boston, MA 02111-1307 USA |
24 | -""" |
25 | + |
26 | +############################################################################### |
27 | +# OpenLP - Open Source Lyrics Projection # |
28 | +# --------------------------------------------------------------------------- # |
29 | +# Copyright (c) 2008-2009 Raoul Snyman # |
30 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
31 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
32 | +# --------------------------------------------------------------------------- # |
33 | +# This program is free software; you can redistribute it and/or modify it # |
34 | +# under the terms of the GNU General Public License as published by the Free # |
35 | +# Software Foundation; version 2 of the License. # |
36 | +# # |
37 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
38 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
39 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
40 | +# more details. # |
41 | +# # |
42 | +# You should have received a copy of the GNU General Public License along # |
43 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
44 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
45 | +############################################################################### |
46 | + |
47 | import codecs |
48 | import sys |
49 | import chardet |
50 | |
51 | === modified file 'copyright.txt' |
52 | --- copyright.txt 2008-12-15 13:52:54 +0000 |
53 | +++ copyright.txt 2009-09-08 19:58:05 +0000 |
54 | @@ -1,19 +1,23 @@ |
55 | # -*- coding: utf-8 -*- |
56 | -# vim: autoindent shiftwidth=4 expandtab textwidth=80 |
57 | -""" |
58 | -OpenLP - Open Source Lyrics Projection |
59 | -Copyright (c) 2008 Raoul Snyman |
60 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley, Carsten Tinggaard |
61 | - |
62 | -This program is free software; you can redistribute it and/or modify it under |
63 | -the terms of the GNU General Public License as published by the Free Software |
64 | -Foundation; version 2 of the License. |
65 | - |
66 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
67 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
68 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
69 | - |
70 | -You should have received a copy of the GNU General Public License along with |
71 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
72 | -Place, Suite 330, Boston, MA 02111-1307 USA |
73 | -""" |
74 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
75 | + |
76 | +############################################################################### |
77 | +# OpenLP - Open Source Lyrics Projection # |
78 | +# --------------------------------------------------------------------------- # |
79 | +# Copyright (c) 2008-2009 Raoul Snyman # |
80 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
81 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
82 | +# --------------------------------------------------------------------------- # |
83 | +# This program is free software; you can redistribute it and/or modify it # |
84 | +# under the terms of the GNU General Public License as published by the Free # |
85 | +# Software Foundation; version 2 of the License. # |
86 | +# # |
87 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
88 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
89 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
90 | +# more details. # |
91 | +# # |
92 | +# You should have received a copy of the GNU General Public License along # |
93 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
94 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
95 | +############################################################################### |
96 | |
97 | === modified file 'demo.py' |
98 | --- demo.py 2009-07-08 06:55:08 +0000 |
99 | +++ demo.py 2009-09-08 19:58:05 +0000 |
100 | @@ -1,20 +1,26 @@ |
101 | -""" |
102 | -OpenLP - Open Source Lyrics Projection |
103 | -Copyright (c) 2008 Raoul Snyman |
104 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley |
105 | - |
106 | -This program is free software; you can redistribute it and/or modify it under |
107 | -the terms of the GNU General Public License as published by the Free Software |
108 | -Foundation; version 2 of the License. |
109 | - |
110 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
111 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
112 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
113 | - |
114 | -You should have received a copy of the GNU General Public License along with |
115 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
116 | -Place, Suite 330, Boston, MA 02111-1307 USA |
117 | -""" |
118 | +# -*- coding: utf-8 -*- |
119 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
120 | + |
121 | +############################################################################### |
122 | +# OpenLP - Open Source Lyrics Projection # |
123 | +# --------------------------------------------------------------------------- # |
124 | +# Copyright (c) 2008-2009 Raoul Snyman # |
125 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
126 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
127 | +# --------------------------------------------------------------------------- # |
128 | +# This program is free software; you can redistribute it and/or modify it # |
129 | +# under the terms of the GNU General Public License as published by the Free # |
130 | +# Software Foundation; version 2 of the License. # |
131 | +# # |
132 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
133 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
134 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
135 | +# more details. # |
136 | +# # |
137 | +# You should have received a copy of the GNU General Public License along # |
138 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
139 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
140 | +############################################################################### |
141 | |
142 | import sys |
143 | import time |
144 | |
145 | === modified file 'documentation/source/core/lib.rst' |
146 | --- documentation/source/core/lib.rst 2009-09-06 18:59:21 +0000 |
147 | +++ documentation/source/core/lib.rst 2009-09-08 20:13:02 +0000 |
148 | @@ -3,107 +3,101 @@ |
149 | :mod:`lib` Module |
150 | ================= |
151 | |
152 | -Module Members |
153 | --------------- |
154 | - |
155 | .. automodule:: openlp.core.lib |
156 | :members: |
157 | |
158 | -Module Classes |
159 | --------------- |
160 | - |
161 | :mod:`BaseListWithDnD` |
162 | -^^^^^^^^^^^^^^^^^^^^^^ |
163 | +---------------------- |
164 | |
165 | .. autoclass:: openlp.core.lib.baselistwithdnd.BaseListWithDnD |
166 | :members: |
167 | |
168 | :mod:`EventReceiver` |
169 | -^^^^^^^^^^^^^^^^^^^^ |
170 | +-------------------- |
171 | |
172 | .. autoclass:: openlp.core.lib.eventreceiver.EventReceiver |
173 | :members: |
174 | |
175 | :mod:`ListWithPreviews` |
176 | -^^^^^^^^^^^^^^^^^^^^^^^ |
177 | +----------------------- |
178 | |
179 | .. autoclass:: openlp.core.lib.listwithpreviews.ListWithPreviews |
180 | :members: |
181 | |
182 | :mod:`MediaManagerItem` |
183 | -^^^^^^^^^^^^^^^^^^^^^^^ |
184 | +----------------------- |
185 | |
186 | .. autoclass:: openlp.core.lib.mediamanageritem.MediaManagerItem |
187 | :members: |
188 | |
189 | :mod:`Plugin` |
190 | -^^^^^^^^^^^^^ |
191 | +------------- |
192 | |
193 | .. autoclass:: openlp.core.lib.plugin.Plugin |
194 | :members: |
195 | |
196 | :mod:`PluginConfig` |
197 | -^^^^^^^^^^^^^^^^^^^ |
198 | +------------------- |
199 | |
200 | .. autoclass:: openlp.core.lib.pluginconfig.PluginConfig |
201 | :members: |
202 | |
203 | :mod:`PluginManager` |
204 | -^^^^^^^^^^^^^^^^^^^^ |
205 | +-------------------- |
206 | |
207 | .. autoclass:: openlp.core.lib.pluginmanager.PluginManager |
208 | :members: |
209 | |
210 | :mod:`Renderer` |
211 | -^^^^^^^^^^^^^^^ |
212 | +--------------- |
213 | |
214 | .. autoclass:: openlp.core.lib.renderer.Renderer |
215 | :members: |
216 | |
217 | :mod:`RenderManager` |
218 | -^^^^^^^^^^^^^^^^^^^^ |
219 | +-------------------- |
220 | |
221 | .. autoclass:: openlp.core.lib.rendermanager.RenderManager |
222 | :members: |
223 | |
224 | :mod:`ServiceItem` |
225 | -^^^^^^^^^^^^^^^^^^ |
226 | +------------------ |
227 | |
228 | .. autoclass:: openlp.core.lib.serviceitem.ServiceItem |
229 | :members: |
230 | |
231 | :mod:`SettingsTab` |
232 | -^^^^^^^^^^^^^^^^^^ |
233 | +------------------ |
234 | |
235 | .. autoclass:: openlp.core.lib.settingstab.SettingsTab |
236 | :members: |
237 | |
238 | :mod:`SongXMLBuilder` |
239 | -^^^^^^^^^^^^^^^^^^^^^ |
240 | +--------------------- |
241 | |
242 | .. autoclass:: openlp.core.lib.songxmlhandler.SongXMLBuilder |
243 | :members: |
244 | |
245 | :mod:`SongXMLParser` |
246 | -^^^^^^^^^^^^^^^^^^^^ |
247 | +-------------------- |
248 | |
249 | .. autoclass:: openlp.core.lib.songxmlhandler.SongXMLParser |
250 | :members: |
251 | |
252 | :mod:`ThemeXML` |
253 | -^^^^^^^^^^^^^^^ |
254 | +--------------- |
255 | |
256 | .. autoclass:: openlp.core.lib.themexmlhandler.ThemeXML |
257 | :members: |
258 | |
259 | :mod:`OpenLPToolbar` |
260 | -^^^^^^^^^^^^^^^^^^^^ |
261 | +-------------------- |
262 | |
263 | .. autoclass:: openlp.core.lib.toolbar.OpenLPToolbar |
264 | :members: |
265 | |
266 | :mod:`XmlRootClass` |
267 | -^^^^^^^^^^^^^^^^^^^ |
268 | +------------------- |
269 | |
270 | .. autoclass:: openlp.core.lib.xmlrootclass.XmlRootClass |
271 | :members: |
272 | |
273 | === modified file 'openlp.pyw' |
274 | --- openlp.pyw 2009-09-02 20:42:57 +0000 |
275 | +++ openlp.pyw 2009-09-08 19:58:05 +0000 |
276 | @@ -1,25 +1,27 @@ |
277 | #!/usr/bin/env python |
278 | # -*- coding: utf-8 -*- |
279 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
280 | -""" |
281 | -OpenLP - Open Source Lyrics Projection |
282 | - |
283 | -Copyright (c) 2008 Raoul Snyman |
284 | - |
285 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, |
286 | - |
287 | -This program is free software; you can redistribute it and/or modify it under |
288 | -the terms of the GNU General Public License as published by the Free Software |
289 | -Foundation; version 2 of the License. |
290 | - |
291 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
292 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
293 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
294 | - |
295 | -You should have received a copy of the GNU General Public License along with |
296 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
297 | -Place, Suite 330, Boston, MA 02111-1307 USA |
298 | -""" |
299 | + |
300 | +############################################################################### |
301 | +# OpenLP - Open Source Lyrics Projection # |
302 | +# --------------------------------------------------------------------------- # |
303 | +# Copyright (c) 2008-2009 Raoul Snyman # |
304 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
305 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
306 | +# --------------------------------------------------------------------------- # |
307 | +# This program is free software; you can redistribute it and/or modify it # |
308 | +# under the terms of the GNU General Public License as published by the Free # |
309 | +# Software Foundation; version 2 of the License. # |
310 | +# # |
311 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
312 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
313 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
314 | +# more details. # |
315 | +# # |
316 | +# You should have received a copy of the GNU General Public License along # |
317 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
318 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
319 | +############################################################################### |
320 | |
321 | import sys |
322 | import logging, logging.handlers |
323 | |
324 | === modified file 'openlp/__init__.py' |
325 | --- openlp/__init__.py 2009-09-02 20:42:57 +0000 |
326 | +++ openlp/__init__.py 2009-09-08 19:58:05 +0000 |
327 | @@ -1,19 +1,23 @@ |
328 | -""" |
329 | -OpenLP - Open Source Lyrics Projection |
330 | - |
331 | -Copyright (c) 2008 Raoul Snyman |
332 | - |
333 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley |
334 | - |
335 | -This program is free software; you can redistribute it and/or modify it under |
336 | -the terms of the GNU General Public License as published by the Free Software |
337 | -Foundation; version 2 of the License. |
338 | - |
339 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
340 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
341 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
342 | - |
343 | -You should have received a copy of the GNU General Public License along with |
344 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
345 | -Place, Suite 330, Boston, MA 02111-1307 USA |
346 | -""" |
347 | +# -*- coding: utf-8 -*- |
348 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
349 | + |
350 | +############################################################################### |
351 | +# OpenLP - Open Source Lyrics Projection # |
352 | +# --------------------------------------------------------------------------- # |
353 | +# Copyright (c) 2008-2009 Raoul Snyman # |
354 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
355 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
356 | +# --------------------------------------------------------------------------- # |
357 | +# This program is free software; you can redistribute it and/or modify it # |
358 | +# under the terms of the GNU General Public License as published by the Free # |
359 | +# Software Foundation; version 2 of the License. # |
360 | +# # |
361 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
362 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
363 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
364 | +# more details. # |
365 | +# # |
366 | +# You should have received a copy of the GNU General Public License along # |
367 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
368 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
369 | +############################################################################### |
370 | |
371 | === modified file 'openlp/core/__init__.py' |
372 | --- openlp/core/__init__.py 2009-09-02 20:42:57 +0000 |
373 | +++ openlp/core/__init__.py 2009-09-08 19:58:05 +0000 |
374 | @@ -1,27 +1,23 @@ |
375 | # -*- coding: utf-8 -*- |
376 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
377 | -""" |
378 | -OpenLP - Open Source Lyrics Projection |
379 | - |
380 | -Copyright (c) 2008 Raoul Snyman |
381 | - |
382 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley |
383 | - |
384 | -This program is free software; you can redistribute it and/or modify it under |
385 | -the terms of the GNU General Public License as published by the Free Software |
386 | -Foundation; version 2 of the License. |
387 | - |
388 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
389 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
390 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
391 | - |
392 | -You should have received a copy of the GNU General Public License along with |
393 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
394 | -Place, Suite 330, Boston, MA 02111-1307 USA |
395 | -""" |
396 | - |
397 | -#from settingsmanager import SettingsManager |
398 | -#from openlp.core.lib.pluginmanager import PluginManager |
399 | -# |
400 | -#__all__ = ['SettingsManager', 'PluginManager' ] |
401 | - |
402 | + |
403 | +############################################################################### |
404 | +# OpenLP - Open Source Lyrics Projection # |
405 | +# --------------------------------------------------------------------------- # |
406 | +# Copyright (c) 2008-2009 Raoul Snyman # |
407 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
408 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
409 | +# --------------------------------------------------------------------------- # |
410 | +# This program is free software; you can redistribute it and/or modify it # |
411 | +# under the terms of the GNU General Public License as published by the Free # |
412 | +# Software Foundation; version 2 of the License. # |
413 | +# # |
414 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
415 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
416 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
417 | +# more details. # |
418 | +# # |
419 | +# You should have received a copy of the GNU General Public License along # |
420 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
421 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
422 | +############################################################################### |
423 | |
424 | === modified file 'openlp/core/lib/__init__.py' |
425 | --- openlp/core/lib/__init__.py 2009-09-06 18:59:21 +0000 |
426 | +++ openlp/core/lib/__init__.py 2009-09-08 20:03:39 +0000 |
427 | @@ -1,24 +1,32 @@ |
428 | # -*- coding: utf-8 -*- |
429 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
430 | -""" |
431 | -OpenLP - Open Source Lyrics Projection |
432 | - |
433 | -Copyright (c) 2008 Raoul Snyman |
434 | - |
435 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, |
436 | - |
437 | -This program is free software; you can redistribute it and/or modify it under |
438 | -the terms of the GNU General Public License as published by the Free Software |
439 | -Foundation; version 2 of the License. |
440 | - |
441 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
442 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
443 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
444 | - |
445 | -You should have received a copy of the GNU General Public License along with |
446 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
447 | -Place, Suite 330, Boston, MA 02111-1307 USA |
448 | -""" |
449 | + |
450 | +############################################################################### |
451 | +# OpenLP - Open Source Lyrics Projection # |
452 | +# --------------------------------------------------------------------------- # |
453 | +# Copyright (c) 2008-2009 Raoul Snyman # |
454 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
455 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
456 | +# --------------------------------------------------------------------------- # |
457 | +# This program is free software; you can redistribute it and/or modify it # |
458 | +# under the terms of the GNU General Public License as published by the Free # |
459 | +# Software Foundation; version 2 of the License. # |
460 | +# # |
461 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
462 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
463 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
464 | +# more details. # |
465 | +# # |
466 | +# You should have received a copy of the GNU General Public License along # |
467 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
468 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
469 | +############################################################################### |
470 | + |
471 | +""" |
472 | +The :mod:`lib` module contains most of the components and libraries that make |
473 | +OpenLP work. |
474 | +""" |
475 | + |
476 | import types |
477 | from PyQt4 import QtCore, QtGui |
478 | |
479 | |
480 | === modified file 'openlp/core/lib/baselistwithdnd.py' |
481 | --- openlp/core/lib/baselistwithdnd.py 2009-06-27 15:33:03 +0000 |
482 | +++ openlp/core/lib/baselistwithdnd.py 2009-09-08 19:58:05 +0000 |
483 | @@ -1,22 +1,27 @@ |
484 | # -*- coding: utf-8 -*- |
485 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
486 | -""" |
487 | -OpenLP - Open Source Lyrics Projection |
488 | -Copyright (c) 2008-2009 Raoul Snyman |
489 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley |
490 | - |
491 | -This program is free software; you can redistribute it and/or modify it under |
492 | -the terms of the GNU General Public License as published by the Free Software |
493 | -Foundation; version 2 of the License. |
494 | - |
495 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
496 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
497 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
498 | - |
499 | -You should have received a copy of the GNU General Public License along with |
500 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
501 | -Place, Suite 330, Boston, MA 02111-1307 USA |
502 | -""" |
503 | + |
504 | +############################################################################### |
505 | +# OpenLP - Open Source Lyrics Projection # |
506 | +# --------------------------------------------------------------------------- # |
507 | +# Copyright (c) 2008-2009 Raoul Snyman # |
508 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
509 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
510 | +# --------------------------------------------------------------------------- # |
511 | +# This program is free software; you can redistribute it and/or modify it # |
512 | +# under the terms of the GNU General Public License as published by the Free # |
513 | +# Software Foundation; version 2 of the License. # |
514 | +# # |
515 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
516 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
517 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
518 | +# more details. # |
519 | +# # |
520 | +# You should have received a copy of the GNU General Public License along # |
521 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
522 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
523 | +############################################################################### |
524 | + |
525 | import types |
526 | |
527 | from PyQt4 import QtCore, QtGui |
528 | |
529 | === modified file 'openlp/core/lib/eventreceiver.py' |
530 | --- openlp/core/lib/eventreceiver.py 2009-09-06 18:47:48 +0000 |
531 | +++ openlp/core/lib/eventreceiver.py 2009-09-08 19:58:05 +0000 |
532 | @@ -1,23 +1,27 @@ |
533 | # -*- coding: utf-8 -*- |
534 | -""" |
535 | -OpenLP - Open Source Lyrics Projection |
536 | - |
537 | -Copyright (c) 2008 Raoul Snyman |
538 | - |
539 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, |
540 | - |
541 | -This program is free software; you can redistribute it and/or modify it under |
542 | -the terms of the GNU General Public License as published by the Free Software |
543 | -Foundation; version 2 of the License. |
544 | - |
545 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
546 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
547 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
548 | - |
549 | -You should have received a copy of the GNU General Public License along with |
550 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
551 | -Place, Suite 330, Boston, MA 02111-1307 USA |
552 | -""" |
553 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
554 | + |
555 | +############################################################################### |
556 | +# OpenLP - Open Source Lyrics Projection # |
557 | +# --------------------------------------------------------------------------- # |
558 | +# Copyright (c) 2008-2009 Raoul Snyman # |
559 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
560 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
561 | +# --------------------------------------------------------------------------- # |
562 | +# This program is free software; you can redistribute it and/or modify it # |
563 | +# under the terms of the GNU General Public License as published by the Free # |
564 | +# Software Foundation; version 2 of the License. # |
565 | +# # |
566 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
567 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
568 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
569 | +# more details. # |
570 | +# # |
571 | +# You should have received a copy of the GNU General Public License along # |
572 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
573 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
574 | +############################################################################### |
575 | + |
576 | import logging |
577 | |
578 | from PyQt4 import QtCore |
579 | |
580 | === modified file 'openlp/core/lib/listwithpreviews.py' |
581 | --- openlp/core/lib/listwithpreviews.py 2009-09-02 01:44:09 +0000 |
582 | +++ openlp/core/lib/listwithpreviews.py 2009-09-08 19:58:05 +0000 |
583 | @@ -1,22 +1,27 @@ |
584 | # -*- coding: utf-8 -*- |
585 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
586 | -""" |
587 | -OpenLP - Open Source Lyrics Projection |
588 | -Copyright (c) 2008 Raoul Snyman |
589 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley |
590 | - |
591 | -This program is free software; you can redistribute it and/or modify it under |
592 | -the terms of the GNU General Public License as published by the Free Software |
593 | -Foundation; version 2 of the License. |
594 | - |
595 | -This program is diunicodeibuted in the hope that it will be useful, but WITHOUT ANY |
596 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
597 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
598 | - |
599 | -You should have received a copy of the GNU General Public License along with |
600 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
601 | -Place, Suite 330, Boston, MA 02111-1307 USA |
602 | -""" |
603 | + |
604 | +############################################################################### |
605 | +# OpenLP - Open Source Lyrics Projection # |
606 | +# --------------------------------------------------------------------------- # |
607 | +# Copyright (c) 2008-2009 Raoul Snyman # |
608 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
609 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
610 | +# --------------------------------------------------------------------------- # |
611 | +# This program is free software; you can redistribute it and/or modify it # |
612 | +# under the terms of the GNU General Public License as published by the Free # |
613 | +# Software Foundation; version 2 of the License. # |
614 | +# # |
615 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
616 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
617 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
618 | +# more details. # |
619 | +# # |
620 | +# You should have received a copy of the GNU General Public License along # |
621 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
622 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
623 | +############################################################################### |
624 | + |
625 | import os |
626 | import logging |
627 | from PyQt4 import QtCore, QtGui |
628 | @@ -36,7 +41,7 @@ |
629 | self.rowheight = 50 |
630 | self.maximagewidth = self.rowheight * 16 / 9.0; |
631 | self.preview_function = new_preview_function |
632 | - |
633 | + |
634 | def make_preview(self, filename): |
635 | if os.path.exists(filename): |
636 | if self.preview_function is not None: |
637 | @@ -45,7 +50,7 @@ |
638 | preview = QtGui.QImage(filename) |
639 | else: |
640 | preview = None |
641 | - |
642 | + |
643 | if preview is not None: |
644 | w = self.maximagewidth; |
645 | h = self.rowheight |
646 | |
647 | === modified file 'openlp/core/lib/mediamanageritem.py' |
648 | --- openlp/core/lib/mediamanageritem.py 2009-09-06 18:59:21 +0000 |
649 | +++ openlp/core/lib/mediamanageritem.py 2009-09-08 19:58:05 +0000 |
650 | @@ -1,22 +1,27 @@ |
651 | # -*- coding: utf-8 -*- |
652 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
653 | -""" |
654 | -OpenLP - Open Source Lyrics Projection |
655 | -Copyright (c) 2008-2009 Raoul Snyman |
656 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley |
657 | - |
658 | -This program is free software; you can redistribute it and/or modify it under |
659 | -the terms of the GNU General Public License as published by the Free Software |
660 | -Foundation; version 2 of the License. |
661 | - |
662 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
663 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
664 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
665 | - |
666 | -You should have received a copy of the GNU General Public License along with |
667 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
668 | -Place, Suite 330, Boston, MA 02111-1307 USA |
669 | -""" |
670 | + |
671 | +############################################################################### |
672 | +# OpenLP - Open Source Lyrics Projection # |
673 | +# --------------------------------------------------------------------------- # |
674 | +# Copyright (c) 2008-2009 Raoul Snyman # |
675 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
676 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
677 | +# --------------------------------------------------------------------------- # |
678 | +# This program is free software; you can redistribute it and/or modify it # |
679 | +# under the terms of the GNU General Public License as published by the Free # |
680 | +# Software Foundation; version 2 of the License. # |
681 | +# # |
682 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
683 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
684 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
685 | +# more details. # |
686 | +# # |
687 | +# You should have received a copy of the GNU General Public License along # |
688 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
689 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
690 | +############################################################################### |
691 | + |
692 | import types |
693 | import os |
694 | |
695 | |
696 | === modified file 'openlp/core/lib/plugin.py' |
697 | --- openlp/core/lib/plugin.py 2009-09-06 18:59:21 +0000 |
698 | +++ openlp/core/lib/plugin.py 2009-09-08 19:58:05 +0000 |
699 | @@ -1,22 +1,26 @@ |
700 | # -*- coding: utf-8 -*- |
701 | -# vim: autoindent shiftwidth=4 expandtab textwidth=80 |
702 | -""" |
703 | -OpenLP - Open Source Lyrics Projection |
704 | -Copyright (c) 2008 Raoul Snyman |
705 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley, |
706 | - |
707 | -This program is free software; you can redistribute it and/or modify it under |
708 | -the terms of the GNU General Public License as published by the Free Software |
709 | -Foundation; version 2 of the License. |
710 | - |
711 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
712 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
713 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
714 | - |
715 | -You should have received a copy of the GNU General Public License along with |
716 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
717 | -Place, Suite 330, Boston, MA 02111-1307 USA |
718 | -""" |
719 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
720 | + |
721 | +############################################################################### |
722 | +# OpenLP - Open Source Lyrics Projection # |
723 | +# --------------------------------------------------------------------------- # |
724 | +# Copyright (c) 2008-2009 Raoul Snyman # |
725 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
726 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
727 | +# --------------------------------------------------------------------------- # |
728 | +# This program is free software; you can redistribute it and/or modify it # |
729 | +# under the terms of the GNU General Public License as published by the Free # |
730 | +# Software Foundation; version 2 of the License. # |
731 | +# # |
732 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
733 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
734 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
735 | +# more details. # |
736 | +# # |
737 | +# You should have received a copy of the GNU General Public License along # |
738 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
739 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
740 | +############################################################################### |
741 | |
742 | import logging |
743 | from PyQt4 import QtCore |
744 | |
745 | === modified file 'openlp/core/lib/pluginconfig.py' |
746 | --- openlp/core/lib/pluginconfig.py 2009-09-06 18:59:21 +0000 |
747 | +++ openlp/core/lib/pluginconfig.py 2009-09-08 19:58:05 +0000 |
748 | @@ -1,24 +1,26 @@ |
749 | # -*- coding: utf-8 -*- |
750 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
751 | -""" |
752 | -OpenLP - Open Source Lyrics Projection |
753 | - |
754 | -Copyright (c) 2008 Raoul Snyman |
755 | - |
756 | -Portions copyright (c) 2008 -2009 Martin Thompson, Tim Bentley |
757 | - |
758 | -This program is free software; you can redistribute it and/or modify it under |
759 | -the terms of the GNU General Public License as published by the Free Software |
760 | -Foundation; version 2 of the License. |
761 | - |
762 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
763 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
764 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
765 | - |
766 | -You should have received a copy of the GNU General Public License along with |
767 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
768 | -Place, Suite 330, Boston, MA 02111-1307 USA |
769 | -""" |
770 | + |
771 | +############################################################################### |
772 | +# OpenLP - Open Source Lyrics Projection # |
773 | +# --------------------------------------------------------------------------- # |
774 | +# Copyright (c) 2008-2009 Raoul Snyman # |
775 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
776 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
777 | +# --------------------------------------------------------------------------- # |
778 | +# This program is free software; you can redistribute it and/or modify it # |
779 | +# under the terms of the GNU General Public License as published by the Free # |
780 | +# Software Foundation; version 2 of the License. # |
781 | +# # |
782 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
783 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
784 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
785 | +# more details. # |
786 | +# # |
787 | +# You should have received a copy of the GNU General Public License along # |
788 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
789 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
790 | +############################################################################### |
791 | |
792 | import os |
793 | |
794 | |
795 | === modified file 'openlp/core/lib/pluginmanager.py' |
796 | --- openlp/core/lib/pluginmanager.py 2009-09-06 18:59:21 +0000 |
797 | +++ openlp/core/lib/pluginmanager.py 2009-09-08 19:58:05 +0000 |
798 | @@ -1,24 +1,27 @@ |
799 | # -*- coding: utf-8 -*- |
800 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
801 | -""" |
802 | -OpenLP - Open Source Lyrics Projection |
803 | - |
804 | -Copyright (c) 2008 Raoul Snyman |
805 | - |
806 | -Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley, |
807 | - |
808 | -This program is free software; you can redistribute it and/or modify it under |
809 | -the terms of the GNU General Public License as published by the Free Software |
810 | -Foundation; version 2 of the License. |
811 | - |
812 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
813 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
814 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
815 | - |
816 | -You should have received a copy of the GNU General Public License along with |
817 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
818 | -Place, Suite 330, Boston, MA 02111-1307 USA |
819 | -""" |
820 | + |
821 | +############################################################################### |
822 | +# OpenLP - Open Source Lyrics Projection # |
823 | +# --------------------------------------------------------------------------- # |
824 | +# Copyright (c) 2008-2009 Raoul Snyman # |
825 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
826 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
827 | +# --------------------------------------------------------------------------- # |
828 | +# This program is free software; you can redistribute it and/or modify it # |
829 | +# under the terms of the GNU General Public License as published by the Free # |
830 | +# Software Foundation; version 2 of the License. # |
831 | +# # |
832 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
833 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
834 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
835 | +# more details. # |
836 | +# # |
837 | +# You should have received a copy of the GNU General Public License along # |
838 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
839 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
840 | +############################################################################### |
841 | + |
842 | import os |
843 | import sys |
844 | import logging |
845 | |
846 | === modified file 'openlp/core/lib/renderer.py' |
847 | --- openlp/core/lib/renderer.py 2009-09-06 18:59:21 +0000 |
848 | +++ openlp/core/lib/renderer.py 2009-09-08 19:58:05 +0000 |
849 | @@ -1,24 +1,27 @@ |
850 | # -*- coding: utf-8 -*- |
851 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
852 | -""" |
853 | -OpenLP - Open Source Lyrics Projection |
854 | - |
855 | -Copyright (c) 2008 Raoul Snyman |
856 | - |
857 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley |
858 | - |
859 | -This program is free software; you can redistribute it and/or modify it under |
860 | -the terms of the GNU General Public License as published by the Free Software |
861 | -Foundation; version 2 of the License. |
862 | - |
863 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
864 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
865 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
866 | - |
867 | -You should have received a copy of the GNU General Public License along with |
868 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
869 | -Place, Suite 330, Boston, MA 02111-1307 USA |
870 | -""" |
871 | + |
872 | +############################################################################### |
873 | +# OpenLP - Open Source Lyrics Projection # |
874 | +# --------------------------------------------------------------------------- # |
875 | +# Copyright (c) 2008-2009 Raoul Snyman # |
876 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
877 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
878 | +# --------------------------------------------------------------------------- # |
879 | +# This program is free software; you can redistribute it and/or modify it # |
880 | +# under the terms of the GNU General Public License as published by the Free # |
881 | +# Software Foundation; version 2 of the License. # |
882 | +# # |
883 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
884 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
885 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
886 | +# more details. # |
887 | +# # |
888 | +# You should have received a copy of the GNU General Public License along # |
889 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
890 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
891 | +############################################################################### |
892 | + |
893 | import logging |
894 | import os |
895 | import sys |
896 | |
897 | === modified file 'openlp/core/lib/rendermanager.py' |
898 | --- openlp/core/lib/rendermanager.py 2009-09-06 18:59:21 +0000 |
899 | +++ openlp/core/lib/rendermanager.py 2009-09-08 19:58:05 +0000 |
900 | @@ -1,24 +1,27 @@ |
901 | # -*- coding: utf-8 -*- |
902 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
903 | -""" |
904 | -OpenLP - Open Source Lyrics Projection |
905 | - |
906 | -Copyright (c) 2008 Raoul Snyman |
907 | - |
908 | -Portions copyright (c) 2008 - 2009Martin Thompson, Tim Bentley |
909 | - |
910 | -This program is free software; you can redistribute it and/or modify it under |
911 | -the terms of the GNU General Public License as published by the Free Software |
912 | -Foundation; version 2 of the License. |
913 | - |
914 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
915 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
916 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
917 | - |
918 | -You should have received a copy of the GNU General Public License along with |
919 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
920 | -Place, Suite 330, Boston, MA 02111-1307 USA |
921 | -""" |
922 | + |
923 | +############################################################################### |
924 | +# OpenLP - Open Source Lyrics Projection # |
925 | +# --------------------------------------------------------------------------- # |
926 | +# Copyright (c) 2008-2009 Raoul Snyman # |
927 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
928 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
929 | +# --------------------------------------------------------------------------- # |
930 | +# This program is free software; you can redistribute it and/or modify it # |
931 | +# under the terms of the GNU General Public License as published by the Free # |
932 | +# Software Foundation; version 2 of the License. # |
933 | +# # |
934 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
935 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
936 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
937 | +# more details. # |
938 | +# # |
939 | +# You should have received a copy of the GNU General Public License along # |
940 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
941 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
942 | +############################################################################### |
943 | + |
944 | import logging |
945 | import os |
946 | import sys |
947 | |
948 | === modified file 'openlp/core/lib/serviceitem.py' |
949 | --- openlp/core/lib/serviceitem.py 2009-09-06 18:59:21 +0000 |
950 | +++ openlp/core/lib/serviceitem.py 2009-09-08 19:58:05 +0000 |
951 | @@ -1,24 +1,27 @@ |
952 | # -*- coding: utf-8 -*- |
953 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
954 | -""" |
955 | -OpenLP - Open Source Lyrics Projection |
956 | - |
957 | -Copyright (c) 2008 Raoul Snyman |
958 | - |
959 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley |
960 | - |
961 | -This program is free software; you can redistribute it and/or modify it under |
962 | -the terms of the GNU General Public License as published by the Free Software |
963 | -Foundation; version 2 of the License. |
964 | - |
965 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
966 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
967 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
968 | - |
969 | -You should have received a copy of the GNU General Public License along with |
970 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
971 | -Place, Suite 330, Boston, MA 02111-1307 USA |
972 | -""" |
973 | + |
974 | +############################################################################### |
975 | +# OpenLP - Open Source Lyrics Projection # |
976 | +# --------------------------------------------------------------------------- # |
977 | +# Copyright (c) 2008-2009 Raoul Snyman # |
978 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
979 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
980 | +# --------------------------------------------------------------------------- # |
981 | +# This program is free software; you can redistribute it and/or modify it # |
982 | +# under the terms of the GNU General Public License as published by the Free # |
983 | +# Software Foundation; version 2 of the License. # |
984 | +# # |
985 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
986 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
987 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
988 | +# more details. # |
989 | +# # |
990 | +# You should have received a copy of the GNU General Public License along # |
991 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
992 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
993 | +############################################################################### |
994 | + |
995 | import logging |
996 | import os |
997 | import time |
998 | |
999 | === modified file 'openlp/core/lib/settingstab.py' |
1000 | --- openlp/core/lib/settingstab.py 2009-09-06 18:59:21 +0000 |
1001 | +++ openlp/core/lib/settingstab.py 2009-09-08 19:58:05 +0000 |
1002 | @@ -1,24 +1,26 @@ |
1003 | # -*- coding: utf-8 -*- |
1004 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
1005 | -""" |
1006 | -OpenLP - Open Source Lyrics Projection |
1007 | - |
1008 | -Copyright (c) 2008 Raoul Snyman |
1009 | - |
1010 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley |
1011 | - |
1012 | -This program is free software; you can redistribute it and/or modify it under |
1013 | -the terms of the GNU General Public License as published by the Free Software |
1014 | -Foundation; version 2 of the License. |
1015 | - |
1016 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
1017 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
1018 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
1019 | - |
1020 | -You should have received a copy of the GNU General Public License along with |
1021 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
1022 | -Place, Suite 330, Boston, MA 02111-1307 USA |
1023 | -""" |
1024 | + |
1025 | +############################################################################### |
1026 | +# OpenLP - Open Source Lyrics Projection # |
1027 | +# --------------------------------------------------------------------------- # |
1028 | +# Copyright (c) 2008-2009 Raoul Snyman # |
1029 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
1030 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
1031 | +# --------------------------------------------------------------------------- # |
1032 | +# This program is free software; you can redistribute it and/or modify it # |
1033 | +# under the terms of the GNU General Public License as published by the Free # |
1034 | +# Software Foundation; version 2 of the License. # |
1035 | +# # |
1036 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
1037 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
1038 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
1039 | +# more details. # |
1040 | +# # |
1041 | +# You should have received a copy of the GNU General Public License along # |
1042 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
1043 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
1044 | +############################################################################### |
1045 | |
1046 | from PyQt4 import QtCore, QtGui |
1047 | |
1048 | |
1049 | === modified file 'openlp/core/lib/songxmlhandler.py' |
1050 | --- openlp/core/lib/songxmlhandler.py 2009-07-14 13:51:27 +0000 |
1051 | +++ openlp/core/lib/songxmlhandler.py 2009-09-08 19:58:05 +0000 |
1052 | @@ -1,24 +1,27 @@ |
1053 | # -*- coding: utf-8 -*- |
1054 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
1055 | -""" |
1056 | -OpenLP - Open Source Lyrics Projection |
1057 | - |
1058 | -Copyright (c) 2008 Raoul Snyman |
1059 | - |
1060 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten Tinggaard |
1061 | - |
1062 | -This program is free software; you can redistribute it and/or modify it under |
1063 | -the terms of the GNU General Public License as published by the Free Software |
1064 | -Foundation; version 2 of the License. |
1065 | - |
1066 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
1067 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
1068 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
1069 | - |
1070 | -You should have received a copy of the GNU General Public License along with |
1071 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
1072 | -Place, Suite 330, Boston, MA 02111-1307 USA |
1073 | -""" |
1074 | + |
1075 | +############################################################################### |
1076 | +# OpenLP - Open Source Lyrics Projection # |
1077 | +# --------------------------------------------------------------------------- # |
1078 | +# Copyright (c) 2008-2009 Raoul Snyman # |
1079 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
1080 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
1081 | +# --------------------------------------------------------------------------- # |
1082 | +# This program is free software; you can redistribute it and/or modify it # |
1083 | +# under the terms of the GNU General Public License as published by the Free # |
1084 | +# Software Foundation; version 2 of the License. # |
1085 | +# # |
1086 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
1087 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
1088 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
1089 | +# more details. # |
1090 | +# # |
1091 | +# You should have received a copy of the GNU General Public License along # |
1092 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
1093 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
1094 | +############################################################################### |
1095 | + |
1096 | import logging |
1097 | from xml.dom.minidom import Document |
1098 | from xml.etree.ElementTree import ElementTree, XML, dump |
1099 | |
1100 | === modified file 'openlp/core/lib/themexmlhandler.py' |
1101 | --- openlp/core/lib/themexmlhandler.py 2009-09-06 18:59:21 +0000 |
1102 | +++ openlp/core/lib/themexmlhandler.py 2009-09-08 19:58:05 +0000 |
1103 | @@ -1,26 +1,27 @@ |
1104 | # -*- coding: utf-8 -*- |
1105 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
1106 | -""" |
1107 | -OpenLP - Open Source Lyrics Projection |
1108 | - |
1109 | -Copyright (c) 2008 Raoul Snyman |
1110 | - |
1111 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten Tinggaard |
1112 | - |
1113 | -This program is free software; you can redistribute it and/or modify it under |
1114 | -the terms of the GNU General Public License as published by the Free Software |
1115 | -Foundation; version 2 of the License. |
1116 | - |
1117 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
1118 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
1119 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
1120 | - |
1121 | -You should have received a copy of the GNU General Public License along with |
1122 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
1123 | -Place, Suite 330, Boston, MA 02111-1307 USA |
1124 | - |
1125 | -For XML Schema see wiki.openlp.org |
1126 | -""" |
1127 | + |
1128 | +############################################################################### |
1129 | +# OpenLP - Open Source Lyrics Projection # |
1130 | +# --------------------------------------------------------------------------- # |
1131 | +# Copyright (c) 2008-2009 Raoul Snyman # |
1132 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
1133 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
1134 | +# --------------------------------------------------------------------------- # |
1135 | +# This program is free software; you can redistribute it and/or modify it # |
1136 | +# under the terms of the GNU General Public License as published by the Free # |
1137 | +# Software Foundation; version 2 of the License. # |
1138 | +# # |
1139 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
1140 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
1141 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
1142 | +# more details. # |
1143 | +# # |
1144 | +# You should have received a copy of the GNU General Public License along # |
1145 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
1146 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
1147 | +############################################################################### |
1148 | + |
1149 | import os |
1150 | |
1151 | from xml.dom.minidom import Document |
1152 | |
1153 | === modified file 'openlp/core/lib/toolbar.py' |
1154 | --- openlp/core/lib/toolbar.py 2009-09-06 18:59:21 +0000 |
1155 | +++ openlp/core/lib/toolbar.py 2009-09-08 19:58:05 +0000 |
1156 | @@ -1,24 +1,27 @@ |
1157 | # -*- coding: utf-8 -*- |
1158 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
1159 | -""" |
1160 | -OpenLP - Open Source Lyrics Projection |
1161 | - |
1162 | -Copyright (c) 2009 Raoul Snyman |
1163 | - |
1164 | -Portions copyright (c) 2009 Martin Thompson, Tim Bentley |
1165 | - |
1166 | -This program is free software; you can redistribute it and/or modify it under |
1167 | -the terms of the GNU General Public License as published by the Free Software |
1168 | -Foundation; version 2 of the License. |
1169 | - |
1170 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
1171 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
1172 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
1173 | - |
1174 | -You should have received a copy of the GNU General Public License along with |
1175 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
1176 | -Place, Suite 330, Boston, MA 02111-1307 USA |
1177 | -""" |
1178 | + |
1179 | +############################################################################### |
1180 | +# OpenLP - Open Source Lyrics Projection # |
1181 | +# --------------------------------------------------------------------------- # |
1182 | +# Copyright (c) 2008-2009 Raoul Snyman # |
1183 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
1184 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
1185 | +# --------------------------------------------------------------------------- # |
1186 | +# This program is free software; you can redistribute it and/or modify it # |
1187 | +# under the terms of the GNU General Public License as published by the Free # |
1188 | +# Software Foundation; version 2 of the License. # |
1189 | +# # |
1190 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
1191 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
1192 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
1193 | +# more details. # |
1194 | +# # |
1195 | +# You should have received a copy of the GNU General Public License along # |
1196 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
1197 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
1198 | +############################################################################### |
1199 | + |
1200 | import types |
1201 | import logging |
1202 | |
1203 | |
1204 | === modified file 'openlp/core/lib/xmlrootclass.py' |
1205 | --- openlp/core/lib/xmlrootclass.py 2009-07-14 13:51:27 +0000 |
1206 | +++ openlp/core/lib/xmlrootclass.py 2009-09-08 19:58:05 +0000 |
1207 | @@ -1,24 +1,26 @@ |
1208 | # -*- coding: utf-8 -*- |
1209 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
1210 | -""" |
1211 | -OpenLP - Open Source Lyrics Projection |
1212 | - |
1213 | -Copyright (c) 2008 Raoul Snyman |
1214 | - |
1215 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley, Carsten Tinggaard |
1216 | - |
1217 | -This program is free software; you can redistribute it and/or modify it under |
1218 | -the terms of the GNU General Public License as published by the Free Software |
1219 | -Foundation; version 2 of the License. |
1220 | - |
1221 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
1222 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
1223 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
1224 | - |
1225 | -You should have received a copy of the GNU General Public License along with |
1226 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
1227 | -Place, Suite 330, Boston, MA 02111-1307 USA |
1228 | -""" |
1229 | + |
1230 | +############################################################################### |
1231 | +# OpenLP - Open Source Lyrics Projection # |
1232 | +# --------------------------------------------------------------------------- # |
1233 | +# Copyright (c) 2008-2009 Raoul Snyman # |
1234 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
1235 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
1236 | +# --------------------------------------------------------------------------- # |
1237 | +# This program is free software; you can redistribute it and/or modify it # |
1238 | +# under the terms of the GNU General Public License as published by the Free # |
1239 | +# Software Foundation; version 2 of the License. # |
1240 | +# # |
1241 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
1242 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
1243 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
1244 | +# more details. # |
1245 | +# # |
1246 | +# You should have received a copy of the GNU General Public License along # |
1247 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
1248 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
1249 | +############################################################################### |
1250 | |
1251 | import platform |
1252 | import sys |
1253 | |
1254 | === modified file 'openlp/core/resources.py' |
1255 | --- openlp/core/resources.py 2009-07-24 22:13:40 +0000 |
1256 | +++ openlp/core/resources.py 2009-09-08 19:58:05 +0000 |
1257 | @@ -1,11 +1,26 @@ |
1258 | # -*- coding: utf-8 -*- |
1259 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
1260 | |
1261 | -# Resource object code |
1262 | -# |
1263 | -# Created: Fri Jul 24 23:28:28 2009 |
1264 | -# by: The Resource Compiler for PyQt (Qt v4.5.0) |
1265 | -# |
1266 | -# WARNING! All changes made in this file will be lost! |
1267 | +############################################################################### |
1268 | +# OpenLP - Open Source Lyrics Projection # |
1269 | +# --------------------------------------------------------------------------- # |
1270 | +# Copyright (c) 2008-2009 Raoul Snyman # |
1271 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
1272 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
1273 | +# --------------------------------------------------------------------------- # |
1274 | +# This program is free software; you can redistribute it and/or modify it # |
1275 | +# under the terms of the GNU General Public License as published by the Free # |
1276 | +# Software Foundation; version 2 of the License. # |
1277 | +# # |
1278 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
1279 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
1280 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
1281 | +# more details. # |
1282 | +# # |
1283 | +# You should have received a copy of the GNU General Public License along # |
1284 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
1285 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
1286 | +############################################################################### |
1287 | |
1288 | from PyQt4 import QtCore |
1289 | |
1290 | |
1291 | === modified file 'openlp/core/theme/__init__.py' |
1292 | --- openlp/core/theme/__init__.py 2008-11-26 20:15:49 +0000 |
1293 | +++ openlp/core/theme/__init__.py 2009-09-08 19:58:05 +0000 |
1294 | @@ -1,19 +1,25 @@ |
1295 | -""" |
1296 | -OpenLP - Open Source Lyrics Projection |
1297 | -Copyright (c) 2008 Raoul Snyman |
1298 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley |
1299 | - |
1300 | -This program is free software; you can redistribute it and/or modify it under |
1301 | -the terms of the GNU General Public License as published by the Free Software |
1302 | -Foundation; version 2 of the License. |
1303 | - |
1304 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
1305 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
1306 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
1307 | - |
1308 | -You should have received a copy of the GNU General Public License along with |
1309 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
1310 | -Place, Suite 330, Boston, MA 02111-1307 USA |
1311 | -""" |
1312 | +# -*- coding: utf-8 -*- |
1313 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
1314 | + |
1315 | +############################################################################### |
1316 | +# OpenLP - Open Source Lyrics Projection # |
1317 | +# --------------------------------------------------------------------------- # |
1318 | +# Copyright (c) 2008-2009 Raoul Snyman # |
1319 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
1320 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
1321 | +# --------------------------------------------------------------------------- # |
1322 | +# This program is free software; you can redistribute it and/or modify it # |
1323 | +# under the terms of the GNU General Public License as published by the Free # |
1324 | +# Software Foundation; version 2 of the License. # |
1325 | +# # |
1326 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
1327 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
1328 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
1329 | +# more details. # |
1330 | +# # |
1331 | +# You should have received a copy of the GNU General Public License along # |
1332 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
1333 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
1334 | +############################################################################### |
1335 | |
1336 | from theme import Theme |
1337 | |
1338 | === modified file 'openlp/core/theme/theme.py' |
1339 | --- openlp/core/theme/theme.py 2009-06-24 05:17:41 +0000 |
1340 | +++ openlp/core/theme/theme.py 2009-09-08 19:58:05 +0000 |
1341 | @@ -1,23 +1,27 @@ |
1342 | # -*- coding: utf-8 -*- |
1343 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
1344 | -""" |
1345 | -OpenLP - Open Source Lyrics Projection |
1346 | -Copyright (c) 2008 Raoul Snyman |
1347 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten Tinggaard |
1348 | - |
1349 | -This program is free software; you can redistribute it and/or modify it under |
1350 | -the terms of the GNU General Public License as published by the Free Software |
1351 | -Foundation; version 2 of the License. |
1352 | - |
1353 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
1354 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
1355 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
1356 | - |
1357 | -You should have received a copy of the GNU General Public License along with |
1358 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
1359 | -Place, Suite 330, Boston, MA 02111-1307 USA |
1360 | - |
1361 | -""" |
1362 | + |
1363 | +############################################################################### |
1364 | +# OpenLP - Open Source Lyrics Projection # |
1365 | +# --------------------------------------------------------------------------- # |
1366 | +# Copyright (c) 2008-2009 Raoul Snyman # |
1367 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
1368 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
1369 | +# --------------------------------------------------------------------------- # |
1370 | +# This program is free software; you can redistribute it and/or modify it # |
1371 | +# under the terms of the GNU General Public License as published by the Free # |
1372 | +# Software Foundation; version 2 of the License. # |
1373 | +# # |
1374 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
1375 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
1376 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
1377 | +# more details. # |
1378 | +# # |
1379 | +# You should have received a copy of the GNU General Public License along # |
1380 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
1381 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
1382 | +############################################################################### |
1383 | + |
1384 | import platform |
1385 | import types |
1386 | from xml.etree.ElementTree import ElementTree, XML |
1387 | |
1388 | === modified file 'openlp/core/ui/__init__.py' |
1389 | --- openlp/core/ui/__init__.py 2009-08-27 05:17:20 +0000 |
1390 | +++ openlp/core/ui/__init__.py 2009-09-08 19:58:05 +0000 |
1391 | @@ -1,22 +1,27 @@ |
1392 | # -*- coding: utf-8 -*- |
1393 | -# vim: autoindent shiftwidth=4 expandtab textwidth=80 |
1394 | -""" |
1395 | -OpenLP - Open Source Lyrics Projection |
1396 | -Copyright (c) 2008 Raoul Snyman |
1397 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley, |
1398 | - |
1399 | -This program is free software; you can redistribute it and/or modify it under |
1400 | -the terms of the GNU General Public License as published by the Free Software |
1401 | -Foundation; version 2 of the License. |
1402 | - |
1403 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
1404 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
1405 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
1406 | - |
1407 | -You should have received a copy of the GNU General Public License along with |
1408 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
1409 | -Place, Suite 330, Boston, MA 02111-1307 USA |
1410 | -""" |
1411 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
1412 | + |
1413 | +############################################################################### |
1414 | +# OpenLP - Open Source Lyrics Projection # |
1415 | +# --------------------------------------------------------------------------- # |
1416 | +# Copyright (c) 2008-2009 Raoul Snyman # |
1417 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
1418 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
1419 | +# --------------------------------------------------------------------------- # |
1420 | +# This program is free software; you can redistribute it and/or modify it # |
1421 | +# under the terms of the GNU General Public License as published by the Free # |
1422 | +# Software Foundation; version 2 of the License. # |
1423 | +# # |
1424 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
1425 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
1426 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
1427 | +# more details. # |
1428 | +# # |
1429 | +# You should have received a copy of the GNU General Public License along # |
1430 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
1431 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
1432 | +############################################################################### |
1433 | + |
1434 | #from slidecontroller import MasterToolbar |
1435 | from maindisplay import MainDisplay |
1436 | from amendthemeform import AmendThemeForm |
1437 | @@ -33,5 +38,6 @@ |
1438 | from thememanager import ThemeManager |
1439 | from mainwindow import MainWindow |
1440 | |
1441 | -__all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MasterToolbar' |
1442 | - 'MainWindow', 'MainDisplay', 'SlideController', 'ServiceManager', 'ThemeManager', 'AmendThemeForm'] |
1443 | +__all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MasterToolbar', |
1444 | + 'MainWindow', 'MainDisplay', 'SlideController', 'ServiceManager', |
1445 | + 'ThemeManager', 'AmendThemeForm'] |
1446 | |
1447 | === modified file 'openlp/core/ui/about.py' |
1448 | --- openlp/core/ui/about.py 2009-06-02 19:02:12 +0000 |
1449 | +++ openlp/core/ui/about.py 2009-09-08 19:58:05 +0000 |
1450 | @@ -1,22 +1,26 @@ |
1451 | # -*- coding: utf-8 -*- |
1452 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
1453 | -""" |
1454 | -OpenLP - Open Source Lyrics Projection |
1455 | -Copyright (c) 2008 Raoul Snyman |
1456 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley, |
1457 | - |
1458 | -This program is free software; you can redistribute it and/or modify it under |
1459 | -the terms of the GNU General Public License as published by the Free Software |
1460 | -Foundation; version 2 of the License. |
1461 | - |
1462 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
1463 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
1464 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
1465 | - |
1466 | -You should have received a copy of the GNU General Public License along with |
1467 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
1468 | -Place, Suite 330, Boston, MA 02111-1307 USA |
1469 | -""" |
1470 | + |
1471 | +############################################################################### |
1472 | +# OpenLP - Open Source Lyrics Projection # |
1473 | +# --------------------------------------------------------------------------- # |
1474 | +# Copyright (c) 2008-2009 Raoul Snyman # |
1475 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
1476 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
1477 | +# --------------------------------------------------------------------------- # |
1478 | +# This program is free software; you can redistribute it and/or modify it # |
1479 | +# under the terms of the GNU General Public License as published by the Free # |
1480 | +# Software Foundation; version 2 of the License. # |
1481 | +# # |
1482 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
1483 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
1484 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
1485 | +# more details. # |
1486 | +# # |
1487 | +# You should have received a copy of the GNU General Public License along # |
1488 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
1489 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
1490 | +############################################################################### |
1491 | |
1492 | from PyQt4 import QtCore, QtGui |
1493 | |
1494 | |
1495 | === modified file 'openlp/core/ui/alertform.py' |
1496 | --- openlp/core/ui/alertform.py 2009-08-10 20:10:20 +0000 |
1497 | +++ openlp/core/ui/alertform.py 2009-09-08 19:58:05 +0000 |
1498 | @@ -1,22 +1,27 @@ |
1499 | # -*- coding: utf-8 -*- |
1500 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
1501 | -""" |
1502 | -OpenLP - Open Source Lyrics Projection |
1503 | -Copyright (c) 2008 Raoul Snyman |
1504 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley, |
1505 | - |
1506 | -This program is free software; you can redistribute it and/or modify it under |
1507 | -the terms of the GNU General Public License as published by the Free Software |
1508 | -Foundation; version 2 of the License. |
1509 | - |
1510 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
1511 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
1512 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
1513 | - |
1514 | -You should have received a copy of the GNU General Public License along with |
1515 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
1516 | -Place, Suite 330, Boston, MA 02111-1307 USA |
1517 | -""" |
1518 | + |
1519 | +############################################################################### |
1520 | +# OpenLP - Open Source Lyrics Projection # |
1521 | +# --------------------------------------------------------------------------- # |
1522 | +# Copyright (c) 2008-2009 Raoul Snyman # |
1523 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
1524 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
1525 | +# --------------------------------------------------------------------------- # |
1526 | +# This program is free software; you can redistribute it and/or modify it # |
1527 | +# under the terms of the GNU General Public License as published by the Free # |
1528 | +# Software Foundation; version 2 of the License. # |
1529 | +# # |
1530 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
1531 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
1532 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
1533 | +# more details. # |
1534 | +# # |
1535 | +# You should have received a copy of the GNU General Public License along # |
1536 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
1537 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
1538 | +############################################################################### |
1539 | + |
1540 | import logging |
1541 | from PyQt4 import QtCore, QtGui |
1542 | from openlp.core.lib import translate |
1543 | |
1544 | === modified file 'openlp/core/ui/alertstab.py' |
1545 | --- openlp/core/ui/alertstab.py 2009-06-16 18:21:24 +0000 |
1546 | +++ openlp/core/ui/alertstab.py 2009-09-08 19:58:05 +0000 |
1547 | @@ -1,22 +1,26 @@ |
1548 | # -*- coding: utf-8 -*- |
1549 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
1550 | -""" |
1551 | -OpenLP - Open Source Lyrics Projection |
1552 | -Copyright (c) 2008 Raoul Snyman |
1553 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley, |
1554 | - |
1555 | -This program is free software; you can redistribute it and/or modify it under |
1556 | -the terms of the GNU General Public License as published by the Free Software |
1557 | -Foundation; version 2 of the License. |
1558 | - |
1559 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
1560 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
1561 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
1562 | - |
1563 | -You should have received a copy of the GNU General Public License along with |
1564 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
1565 | -Place, Suite 330, Boston, MA 02111-1307 USA |
1566 | -""" |
1567 | + |
1568 | +############################################################################### |
1569 | +# OpenLP - Open Source Lyrics Projection # |
1570 | +# --------------------------------------------------------------------------- # |
1571 | +# Copyright (c) 2008-2009 Raoul Snyman # |
1572 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
1573 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
1574 | +# --------------------------------------------------------------------------- # |
1575 | +# This program is free software; you can redistribute it and/or modify it # |
1576 | +# under the terms of the GNU General Public License as published by the Free # |
1577 | +# Software Foundation; version 2 of the License. # |
1578 | +# # |
1579 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
1580 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
1581 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
1582 | +# more details. # |
1583 | +# # |
1584 | +# You should have received a copy of the GNU General Public License along # |
1585 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
1586 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
1587 | +############################################################################### |
1588 | |
1589 | from PyQt4 import QtCore, QtGui |
1590 | |
1591 | @@ -195,4 +199,4 @@ |
1592 | font.setPointSize(16) |
1593 | self.FontPreview.setFont(font) |
1594 | self.FontPreview.setStyleSheet( |
1595 | - u'background-color: %s; color: %s' % (self.bg_color, self.font_color)) |
1596 | \ No newline at end of file |
1597 | + u'background-color: %s; color: %s' % (self.bg_color, self.font_color)) |
1598 | |
1599 | === modified file 'openlp/core/ui/amendthemedialog.py' |
1600 | --- openlp/core/ui/amendthemedialog.py 2009-08-01 18:03:07 +0000 |
1601 | +++ openlp/core/ui/amendthemedialog.py 2009-09-08 19:58:05 +0000 |
1602 | @@ -1,22 +1,27 @@ |
1603 | # -*- coding: utf-8 -*- |
1604 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
1605 | -""" |
1606 | -OpenLP - Open Source Lyrics Projection |
1607 | -Copyright (c) 2008 Raoul Snyman |
1608 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, |
1609 | - |
1610 | -This program is free software; you can redistribute it and/or modify it under |
1611 | -the terms of the GNU General Public License as published by the Free Software |
1612 | -Foundation; version 2 of the License. |
1613 | - |
1614 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
1615 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
1616 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
1617 | - |
1618 | -You should have received a copy of the GNU General Public License along with |
1619 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
1620 | -Place, Suite 330, Boston, MA 02111-1307 USA |
1621 | -""" |
1622 | + |
1623 | +############################################################################### |
1624 | +# OpenLP - Open Source Lyrics Projection # |
1625 | +# --------------------------------------------------------------------------- # |
1626 | +# Copyright (c) 2008-2009 Raoul Snyman # |
1627 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
1628 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
1629 | +# --------------------------------------------------------------------------- # |
1630 | +# This program is free software; you can redistribute it and/or modify it # |
1631 | +# under the terms of the GNU General Public License as published by the Free # |
1632 | +# Software Foundation; version 2 of the License. # |
1633 | +# # |
1634 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
1635 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
1636 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
1637 | +# more details. # |
1638 | +# # |
1639 | +# You should have received a copy of the GNU General Public License along # |
1640 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
1641 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
1642 | +############################################################################### |
1643 | + |
1644 | from PyQt4 import QtCore, QtGui |
1645 | from openlp.core.lib import translate |
1646 | |
1647 | |
1648 | === modified file 'openlp/core/ui/amendthemeform.py' |
1649 | --- openlp/core/ui/amendthemeform.py 2009-09-05 01:22:05 +0000 |
1650 | +++ openlp/core/ui/amendthemeform.py 2009-09-08 19:58:05 +0000 |
1651 | @@ -1,22 +1,27 @@ |
1652 | # -*- coding: utf-8 -*- |
1653 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
1654 | -""" |
1655 | -OpenLP - Open Source Lyrics Projection |
1656 | -Copyright (c) 2008 Raoul Snyman |
1657 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley, |
1658 | - |
1659 | -This program is free software; you can redistribute it and/or modify it under |
1660 | -the terms of the GNU General Public License as published by the Free Software |
1661 | -Foundation; version 2 of the License. |
1662 | - |
1663 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
1664 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
1665 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
1666 | - |
1667 | -You should have received a copy of the GNU General Public License along with |
1668 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
1669 | -Place, Suite 330, Boston, MA 02111-1307 USA |
1670 | -""" |
1671 | + |
1672 | +############################################################################### |
1673 | +# OpenLP - Open Source Lyrics Projection # |
1674 | +# --------------------------------------------------------------------------- # |
1675 | +# Copyright (c) 2008-2009 Raoul Snyman # |
1676 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
1677 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
1678 | +# --------------------------------------------------------------------------- # |
1679 | +# This program is free software; you can redistribute it and/or modify it # |
1680 | +# under the terms of the GNU General Public License as published by the Free # |
1681 | +# Software Foundation; version 2 of the License. # |
1682 | +# # |
1683 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
1684 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
1685 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
1686 | +# more details. # |
1687 | +# # |
1688 | +# You should have received a copy of the GNU General Public License along # |
1689 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
1690 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
1691 | +############################################################################### |
1692 | + |
1693 | import logging |
1694 | import os, os.path |
1695 | |
1696 | |
1697 | === modified file 'openlp/core/ui/generaltab.py' |
1698 | --- openlp/core/ui/generaltab.py 2009-06-17 05:11:16 +0000 |
1699 | +++ openlp/core/ui/generaltab.py 2009-09-08 19:58:05 +0000 |
1700 | @@ -1,22 +1,26 @@ |
1701 | # -*- coding: utf-8 -*- |
1702 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
1703 | -""" |
1704 | -OpenLP - Open Source Lyrics Projection |
1705 | -Copyright (c) 2008 Raoul Snyman |
1706 | -Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley, |
1707 | - |
1708 | -This program is free software; you can redistribute it and/or modify it under |
1709 | -the terms of the GNU General Public License as published by the Free Software |
1710 | -Foundation; version 2 of the License. |
1711 | - |
1712 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
1713 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
1714 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
1715 | - |
1716 | -You should have received a copy of the GNU General Public License along with |
1717 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
1718 | -Place, Suite 330, Boston, MA 02111-1307 USA |
1719 | -""" |
1720 | + |
1721 | +############################################################################### |
1722 | +# OpenLP - Open Source Lyrics Projection # |
1723 | +# --------------------------------------------------------------------------- # |
1724 | +# Copyright (c) 2008-2009 Raoul Snyman # |
1725 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
1726 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
1727 | +# --------------------------------------------------------------------------- # |
1728 | +# This program is free software; you can redistribute it and/or modify it # |
1729 | +# under the terms of the GNU General Public License as published by the Free # |
1730 | +# Software Foundation; version 2 of the License. # |
1731 | +# # |
1732 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
1733 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
1734 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
1735 | +# more details. # |
1736 | +# # |
1737 | +# You should have received a copy of the GNU General Public License along # |
1738 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
1739 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
1740 | +############################################################################### |
1741 | |
1742 | from PyQt4 import QtCore, QtGui |
1743 | |
1744 | |
1745 | === modified file 'openlp/core/ui/maindisplay.py' |
1746 | --- openlp/core/ui/maindisplay.py 2009-08-26 05:00:19 +0000 |
1747 | +++ openlp/core/ui/maindisplay.py 2009-09-08 19:58:05 +0000 |
1748 | @@ -1,22 +1,27 @@ |
1749 | # -*- coding: utf-8 -*- |
1750 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
1751 | -""" |
1752 | -OpenLP - Open Source Lyrics Projection |
1753 | -Copyright (c) 2008 Raoul Snyman |
1754 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, |
1755 | - |
1756 | -This program is free software; you can redistribute it and/or modify it under |
1757 | -the terms of the GNU General Public License as published by the Free Software |
1758 | -Foundation; version 2 of the License. |
1759 | - |
1760 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
1761 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
1762 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
1763 | - |
1764 | -You should have received a copy of the GNU General Public License along with |
1765 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
1766 | -Place, Suite 330, Boston, MA 02111-1307 USA |
1767 | -""" |
1768 | + |
1769 | +############################################################################### |
1770 | +# OpenLP - Open Source Lyrics Projection # |
1771 | +# --------------------------------------------------------------------------- # |
1772 | +# Copyright (c) 2008-2009 Raoul Snyman # |
1773 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
1774 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
1775 | +# --------------------------------------------------------------------------- # |
1776 | +# This program is free software; you can redistribute it and/or modify it # |
1777 | +# under the terms of the GNU General Public License as published by the Free # |
1778 | +# Software Foundation; version 2 of the License. # |
1779 | +# # |
1780 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
1781 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
1782 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
1783 | +# more details. # |
1784 | +# # |
1785 | +# You should have received a copy of the GNU General Public License along # |
1786 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
1787 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
1788 | +############################################################################### |
1789 | + |
1790 | import logging |
1791 | from PyQt4 import QtCore, QtGui |
1792 | |
1793 | |
1794 | === modified file 'openlp/core/ui/mainwindow.py' |
1795 | --- openlp/core/ui/mainwindow.py 2009-09-05 06:29:23 +0000 |
1796 | +++ openlp/core/ui/mainwindow.py 2009-09-08 19:58:05 +0000 |
1797 | @@ -1,22 +1,27 @@ |
1798 | # -*- coding: utf-8 -*- |
1799 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
1800 | -""" |
1801 | -OpenLP - Open Source Lyrics Projection |
1802 | -Copyright (c) 2008 Raoul Snyman |
1803 | -Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley, |
1804 | - |
1805 | -This program is free software; you can redistribute it and/or modify it under |
1806 | -the terms of the GNU General Public License as published by the Free Software |
1807 | -Foundation; version 2 of the License. |
1808 | - |
1809 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
1810 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
1811 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
1812 | - |
1813 | -You should have received a copy of the GNU General Public License along with |
1814 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
1815 | -Place, Suite 330, Boston, MA 02111-1307 USA |
1816 | -""" |
1817 | + |
1818 | +############################################################################### |
1819 | +# OpenLP - Open Source Lyrics Projection # |
1820 | +# --------------------------------------------------------------------------- # |
1821 | +# Copyright (c) 2008-2009 Raoul Snyman # |
1822 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
1823 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
1824 | +# --------------------------------------------------------------------------- # |
1825 | +# This program is free software; you can redistribute it and/or modify it # |
1826 | +# under the terms of the GNU General Public License as published by the Free # |
1827 | +# Software Foundation; version 2 of the License. # |
1828 | +# # |
1829 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
1830 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
1831 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
1832 | +# more details. # |
1833 | +# # |
1834 | +# You should have received a copy of the GNU General Public License along # |
1835 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
1836 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
1837 | +############################################################################### |
1838 | + |
1839 | import os |
1840 | import logging |
1841 | |
1842 | |
1843 | === modified file 'openlp/core/ui/servicemanager.py' |
1844 | --- openlp/core/ui/servicemanager.py 2009-09-05 13:30:09 +0000 |
1845 | +++ openlp/core/ui/servicemanager.py 2009-09-08 19:58:05 +0000 |
1846 | @@ -1,22 +1,27 @@ |
1847 | # -*- coding: utf-8 -*- |
1848 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
1849 | -""" |
1850 | -OpenLP - Open Source Lyrics Projection |
1851 | -Copyright (c) 2009 Raoul Snyman |
1852 | -Portions copyright (c) 2009 Martin Thompson, Tim Bentley, |
1853 | - |
1854 | -This program is free software; you can redistribute it and/or modify it under |
1855 | -the terms of the GNU General Public License as published by the Free Software |
1856 | -Foundation; version 2 of the License. |
1857 | - |
1858 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
1859 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
1860 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
1861 | - |
1862 | -You should have received a copy of the GNU General Public License along with |
1863 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
1864 | -Place, Suite 330, Boston, MA 02111-1307 USA |
1865 | -""" |
1866 | + |
1867 | +############################################################################### |
1868 | +# OpenLP - Open Source Lyrics Projection # |
1869 | +# --------------------------------------------------------------------------- # |
1870 | +# Copyright (c) 2008-2009 Raoul Snyman # |
1871 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
1872 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
1873 | +# --------------------------------------------------------------------------- # |
1874 | +# This program is free software; you can redistribute it and/or modify it # |
1875 | +# under the terms of the GNU General Public License as published by the Free # |
1876 | +# Software Foundation; version 2 of the License. # |
1877 | +# # |
1878 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
1879 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
1880 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
1881 | +# more details. # |
1882 | +# # |
1883 | +# You should have received a copy of the GNU General Public License along # |
1884 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
1885 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
1886 | +############################################################################### |
1887 | + |
1888 | import os |
1889 | import sys |
1890 | import logging |
1891 | |
1892 | === modified file 'openlp/core/ui/settingsdialog.py' |
1893 | --- openlp/core/ui/settingsdialog.py 2009-06-16 18:21:24 +0000 |
1894 | +++ openlp/core/ui/settingsdialog.py 2009-09-08 19:58:05 +0000 |
1895 | @@ -1,22 +1,27 @@ |
1896 | # -*- coding: utf-8 -*- |
1897 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
1898 | -""" |
1899 | -OpenLP - Open Source Lyrics Projection |
1900 | -Copyright (c) 2008 Raoul Snyman |
1901 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, |
1902 | - |
1903 | -This program is free software; you can redistribute it and/or modify it under |
1904 | -the terms of the GNU General Public License as published by the Free Software |
1905 | -Foundation; version 2 of the License. |
1906 | - |
1907 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
1908 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
1909 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
1910 | - |
1911 | -You should have received a copy of the GNU General Public License along with |
1912 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
1913 | -Place, Suite 330, Boston, MA 02111-1307 USA |
1914 | -""" |
1915 | + |
1916 | +############################################################################### |
1917 | +# OpenLP - Open Source Lyrics Projection # |
1918 | +# --------------------------------------------------------------------------- # |
1919 | +# Copyright (c) 2008-2009 Raoul Snyman # |
1920 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
1921 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
1922 | +# --------------------------------------------------------------------------- # |
1923 | +# This program is free software; you can redistribute it and/or modify it # |
1924 | +# under the terms of the GNU General Public License as published by the Free # |
1925 | +# Software Foundation; version 2 of the License. # |
1926 | +# # |
1927 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
1928 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
1929 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
1930 | +# more details. # |
1931 | +# # |
1932 | +# You should have received a copy of the GNU General Public License along # |
1933 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
1934 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
1935 | +############################################################################### |
1936 | + |
1937 | from PyQt4 import QtCore, QtGui |
1938 | from openlp.core.lib import translate |
1939 | |
1940 | |
1941 | === modified file 'openlp/core/ui/settingsform.py' |
1942 | --- openlp/core/ui/settingsform.py 2009-08-29 07:17:56 +0000 |
1943 | +++ openlp/core/ui/settingsform.py 2009-09-08 19:58:05 +0000 |
1944 | @@ -1,22 +1,27 @@ |
1945 | # -*- coding: utf-8 -*- |
1946 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
1947 | -""" |
1948 | -OpenLP - Open Source Lyrics Projection |
1949 | -Copyright (c) 2008 Raoul Snyman |
1950 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley, |
1951 | - |
1952 | -This program is free software; you can redistribute it and/or modify it under |
1953 | -the terms of the GNU General Public License as published by the Free Software |
1954 | -Foundation; version 2 of the License. |
1955 | - |
1956 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
1957 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
1958 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
1959 | - |
1960 | -You should have received a copy of the GNU General Public License along with |
1961 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
1962 | -Place, Suite 330, Boston, MA 02111-1307 USA |
1963 | -""" |
1964 | + |
1965 | +############################################################################### |
1966 | +# OpenLP - Open Source Lyrics Projection # |
1967 | +# --------------------------------------------------------------------------- # |
1968 | +# Copyright (c) 2008-2009 Raoul Snyman # |
1969 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
1970 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
1971 | +# --------------------------------------------------------------------------- # |
1972 | +# This program is free software; you can redistribute it and/or modify it # |
1973 | +# under the terms of the GNU General Public License as published by the Free # |
1974 | +# Software Foundation; version 2 of the License. # |
1975 | +# # |
1976 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
1977 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
1978 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
1979 | +# more details. # |
1980 | +# # |
1981 | +# You should have received a copy of the GNU General Public License along # |
1982 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
1983 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
1984 | +############################################################################### |
1985 | + |
1986 | import logging |
1987 | |
1988 | from PyQt4 import QtCore, QtGui |
1989 | |
1990 | === modified file 'openlp/core/ui/slidecontroller.py' |
1991 | --- openlp/core/ui/slidecontroller.py 2009-09-05 19:58:02 +0000 |
1992 | +++ openlp/core/ui/slidecontroller.py 2009-09-08 19:58:05 +0000 |
1993 | @@ -1,22 +1,27 @@ |
1994 | # -*- coding: utf-8 -*- |
1995 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
1996 | -""" |
1997 | -OpenLP - Open Source Lyrics Projection |
1998 | -Copyright (c) 2008 Raoul Snyman |
1999 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, |
2000 | - |
2001 | -This program is free software; you can redistribute it and/or modify it under |
2002 | -the terms of the GNU General Public License as published by the Free Software |
2003 | -Foundation; version 2 of the License. |
2004 | - |
2005 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
2006 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
2007 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
2008 | - |
2009 | -You should have received a copy of the GNU General Public License along with |
2010 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
2011 | -Place, Suite 330, Boston, MA 02111-1307 USA |
2012 | -""" |
2013 | + |
2014 | +############################################################################### |
2015 | +# OpenLP - Open Source Lyrics Projection # |
2016 | +# --------------------------------------------------------------------------- # |
2017 | +# Copyright (c) 2008-2009 Raoul Snyman # |
2018 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
2019 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
2020 | +# --------------------------------------------------------------------------- # |
2021 | +# This program is free software; you can redistribute it and/or modify it # |
2022 | +# under the terms of the GNU General Public License as published by the Free # |
2023 | +# Software Foundation; version 2 of the License. # |
2024 | +# # |
2025 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
2026 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
2027 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
2028 | +# more details. # |
2029 | +# # |
2030 | +# You should have received a copy of the GNU General Public License along # |
2031 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
2032 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
2033 | +############################################################################### |
2034 | + |
2035 | import logging |
2036 | import os |
2037 | |
2038 | |
2039 | === modified file 'openlp/core/ui/splashscreen.py' |
2040 | --- openlp/core/ui/splashscreen.py 2009-06-16 18:21:24 +0000 |
2041 | +++ openlp/core/ui/splashscreen.py 2009-09-08 19:58:05 +0000 |
2042 | @@ -1,22 +1,27 @@ |
2043 | # -*- coding: utf-8 -*- |
2044 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
2045 | -""" |
2046 | -OpenLP - Open Source Lyrics Projection |
2047 | -Copyright (c) 2008 Raoul Snyman |
2048 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, |
2049 | - |
2050 | -This program is free software; you can redistribute it and/or modify it under |
2051 | -the terms of the GNU General Public License as published by the Free Software |
2052 | -Foundation; version 2 of the License. |
2053 | - |
2054 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
2055 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
2056 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
2057 | - |
2058 | -You should have received a copy of the GNU General Public License along with |
2059 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
2060 | -Place, Suite 330, Boston, MA 02111-1307 USA |
2061 | -""" |
2062 | + |
2063 | +############################################################################### |
2064 | +# OpenLP - Open Source Lyrics Projection # |
2065 | +# --------------------------------------------------------------------------- # |
2066 | +# Copyright (c) 2008-2009 Raoul Snyman # |
2067 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
2068 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
2069 | +# --------------------------------------------------------------------------- # |
2070 | +# This program is free software; you can redistribute it and/or modify it # |
2071 | +# under the terms of the GNU General Public License as published by the Free # |
2072 | +# Software Foundation; version 2 of the License. # |
2073 | +# # |
2074 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
2075 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
2076 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
2077 | +# more details. # |
2078 | +# # |
2079 | +# You should have received a copy of the GNU General Public License along # |
2080 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
2081 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
2082 | +############################################################################### |
2083 | + |
2084 | from PyQt4 import QtCore, QtGui |
2085 | from openlp.core.lib import translate |
2086 | |
2087 | |
2088 | === modified file 'openlp/core/ui/thememanager.py' |
2089 | --- openlp/core/ui/thememanager.py 2009-09-04 22:27:53 +0000 |
2090 | +++ openlp/core/ui/thememanager.py 2009-09-08 19:58:05 +0000 |
2091 | @@ -1,22 +1,27 @@ |
2092 | # -*- coding: utf-8 -*- |
2093 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
2094 | -""" |
2095 | -OpenLP - Open Source Lyrics Projection |
2096 | -Copyright (c) 2009 Raoul Snyman |
2097 | -Portions copyright (c) 2009 Martin Thompson, Tim Bentley, |
2098 | - |
2099 | -This program is free software; you can redistribute it and/or modify it under |
2100 | -the terms of the GNU General Public License as published by the Free Software |
2101 | -Foundation; version 2 of the License. |
2102 | - |
2103 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
2104 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
2105 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
2106 | - |
2107 | -You should have received a copy of the GNU General Public License along with |
2108 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
2109 | -Place, Suite 330, Boston, MA 02111-1307 USA |
2110 | -""" |
2111 | + |
2112 | +############################################################################### |
2113 | +# OpenLP - Open Source Lyrics Projection # |
2114 | +# --------------------------------------------------------------------------- # |
2115 | +# Copyright (c) 2008-2009 Raoul Snyman # |
2116 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
2117 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
2118 | +# --------------------------------------------------------------------------- # |
2119 | +# This program is free software; you can redistribute it and/or modify it # |
2120 | +# under the terms of the GNU General Public License as published by the Free # |
2121 | +# Software Foundation; version 2 of the License. # |
2122 | +# # |
2123 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
2124 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
2125 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
2126 | +# more details. # |
2127 | +# # |
2128 | +# You should have received a copy of the GNU General Public License along # |
2129 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
2130 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
2131 | +############################################################################### |
2132 | + |
2133 | import os |
2134 | import sys |
2135 | import zipfile |
2136 | @@ -330,7 +335,7 @@ |
2137 | os.mkdir(os.path.join(self.path, name)) |
2138 | theme_file = os.path.join(theme_dir, name + u'.xml') |
2139 | log.debug(theme_file) |
2140 | - |
2141 | + |
2142 | result = QtGui.QMessageBox.Yes |
2143 | if os.path.exists(theme_file): |
2144 | result = QtGui.QMessageBox.question( |
2145 | @@ -346,7 +351,7 @@ |
2146 | outfile.close() |
2147 | if image_from is not None and image_from != image_to: |
2148 | shutil.copyfile(image_from, image_to) |
2149 | - |
2150 | + |
2151 | self.generateAndSaveImage(self.path, name, theme_xml) |
2152 | self.loadThemes() |
2153 | else: |
2154 | |
2155 | === modified file 'openlp/core/ui/themestab.py' |
2156 | --- openlp/core/ui/themestab.py 2009-09-02 01:44:09 +0000 |
2157 | +++ openlp/core/ui/themestab.py 2009-09-08 19:58:05 +0000 |
2158 | @@ -1,22 +1,26 @@ |
2159 | # -*- coding: utf-8 -*- |
2160 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
2161 | -""" |
2162 | -OpenLP - Open Source Lyrics Projection |
2163 | -Copyright (c) 2008 Raoul Snyman |
2164 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, |
2165 | - |
2166 | -This program is free software; you can redistribute it and/or modify it under |
2167 | -the terms of the GNU General Public License as published by the Free Software |
2168 | -Foundation; version 2 of the License. |
2169 | - |
2170 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
2171 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
2172 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
2173 | - |
2174 | -You should have received a copy of the GNU General Public License along with |
2175 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
2176 | -Place, Suite 330, Boston, MA 02111-1307 USA |
2177 | -""" |
2178 | + |
2179 | +############################################################################### |
2180 | +# OpenLP - Open Source Lyrics Projection # |
2181 | +# --------------------------------------------------------------------------- # |
2182 | +# Copyright (c) 2008-2009 Raoul Snyman # |
2183 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
2184 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
2185 | +# --------------------------------------------------------------------------- # |
2186 | +# This program is free software; you can redistribute it and/or modify it # |
2187 | +# under the terms of the GNU General Public License as published by the Free # |
2188 | +# Software Foundation; version 2 of the License. # |
2189 | +# # |
2190 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
2191 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
2192 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
2193 | +# more details. # |
2194 | +# # |
2195 | +# You should have received a copy of the GNU General Public License along # |
2196 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
2197 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
2198 | +############################################################################### |
2199 | |
2200 | from PyQt4 import QtCore, QtGui |
2201 | |
2202 | |
2203 | === modified file 'openlp/core/utils/__init__.py' |
2204 | --- openlp/core/utils/__init__.py 2008-12-02 13:33:52 +0000 |
2205 | +++ openlp/core/utils/__init__.py 2009-09-08 19:58:05 +0000 |
2206 | @@ -1,20 +1,26 @@ |
2207 | -""" |
2208 | -OpenLP - Open Source Lyrics Projection |
2209 | -Copyright (c) 2008 Raoul Snyman |
2210 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley |
2211 | - |
2212 | -This program is free software; you can redistribute it and/or modify it under |
2213 | -the terms of the GNU General Public License as published by the Free Software |
2214 | -Foundation; version 2 of the License. |
2215 | - |
2216 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
2217 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
2218 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
2219 | - |
2220 | -You should have received a copy of the GNU General Public License along with |
2221 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
2222 | -Place, Suite 330, Boston, MA 02111-1307 USA |
2223 | -""" |
2224 | +# -*- coding: utf-8 -*- |
2225 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
2226 | + |
2227 | +############################################################################### |
2228 | +# OpenLP - Open Source Lyrics Projection # |
2229 | +# --------------------------------------------------------------------------- # |
2230 | +# Copyright (c) 2008-2009 Raoul Snyman # |
2231 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
2232 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
2233 | +# --------------------------------------------------------------------------- # |
2234 | +# This program is free software; you can redistribute it and/or modify it # |
2235 | +# under the terms of the GNU General Public License as published by the Free # |
2236 | +# Software Foundation; version 2 of the License. # |
2237 | +# # |
2238 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
2239 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
2240 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
2241 | +# more details. # |
2242 | +# # |
2243 | +# You should have received a copy of the GNU General Public License along # |
2244 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
2245 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
2246 | +############################################################################### |
2247 | |
2248 | from registry import Registry |
2249 | from confighelper import ConfigHelper |
2250 | |
2251 | === modified file 'openlp/core/utils/confighelper.py' |
2252 | --- openlp/core/utils/confighelper.py 2009-06-16 18:21:24 +0000 |
2253 | +++ openlp/core/utils/confighelper.py 2009-09-08 19:58:05 +0000 |
2254 | @@ -1,22 +1,26 @@ |
2255 | # -*- coding: utf-8 -*- |
2256 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
2257 | -""" |
2258 | -OpenLP - Open Source Lyrics Projection |
2259 | -Copyright (c) 2008-2009 Raoul Snyman |
2260 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley |
2261 | - |
2262 | -This program is free software; you can redistribute it and/or modify it under |
2263 | -the terms of the GNU General Public License as published by the Free Software |
2264 | -Foundation; version 2 of the License. |
2265 | - |
2266 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
2267 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
2268 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
2269 | - |
2270 | -You should have received a copy of the GNU General Public License along with |
2271 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
2272 | -Place, Suite 330, Boston, MA 02111-1307 USA |
2273 | -""" |
2274 | + |
2275 | +############################################################################### |
2276 | +# OpenLP - Open Source Lyrics Projection # |
2277 | +# --------------------------------------------------------------------------- # |
2278 | +# Copyright (c) 2008-2009 Raoul Snyman # |
2279 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
2280 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
2281 | +# --------------------------------------------------------------------------- # |
2282 | +# This program is free software; you can redistribute it and/or modify it # |
2283 | +# under the terms of the GNU General Public License as published by the Free # |
2284 | +# Software Foundation; version 2 of the License. # |
2285 | +# # |
2286 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
2287 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
2288 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
2289 | +# more details. # |
2290 | +# # |
2291 | +# You should have received a copy of the GNU General Public License along # |
2292 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
2293 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
2294 | +############################################################################### |
2295 | |
2296 | import os |
2297 | from openlp.core.utils.registry import Registry |
2298 | @@ -89,4 +93,4 @@ |
2299 | except ImportError: |
2300 | config_path = os.path.join(os.getenv(u'HOME'), u'.openlp') |
2301 | ConfigHelper.__registry__ = Registry(config_path) |
2302 | - return ConfigHelper.__registry__ |
2303 | \ No newline at end of file |
2304 | + return ConfigHelper.__registry__ |
2305 | |
2306 | === modified file 'openlp/core/utils/registry.py' |
2307 | --- openlp/core/utils/registry.py 2009-06-16 18:21:24 +0000 |
2308 | +++ openlp/core/utils/registry.py 2009-09-08 19:58:05 +0000 |
2309 | @@ -1,22 +1,27 @@ |
2310 | # -*- coding: utf-8 -*- |
2311 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
2312 | -""" |
2313 | -OpenLP - Open Source Lyrics Projection |
2314 | -Copyright (c) 2008 Raoul Snyman |
2315 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley |
2316 | - |
2317 | -This program is free software; you can redistribute it and/or modify it under |
2318 | -the terms of the GNU General Public License as published by the Free Software |
2319 | -Foundation; version 2 of the License. |
2320 | - |
2321 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
2322 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
2323 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
2324 | - |
2325 | -You should have received a copy of the GNU General Public License along with |
2326 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
2327 | -Place, Suite 330, Boston, MA 02111-1307 USA |
2328 | -""" |
2329 | + |
2330 | +############################################################################### |
2331 | +# OpenLP - Open Source Lyrics Projection # |
2332 | +# --------------------------------------------------------------------------- # |
2333 | +# Copyright (c) 2008-2009 Raoul Snyman # |
2334 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
2335 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
2336 | +# --------------------------------------------------------------------------- # |
2337 | +# This program is free software; you can redistribute it and/or modify it # |
2338 | +# under the terms of the GNU General Public License as published by the Free # |
2339 | +# Software Foundation; version 2 of the License. # |
2340 | +# # |
2341 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
2342 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
2343 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
2344 | +# more details. # |
2345 | +# # |
2346 | +# You should have received a copy of the GNU General Public License along # |
2347 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
2348 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
2349 | +############################################################################### |
2350 | + |
2351 | import os |
2352 | import sys |
2353 | from ConfigParser import SafeConfigParser |
2354 | @@ -115,4 +120,4 @@ |
2355 | file_handle.close() |
2356 | return self._load() |
2357 | except: |
2358 | - return False |
2359 | \ No newline at end of file |
2360 | + return False |
2361 | |
2362 | === modified file 'openlp/migration/__init__.py' |
2363 | --- openlp/migration/__init__.py 2009-01-01 11:18:16 +0000 |
2364 | +++ openlp/migration/__init__.py 2009-09-08 19:58:05 +0000 |
2365 | @@ -1,17 +1,23 @@ |
2366 | -""" |
2367 | -OpenLP - Open Source Lyrics Projection |
2368 | -Copyright (c) 2008 Raoul Snyman |
2369 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley |
2370 | - |
2371 | -This program is free software; you can redistribute it and/or modify it under |
2372 | -the terms of the GNU General Public License as published by the Free Software |
2373 | -Foundation; version 2 of the License. |
2374 | - |
2375 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
2376 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
2377 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
2378 | - |
2379 | -You should have received a copy of the GNU General Public License along with |
2380 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
2381 | -Place, Suite 330, Boston, MA 02111-1307 USA |
2382 | -""" |
2383 | +# -*- coding: utf-8 -*- |
2384 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
2385 | + |
2386 | +############################################################################### |
2387 | +# OpenLP - Open Source Lyrics Projection # |
2388 | +# --------------------------------------------------------------------------- # |
2389 | +# Copyright (c) 2008-2009 Raoul Snyman # |
2390 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
2391 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
2392 | +# --------------------------------------------------------------------------- # |
2393 | +# This program is free software; you can redistribute it and/or modify it # |
2394 | +# under the terms of the GNU General Public License as published by the Free # |
2395 | +# Software Foundation; version 2 of the License. # |
2396 | +# # |
2397 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
2398 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
2399 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
2400 | +# more details. # |
2401 | +# # |
2402 | +# You should have received a copy of the GNU General Public License along # |
2403 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
2404 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
2405 | +############################################################################### |
2406 | |
2407 | === modified file 'openlp/migration/display.py' |
2408 | --- openlp/migration/display.py 2009-06-23 16:25:40 +0000 |
2409 | +++ openlp/migration/display.py 2009-09-08 19:58:05 +0000 |
2410 | @@ -1,20 +1,26 @@ |
2411 | -""" |
2412 | -OpenLP - Open Source Lyrics Projection |
2413 | -Copyright (c) 2008 Raoul Snyman |
2414 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley |
2415 | - |
2416 | -This program is free software; you can redistribute it and/or modify it under |
2417 | -the terms of the GNU General Public License as published by the Free Software |
2418 | -Foundation; version 2 of the License. |
2419 | - |
2420 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
2421 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
2422 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
2423 | - |
2424 | -You should have received a copy of the GNU General Public License along with |
2425 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
2426 | -Place, Suite 330, Boston, MA 02111-1307 USA |
2427 | -""" |
2428 | +# -*- coding: utf-8 -*- |
2429 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
2430 | + |
2431 | +############################################################################### |
2432 | +# OpenLP - Open Source Lyrics Projection # |
2433 | +# --------------------------------------------------------------------------- # |
2434 | +# Copyright (c) 2008-2009 Raoul Snyman # |
2435 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
2436 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
2437 | +# --------------------------------------------------------------------------- # |
2438 | +# This program is free software; you can redistribute it and/or modify it # |
2439 | +# under the terms of the GNU General Public License as published by the Free # |
2440 | +# Software Foundation; version 2 of the License. # |
2441 | +# # |
2442 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
2443 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
2444 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
2445 | +# more details. # |
2446 | +# # |
2447 | +# You should have received a copy of the GNU General Public License along # |
2448 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
2449 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
2450 | +############################################################################### |
2451 | |
2452 | import logging |
2453 | |
2454 | |
2455 | === modified file 'openlp/migration/migratebibles.py' |
2456 | --- openlp/migration/migratebibles.py 2009-06-16 18:21:24 +0000 |
2457 | +++ openlp/migration/migratebibles.py 2009-09-08 19:58:05 +0000 |
2458 | @@ -1,20 +1,26 @@ |
2459 | -""" |
2460 | -OpenLP - Open Source Lyrics Projection |
2461 | -Copyright (c) 2008 Raoul Snyman |
2462 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley |
2463 | - |
2464 | -This program is free software; you can redistribute it and/or modify it under |
2465 | -the terms of the GNU General Public License as published by the Free Software |
2466 | -Foundation; version 2 of the License. |
2467 | - |
2468 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
2469 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
2470 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
2471 | - |
2472 | -You should have received a copy of the GNU General Public License along with |
2473 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
2474 | -Place, Suite 330, Boston, MA 02111-1307 USA |
2475 | -""" |
2476 | +# -*- coding: utf-8 -*- |
2477 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
2478 | + |
2479 | +############################################################################### |
2480 | +# OpenLP - Open Source Lyrics Projection # |
2481 | +# --------------------------------------------------------------------------- # |
2482 | +# Copyright (c) 2008-2009 Raoul Snyman # |
2483 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
2484 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
2485 | +# --------------------------------------------------------------------------- # |
2486 | +# This program is free software; you can redistribute it and/or modify it # |
2487 | +# under the terms of the GNU General Public License as published by the Free # |
2488 | +# Software Foundation; version 2 of the License. # |
2489 | +# # |
2490 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
2491 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
2492 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
2493 | +# more details. # |
2494 | +# # |
2495 | +# You should have received a copy of the GNU General Public License along # |
2496 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
2497 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
2498 | +############################################################################### |
2499 | |
2500 | import logging |
2501 | |
2502 | @@ -24,4 +30,4 @@ |
2503 | |
2504 | def process(self): |
2505 | self.display.output(u'Bible process started'); |
2506 | - self.display.output(u'Bible process finished'); |
2507 | \ No newline at end of file |
2508 | + self.display.output(u'Bible process finished'); |
2509 | |
2510 | === modified file 'openlp/migration/migratefiles.py' |
2511 | --- openlp/migration/migratefiles.py 2009-06-23 16:25:40 +0000 |
2512 | +++ openlp/migration/migratefiles.py 2009-09-08 19:58:05 +0000 |
2513 | @@ -1,20 +1,27 @@ |
2514 | -""" |
2515 | -OpenLP - Open Source Lyrics Projection |
2516 | -Copyright (c) 2008 Raoul Snyman |
2517 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley |
2518 | - |
2519 | -This program is free software; you can redistribute it and/or modify it under |
2520 | -the terms of the GNU General Public License as published by the Free Software |
2521 | -Foundation; version 2 of the License. |
2522 | - |
2523 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
2524 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
2525 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
2526 | - |
2527 | -You should have received a copy of the GNU General Public License along with |
2528 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
2529 | -Place, Suite 330, Boston, MA 02111-1307 USA |
2530 | -""" |
2531 | +# -*- coding: utf-8 -*- |
2532 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
2533 | + |
2534 | +############################################################################### |
2535 | +# OpenLP - Open Source Lyrics Projection # |
2536 | +# --------------------------------------------------------------------------- # |
2537 | +# Copyright (c) 2008-2009 Raoul Snyman # |
2538 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
2539 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
2540 | +# --------------------------------------------------------------------------- # |
2541 | +# This program is free software; you can redistribute it and/or modify it # |
2542 | +# under the terms of the GNU General Public License as published by the Free # |
2543 | +# Software Foundation; version 2 of the License. # |
2544 | +# # |
2545 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
2546 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
2547 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
2548 | +# more details. # |
2549 | +# # |
2550 | +# You should have received a copy of the GNU General Public License along # |
2551 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
2552 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
2553 | +############################################################################### |
2554 | + |
2555 | from openlp.core.utils import ConfigHelper |
2556 | |
2557 | class MigrateFiles(): |
2558 | |
2559 | === modified file 'openlp/migration/migratesongs.py' |
2560 | --- openlp/migration/migratesongs.py 2009-08-02 16:13:59 +0000 |
2561 | +++ openlp/migration/migratesongs.py 2009-09-08 19:58:05 +0000 |
2562 | @@ -1,20 +1,27 @@ |
2563 | -""" |
2564 | -OpenLP - Open Source Lyrics Projection |
2565 | -Copyright (c) 2008 Raoul Snyman |
2566 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley |
2567 | - |
2568 | -This program is free software; you can redistribute it and/or modify it under |
2569 | -the terms of the GNU General Public License as published by the Free Software |
2570 | -Foundation; version 2 of the License. |
2571 | - |
2572 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
2573 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
2574 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
2575 | - |
2576 | -You should have received a copy of the GNU General Public License along with |
2577 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
2578 | -Place, Suite 330, Boston, MA 02111-1307 USA |
2579 | -""" |
2580 | +# -*- coding: utf-8 -*- |
2581 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
2582 | + |
2583 | +############################################################################### |
2584 | +# OpenLP - Open Source Lyrics Projection # |
2585 | +# --------------------------------------------------------------------------- # |
2586 | +# Copyright (c) 2008-2009 Raoul Snyman # |
2587 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
2588 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
2589 | +# --------------------------------------------------------------------------- # |
2590 | +# This program is free software; you can redistribute it and/or modify it # |
2591 | +# under the terms of the GNU General Public License as published by the Free # |
2592 | +# Software Foundation; version 2 of the License. # |
2593 | +# # |
2594 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
2595 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
2596 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
2597 | +# more details. # |
2598 | +# # |
2599 | +# You should have received a copy of the GNU General Public License along # |
2600 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
2601 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
2602 | +############################################################################### |
2603 | + |
2604 | import os |
2605 | import sys |
2606 | import logging |
2607 | |
2608 | === modified file 'openlp/plugins/__init__.py' |
2609 | --- openlp/plugins/__init__.py 2008-11-28 19:22:14 +0000 |
2610 | +++ openlp/plugins/__init__.py 2009-09-08 19:58:05 +0000 |
2611 | @@ -1,1 +1,23 @@ |
2612 | +# -*- coding: utf-8 -*- |
2613 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
2614 | |
2615 | +############################################################################### |
2616 | +# OpenLP - Open Source Lyrics Projection # |
2617 | +# --------------------------------------------------------------------------- # |
2618 | +# Copyright (c) 2008-2009 Raoul Snyman # |
2619 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
2620 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
2621 | +# --------------------------------------------------------------------------- # |
2622 | +# This program is free software; you can redistribute it and/or modify it # |
2623 | +# under the terms of the GNU General Public License as published by the Free # |
2624 | +# Software Foundation; version 2 of the License. # |
2625 | +# # |
2626 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
2627 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
2628 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
2629 | +# more details. # |
2630 | +# # |
2631 | +# You should have received a copy of the GNU General Public License along # |
2632 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
2633 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
2634 | +############################################################################### |
2635 | |
2636 | === modified file 'openlp/plugins/bibles/__init__.py' |
2637 | --- openlp/plugins/bibles/__init__.py 2008-12-06 09:30:38 +0000 |
2638 | +++ openlp/plugins/bibles/__init__.py 2009-09-08 19:58:05 +0000 |
2639 | @@ -1,20 +1,23 @@ |
2640 | # -*- coding: utf-8 -*- |
2641 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
2642 | -""" |
2643 | -OpenLP - Open Source Lyrics Projection |
2644 | -Copyright (c) 2008 Raoul Snyman |
2645 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley |
2646 | - |
2647 | -This program is free software; you can redistribute it and/or modify it under |
2648 | -the terms of the GNU General Public License as published by the Free Software |
2649 | -Foundation; version 2 of the License. |
2650 | - |
2651 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
2652 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
2653 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
2654 | - |
2655 | -You should have received a copy of the GNU General Public License along with |
2656 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
2657 | -Place, Suite 330, Boston, MA 02111-1307 USA |
2658 | -""" |
2659 | - |
2660 | + |
2661 | +############################################################################### |
2662 | +# OpenLP - Open Source Lyrics Projection # |
2663 | +# --------------------------------------------------------------------------- # |
2664 | +# Copyright (c) 2008-2009 Raoul Snyman # |
2665 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
2666 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
2667 | +# --------------------------------------------------------------------------- # |
2668 | +# This program is free software; you can redistribute it and/or modify it # |
2669 | +# under the terms of the GNU General Public License as published by the Free # |
2670 | +# Software Foundation; version 2 of the License. # |
2671 | +# # |
2672 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
2673 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
2674 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
2675 | +# more details. # |
2676 | +# # |
2677 | +# You should have received a copy of the GNU General Public License along # |
2678 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
2679 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
2680 | +############################################################################### |
2681 | |
2682 | === modified file 'openlp/plugins/bibles/bibleplugin.py' |
2683 | --- openlp/plugins/bibles/bibleplugin.py 2009-08-26 05:00:19 +0000 |
2684 | +++ openlp/plugins/bibles/bibleplugin.py 2009-09-08 19:58:05 +0000 |
2685 | @@ -1,22 +1,27 @@ |
2686 | # -*- coding: utf-8 -*- |
2687 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
2688 | -""" |
2689 | -OpenLP - Open Source Lyrics Projection |
2690 | -Copyright (c) 2008 Raoul Snyman |
2691 | -Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley |
2692 | - |
2693 | -This program is free software; you can redistribute it and/or modify it under |
2694 | -the terms of the GNU General Public License as published by the Free Software |
2695 | -Foundation; version 2 of the License. |
2696 | - |
2697 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
2698 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
2699 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
2700 | - |
2701 | -You should have received a copy of the GNU General Public License along with |
2702 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
2703 | -Place, Suite 330, Boston, MA 02111-1307 USA |
2704 | -""" |
2705 | + |
2706 | +############################################################################### |
2707 | +# OpenLP - Open Source Lyrics Projection # |
2708 | +# --------------------------------------------------------------------------- # |
2709 | +# Copyright (c) 2008-2009 Raoul Snyman # |
2710 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
2711 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
2712 | +# --------------------------------------------------------------------------- # |
2713 | +# This program is free software; you can redistribute it and/or modify it # |
2714 | +# under the terms of the GNU General Public License as published by the Free # |
2715 | +# Software Foundation; version 2 of the License. # |
2716 | +# # |
2717 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
2718 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
2719 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
2720 | +# more details. # |
2721 | +# # |
2722 | +# You should have received a copy of the GNU General Public License along # |
2723 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
2724 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
2725 | +############################################################################### |
2726 | + |
2727 | import logging |
2728 | |
2729 | from PyQt4 import QtCore, QtGui |
2730 | |
2731 | === modified file 'openlp/plugins/bibles/forms/__init__.py' |
2732 | --- openlp/plugins/bibles/forms/__init__.py 2008-12-14 15:49:54 +0000 |
2733 | +++ openlp/plugins/bibles/forms/__init__.py 2009-09-08 19:58:05 +0000 |
2734 | @@ -1,22 +1,26 @@ |
2735 | # -*- coding: utf-8 -*- |
2736 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
2737 | -""" |
2738 | -OpenLP - Open Source Lyrics Projection |
2739 | -Copyright (c) 2008 Raoul Snyman |
2740 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley |
2741 | - |
2742 | -This program is free software; you can redistribute it and/or modify it under |
2743 | -the terms of the GNU General Public License as published by the Free Software |
2744 | -Foundation; version 2 of the License. |
2745 | - |
2746 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
2747 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
2748 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
2749 | - |
2750 | -You should have received a copy of the GNU General Public License along with |
2751 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
2752 | -Place, Suite 330, Boston, MA 02111-1307 USA |
2753 | -""" |
2754 | + |
2755 | +############################################################################### |
2756 | +# OpenLP - Open Source Lyrics Projection # |
2757 | +# --------------------------------------------------------------------------- # |
2758 | +# Copyright (c) 2008-2009 Raoul Snyman # |
2759 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
2760 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
2761 | +# --------------------------------------------------------------------------- # |
2762 | +# This program is free software; you can redistribute it and/or modify it # |
2763 | +# under the terms of the GNU General Public License as published by the Free # |
2764 | +# Software Foundation; version 2 of the License. # |
2765 | +# # |
2766 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
2767 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
2768 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
2769 | +# more details. # |
2770 | +# # |
2771 | +# You should have received a copy of the GNU General Public License along # |
2772 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
2773 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
2774 | +############################################################################### |
2775 | |
2776 | from bibleimportform import BibleImportForm |
2777 | |
2778 | |
2779 | === modified file 'openlp/plugins/bibles/forms/bibleimportdialog.py' |
2780 | --- openlp/plugins/bibles/forms/bibleimportdialog.py 2009-08-07 17:19:32 +0000 |
2781 | +++ openlp/plugins/bibles/forms/bibleimportdialog.py 2009-09-08 19:58:05 +0000 |
2782 | @@ -1,11 +1,26 @@ |
2783 | # -*- coding: utf-8 -*- |
2784 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
2785 | |
2786 | -# Form implementation generated from reading ui file 'bibleimportdialog.ui' |
2787 | -# |
2788 | -# Created: Fri Aug 7 06:07:06 2009 |
2789 | -# by: PyQt4 UI code generator 4.4.4 |
2790 | -# |
2791 | -# WARNING! All changes made in this file will be lost! |
2792 | +############################################################################### |
2793 | +# OpenLP - Open Source Lyrics Projection # |
2794 | +# --------------------------------------------------------------------------- # |
2795 | +# Copyright (c) 2008-2009 Raoul Snyman # |
2796 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
2797 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
2798 | +# --------------------------------------------------------------------------- # |
2799 | +# This program is free software; you can redistribute it and/or modify it # |
2800 | +# under the terms of the GNU General Public License as published by the Free # |
2801 | +# Software Foundation; version 2 of the License. # |
2802 | +# # |
2803 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
2804 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
2805 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
2806 | +# more details. # |
2807 | +# # |
2808 | +# You should have received a copy of the GNU General Public License along # |
2809 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
2810 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
2811 | +############################################################################### |
2812 | |
2813 | from PyQt4 import QtCore, QtGui |
2814 | |
2815 | |
2816 | === modified file 'openlp/plugins/bibles/forms/bibleimportform.py' |
2817 | --- openlp/plugins/bibles/forms/bibleimportform.py 2009-08-24 20:05:46 +0000 |
2818 | +++ openlp/plugins/bibles/forms/bibleimportform.py 2009-09-08 19:58:05 +0000 |
2819 | @@ -1,22 +1,27 @@ |
2820 | # -*- coding: utf-8 -*- |
2821 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
2822 | -''' |
2823 | -OpenLP - Open Source Lyrics Projection |
2824 | -Copyright (c) 2008 Raoul Snyman |
2825 | -Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley |
2826 | - |
2827 | -This program is free software; you can redistribute it and/or modify it under |
2828 | -the terms of the GNU General Public License as published by the Free Software |
2829 | -Foundation; version 2 of the License. |
2830 | - |
2831 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
2832 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
2833 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
2834 | - |
2835 | -You should have received a copy of the GNU General Public License along with |
2836 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
2837 | -Place, Suite 330, Boston, MA 02111-1307 USA |
2838 | -''' |
2839 | + |
2840 | +############################################################################### |
2841 | +# OpenLP - Open Source Lyrics Projection # |
2842 | +# --------------------------------------------------------------------------- # |
2843 | +# Copyright (c) 2008-2009 Raoul Snyman # |
2844 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
2845 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
2846 | +# --------------------------------------------------------------------------- # |
2847 | +# This program is free software; you can redistribute it and/or modify it # |
2848 | +# under the terms of the GNU General Public License as published by the Free # |
2849 | +# Software Foundation; version 2 of the License. # |
2850 | +# # |
2851 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
2852 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
2853 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
2854 | +# more details. # |
2855 | +# # |
2856 | +# You should have received a copy of the GNU General Public License along # |
2857 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
2858 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
2859 | +############################################################################### |
2860 | + |
2861 | import sys |
2862 | import os, os.path |
2863 | import sys |
2864 | |
2865 | === modified file 'openlp/plugins/bibles/lib/__init__.py' |
2866 | --- openlp/plugins/bibles/lib/__init__.py 2009-06-17 05:11:16 +0000 |
2867 | +++ openlp/plugins/bibles/lib/__init__.py 2009-09-08 19:58:05 +0000 |
2868 | @@ -1,22 +1,27 @@ |
2869 | # -*- coding: utf-8 -*- |
2870 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
2871 | -""" |
2872 | -OpenLP - Open Source Lyrics Projection |
2873 | -Copyright (c) 2008 Raoul Snyman |
2874 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley |
2875 | - |
2876 | -This program is free software; you can redistribute it and/or modify it under |
2877 | -the terms of the GNU General Public License as published by the Free Software |
2878 | -Foundation; version 2 of the License. |
2879 | - |
2880 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
2881 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
2882 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
2883 | - |
2884 | -You should have received a copy of the GNU General Public License along with |
2885 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
2886 | -Place, Suite 330, Boston, MA 02111-1307 USA |
2887 | -""" |
2888 | + |
2889 | +############################################################################### |
2890 | +# OpenLP - Open Source Lyrics Projection # |
2891 | +# --------------------------------------------------------------------------- # |
2892 | +# Copyright (c) 2008-2009 Raoul Snyman # |
2893 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
2894 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
2895 | +# --------------------------------------------------------------------------- # |
2896 | +# This program is free software; you can redistribute it and/or modify it # |
2897 | +# under the terms of the GNU General Public License as published by the Free # |
2898 | +# Software Foundation; version 2 of the License. # |
2899 | +# # |
2900 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
2901 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
2902 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
2903 | +# more details. # |
2904 | +# # |
2905 | +# You should have received a copy of the GNU General Public License along # |
2906 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
2907 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
2908 | +############################################################################### |
2909 | + |
2910 | from common import BibleCommon |
2911 | from manager import BibleManager |
2912 | from biblestab import BiblesTab |
2913 | |
2914 | === modified file 'openlp/plugins/bibles/lib/bibleCSVimpl.py' |
2915 | --- openlp/plugins/bibles/lib/bibleCSVimpl.py 2009-08-24 04:30:04 +0000 |
2916 | +++ openlp/plugins/bibles/lib/bibleCSVimpl.py 2009-09-08 19:58:05 +0000 |
2917 | @@ -1,20 +1,27 @@ |
2918 | -""" |
2919 | -OpenLP - Open Source Lyrics Projection |
2920 | -Copyright (c) 2008 Raoul Snyman |
2921 | -Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley |
2922 | - |
2923 | -This program is free software; you can redistribute it and/or modify it under |
2924 | -the terms of the GNU General Public License as published by the Free Software |
2925 | -Foundation; version 2 of the License. |
2926 | - |
2927 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
2928 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
2929 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
2930 | - |
2931 | -You should have received a copy of the GNU General Public License along with |
2932 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
2933 | -Place, Suite 330, Boston, MA 02111-1307 USA |
2934 | -""" |
2935 | +# -*- coding: utf-8 -*- |
2936 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
2937 | + |
2938 | +############################################################################### |
2939 | +# OpenLP - Open Source Lyrics Projection # |
2940 | +# --------------------------------------------------------------------------- # |
2941 | +# Copyright (c) 2008-2009 Raoul Snyman # |
2942 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
2943 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
2944 | +# --------------------------------------------------------------------------- # |
2945 | +# This program is free software; you can redistribute it and/or modify it # |
2946 | +# under the terms of the GNU General Public License as published by the Free # |
2947 | +# Software Foundation; version 2 of the License. # |
2948 | +# # |
2949 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
2950 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
2951 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
2952 | +# more details. # |
2953 | +# # |
2954 | +# You should have received a copy of the GNU General Public License along # |
2955 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
2956 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
2957 | +############################################################################### |
2958 | + |
2959 | import logging |
2960 | import chardet |
2961 | |
2962 | |
2963 | === modified file 'openlp/plugins/bibles/lib/bibleDBimpl.py' |
2964 | --- openlp/plugins/bibles/lib/bibleDBimpl.py 2009-07-18 05:43:50 +0000 |
2965 | +++ openlp/plugins/bibles/lib/bibleDBimpl.py 2009-09-08 19:58:05 +0000 |
2966 | @@ -1,24 +1,27 @@ |
2967 | # -*- coding: utf-8 -*- |
2968 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
2969 | -""" |
2970 | -OpenLP - Open Source Lyrics Projection |
2971 | - |
2972 | -Copyright (c) 2008 Raoul Snyman |
2973 | - |
2974 | -Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley |
2975 | - |
2976 | -This program is free software; you can redistribute it and/or modify it under |
2977 | -the terms of the GNU General Public License as published by the Free Software |
2978 | -Foundation; version 2 of the License. |
2979 | - |
2980 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
2981 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
2982 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
2983 | - |
2984 | -You should have received a copy of the GNU General Public License along with |
2985 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
2986 | -Place, Suite 330, Boston, MA 02111-1307 USA |
2987 | -""" |
2988 | + |
2989 | +############################################################################### |
2990 | +# OpenLP - Open Source Lyrics Projection # |
2991 | +# --------------------------------------------------------------------------- # |
2992 | +# Copyright (c) 2008-2009 Raoul Snyman # |
2993 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
2994 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
2995 | +# --------------------------------------------------------------------------- # |
2996 | +# This program is free software; you can redistribute it and/or modify it # |
2997 | +# under the terms of the GNU General Public License as published by the Free # |
2998 | +# Software Foundation; version 2 of the License. # |
2999 | +# # |
3000 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
3001 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
3002 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
3003 | +# more details. # |
3004 | +# # |
3005 | +# You should have received a copy of the GNU General Public License along # |
3006 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
3007 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
3008 | +############################################################################### |
3009 | + |
3010 | import os |
3011 | import logging |
3012 | |
3013 | |
3014 | === modified file 'openlp/plugins/bibles/lib/bibleHTTPimpl.py' |
3015 | --- openlp/plugins/bibles/lib/bibleHTTPimpl.py 2009-08-02 13:44:41 +0000 |
3016 | +++ openlp/plugins/bibles/lib/bibleHTTPimpl.py 2009-09-08 19:58:05 +0000 |
3017 | @@ -1,20 +1,26 @@ |
3018 | -""" |
3019 | -OpenLP - Open Source Lyrics Projection |
3020 | -Copyright (c) 2008 Raoul Snyman |
3021 | -Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley |
3022 | - |
3023 | -This program is free software; you can redistribute it and/or modify it under |
3024 | -the terms of the GNU General Public License as published by the Free Software |
3025 | -Foundation; version 2 of the License. |
3026 | - |
3027 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
3028 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
3029 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
3030 | - |
3031 | -You should have received a copy of the GNU General Public License along with |
3032 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
3033 | -Place, Suite 330, Boston, MA 02111-1307 USA |
3034 | -""" |
3035 | +# -*- coding: utf-8 -*- |
3036 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
3037 | + |
3038 | +############################################################################### |
3039 | +# OpenLP - Open Source Lyrics Projection # |
3040 | +# --------------------------------------------------------------------------- # |
3041 | +# Copyright (c) 2008-2009 Raoul Snyman # |
3042 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
3043 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
3044 | +# --------------------------------------------------------------------------- # |
3045 | +# This program is free software; you can redistribute it and/or modify it # |
3046 | +# under the terms of the GNU General Public License as published by the Free # |
3047 | +# Software Foundation; version 2 of the License. # |
3048 | +# # |
3049 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
3050 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
3051 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
3052 | +# more details. # |
3053 | +# # |
3054 | +# You should have received a copy of the GNU General Public License along # |
3055 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
3056 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
3057 | +############################################################################### |
3058 | |
3059 | import os, os.path |
3060 | import sys |
3061 | |
3062 | === modified file 'openlp/plugins/bibles/lib/bibleOSISimpl.py' |
3063 | --- openlp/plugins/bibles/lib/bibleOSISimpl.py 2009-08-24 04:30:04 +0000 |
3064 | +++ openlp/plugins/bibles/lib/bibleOSISimpl.py 2009-09-08 19:58:05 +0000 |
3065 | @@ -1,22 +1,27 @@ |
3066 | -""" |
3067 | -OpenLP - Open Source Lyrics Projection |
3068 | - |
3069 | -Copyright (c) 2008 Raoul Snyman |
3070 | - |
3071 | -Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley |
3072 | - |
3073 | -This program is free software; you can redistribute it and/or modify it under |
3074 | -the terms of the GNU General Public License as published by the Free Software |
3075 | -Foundation; version 2 of the License. |
3076 | - |
3077 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
3078 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
3079 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
3080 | - |
3081 | -You should have received a copy of the GNU General Public License along with |
3082 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
3083 | -Place, Suite 330, Boston, MA 02111-1307 USA |
3084 | -""" |
3085 | +# -*- coding: utf-8 -*- |
3086 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
3087 | + |
3088 | +############################################################################### |
3089 | +# OpenLP - Open Source Lyrics Projection # |
3090 | +# --------------------------------------------------------------------------- # |
3091 | +# Copyright (c) 2008-2009 Raoul Snyman # |
3092 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
3093 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
3094 | +# --------------------------------------------------------------------------- # |
3095 | +# This program is free software; you can redistribute it and/or modify it # |
3096 | +# under the terms of the GNU General Public License as published by the Free # |
3097 | +# Software Foundation; version 2 of the License. # |
3098 | +# # |
3099 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
3100 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
3101 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
3102 | +# more details. # |
3103 | +# # |
3104 | +# You should have received a copy of the GNU General Public License along # |
3105 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
3106 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
3107 | +############################################################################### |
3108 | + |
3109 | import os |
3110 | import os.path |
3111 | import logging |
3112 | |
3113 | === modified file 'openlp/plugins/bibles/lib/biblestab.py' |
3114 | --- openlp/plugins/bibles/lib/biblestab.py 2009-08-25 05:18:09 +0000 |
3115 | +++ openlp/plugins/bibles/lib/biblestab.py 2009-09-08 19:58:05 +0000 |
3116 | @@ -1,22 +1,27 @@ |
3117 | # -*- coding: utf-8 -*- |
3118 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
3119 | -""" |
3120 | -OpenLP - Open Source Lyrics Projection |
3121 | -Copyright (c) 2008 Raoul Snyman |
3122 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, |
3123 | - |
3124 | -This program is free software; you can redistribute it and/or modify it under |
3125 | -the terms of the GNU General Public License as published by the Free Software |
3126 | -Foundation; version 2 of the License. |
3127 | - |
3128 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
3129 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
3130 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
3131 | - |
3132 | -You should have received a copy of the GNU General Public License along with |
3133 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
3134 | -Place, Suite 330, Boston, MA 02111-1307 USA |
3135 | -""" |
3136 | + |
3137 | +############################################################################### |
3138 | +# OpenLP - Open Source Lyrics Projection # |
3139 | +# --------------------------------------------------------------------------- # |
3140 | +# Copyright (c) 2008-2009 Raoul Snyman # |
3141 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
3142 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
3143 | +# --------------------------------------------------------------------------- # |
3144 | +# This program is free software; you can redistribute it and/or modify it # |
3145 | +# under the terms of the GNU General Public License as published by the Free # |
3146 | +# Software Foundation; version 2 of the License. # |
3147 | +# # |
3148 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
3149 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
3150 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
3151 | +# more details. # |
3152 | +# # |
3153 | +# You should have received a copy of the GNU General Public License along # |
3154 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
3155 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
3156 | +############################################################################### |
3157 | + |
3158 | import logging |
3159 | |
3160 | from PyQt4 import Qt, QtCore, QtGui |
3161 | |
3162 | === modified file 'openlp/plugins/bibles/lib/common.py' |
3163 | --- openlp/plugins/bibles/lib/common.py 2009-07-12 15:11:57 +0000 |
3164 | +++ openlp/plugins/bibles/lib/common.py 2009-09-08 19:58:05 +0000 |
3165 | @@ -1,20 +1,27 @@ |
3166 | -""" |
3167 | -OpenLP - Open Source Lyrics Projection |
3168 | -Copyright (c) 2008 Raoul Snyman |
3169 | -Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley |
3170 | - |
3171 | -This program is free software; you can redistribute it and/or modify it under |
3172 | -the terms of the GNU General Public License as published by the Free Software |
3173 | -Foundation; version 2 of the License. |
3174 | - |
3175 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
3176 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
3177 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
3178 | - |
3179 | -You should have received a copy of the GNU General Public License along with |
3180 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
3181 | -Place, Suite 330, Boston, MA 02111-1307 USA |
3182 | -""" |
3183 | +# -*- coding: utf-8 -*- |
3184 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
3185 | + |
3186 | +############################################################################### |
3187 | +# OpenLP - Open Source Lyrics Projection # |
3188 | +# --------------------------------------------------------------------------- # |
3189 | +# Copyright (c) 2008-2009 Raoul Snyman # |
3190 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
3191 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
3192 | +# --------------------------------------------------------------------------- # |
3193 | +# This program is free software; you can redistribute it and/or modify it # |
3194 | +# under the terms of the GNU General Public License as published by the Free # |
3195 | +# Software Foundation; version 2 of the License. # |
3196 | +# # |
3197 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
3198 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
3199 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
3200 | +# more details. # |
3201 | +# # |
3202 | +# You should have received a copy of the GNU General Public License along # |
3203 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
3204 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
3205 | +############################################################################### |
3206 | + |
3207 | import os |
3208 | import os.path |
3209 | import sys |
3210 | |
3211 | === modified file 'openlp/plugins/bibles/lib/manager.py' |
3212 | --- openlp/plugins/bibles/lib/manager.py 2009-08-02 13:44:41 +0000 |
3213 | +++ openlp/plugins/bibles/lib/manager.py 2009-09-08 19:58:05 +0000 |
3214 | @@ -1,24 +1,27 @@ |
3215 | # -*- coding: utf-8 -*- |
3216 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
3217 | -""" |
3218 | -OpenLP - Open Source Lyrics Projection |
3219 | - |
3220 | -Copyright (c) 2008 Raoul Snyman |
3221 | - |
3222 | -Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley |
3223 | - |
3224 | -This program is free software; you can redistribute it and/or modify it under |
3225 | -the terms of the GNU General Public License as published by the Free Software |
3226 | -Foundation; version 2 of the License. |
3227 | - |
3228 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
3229 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
3230 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
3231 | - |
3232 | -You should have received a copy of the GNU General Public License along with |
3233 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
3234 | -Place, Suite 330, Boston, MA 02111-1307 USA |
3235 | -""" |
3236 | + |
3237 | +############################################################################### |
3238 | +# OpenLP - Open Source Lyrics Projection # |
3239 | +# --------------------------------------------------------------------------- # |
3240 | +# Copyright (c) 2008-2009 Raoul Snyman # |
3241 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
3242 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
3243 | +# --------------------------------------------------------------------------- # |
3244 | +# This program is free software; you can redistribute it and/or modify it # |
3245 | +# under the terms of the GNU General Public License as published by the Free # |
3246 | +# Software Foundation; version 2 of the License. # |
3247 | +# # |
3248 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
3249 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
3250 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
3251 | +# more details. # |
3252 | +# # |
3253 | +# You should have received a copy of the GNU General Public License along # |
3254 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
3255 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
3256 | +############################################################################### |
3257 | + |
3258 | import logging |
3259 | import os |
3260 | import sys |
3261 | |
3262 | === modified file 'openlp/plugins/bibles/lib/mediaitem.py' |
3263 | --- openlp/plugins/bibles/lib/mediaitem.py 2009-09-01 05:17:32 +0000 |
3264 | +++ openlp/plugins/bibles/lib/mediaitem.py 2009-09-08 19:58:05 +0000 |
3265 | @@ -1,24 +1,27 @@ |
3266 | # -*- coding: utf-8 -*- |
3267 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
3268 | -""" |
3269 | -OpenLP - Open Source Lyrics Projection |
3270 | - |
3271 | -Copyright (c) 2008 Raoul Snyman |
3272 | - |
3273 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley |
3274 | - |
3275 | -This program is free software; you can redistribute it and/or modify it under |
3276 | -the terms of the GNU General Public License as published by the Free Software |
3277 | -Foundation; version 2 of the License. |
3278 | - |
3279 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
3280 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
3281 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
3282 | - |
3283 | -You should have received a copy of the GNU General Public License along with |
3284 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
3285 | -Place, Suite 330, Boston, MA 02111-1307 USA |
3286 | -""" |
3287 | + |
3288 | +############################################################################### |
3289 | +# OpenLP - Open Source Lyrics Projection # |
3290 | +# --------------------------------------------------------------------------- # |
3291 | +# Copyright (c) 2008-2009 Raoul Snyman # |
3292 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
3293 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
3294 | +# --------------------------------------------------------------------------- # |
3295 | +# This program is free software; you can redistribute it and/or modify it # |
3296 | +# under the terms of the GNU General Public License as published by the Free # |
3297 | +# Software Foundation; version 2 of the License. # |
3298 | +# # |
3299 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
3300 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
3301 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
3302 | +# more details. # |
3303 | +# # |
3304 | +# You should have received a copy of the GNU General Public License along # |
3305 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
3306 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
3307 | +############################################################################### |
3308 | + |
3309 | import logging |
3310 | import time |
3311 | |
3312 | |
3313 | === modified file 'openlp/plugins/custom/__init__.py' |
3314 | --- openlp/plugins/custom/__init__.py 2009-03-07 09:20:26 +0000 |
3315 | +++ openlp/plugins/custom/__init__.py 2009-09-08 19:58:05 +0000 |
3316 | @@ -1,17 +1,23 @@ |
3317 | -""" |
3318 | -OpenLP - Open Source Lyrics Projection |
3319 | -Copyright (c) 2008 Raoul Snyman |
3320 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten Tinggaard |
3321 | - |
3322 | -This program is free software; you can redistribute it and/or modify it under |
3323 | -the terms of the GNU General Public License as published by the Free Software |
3324 | -Foundation; version 2 of the License. |
3325 | - |
3326 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
3327 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
3328 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
3329 | - |
3330 | -You should have received a copy of the GNU General Public License along with |
3331 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
3332 | -Place, Suite 330, Boston, MA 02111-1307 USA |
3333 | -""" |
3334 | +# -*- coding: utf-8 -*- |
3335 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
3336 | + |
3337 | +############################################################################### |
3338 | +# OpenLP - Open Source Lyrics Projection # |
3339 | +# --------------------------------------------------------------------------- # |
3340 | +# Copyright (c) 2008-2009 Raoul Snyman # |
3341 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
3342 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
3343 | +# --------------------------------------------------------------------------- # |
3344 | +# This program is free software; you can redistribute it and/or modify it # |
3345 | +# under the terms of the GNU General Public License as published by the Free # |
3346 | +# Software Foundation; version 2 of the License. # |
3347 | +# # |
3348 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
3349 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
3350 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
3351 | +# more details. # |
3352 | +# # |
3353 | +# You should have received a copy of the GNU General Public License along # |
3354 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
3355 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
3356 | +############################################################################### |
3357 | |
3358 | === modified file 'openlp/plugins/custom/customplugin.py' |
3359 | --- openlp/plugins/custom/customplugin.py 2009-08-26 05:00:19 +0000 |
3360 | +++ openlp/plugins/custom/customplugin.py 2009-09-08 19:58:05 +0000 |
3361 | @@ -1,22 +1,27 @@ |
3362 | # -*- coding: utf-8 -*- |
3363 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
3364 | -""" |
3365 | -OpenLP - Open Source Lyrics Projection |
3366 | -Copyright (c) 2008 Raoul Snyman |
3367 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley, |
3368 | - |
3369 | -This program is free software; you can redistribute it and/or modify it under |
3370 | -the terms of the GNU General Public License as published by the Free Software |
3371 | -Foundation; version 2 of the License. |
3372 | - |
3373 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
3374 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
3375 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
3376 | - |
3377 | -You should have received a copy of the GNU General Public License along with |
3378 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
3379 | -Place, Suite 330, Boston, MA 02111-1307 USA |
3380 | -""" |
3381 | + |
3382 | +############################################################################### |
3383 | +# OpenLP - Open Source Lyrics Projection # |
3384 | +# --------------------------------------------------------------------------- # |
3385 | +# Copyright (c) 2008-2009 Raoul Snyman # |
3386 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
3387 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
3388 | +# --------------------------------------------------------------------------- # |
3389 | +# This program is free software; you can redistribute it and/or modify it # |
3390 | +# under the terms of the GNU General Public License as published by the Free # |
3391 | +# Software Foundation; version 2 of the License. # |
3392 | +# # |
3393 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
3394 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
3395 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
3396 | +# more details. # |
3397 | +# # |
3398 | +# You should have received a copy of the GNU General Public License along # |
3399 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
3400 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
3401 | +############################################################################### |
3402 | + |
3403 | import logging |
3404 | |
3405 | from PyQt4 import QtCore, QtGui |
3406 | |
3407 | === modified file 'openlp/plugins/custom/forms/__init__.py' |
3408 | --- openlp/plugins/custom/forms/__init__.py 2009-03-07 09:20:26 +0000 |
3409 | +++ openlp/plugins/custom/forms/__init__.py 2009-09-08 19:58:05 +0000 |
3410 | @@ -1,22 +1,26 @@ |
3411 | # -*- coding: utf-8 -*- |
3412 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
3413 | -""" |
3414 | -OpenLP - Open Source Lyrics Projection |
3415 | -Copyright (c) 2008 Raoul Snyman |
3416 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, |
3417 | - |
3418 | -This program is free software; you can redistribute it and/or modify it under |
3419 | -the terms of the GNU General Public License as published by the Free Software |
3420 | -Foundation; version 2 of the License. |
3421 | - |
3422 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
3423 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
3424 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
3425 | - |
3426 | -You should have received a copy of the GNU General Public License along with |
3427 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
3428 | -Place, Suite 330, Boston, MA 02111-1307 USA |
3429 | -""" |
3430 | + |
3431 | +############################################################################### |
3432 | +# OpenLP - Open Source Lyrics Projection # |
3433 | +# --------------------------------------------------------------------------- # |
3434 | +# Copyright (c) 2008-2009 Raoul Snyman # |
3435 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
3436 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
3437 | +# --------------------------------------------------------------------------- # |
3438 | +# This program is free software; you can redistribute it and/or modify it # |
3439 | +# under the terms of the GNU General Public License as published by the Free # |
3440 | +# Software Foundation; version 2 of the License. # |
3441 | +# # |
3442 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
3443 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
3444 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
3445 | +# more details. # |
3446 | +# # |
3447 | +# You should have received a copy of the GNU General Public License along # |
3448 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
3449 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
3450 | +############################################################################### |
3451 | |
3452 | from editcustomform import EditCustomForm |
3453 | |
3454 | |
3455 | === modified file 'openlp/plugins/custom/forms/editcustomdialog.py' |
3456 | --- openlp/plugins/custom/forms/editcustomdialog.py 2009-06-17 05:11:16 +0000 |
3457 | +++ openlp/plugins/custom/forms/editcustomdialog.py 2009-09-08 19:58:05 +0000 |
3458 | @@ -1,11 +1,26 @@ |
3459 | # -*- coding: utf-8 -*- |
3460 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
3461 | |
3462 | -# Form implementation generated from reading ui file 'editcustomdialog.ui' |
3463 | -# |
3464 | -# Created: Sat Mar 7 09:01:43 2009 |
3465 | -# by: PyQt4 UI code generator 4.4.4 |
3466 | -# |
3467 | -# WARNING! All changes made in this file will be lost! |
3468 | +############################################################################### |
3469 | +# OpenLP - Open Source Lyrics Projection # |
3470 | +# --------------------------------------------------------------------------- # |
3471 | +# Copyright (c) 2008-2009 Raoul Snyman # |
3472 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
3473 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
3474 | +# --------------------------------------------------------------------------- # |
3475 | +# This program is free software; you can redistribute it and/or modify it # |
3476 | +# under the terms of the GNU General Public License as published by the Free # |
3477 | +# Software Foundation; version 2 of the License. # |
3478 | +# # |
3479 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
3480 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
3481 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
3482 | +# more details. # |
3483 | +# # |
3484 | +# You should have received a copy of the GNU General Public License along # |
3485 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
3486 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
3487 | +############################################################################### |
3488 | |
3489 | from PyQt4 import QtCore, QtGui |
3490 | from openlp.core.lib import translate |
3491 | |
3492 | === modified file 'openlp/plugins/custom/forms/editcustomform.py' |
3493 | --- openlp/plugins/custom/forms/editcustomform.py 2009-08-25 20:04:58 +0000 |
3494 | +++ openlp/plugins/custom/forms/editcustomform.py 2009-09-08 19:58:05 +0000 |
3495 | @@ -1,22 +1,27 @@ |
3496 | # -*- coding: utf-8 -*- |
3497 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
3498 | -""" |
3499 | -OpenLP - Open Source Lyrics Projection |
3500 | -Copyright (c) 2008 Raoul Snyman |
3501 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, |
3502 | - |
3503 | -This program is free software; you can redistribute it and/or modify it under |
3504 | -the terms of the GNU General Public License as published by the Free Software |
3505 | -Foundation; version 2 of the License. |
3506 | - |
3507 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
3508 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
3509 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
3510 | - |
3511 | -You should have received a copy of the GNU General Public License along with |
3512 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
3513 | -Place, Suite 330, Boston, MA 02111-1307 USA |
3514 | -""" |
3515 | + |
3516 | +############################################################################### |
3517 | +# OpenLP - Open Source Lyrics Projection # |
3518 | +# --------------------------------------------------------------------------- # |
3519 | +# Copyright (c) 2008-2009 Raoul Snyman # |
3520 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
3521 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
3522 | +# --------------------------------------------------------------------------- # |
3523 | +# This program is free software; you can redistribute it and/or modify it # |
3524 | +# under the terms of the GNU General Public License as published by the Free # |
3525 | +# Software Foundation; version 2 of the License. # |
3526 | +# # |
3527 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
3528 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
3529 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
3530 | +# more details. # |
3531 | +# # |
3532 | +# You should have received a copy of the GNU General Public License along # |
3533 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
3534 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
3535 | +############################################################################### |
3536 | + |
3537 | from PyQt4 import Qt, QtCore, QtGui |
3538 | |
3539 | from editcustomdialog import Ui_customEditDialog |
3540 | |
3541 | === modified file 'openlp/plugins/custom/lib/__init__.py' |
3542 | --- openlp/plugins/custom/lib/__init__.py 2009-06-17 05:11:16 +0000 |
3543 | +++ openlp/plugins/custom/lib/__init__.py 2009-09-08 19:58:05 +0000 |
3544 | @@ -1,22 +1,27 @@ |
3545 | # -*- coding: utf-8 -*- |
3546 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
3547 | -""" |
3548 | -OpenLP - Open Source Lyrics Projection |
3549 | -Copyright (c) 2008 Raoul Snyman |
3550 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley |
3551 | - |
3552 | -This program is free software; you can redistribute it and/or modify it under |
3553 | -the terms of the GNU General Public License as published by the Free Software |
3554 | -Foundation; version 2 of the License. |
3555 | - |
3556 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
3557 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
3558 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
3559 | - |
3560 | -You should have received a copy of the GNU General Public License along with |
3561 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
3562 | -Place, Suite 330, Boston, MA 02111-1307 USA |
3563 | -""" |
3564 | + |
3565 | +############################################################################### |
3566 | +# OpenLP - Open Source Lyrics Projection # |
3567 | +# --------------------------------------------------------------------------- # |
3568 | +# Copyright (c) 2008-2009 Raoul Snyman # |
3569 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
3570 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
3571 | +# --------------------------------------------------------------------------- # |
3572 | +# This program is free software; you can redistribute it and/or modify it # |
3573 | +# under the terms of the GNU General Public License as published by the Free # |
3574 | +# Software Foundation; version 2 of the License. # |
3575 | +# # |
3576 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
3577 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
3578 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
3579 | +# more details. # |
3580 | +# # |
3581 | +# You should have received a copy of the GNU General Public License along # |
3582 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
3583 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
3584 | +############################################################################### |
3585 | + |
3586 | from manager import CustomManager |
3587 | from customtab import CustomTab |
3588 | from mediaitem import CustomMediaItem |
3589 | |
3590 | === modified file 'openlp/plugins/custom/lib/classes.py' |
3591 | --- openlp/plugins/custom/lib/classes.py 2009-03-07 09:20:26 +0000 |
3592 | +++ openlp/plugins/custom/lib/classes.py 2009-09-08 19:58:05 +0000 |
3593 | @@ -1,21 +1,26 @@ |
3594 | +# -*- coding: utf-8 -*- |
3595 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
3596 | -""" |
3597 | -OpenLP - Open Source Lyrics Projection |
3598 | -Copyright (c) 2008 Raoul Snyman |
3599 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley, |
3600 | - |
3601 | -This program is free software; you can redistribute it and/or modify it under |
3602 | -the terms of the GNU General Public License as published by the Free Software |
3603 | -Foundation; version 2 of the License. |
3604 | - |
3605 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
3606 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
3607 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
3608 | - |
3609 | -You should have received a copy of the GNU General Public License along with |
3610 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
3611 | -Place, Suite 330, Boston, MA 02111-1307 USA |
3612 | -""" |
3613 | + |
3614 | +############################################################################### |
3615 | +# OpenLP - Open Source Lyrics Projection # |
3616 | +# --------------------------------------------------------------------------- # |
3617 | +# Copyright (c) 2008-2009 Raoul Snyman # |
3618 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
3619 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
3620 | +# --------------------------------------------------------------------------- # |
3621 | +# This program is free software; you can redistribute it and/or modify it # |
3622 | +# under the terms of the GNU General Public License as published by the Free # |
3623 | +# Software Foundation; version 2 of the License. # |
3624 | +# # |
3625 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
3626 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
3627 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
3628 | +# more details. # |
3629 | +# # |
3630 | +# You should have received a copy of the GNU General Public License along # |
3631 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
3632 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
3633 | +############################################################################### |
3634 | |
3635 | class BaseModel(object): |
3636 | """ |
3637 | |
3638 | === modified file 'openlp/plugins/custom/lib/customtab.py' |
3639 | --- openlp/plugins/custom/lib/customtab.py 2009-06-05 18:53:50 +0000 |
3640 | +++ openlp/plugins/custom/lib/customtab.py 2009-09-08 19:58:05 +0000 |
3641 | @@ -1,22 +1,26 @@ |
3642 | # -*- coding: utf-8 -*- |
3643 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
3644 | -""" |
3645 | -OpenLP - Open Source Lyrics Projection |
3646 | -Copyright (c) 2008 Raoul Snyman |
3647 | -Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley, |
3648 | - |
3649 | -This program is free software; you can redistribute it and/or modify it under |
3650 | -the terms of the GNU General Public License as published by the Free Software |
3651 | -Foundation; version 2 of the License. |
3652 | - |
3653 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
3654 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
3655 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
3656 | - |
3657 | -You should have received a copy of the GNU General Public License along with |
3658 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
3659 | -Place, Suite 330, Boston, MA 02111-1307 USA |
3660 | -""" |
3661 | + |
3662 | +############################################################################### |
3663 | +# OpenLP - Open Source Lyrics Projection # |
3664 | +# --------------------------------------------------------------------------- # |
3665 | +# Copyright (c) 2008-2009 Raoul Snyman # |
3666 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
3667 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
3668 | +# --------------------------------------------------------------------------- # |
3669 | +# This program is free software; you can redistribute it and/or modify it # |
3670 | +# under the terms of the GNU General Public License as published by the Free # |
3671 | +# Software Foundation; version 2 of the License. # |
3672 | +# # |
3673 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
3674 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
3675 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
3676 | +# more details. # |
3677 | +# # |
3678 | +# You should have received a copy of the GNU General Public License along # |
3679 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
3680 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
3681 | +############################################################################### |
3682 | |
3683 | from PyQt4 import QtCore, QtGui |
3684 | |
3685 | |
3686 | === modified file 'openlp/plugins/custom/lib/manager.py' |
3687 | --- openlp/plugins/custom/lib/manager.py 2009-03-15 19:31:33 +0000 |
3688 | +++ openlp/plugins/custom/lib/manager.py 2009-09-08 19:58:05 +0000 |
3689 | @@ -1,22 +1,26 @@ |
3690 | # -*- coding: utf-8 -*- |
3691 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
3692 | -""" |
3693 | -OpenLP - Open Source Lyrics Projection |
3694 | -Copyright (c) 2008 Raoul Snyman |
3695 | -Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley |
3696 | - |
3697 | -This program is free software; you can redistribute it and/or modify it under |
3698 | -the terms of the GNU General Public License as published by the Free Software |
3699 | -Foundation; version 2 of the License. |
3700 | - |
3701 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
3702 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
3703 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
3704 | - |
3705 | -You should have received a copy of the GNU General Public License along with |
3706 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
3707 | -Place, Suite 330, Boston, MA 02111-1307 USA |
3708 | -""" |
3709 | + |
3710 | +############################################################################### |
3711 | +# OpenLP - Open Source Lyrics Projection # |
3712 | +# --------------------------------------------------------------------------- # |
3713 | +# Copyright (c) 2008-2009 Raoul Snyman # |
3714 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
3715 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
3716 | +# --------------------------------------------------------------------------- # |
3717 | +# This program is free software; you can redistribute it and/or modify it # |
3718 | +# under the terms of the GNU General Public License as published by the Free # |
3719 | +# Software Foundation; version 2 of the License. # |
3720 | +# # |
3721 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
3722 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
3723 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
3724 | +# more details. # |
3725 | +# # |
3726 | +# You should have received a copy of the GNU General Public License along # |
3727 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
3728 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
3729 | +############################################################################### |
3730 | |
3731 | import os, os.path |
3732 | import sys |
3733 | @@ -58,7 +62,7 @@ |
3734 | self.session = init_models(self.db_url) |
3735 | if not custom_slide_table.exists(): |
3736 | metadata.create_all() |
3737 | - |
3738 | + |
3739 | log.debug(u'Custom Initialised') |
3740 | # |
3741 | # def process_dialog(self, dialogobject): |
3742 | @@ -81,9 +85,9 @@ |
3743 | log.debug(u'Custom Slide saved') |
3744 | return True |
3745 | except: |
3746 | - log.debug(u'Custom Slide failed') |
3747 | + log.debug(u'Custom Slide failed') |
3748 | return False |
3749 | - |
3750 | + |
3751 | def get_custom(self, id=None): |
3752 | """ |
3753 | Returns the details of a Custom Slide |
3754 | @@ -91,7 +95,7 @@ |
3755 | if id is None: |
3756 | return CustomSlide() |
3757 | else: |
3758 | - return self.session.query(CustomSlide).get(id) |
3759 | + return self.session.query(CustomSlide).get(id) |
3760 | |
3761 | def delete_custom(self, id): |
3762 | if id !=0: |
3763 | |
3764 | === modified file 'openlp/plugins/custom/lib/mediaitem.py' |
3765 | --- openlp/plugins/custom/lib/mediaitem.py 2009-09-01 05:17:32 +0000 |
3766 | +++ openlp/plugins/custom/lib/mediaitem.py 2009-09-08 19:58:05 +0000 |
3767 | @@ -1,22 +1,27 @@ |
3768 | # -*- coding: utf-8 -*- |
3769 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
3770 | -""" |
3771 | -OpenLP - Open Source Lyrics Projection |
3772 | -Copyright (c) 2008 Raoul Snyman |
3773 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley |
3774 | - |
3775 | -This program is free software; you can redistribute it and/or modify it under |
3776 | -the terms of the GNU General Public License as published by the Free Software |
3777 | -Foundation; version 2 of the License. |
3778 | - |
3779 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
3780 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
3781 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
3782 | - |
3783 | -You should have received a copy of the GNU General Public License along with |
3784 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
3785 | -Place, Suite 330, Boston, MA 02111-1307 USA |
3786 | -""" |
3787 | + |
3788 | +############################################################################### |
3789 | +# OpenLP - Open Source Lyrics Projection # |
3790 | +# --------------------------------------------------------------------------- # |
3791 | +# Copyright (c) 2008-2009 Raoul Snyman # |
3792 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
3793 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
3794 | +# --------------------------------------------------------------------------- # |
3795 | +# This program is free software; you can redistribute it and/or modify it # |
3796 | +# under the terms of the GNU General Public License as published by the Free # |
3797 | +# Software Foundation; version 2 of the License. # |
3798 | +# # |
3799 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
3800 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
3801 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
3802 | +# more details. # |
3803 | +# # |
3804 | +# You should have received a copy of the GNU General Public License along # |
3805 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
3806 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
3807 | +############################################################################### |
3808 | + |
3809 | import logging |
3810 | |
3811 | from PyQt4 import QtCore, QtGui |
3812 | |
3813 | === modified file 'openlp/plugins/custom/lib/meta.py' |
3814 | --- openlp/plugins/custom/lib/meta.py 2009-03-07 09:20:26 +0000 |
3815 | +++ openlp/plugins/custom/lib/meta.py 2009-09-08 19:58:05 +0000 |
3816 | @@ -1,21 +1,26 @@ |
3817 | +# -*- coding: utf-8 -*- |
3818 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
3819 | -""" |
3820 | -OpenLP - Open Source Lyrics Projection |
3821 | -Copyright (c) 2008 Raoul Snyman |
3822 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley, |
3823 | - |
3824 | -This program is free software; you can redistribute it and/or modify it under |
3825 | -the terms of the GNU General Public License as published by the Free Software |
3826 | -Foundation; version 2 of the License. |
3827 | - |
3828 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
3829 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
3830 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
3831 | - |
3832 | -You should have received a copy of the GNU General Public License along with |
3833 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
3834 | -Place, Suite 330, Boston, MA 02111-1307 USA |
3835 | -""" |
3836 | + |
3837 | +############################################################################### |
3838 | +# OpenLP - Open Source Lyrics Projection # |
3839 | +# --------------------------------------------------------------------------- # |
3840 | +# Copyright (c) 2008-2009 Raoul Snyman # |
3841 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
3842 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
3843 | +# --------------------------------------------------------------------------- # |
3844 | +# This program is free software; you can redistribute it and/or modify it # |
3845 | +# under the terms of the GNU General Public License as published by the Free # |
3846 | +# Software Foundation; version 2 of the License. # |
3847 | +# # |
3848 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
3849 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
3850 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
3851 | +# more details. # |
3852 | +# # |
3853 | +# You should have received a copy of the GNU General Public License along # |
3854 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
3855 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
3856 | +############################################################################### |
3857 | |
3858 | from sqlalchemy import MetaData |
3859 | from sqlalchemy.orm import scoped_session, sessionmaker |
3860 | |
3861 | === modified file 'openlp/plugins/custom/lib/models.py' |
3862 | --- openlp/plugins/custom/lib/models.py 2009-03-07 09:20:26 +0000 |
3863 | +++ openlp/plugins/custom/lib/models.py 2009-09-08 19:58:05 +0000 |
3864 | @@ -1,21 +1,26 @@ |
3865 | +# -*- coding: utf-8 -*- |
3866 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
3867 | -""" |
3868 | -OpenLP - Open Source Lyrics Projection |
3869 | -Copyright (c) 2008 Raoul Snyman |
3870 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley, |
3871 | - |
3872 | -This program is free software; you can redistribute it and/or modify it under |
3873 | -the terms of the GNU General Public License as published by the Free Software |
3874 | -Foundation; version 2 of the License. |
3875 | - |
3876 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
3877 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
3878 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
3879 | - |
3880 | -You should have received a copy of the GNU General Public License along with |
3881 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
3882 | -Place, Suite 330, Boston, MA 02111-1307 USA |
3883 | -""" |
3884 | + |
3885 | +############################################################################### |
3886 | +# OpenLP - Open Source Lyrics Projection # |
3887 | +# --------------------------------------------------------------------------- # |
3888 | +# Copyright (c) 2008-2009 Raoul Snyman # |
3889 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
3890 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
3891 | +# --------------------------------------------------------------------------- # |
3892 | +# This program is free software; you can redistribute it and/or modify it # |
3893 | +# under the terms of the GNU General Public License as published by the Free # |
3894 | +# Software Foundation; version 2 of the License. # |
3895 | +# # |
3896 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
3897 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
3898 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
3899 | +# more details. # |
3900 | +# # |
3901 | +# You should have received a copy of the GNU General Public License along # |
3902 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
3903 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
3904 | +############################################################################### |
3905 | |
3906 | from sqlalchemy import create_engine |
3907 | from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation |
3908 | |
3909 | === modified file 'openlp/plugins/custom/lib/tables.py' |
3910 | --- openlp/plugins/custom/lib/tables.py 2009-06-16 18:21:24 +0000 |
3911 | +++ openlp/plugins/custom/lib/tables.py 2009-09-08 19:58:05 +0000 |
3912 | @@ -1,21 +1,26 @@ |
3913 | +# -*- coding: utf-8 -*- |
3914 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
3915 | -""" |
3916 | -OpenLP - Open Source Lyrics Projection |
3917 | -Copyright (c) 2008 Raoul Snyman |
3918 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley, |
3919 | - |
3920 | -This program is free software; you can redistribute it and/or modify it under |
3921 | -the terms of the GNU General Public License as published by the Free Software |
3922 | -Foundation; version 2 of the License. |
3923 | - |
3924 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
3925 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
3926 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
3927 | - |
3928 | -You should have received a copy of the GNU General Public License along with |
3929 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
3930 | -Place, Suite 330, Boston, MA 02111-1307 USA |
3931 | -""" |
3932 | + |
3933 | +############################################################################### |
3934 | +# OpenLP - Open Source Lyrics Projection # |
3935 | +# --------------------------------------------------------------------------- # |
3936 | +# Copyright (c) 2008-2009 Raoul Snyman # |
3937 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
3938 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
3939 | +# --------------------------------------------------------------------------- # |
3940 | +# This program is free software; you can redistribute it and/or modify it # |
3941 | +# under the terms of the GNU General Public License as published by the Free # |
3942 | +# Software Foundation; version 2 of the License. # |
3943 | +# # |
3944 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
3945 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
3946 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
3947 | +# more details. # |
3948 | +# # |
3949 | +# You should have received a copy of the GNU General Public License along # |
3950 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
3951 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
3952 | +############################################################################### |
3953 | |
3954 | from sqlalchemy import Column, Table, ForeignKey, types |
3955 | |
3956 | @@ -28,4 +33,4 @@ |
3957 | Column(u'text', types.UnicodeText, nullable=False), |
3958 | Column(u'credits', types.UnicodeText), |
3959 | Column(u'theme_name', types.Unicode(128)) |
3960 | -) |
3961 | \ No newline at end of file |
3962 | +) |
3963 | |
3964 | === modified file 'openlp/plugins/images/__init__.py' |
3965 | --- openlp/plugins/images/__init__.py 2009-06-20 10:44:12 +0000 |
3966 | +++ openlp/plugins/images/__init__.py 2009-09-08 19:58:05 +0000 |
3967 | @@ -1,19 +1,23 @@ |
3968 | # -*- coding: utf-8 -*- |
3969 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
3970 | -""" |
3971 | -OpenLP - Open Source Lyrics Projection |
3972 | -Copyright (c) 2008 - 2009 Raoul Snyman |
3973 | -Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley, |
3974 | - |
3975 | -This program is free software; you can redistribute it and/or modify it under |
3976 | -the terms of the GNU General Public License as published by the Free Software |
3977 | -Foundation; version 2 of the License. |
3978 | - |
3979 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
3980 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
3981 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
3982 | - |
3983 | -You should have received a copy of the GNU General Public License along with |
3984 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
3985 | -Place, Suite 330, Boston, MA 02111-1307 USA |
3986 | -""" |
3987 | + |
3988 | +############################################################################### |
3989 | +# OpenLP - Open Source Lyrics Projection # |
3990 | +# --------------------------------------------------------------------------- # |
3991 | +# Copyright (c) 2008-2009 Raoul Snyman # |
3992 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
3993 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
3994 | +# --------------------------------------------------------------------------- # |
3995 | +# This program is free software; you can redistribute it and/or modify it # |
3996 | +# under the terms of the GNU General Public License as published by the Free # |
3997 | +# Software Foundation; version 2 of the License. # |
3998 | +# # |
3999 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
4000 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
4001 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
4002 | +# more details. # |
4003 | +# # |
4004 | +# You should have received a copy of the GNU General Public License along # |
4005 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
4006 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
4007 | +############################################################################### |
4008 | |
4009 | === modified file 'openlp/plugins/images/imageplugin.py' |
4010 | --- openlp/plugins/images/imageplugin.py 2009-08-26 05:00:19 +0000 |
4011 | +++ openlp/plugins/images/imageplugin.py 2009-09-08 19:58:05 +0000 |
4012 | @@ -1,22 +1,27 @@ |
4013 | # -*- coding: utf-8 -*- |
4014 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
4015 | -""" |
4016 | -OpenLP - Open Source Lyrics Projection |
4017 | -Copyright (c) 2008 Raoul Snyman |
4018 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, |
4019 | - |
4020 | -This program is free software; you can redistribute it and/or modify it under |
4021 | -the terms of the GNU General Public License as published by the Free Software |
4022 | -Foundation; version 2 of the License. |
4023 | - |
4024 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
4025 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
4026 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
4027 | - |
4028 | -You should have received a copy of the GNU General Public License along with |
4029 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
4030 | -Place, Suite 330, Boston, MA 02111-1307 USA |
4031 | -""" |
4032 | + |
4033 | +############################################################################### |
4034 | +# OpenLP - Open Source Lyrics Projection # |
4035 | +# --------------------------------------------------------------------------- # |
4036 | +# Copyright (c) 2008-2009 Raoul Snyman # |
4037 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
4038 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
4039 | +# --------------------------------------------------------------------------- # |
4040 | +# This program is free software; you can redistribute it and/or modify it # |
4041 | +# under the terms of the GNU General Public License as published by the Free # |
4042 | +# Software Foundation; version 2 of the License. # |
4043 | +# # |
4044 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
4045 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
4046 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
4047 | +# more details. # |
4048 | +# # |
4049 | +# You should have received a copy of the GNU General Public License along # |
4050 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
4051 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
4052 | +############################################################################### |
4053 | + |
4054 | import logging |
4055 | |
4056 | from PyQt4 import QtCore, QtGui |
4057 | |
4058 | === modified file 'openlp/plugins/images/lib/__init__.py' |
4059 | --- openlp/plugins/images/lib/__init__.py 2009-08-27 05:17:20 +0000 |
4060 | +++ openlp/plugins/images/lib/__init__.py 2009-09-08 19:58:05 +0000 |
4061 | @@ -1,21 +1,26 @@ |
4062 | # -*- coding: utf-8 -*- |
4063 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
4064 | -""" |
4065 | -OpenLP - Open Source Lyrics Projection |
4066 | -Copyright (c) 2008 - 2009 Raoul Snyman |
4067 | -Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley, |
4068 | - |
4069 | -This program is free software; you can redistribute it and/or modify it under |
4070 | -the terms of the GNU General Public License as published by the Free Software |
4071 | -Foundation; version 2 of the License. |
4072 | - |
4073 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
4074 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
4075 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
4076 | - |
4077 | -You should have received a copy of the GNU General Public License along with |
4078 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
4079 | -Place, Suite 330, Boston, MA 02111-1307 USA |
4080 | -""" |
4081 | + |
4082 | +############################################################################### |
4083 | +# OpenLP - Open Source Lyrics Projection # |
4084 | +# --------------------------------------------------------------------------- # |
4085 | +# Copyright (c) 2008-2009 Raoul Snyman # |
4086 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
4087 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
4088 | +# --------------------------------------------------------------------------- # |
4089 | +# This program is free software; you can redistribute it and/or modify it # |
4090 | +# under the terms of the GNU General Public License as published by the Free # |
4091 | +# Software Foundation; version 2 of the License. # |
4092 | +# # |
4093 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
4094 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
4095 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
4096 | +# more details. # |
4097 | +# # |
4098 | +# You should have received a copy of the GNU General Public License along # |
4099 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
4100 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
4101 | +############################################################################### |
4102 | + |
4103 | from mediaitem import ImageMediaItem |
4104 | from imagetab import ImageTab |
4105 | |
4106 | === modified file 'openlp/plugins/images/lib/imagetab.py' |
4107 | --- openlp/plugins/images/lib/imagetab.py 2009-08-29 07:17:56 +0000 |
4108 | +++ openlp/plugins/images/lib/imagetab.py 2009-09-08 19:58:05 +0000 |
4109 | @@ -1,22 +1,26 @@ |
4110 | # -*- coding: utf-8 -*- |
4111 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
4112 | -""" |
4113 | -OpenLP - Open Source Lyrics Projection |
4114 | -Copyright (c) 2008 Raoul Snyman |
4115 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, |
4116 | - |
4117 | -This program is free software; you can redistribute it and/or modify it under |
4118 | -the terms of the GNU General Public License as published by the Free Software |
4119 | -Foundation; version 2 of the License. |
4120 | - |
4121 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
4122 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
4123 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
4124 | - |
4125 | -You should have received a copy of the GNU General Public License along with |
4126 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
4127 | -Place, Suite 330, Boston, MA 02111-1307 USA |
4128 | -""" |
4129 | + |
4130 | +############################################################################### |
4131 | +# OpenLP - Open Source Lyrics Projection # |
4132 | +# --------------------------------------------------------------------------- # |
4133 | +# Copyright (c) 2008-2009 Raoul Snyman # |
4134 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
4135 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
4136 | +# --------------------------------------------------------------------------- # |
4137 | +# This program is free software; you can redistribute it and/or modify it # |
4138 | +# under the terms of the GNU General Public License as published by the Free # |
4139 | +# Software Foundation; version 2 of the License. # |
4140 | +# # |
4141 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
4142 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
4143 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
4144 | +# more details. # |
4145 | +# # |
4146 | +# You should have received a copy of the GNU General Public License along # |
4147 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
4148 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
4149 | +############################################################################### |
4150 | |
4151 | from PyQt4 import QtCore, QtGui |
4152 | |
4153 | |
4154 | === modified file 'openlp/plugins/images/lib/mediaitem.py' |
4155 | --- openlp/plugins/images/lib/mediaitem.py 2009-09-01 05:17:32 +0000 |
4156 | +++ openlp/plugins/images/lib/mediaitem.py 2009-09-08 19:58:05 +0000 |
4157 | @@ -1,22 +1,27 @@ |
4158 | # -*- coding: utf-8 -*- |
4159 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
4160 | -""" |
4161 | -OpenLP - Open Source Lyrics Projection |
4162 | -Copyright (c) 2008 Raoul Snyman |
4163 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley |
4164 | - |
4165 | -This program is free software; you can redistribute it and/or modify it under |
4166 | -the terms of the GNU General Public License as published by the Free Software |
4167 | -Foundation; version 2 of the License. |
4168 | - |
4169 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
4170 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
4171 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
4172 | - |
4173 | -You should have received a copy of the GNU General Public License along with |
4174 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
4175 | -Place, Suite 330, Boston, MA 02111-1307 USA |
4176 | -""" |
4177 | + |
4178 | +############################################################################### |
4179 | +# OpenLP - Open Source Lyrics Projection # |
4180 | +# --------------------------------------------------------------------------- # |
4181 | +# Copyright (c) 2008-2009 Raoul Snyman # |
4182 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
4183 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
4184 | +# --------------------------------------------------------------------------- # |
4185 | +# This program is free software; you can redistribute it and/or modify it # |
4186 | +# under the terms of the GNU General Public License as published by the Free # |
4187 | +# Software Foundation; version 2 of the License. # |
4188 | +# # |
4189 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
4190 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
4191 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
4192 | +# more details. # |
4193 | +# # |
4194 | +# You should have received a copy of the GNU General Public License along # |
4195 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
4196 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
4197 | +############################################################################### |
4198 | + |
4199 | import logging |
4200 | import os |
4201 | |
4202 | |
4203 | === modified file 'openlp/plugins/media/__init__.py' |
4204 | --- openlp/plugins/media/__init__.py 2008-12-14 16:19:28 +0000 |
4205 | +++ openlp/plugins/media/__init__.py 2009-09-08 19:58:05 +0000 |
4206 | @@ -0,0 +1,23 @@ |
4207 | +# -*- coding: utf-8 -*- |
4208 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
4209 | + |
4210 | +############################################################################### |
4211 | +# OpenLP - Open Source Lyrics Projection # |
4212 | +# --------------------------------------------------------------------------- # |
4213 | +# Copyright (c) 2008-2009 Raoul Snyman # |
4214 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
4215 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
4216 | +# --------------------------------------------------------------------------- # |
4217 | +# This program is free software; you can redistribute it and/or modify it # |
4218 | +# under the terms of the GNU General Public License as published by the Free # |
4219 | +# Software Foundation; version 2 of the License. # |
4220 | +# # |
4221 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
4222 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
4223 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
4224 | +# more details. # |
4225 | +# # |
4226 | +# You should have received a copy of the GNU General Public License along # |
4227 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
4228 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
4229 | +############################################################################### |
4230 | |
4231 | === modified file 'openlp/plugins/media/lib/__init__.py' |
4232 | --- openlp/plugins/media/lib/__init__.py 2009-05-15 05:15:53 +0000 |
4233 | +++ openlp/plugins/media/lib/__init__.py 2009-09-08 19:58:05 +0000 |
4234 | @@ -1,22 +1,26 @@ |
4235 | # -*- coding: utf-8 -*- |
4236 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
4237 | -""" |
4238 | -OpenLP - Open Source Lyrics Projection |
4239 | -Copyright (c) 2008 Raoul Snyman |
4240 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley |
4241 | - |
4242 | -This program is free software; you can redistribute it and/or modify it under |
4243 | -the terms of the GNU General Public License as published by the Free Software |
4244 | -Foundation; version 2 of the License. |
4245 | - |
4246 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
4247 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
4248 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
4249 | - |
4250 | -You should have received a copy of the GNU General Public License along with |
4251 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
4252 | -Place, Suite 330, Boston, MA 02111-1307 USA |
4253 | -""" |
4254 | + |
4255 | +############################################################################### |
4256 | +# OpenLP - Open Source Lyrics Projection # |
4257 | +# --------------------------------------------------------------------------- # |
4258 | +# Copyright (c) 2008-2009 Raoul Snyman # |
4259 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
4260 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
4261 | +# --------------------------------------------------------------------------- # |
4262 | +# This program is free software; you can redistribute it and/or modify it # |
4263 | +# under the terms of the GNU General Public License as published by the Free # |
4264 | +# Software Foundation; version 2 of the License. # |
4265 | +# # |
4266 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
4267 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
4268 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
4269 | +# more details. # |
4270 | +# # |
4271 | +# You should have received a copy of the GNU General Public License along # |
4272 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
4273 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
4274 | +############################################################################### |
4275 | |
4276 | from filelistdata import FileListData |
4277 | from mediatab import MediaTab |
4278 | |
4279 | === modified file 'openlp/plugins/media/lib/filelistdata.py' |
4280 | --- openlp/plugins/media/lib/filelistdata.py 2009-06-16 18:21:24 +0000 |
4281 | +++ openlp/plugins/media/lib/filelistdata.py 2009-09-08 19:58:05 +0000 |
4282 | @@ -1,22 +1,27 @@ |
4283 | # -*- coding: utf-8 -*- |
4284 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
4285 | -""" |
4286 | -OpenLP - Open Source Lyrics Projection |
4287 | -Copyright (c) 2008 Raoul Snyman |
4288 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley, |
4289 | - |
4290 | -This program is free software; you can redistribute it and/or modify it under |
4291 | -the terms of the GNU General Public License as published by the Free Software |
4292 | -Foundation; version 2 of the License. |
4293 | - |
4294 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
4295 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
4296 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
4297 | - |
4298 | -You should have received a copy of the GNU General Public License along with |
4299 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
4300 | -Place, Suite 330, Boston, MA 02111-1307 USA |
4301 | -""" |
4302 | + |
4303 | +############################################################################### |
4304 | +# OpenLP - Open Source Lyrics Projection # |
4305 | +# --------------------------------------------------------------------------- # |
4306 | +# Copyright (c) 2008-2009 Raoul Snyman # |
4307 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
4308 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
4309 | +# --------------------------------------------------------------------------- # |
4310 | +# This program is free software; you can redistribute it and/or modify it # |
4311 | +# under the terms of the GNU General Public License as published by the Free # |
4312 | +# Software Foundation; version 2 of the License. # |
4313 | +# # |
4314 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
4315 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
4316 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
4317 | +# more details. # |
4318 | +# # |
4319 | +# You should have received a copy of the GNU General Public License along # |
4320 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
4321 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
4322 | +############################################################################### |
4323 | + |
4324 | import os |
4325 | import logging |
4326 | from PyQt4.QtCore import * |
4327 | |
4328 | === modified file 'openlp/plugins/media/lib/mediaitem.py' |
4329 | --- openlp/plugins/media/lib/mediaitem.py 2009-08-31 21:53:35 +0000 |
4330 | +++ openlp/plugins/media/lib/mediaitem.py 2009-09-08 19:58:05 +0000 |
4331 | @@ -1,22 +1,27 @@ |
4332 | # -*- coding: utf-8 -*- |
4333 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
4334 | -""" |
4335 | -OpenLP - Open Source Lyrics Projection |
4336 | -Copyright (c) 2008 Raoul Snyman |
4337 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley |
4338 | - |
4339 | -This program is free software; you can redistribute it and/or modify it under |
4340 | -the terms of the GNU General Public License as published by the Free Software |
4341 | -Foundation; version 2 of the License. |
4342 | - |
4343 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
4344 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
4345 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
4346 | - |
4347 | -You should have received a copy of the GNU General Public License along with |
4348 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
4349 | -Place, Suite 330, Boston, MA 02111-1307 USA |
4350 | -""" |
4351 | + |
4352 | +############################################################################### |
4353 | +# OpenLP - Open Source Lyrics Projection # |
4354 | +# --------------------------------------------------------------------------- # |
4355 | +# Copyright (c) 2008-2009 Raoul Snyman # |
4356 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
4357 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
4358 | +# --------------------------------------------------------------------------- # |
4359 | +# This program is free software; you can redistribute it and/or modify it # |
4360 | +# under the terms of the GNU General Public License as published by the Free # |
4361 | +# Software Foundation; version 2 of the License. # |
4362 | +# # |
4363 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
4364 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
4365 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
4366 | +# more details. # |
4367 | +# # |
4368 | +# You should have received a copy of the GNU General Public License along # |
4369 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
4370 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
4371 | +############################################################################### |
4372 | + |
4373 | import logging |
4374 | import os |
4375 | import tempfile |
4376 | |
4377 | === modified file 'openlp/plugins/media/lib/mediatab.py' |
4378 | --- openlp/plugins/media/lib/mediatab.py 2009-06-16 18:21:24 +0000 |
4379 | +++ openlp/plugins/media/lib/mediatab.py 2009-09-08 19:58:05 +0000 |
4380 | @@ -1,22 +1,26 @@ |
4381 | # -*- coding: utf-8 -*- |
4382 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
4383 | -""" |
4384 | -OpenLP - Open Source Lyrics Projection |
4385 | -Copyright (c) 2008 Raoul Snyman |
4386 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, |
4387 | - |
4388 | -This program is free software; you can redistribute it and/or modify it under |
4389 | -the terms of the GNU General Public License as published by the Free Software |
4390 | -Foundation; version 2 of the License. |
4391 | - |
4392 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
4393 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
4394 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
4395 | - |
4396 | -You should have received a copy of the GNU General Public License along with |
4397 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
4398 | -Place, Suite 330, Boston, MA 02111-1307 USA |
4399 | -""" |
4400 | + |
4401 | +############################################################################### |
4402 | +# OpenLP - Open Source Lyrics Projection # |
4403 | +# --------------------------------------------------------------------------- # |
4404 | +# Copyright (c) 2008-2009 Raoul Snyman # |
4405 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
4406 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
4407 | +# --------------------------------------------------------------------------- # |
4408 | +# This program is free software; you can redistribute it and/or modify it # |
4409 | +# under the terms of the GNU General Public License as published by the Free # |
4410 | +# Software Foundation; version 2 of the License. # |
4411 | +# # |
4412 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
4413 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
4414 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
4415 | +# more details. # |
4416 | +# # |
4417 | +# You should have received a copy of the GNU General Public License along # |
4418 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
4419 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
4420 | +############################################################################### |
4421 | |
4422 | from PyQt4 import QtCore, QtGui |
4423 | |
4424 | @@ -73,4 +77,4 @@ |
4425 | self.UseVMRCheckBox.setChecked(True) |
4426 | |
4427 | def save(self): |
4428 | - self.config.set_config(u'use mode layout', unicode(self.use_vmr_mode)) |
4429 | \ No newline at end of file |
4430 | + self.config.set_config(u'use mode layout', unicode(self.use_vmr_mode)) |
4431 | |
4432 | === modified file 'openlp/plugins/media/mediaplugin.py' |
4433 | --- openlp/plugins/media/mediaplugin.py 2009-07-04 05:52:30 +0000 |
4434 | +++ openlp/plugins/media/mediaplugin.py 2009-09-08 19:58:05 +0000 |
4435 | @@ -1,22 +1,27 @@ |
4436 | # -*- coding: utf-8 -*- |
4437 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
4438 | -""" |
4439 | -OpenLP - Open Source Lyrics Projection |
4440 | -Copyright (c) 2008 Raoul Snyman |
4441 | -Portions copyright (c) 2008 Martin Thompson, Tim Bentley, |
4442 | - |
4443 | -This program is free software; you can redistribute it and/or modify it under |
4444 | -the terms of the GNU General Public License as published by the Free Software |
4445 | -Foundation; version 2 of the License. |
4446 | - |
4447 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
4448 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
4449 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
4450 | - |
4451 | -You should have received a copy of the GNU General Public License along with |
4452 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
4453 | -Place, Suite 330, Boston, MA 02111-1307 USA |
4454 | -""" |
4455 | + |
4456 | +############################################################################### |
4457 | +# OpenLP - Open Source Lyrics Projection # |
4458 | +# --------------------------------------------------------------------------- # |
4459 | +# Copyright (c) 2008-2009 Raoul Snyman # |
4460 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
4461 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
4462 | +# --------------------------------------------------------------------------- # |
4463 | +# This program is free software; you can redistribute it and/or modify it # |
4464 | +# under the terms of the GNU General Public License as published by the Free # |
4465 | +# Software Foundation; version 2 of the License. # |
4466 | +# # |
4467 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
4468 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
4469 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
4470 | +# more details. # |
4471 | +# # |
4472 | +# You should have received a copy of the GNU General Public License along # |
4473 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
4474 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
4475 | +############################################################################### |
4476 | + |
4477 | import os |
4478 | from PyQt4 import QtCore, QtGui |
4479 | |
4480 | |
4481 | === modified file 'openlp/plugins/presentations/__init__.py' |
4482 | --- openlp/plugins/presentations/__init__.py 2008-12-11 21:07:12 +0000 |
4483 | +++ openlp/plugins/presentations/__init__.py 2009-09-08 19:58:05 +0000 |
4484 | @@ -1,1 +1,23 @@ |
4485 | +# -*- coding: utf-8 -*- |
4486 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
4487 | |
4488 | +############################################################################### |
4489 | +# OpenLP - Open Source Lyrics Projection # |
4490 | +# --------------------------------------------------------------------------- # |
4491 | +# Copyright (c) 2008-2009 Raoul Snyman # |
4492 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
4493 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
4494 | +# --------------------------------------------------------------------------- # |
4495 | +# This program is free software; you can redistribute it and/or modify it # |
4496 | +# under the terms of the GNU General Public License as published by the Free # |
4497 | +# Software Foundation; version 2 of the License. # |
4498 | +# # |
4499 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
4500 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
4501 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
4502 | +# more details. # |
4503 | +# # |
4504 | +# You should have received a copy of the GNU General Public License along # |
4505 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
4506 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
4507 | +############################################################################### |
4508 | |
4509 | === modified file 'openlp/plugins/presentations/lib/__init__.py' |
4510 | --- openlp/plugins/presentations/lib/__init__.py 2009-09-05 13:30:09 +0000 |
4511 | +++ openlp/plugins/presentations/lib/__init__.py 2009-09-08 19:58:05 +0000 |
4512 | @@ -1,22 +1,27 @@ |
4513 | # -*- coding: utf-8 -*- |
4514 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
4515 | -""" |
4516 | -OpenLP - Open Source Lyrics Projection |
4517 | -Copyright (c) 2008 Raoul Snyman |
4518 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley |
4519 | - |
4520 | -This program is free software; you can redistribute it and/or modify it under |
4521 | -the terms of the GNU General Public License as published by the Free Software |
4522 | -Foundation; version 2 of the License. |
4523 | - |
4524 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
4525 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
4526 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
4527 | - |
4528 | -You should have received a copy of the GNU General Public License along with |
4529 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
4530 | -Place, Suite 330, Boston, MA 02111-1307 USA |
4531 | -""" |
4532 | + |
4533 | +############################################################################### |
4534 | +# OpenLP - Open Source Lyrics Projection # |
4535 | +# --------------------------------------------------------------------------- # |
4536 | +# Copyright (c) 2008-2009 Raoul Snyman # |
4537 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
4538 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
4539 | +# --------------------------------------------------------------------------- # |
4540 | +# This program is free software; you can redistribute it and/or modify it # |
4541 | +# under the terms of the GNU General Public License as published by the Free # |
4542 | +# Software Foundation; version 2 of the License. # |
4543 | +# # |
4544 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
4545 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
4546 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
4547 | +# more details. # |
4548 | +# # |
4549 | +# You should have received a copy of the GNU General Public License along # |
4550 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
4551 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
4552 | +############################################################################### |
4553 | + |
4554 | from impresscontroller import ImpressController |
4555 | from messagelistener import MessageListener |
4556 | from mediaitem import PresentationMediaItem |
4557 | |
4558 | === modified file 'openlp/plugins/presentations/lib/impresscom.py' |
4559 | --- openlp/plugins/presentations/lib/impresscom.py 2009-09-05 06:29:23 +0000 |
4560 | +++ openlp/plugins/presentations/lib/impresscom.py 2009-09-08 19:58:05 +0000 |
4561 | @@ -1,22 +1,27 @@ |
4562 | # -*- coding: utf-8 -*- |
4563 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
4564 | -""" |
4565 | -OpenLP - Open Source Lyrics Projection |
4566 | -Copyright (c) 2008 Raoul Snyman |
4567 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley |
4568 | - |
4569 | -This program is free software; you can redistribute it and/or modify it under |
4570 | -the terms of the GNU General Public License as published by the Free Software |
4571 | -Foundation; version 2 of the License. |
4572 | - |
4573 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
4574 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
4575 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
4576 | - |
4577 | -You should have received a copy of the GNU General Public License along with |
4578 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
4579 | -Place, Suite 330, Boston, MA 02111-1307 USA |
4580 | -""" |
4581 | + |
4582 | +############################################################################### |
4583 | +# OpenLP - Open Source Lyrics Projection # |
4584 | +# --------------------------------------------------------------------------- # |
4585 | +# Copyright (c) 2008-2009 Raoul Snyman # |
4586 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
4587 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
4588 | +# --------------------------------------------------------------------------- # |
4589 | +# This program is free software; you can redistribute it and/or modify it # |
4590 | +# under the terms of the GNU General Public License as published by the Free # |
4591 | +# Software Foundation; version 2 of the License. # |
4592 | +# # |
4593 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
4594 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
4595 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
4596 | +# more details. # |
4597 | +# # |
4598 | +# You should have received a copy of the GNU General Public License along # |
4599 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
4600 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
4601 | +############################################################################### |
4602 | + |
4603 | # OOo API documentation: |
4604 | # http://api.openoffice.org/docs/common/ref/com/sun/star/presentation/XSlideShowController.html |
4605 | # http://docs.go-oo.org/sd/html/classsd_1_1SlideShow.html |
4606 | |
4607 | === modified file 'openlp/plugins/presentations/lib/mediaitem.py' |
4608 | --- openlp/plugins/presentations/lib/mediaitem.py 2009-09-05 13:30:09 +0000 |
4609 | +++ openlp/plugins/presentations/lib/mediaitem.py 2009-09-08 19:58:05 +0000 |
4610 | @@ -1,22 +1,27 @@ |
4611 | # -*- coding: utf-8 -*- |
4612 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
4613 | -""" |
4614 | -OpenLP - Open Source Lyrics Projection |
4615 | -Copyright (c) 2008 Raoul Snyman |
4616 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley |
4617 | - |
4618 | -This program is free software; you can redistribute it and/or modify it under |
4619 | -the terms of the GNU General Public License as published by the Free Software |
4620 | -Foundation; version 2 of the License. |
4621 | - |
4622 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
4623 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
4624 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
4625 | - |
4626 | -You should have received a copy of the GNU General Public License along with |
4627 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
4628 | -Place, Suite 330, Boston, MA 02111-1307 USA |
4629 | -""" |
4630 | + |
4631 | +############################################################################### |
4632 | +# OpenLP - Open Source Lyrics Projection # |
4633 | +# --------------------------------------------------------------------------- # |
4634 | +# Copyright (c) 2008-2009 Raoul Snyman # |
4635 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
4636 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
4637 | +# --------------------------------------------------------------------------- # |
4638 | +# This program is free software; you can redistribute it and/or modify it # |
4639 | +# under the terms of the GNU General Public License as published by the Free # |
4640 | +# Software Foundation; version 2 of the License. # |
4641 | +# # |
4642 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
4643 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
4644 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
4645 | +# more details. # |
4646 | +# # |
4647 | +# You should have received a copy of the GNU General Public License along # |
4648 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
4649 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
4650 | +############################################################################### |
4651 | + |
4652 | import logging |
4653 | import os |
4654 | |
4655 | |
4656 | === modified file 'openlp/plugins/presentations/lib/powerpoint.py' |
4657 | --- openlp/plugins/presentations/lib/powerpoint.py 2009-06-16 18:21:24 +0000 |
4658 | +++ openlp/plugins/presentations/lib/powerpoint.py 2009-09-08 19:58:05 +0000 |
4659 | @@ -1,9 +1,32 @@ |
4660 | +# -*- coding: utf-8 -*- |
4661 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
4662 | + |
4663 | +############################################################################### |
4664 | +# OpenLP - Open Source Lyrics Projection # |
4665 | +# --------------------------------------------------------------------------- # |
4666 | +# Copyright (c) 2008-2009 Raoul Snyman # |
4667 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
4668 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
4669 | +# --------------------------------------------------------------------------- # |
4670 | +# This program is free software; you can redistribute it and/or modify it # |
4671 | +# under the terms of the GNU General Public License as published by the Free # |
4672 | +# Software Foundation; version 2 of the License. # |
4673 | +# # |
4674 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
4675 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
4676 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
4677 | +# more details. # |
4678 | +# # |
4679 | +# You should have received a copy of the GNU General Public License along # |
4680 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
4681 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
4682 | +############################################################################### |
4683 | + |
4684 | from win32com.client import Dispatch |
4685 | |
4686 | # PPT API documentation: |
4687 | # http://msdn.microsoft.com/en-us/library/aa269321(office.10).aspx |
4688 | |
4689 | - |
4690 | class PowerPointApp(object): |
4691 | def __init__(self): |
4692 | self.createApp() |
4693 | @@ -31,13 +54,13 @@ |
4694 | def quit(self): |
4695 | self._app.Quit() |
4696 | self._app = None |
4697 | - |
4698 | + |
4699 | class PowerPointPres(object): |
4700 | def __init__(self, pptApp, filename): |
4701 | self.pptApp = pptApp |
4702 | self.filename = filename |
4703 | self.open() |
4704 | - |
4705 | + |
4706 | def getPres(self): |
4707 | if self._pres == None: |
4708 | for p in self.pptApp.app.Presentations: |
4709 | @@ -52,9 +75,9 @@ |
4710 | if self._pres == None: |
4711 | self.openPres() |
4712 | return self._pres |
4713 | - |
4714 | + |
4715 | pres = property(getPres) |
4716 | - |
4717 | + |
4718 | def open(self): |
4719 | self.pptApp.app.Presentations.Open(self.filename, False, False, True) |
4720 | self._pres = self.pptApp.app.Presentations(ppt.app.Presentations.Count) |
4721 | @@ -82,11 +105,11 @@ |
4722 | def blankScreen(self): |
4723 | if self.isActive(): |
4724 | self.pres.SlideShowWindow.View.State = 3 |
4725 | - |
4726 | + |
4727 | def stop(self): |
4728 | if self.isActive(): |
4729 | self.pres.SlideShowWindow.View.Exit() |
4730 | - |
4731 | + |
4732 | def go(self): |
4733 | self.pres.SlideShowSettings.Run() |
4734 | |
4735 | @@ -95,7 +118,7 @@ |
4736 | return self.pres.SlideShowWindow.View.CurrentShowPosition |
4737 | else: |
4738 | return -1 |
4739 | - |
4740 | + |
4741 | def setCurrentSlideIndex(self, slideno): |
4742 | if not self.isActive(): |
4743 | self.resume() |
4744 | @@ -136,4 +159,3 @@ |
4745 | # w.CloseClipboard() |
4746 | return self.preview |
4747 | |
4748 | - |
4749 | \ No newline at end of file |
4750 | |
4751 | === modified file 'openlp/plugins/presentations/lib/pptview.py' |
4752 | --- openlp/plugins/presentations/lib/pptview.py 2009-09-03 15:19:30 +0000 |
4753 | +++ openlp/plugins/presentations/lib/pptview.py 2009-09-08 19:58:05 +0000 |
4754 | @@ -1,3 +1,27 @@ |
4755 | +# -*- coding: utf-8 -*- |
4756 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
4757 | + |
4758 | +############################################################################### |
4759 | +# OpenLP - Open Source Lyrics Projection # |
4760 | +# --------------------------------------------------------------------------- # |
4761 | +# Copyright (c) 2008-2009 Raoul Snyman # |
4762 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
4763 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
4764 | +# --------------------------------------------------------------------------- # |
4765 | +# This program is free software; you can redistribute it and/or modify it # |
4766 | +# under the terms of the GNU General Public License as published by the Free # |
4767 | +# Software Foundation; version 2 of the License. # |
4768 | +# # |
4769 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
4770 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
4771 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
4772 | +# more details. # |
4773 | +# # |
4774 | +# You should have received a copy of the GNU General Public License along # |
4775 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
4776 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
4777 | +############################################################################### |
4778 | + |
4779 | import sys |
4780 | import win32api |
4781 | from PyQt4 import QtGui, QtCore |
4782 | @@ -66,29 +90,29 @@ |
4783 | if self.pptid<0: return |
4784 | pptdll.PrevStep(self.pptid) |
4785 | self.slideEdit.setText(pptdll.GetCurrentSlide(self.pptid)) |
4786 | - |
4787 | + |
4788 | def NextClick(self): |
4789 | if(self.pptid<0): return |
4790 | pptdll.NextStep(self.pptid) |
4791 | self.slideEdit.setText(pptdll.GetCurrentSlide(self.pptid)) |
4792 | - |
4793 | + |
4794 | def BlankClick(self): |
4795 | if(self.pptid<0): return |
4796 | pptdll.Blank(self.pptid) |
4797 | - |
4798 | + |
4799 | def UnblankClick(self): |
4800 | if(self.pptid<0): return |
4801 | pptdll.Unblank(self.pptid) |
4802 | - |
4803 | + |
4804 | def RestartClick(self): |
4805 | if(self.pptid<0): return |
4806 | pptdll.RestartShow(self.pptid) |
4807 | self.slideEdit.setText(pptdll.GetCurrentSlide(self.pptid)) |
4808 | - |
4809 | + |
4810 | def StopClick(self): |
4811 | if(self.pptid<0): return |
4812 | pptdll.Stop(self.pptid) |
4813 | - |
4814 | + |
4815 | def ResumeClick(self): |
4816 | if(self.pptid<0): return |
4817 | pptdll.Resume(self.pptid) |
4818 | |
4819 | === modified file 'openlp/plugins/presentations/lib/pptviewlib/ppttest.py' |
4820 | --- openlp/plugins/presentations/lib/pptviewlib/ppttest.py 2009-09-03 15:19:30 +0000 |
4821 | +++ openlp/plugins/presentations/lib/pptviewlib/ppttest.py 2009-09-08 19:58:05 +0000 |
4822 | @@ -1,3 +1,27 @@ |
4823 | +# -*- coding: utf-8 -*- |
4824 | +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
4825 | + |
4826 | +############################################################################### |
4827 | +# OpenLP - Open Source Lyrics Projection # |
4828 | +# --------------------------------------------------------------------------- # |
4829 | +# Copyright (c) 2008-2009 Raoul Snyman # |
4830 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
4831 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
4832 | +# --------------------------------------------------------------------------- # |
4833 | +# This program is free software; you can redistribute it and/or modify it # |
4834 | +# under the terms of the GNU General Public License as published by the Free # |
4835 | +# Software Foundation; version 2 of the License. # |
4836 | +# # |
4837 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
4838 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
4839 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
4840 | +# more details. # |
4841 | +# # |
4842 | +# You should have received a copy of the GNU General Public License along # |
4843 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
4844 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
4845 | +############################################################################### |
4846 | + |
4847 | import sys |
4848 | from PyQt4 import QtGui, QtCore |
4849 | from ctypes import * |
4850 | @@ -65,34 +89,34 @@ |
4851 | pptdll.PrevStep(self.pptid) |
4852 | self.UpdateCurrSlide() |
4853 | app.processEvents() |
4854 | - |
4855 | + |
4856 | def NextClick(self): |
4857 | if(self.pptid<0): return |
4858 | pptdll.NextStep(self.pptid) |
4859 | self.UpdateCurrSlide() |
4860 | app.processEvents() |
4861 | - |
4862 | + |
4863 | def BlankClick(self): |
4864 | if(self.pptid<0): return |
4865 | pptdll.Blank(self.pptid) |
4866 | app.processEvents() |
4867 | - |
4868 | + |
4869 | def UnblankClick(self): |
4870 | if(self.pptid<0): return |
4871 | pptdll.Unblank(self.pptid) |
4872 | app.processEvents() |
4873 | - |
4874 | + |
4875 | def RestartClick(self): |
4876 | if(self.pptid<0): return |
4877 | pptdll.RestartShow(self.pptid) |
4878 | self.UpdateCurrSlide() |
4879 | app.processEvents() |
4880 | - |
4881 | + |
4882 | def StopClick(self): |
4883 | if(self.pptid<0): return |
4884 | pptdll.Stop(self.pptid) |
4885 | app.processEvents() |
4886 | - |
4887 | + |
4888 | def ResumeClick(self): |
4889 | if(self.pptid<0): return |
4890 | pptdll.Resume(self.pptid) |
4891 | @@ -117,7 +141,7 @@ |
4892 | print "slidecount: " + unicode(slides) |
4893 | self.total.setNum(pptdll.GetSlideCount(self.pptid)) |
4894 | self.UpdateCurrSlide() |
4895 | - |
4896 | + |
4897 | def UpdateCurrSlide(self): |
4898 | if(self.pptid<0): return |
4899 | slide = unicode(pptdll.GetCurrentSlide(self.pptid)) |
4900 | |
4901 | === modified file 'openlp/plugins/presentations/lib/presentationtab.py' |
4902 | --- openlp/plugins/presentations/lib/presentationtab.py 2009-08-15 19:10:59 +0000 |
4903 | +++ openlp/plugins/presentations/lib/presentationtab.py 2009-09-08 19:58:05 +0000 |
4904 | @@ -1,22 +1,26 @@ |
4905 | # -*- coding: utf-8 -*- |
4906 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
4907 | -""" |
4908 | -OpenLP - Open Source Lyrics Projection |
4909 | -Copyright (c) 2008 Raoul Snyman |
4910 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, |
4911 | - |
4912 | -This program is free software; you can redistribute it and/or modify it under |
4913 | -the terms of the GNU General Public License as published by the Free Software |
4914 | -Foundation; version 2 of the License. |
4915 | - |
4916 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
4917 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
4918 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
4919 | - |
4920 | -You should have received a copy of the GNU General Public License along with |
4921 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
4922 | -Place, Suite 330, Boston, MA 02111-1307 USA |
4923 | -""" |
4924 | + |
4925 | +############################################################################### |
4926 | +# OpenLP - Open Source Lyrics Projection # |
4927 | +# --------------------------------------------------------------------------- # |
4928 | +# Copyright (c) 2008-2009 Raoul Snyman # |
4929 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
4930 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
4931 | +# --------------------------------------------------------------------------- # |
4932 | +# This program is free software; you can redistribute it and/or modify it # |
4933 | +# under the terms of the GNU General Public License as published by the Free # |
4934 | +# Software Foundation; version 2 of the License. # |
4935 | +# # |
4936 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
4937 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
4938 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
4939 | +# more details. # |
4940 | +# # |
4941 | +# You should have received a copy of the GNU General Public License along # |
4942 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
4943 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
4944 | +############################################################################### |
4945 | |
4946 | from PyQt4 import Qt, QtCore, QtGui |
4947 | |
4948 | |
4949 | === modified file 'openlp/plugins/presentations/presentationplugin.py' |
4950 | --- openlp/plugins/presentations/presentationplugin.py 2009-09-06 08:11:32 +0000 |
4951 | +++ openlp/plugins/presentations/presentationplugin.py 2009-09-08 19:58:05 +0000 |
4952 | @@ -1,22 +1,26 @@ |
4953 | # -*- coding: utf-8 -*- |
4954 | # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 |
4955 | -""" |
4956 | -OpenLP - Open Source Lyrics Projection |
4957 | -Copyright (c) 2008 Raoul Snyman |
4958 | -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, |
4959 | - |
4960 | -This program is free software; you can redistribute it and/or modify it under |
4961 | -the terms of the GNU General Public License as published by the Free Software |
4962 | -Foundation; version 2 of the License. |
4963 | - |
4964 | -This program is distributed in the hope that it will be useful, but WITHOUT ANY |
4965 | -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
4966 | -PARTICULAR PURPOSE. See the GNU General Public License for more details. |
4967 | - |
4968 | -You should have received a copy of the GNU General Public License along with |
4969 | -this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
4970 | -Place, Suite 330, Boston, MA 02111-1307 USA |
4971 | -""" |
4972 | + |
4973 | +############################################################################### |
4974 | +# OpenLP - Open Source Lyrics Projection # |
4975 | +# --------------------------------------------------------------------------- # |
4976 | +# Copyright (c) 2008-2009 Raoul Snyman # |
4977 | +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # |
4978 | +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # |
4979 | +# --------------------------------------------------------------------------- # |
4980 | +# This program is free software; you can redistribute it and/or modify it # |
4981 | +# under the terms of the GNU General Public License as published by the Free # |
4982 | +# Software Foundation; version 2 of the License. # |
4983 | +# # |
4984 | +# This program is distributed in the hope that it will be useful, but WITHOUT # |
4985 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # |
4986 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # |
4987 | +# more details. # |
4988 | +# # |
4989 | +# You should have received a copy of the GNU General Public License along # |
4990 | +# with this program; if not, write to the Free Software Foundation, Inc., 59 # |
4991 | +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
4992 | +############################################################################### |
4993 | |
4994 | import os |
4995 | import sys |
4996 | |
4997 | === modified file 'openlp/plugins/songs/__init__.py' |
4998 | --- openlp/plugins/songs/__init__.py 2009-01-02 20:20:33 +0000 |
4999 | +++ openlp/plugins/songs/__init__.py 2009-09-08 19:58:05 +0000 |
5000 | @@ -1,17 +1,23 @@ |
The diff has been truncated for viewing.
MOAR DOCUMENTATIONS!!