Merge lp:~raoul-snyman/openlp/bug-1157938-2.0 into lp:openlp/2.0
- bug-1157938-2.0
- Merge into release-2.0
Proposed by
Raoul Snyman
| Status: | Merged |
|---|---|
| Approved by: | Tim Bentley |
| Approved revision: | 2190 |
| Merged at revision: | 2188 |
| Proposed branch: | lp:~raoul-snyman/openlp/bug-1157938-2.0 |
| Merge into: | lp:openlp/2.0 |
| Diff against target: |
5007 lines (+1145/-719) 233 files modified
.bzrignore (+13/-14) copyright.txt (+2/-2) openlp.pyw (+2/-2) openlp/__init__.py (+2/-2) openlp/core/__init__.py (+2/-2) openlp/core/lib/__init__.py (+2/-2) openlp/core/lib/db.py (+2/-2) openlp/core/lib/dockwidget.py (+2/-2) openlp/core/lib/eventreceiver.py (+2/-2) openlp/core/lib/filedialog.py (+3/-3) openlp/core/lib/formattingtags.py (+2/-2) openlp/core/lib/htmlbuilder.py (+3/-3) openlp/core/lib/imagemanager.py (+2/-2) openlp/core/lib/listwidgetwithdnd.py (+2/-2) openlp/core/lib/mediamanageritem.py (+2/-2) openlp/core/lib/mediaplayer.py (+2/-2) openlp/core/lib/plugin.py (+2/-2) openlp/core/lib/pluginmanager.py (+2/-2) openlp/core/lib/renderer.py (+2/-2) openlp/core/lib/searchedit.py (+2/-2) openlp/core/lib/serviceitem.py (+2/-2) openlp/core/lib/settings.py (+2/-2) openlp/core/lib/settingsmanager.py (+2/-2) openlp/core/lib/settingstab.py (+2/-2) openlp/core/lib/spelltextedit.py (+2/-2) openlp/core/lib/theme.py (+2/-2) openlp/core/lib/toolbar.py (+2/-2) openlp/core/lib/ui.py (+2/-2) openlp/core/resources.py (+289/-100) openlp/core/resources.py.orig (+287/-98) openlp/core/theme/__init__.py (+2/-2) openlp/core/theme/theme.py (+2/-2) openlp/core/ui/__init__.py (+2/-2) openlp/core/ui/aboutdialog.py (+4/-3) openlp/core/ui/aboutform.py (+2/-2) openlp/core/ui/advancedtab.py (+2/-2) openlp/core/ui/exceptiondialog.py (+4/-2) openlp/core/ui/exceptionform.py (+2/-2) openlp/core/ui/filerenamedialog.py (+5/-3) openlp/core/ui/filerenameform.py (+2/-2) openlp/core/ui/firsttimeform.py (+2/-2) openlp/core/ui/firsttimelanguagedialog.py (+5/-3) openlp/core/ui/firsttimelanguageform.py (+2/-2) openlp/core/ui/firsttimewizard.py (+4/-3) openlp/core/ui/formattingtagdialog.py (+5/-3) openlp/core/ui/formattingtagform.py (+2/-2) openlp/core/ui/generaltab.py (+2/-2) openlp/core/ui/maindisplay.py (+2/-2) openlp/core/ui/mainwindow.py (+4/-3) openlp/core/ui/media/__init__.py (+2/-2) openlp/core/ui/media/mediacontroller.py (+2/-2) openlp/core/ui/media/phononplayer.py (+2/-2) openlp/core/ui/media/vlcplayer.py (+3/-3) openlp/core/ui/media/webkitplayer.py (+2/-2) openlp/core/ui/mediadockmanager.py (+2/-2) openlp/core/ui/plugindialog.py (+5/-3) openlp/core/ui/pluginform.py (+2/-2) openlp/core/ui/printservicedialog.py (+4/-2) openlp/core/ui/printserviceform.py (+2/-2) openlp/core/ui/screen.py (+2/-2) openlp/core/ui/serviceitemeditdialog.py (+5/-3) openlp/core/ui/serviceitemeditform.py (+2/-2) openlp/core/ui/servicemanager.py (+2/-2) openlp/core/ui/servicenoteform.py (+2/-2) openlp/core/ui/settingsdialog.py (+4/-4) openlp/core/ui/settingsform.py (+2/-2) openlp/core/ui/shortcutlistdialog.py (+4/-2) openlp/core/ui/shortcutlistform.py (+2/-2) openlp/core/ui/slidecontroller.py (+2/-2) openlp/core/ui/splashscreen.py (+2/-2) openlp/core/ui/starttimedialog.py (+5/-3) openlp/core/ui/starttimeform.py (+2/-2) openlp/core/ui/themeform.py (+2/-2) openlp/core/ui/themelayoutdialog.py (+4/-4) openlp/core/ui/themelayoutform.py (+2/-2) openlp/core/ui/thememanager.py (+2/-2) openlp/core/ui/themestab.py (+2/-2) openlp/core/ui/themewizard.py (+4/-2) openlp/core/ui/wizard.py (+4/-2) openlp/core/utils/__init__.py (+2/-2) openlp/core/utils/actions.py (+2/-2) openlp/core/utils/languagemanager.py (+2/-2) openlp/plugins/__init__.py (+2/-2) openlp/plugins/alerts/__init__.py (+2/-2) openlp/plugins/alerts/alertsplugin.py (+2/-2) openlp/plugins/alerts/forms/__init__.py (+2/-2) openlp/plugins/alerts/forms/alertdialog.py (+3/-3) openlp/plugins/alerts/forms/alertform.py (+2/-2) openlp/plugins/alerts/lib/__init__.py (+2/-2) openlp/plugins/alerts/lib/alertsmanager.py (+2/-2) openlp/plugins/alerts/lib/alertstab.py (+2/-2) openlp/plugins/alerts/lib/db.py (+2/-2) openlp/plugins/bibles/__init__.py (+2/-2) openlp/plugins/bibles/bibleplugin.py (+2/-2) openlp/plugins/bibles/forms/__init__.py (+2/-2) openlp/plugins/bibles/forms/bibleimportform.py (+3/-2) openlp/plugins/bibles/forms/bibleupgradeform.py (+2/-2) openlp/plugins/bibles/forms/booknamedialog.py (+5/-3) openlp/plugins/bibles/forms/booknameform.py (+2/-2) openlp/plugins/bibles/forms/editbibledialog.py (+4/-5) openlp/plugins/bibles/forms/editbibleform.py (+2/-2) openlp/plugins/bibles/forms/languagedialog.py (+5/-3) openlp/plugins/bibles/forms/languageform.py (+2/-2) openlp/plugins/bibles/lib/__init__.py (+2/-2) openlp/plugins/bibles/lib/biblestab.py (+2/-2) openlp/plugins/bibles/lib/csvbible.py (+2/-2) openlp/plugins/bibles/lib/db.py (+2/-2) openlp/plugins/bibles/lib/http.py (+2/-2) openlp/plugins/bibles/lib/manager.py (+4/-4) openlp/plugins/bibles/lib/mediaitem.py (+2/-2) openlp/plugins/bibles/lib/openlp1.py (+2/-2) openlp/plugins/bibles/lib/opensong.py (+3/-3) openlp/plugins/bibles/lib/osis.py (+3/-3) openlp/plugins/bibles/lib/upgrade.py (+2/-2) openlp/plugins/bibles/lib/versereferencelist.py (+2/-2) openlp/plugins/custom/__init__.py (+2/-2) openlp/plugins/custom/customplugin.py (+2/-2) openlp/plugins/custom/forms/__init__.py (+2/-2) openlp/plugins/custom/forms/editcustomdialog.py (+4/-4) openlp/plugins/custom/forms/editcustomform.py (+2/-2) openlp/plugins/custom/forms/editcustomslidedialog.py (+4/-2) openlp/plugins/custom/forms/editcustomslideform.py (+2/-2) openlp/plugins/custom/lib/__init__.py (+2/-2) openlp/plugins/custom/lib/customtab.py (+2/-2) openlp/plugins/custom/lib/customxmlhandler.py (+2/-2) openlp/plugins/custom/lib/db.py (+2/-2) openlp/plugins/custom/lib/mediaitem.py (+2/-2) openlp/plugins/images/__init__.py (+2/-2) openlp/plugins/images/imageplugin.py (+2/-2) openlp/plugins/images/lib/__init__.py (+2/-2) openlp/plugins/images/lib/imagetab.py (+2/-2) openlp/plugins/images/lib/mediaitem.py (+2/-2) openlp/plugins/media/__init__.py (+2/-2) openlp/plugins/media/lib/__init__.py (+2/-2) openlp/plugins/media/lib/mediaitem.py (+2/-2) openlp/plugins/media/lib/mediatab.py (+2/-2) openlp/plugins/media/mediaplugin.py (+2/-2) openlp/plugins/presentations/__init__.py (+2/-2) openlp/plugins/presentations/lib/__init__.py (+2/-2) openlp/plugins/presentations/lib/impresscontroller.py (+2/-2) openlp/plugins/presentations/lib/mediaitem.py (+2/-2) openlp/plugins/presentations/lib/messagelistener.py (+2/-2) openlp/plugins/presentations/lib/powerpointcontroller.py (+2/-2) openlp/plugins/presentations/lib/pptviewcontroller.py (+2/-2) openlp/plugins/presentations/lib/pptviewlib/ppttest.py (+2/-2) openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp (+3/-3) openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h (+2/-2) openlp/plugins/presentations/lib/presentationcontroller.py (+2/-2) openlp/plugins/presentations/lib/presentationtab.py (+2/-2) openlp/plugins/presentations/presentationplugin.py (+2/-2) openlp/plugins/remotes/__init__.py (+2/-2) openlp/plugins/remotes/html/index.html (+2/-2) openlp/plugins/remotes/html/openlp.css (+2/-2) openlp/plugins/remotes/html/openlp.js (+2/-2) openlp/plugins/remotes/html/stage.css (+2/-2) openlp/plugins/remotes/html/stage.html (+2/-2) openlp/plugins/remotes/html/stage.js (+2/-2) openlp/plugins/remotes/lib/__init__.py (+2/-2) openlp/plugins/remotes/lib/httpserver.py (+2/-2) openlp/plugins/remotes/lib/remotetab.py (+2/-2) openlp/plugins/remotes/remoteplugin.py (+2/-2) openlp/plugins/songs/__init__.py (+2/-2) openlp/plugins/songs/forms/__init__.py (+2/-2) openlp/plugins/songs/forms/authorsdialog.py (+5/-3) openlp/plugins/songs/forms/authorsform.py (+2/-2) openlp/plugins/songs/forms/editsongdialog.py (+4/-4) openlp/plugins/songs/forms/editsongform.py (+5/-5) openlp/plugins/songs/forms/editversedialog.py (+4/-2) openlp/plugins/songs/forms/editverseform.py (+2/-2) openlp/plugins/songs/forms/mediafilesdialog.py (+4/-4) openlp/plugins/songs/forms/mediafilesform.py (+2/-2) openlp/plugins/songs/forms/songbookdialog.py (+5/-3) openlp/plugins/songs/forms/songbookform.py (+2/-2) openlp/plugins/songs/forms/songexportform.py (+2/-2) openlp/plugins/songs/forms/songimportform.py (+2/-2) openlp/plugins/songs/forms/songmaintenancedialog.py (+5/-2) openlp/plugins/songs/forms/songmaintenanceform.py (+2/-2) openlp/plugins/songs/forms/topicsdialog.py (+5/-3) openlp/plugins/songs/forms/topicsform.py (+2/-2) openlp/plugins/songs/lib/__init__.py (+4/-4) openlp/plugins/songs/lib/cclifileimport.py (+2/-2) openlp/plugins/songs/lib/db.py (+2/-2) openlp/plugins/songs/lib/dreambeamimport.py (+8/-8) openlp/plugins/songs/lib/easyslidesimport.py (+2/-2) openlp/plugins/songs/lib/ewimport.py (+2/-2) openlp/plugins/songs/lib/foilpresenterimport.py (+2/-2) openlp/plugins/songs/lib/importer.py (+2/-2) openlp/plugins/songs/lib/mediaitem.py (+2/-2) openlp/plugins/songs/lib/mediashoutimport.py (+2/-2) openlp/plugins/songs/lib/olp1import.py (+2/-2) openlp/plugins/songs/lib/olpimport.py (+2/-2) openlp/plugins/songs/lib/oooimport.py (+2/-2) openlp/plugins/songs/lib/openlyricsexport.py (+2/-2) openlp/plugins/songs/lib/openlyricsimport.py (+2/-2) openlp/plugins/songs/lib/opensongimport.py (+2/-2) openlp/plugins/songs/lib/powersongimport.py (+2/-2) openlp/plugins/songs/lib/sofimport.py (+2/-2) openlp/plugins/songs/lib/songbeamerimport.py (+2/-2) openlp/plugins/songs/lib/songimport.py (+2/-2) openlp/plugins/songs/lib/songproimport.py (+2/-2) openlp/plugins/songs/lib/songshowplusimport.py (+3/-3) openlp/plugins/songs/lib/songstab.py (+2/-2) openlp/plugins/songs/lib/sundayplusimport.py (+2/-2) openlp/plugins/songs/lib/test/test_import_file.py (+2/-2) openlp/plugins/songs/lib/test/test_importing_lots.py (+2/-2) openlp/plugins/songs/lib/test/test_opensongimport.py (+2/-2) openlp/plugins/songs/lib/ui.py (+2/-2) openlp/plugins/songs/lib/upgrade.py (+2/-2) openlp/plugins/songs/lib/wowimport.py (+2/-2) openlp/plugins/songs/lib/xml.py (+2/-2) openlp/plugins/songs/lib/zionworximport.py (+2/-2) openlp/plugins/songs/songsplugin.py (+2/-2) openlp/plugins/songusage/__init__.py (+2/-2) openlp/plugins/songusage/forms/__init__.py (+2/-2) openlp/plugins/songusage/forms/songusagedeletedialog.py (+6/-3) openlp/plugins/songusage/forms/songusagedeleteform.py (+2/-2) openlp/plugins/songusage/forms/songusagedetaildialog.py (+5/-2) openlp/plugins/songusage/forms/songusagedetailform.py (+2/-2) openlp/plugins/songusage/lib/__init__.py (+2/-2) openlp/plugins/songusage/lib/db.py (+2/-2) openlp/plugins/songusage/lib/upgrade.py (+2/-2) openlp/plugins/songusage/songusageplugin.py (+2/-2) resources/__init__.py (+2/-2) resources/images/openlp-2.qrc (+1/-0) resources/pyinstaller/hook-openlp.core.ui.media.py (+2/-2) resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py (+2/-2) resources/pyinstaller/hook-openlp.py (+2/-2) scripts/check_dependencies.py (+2/-2) scripts/generate_resources.sh (+2/-2) scripts/openlp-remoteclient.py (+2/-2) scripts/resources.patch (+2/-2) scripts/translation_utils.py (+2/-2) setup.py (+2/-2) |
| To merge this branch: | bzr merge lp:~raoul-snyman/openlp/bug-1157938-2.0 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tim Bentley | Approve | ||
| Phill | Approve | ||
| mahfiaz | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2014-01-14.
Commit message
Description of the change
Try to fix bug #1157938 by changing all the png icons to svg
To post a comment you must log in.
Revision history for this message
| mahfiaz (mahfiaz) wrote : Posted in a previous version of this proposal | # |
review:
Needs Fixing
Revision history for this message
| Phill (phill-ridout) wrote : Posted in a previous version of this proposal | # |
Looks good. Icons appear fine on windows xp and Ubuntu.
review:
Approve
Revision history for this message
| Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal | # |
Haha, .gitignore - we're using bzr. But yes, I'll add it to the ignore. Silly file managers.
Revision history for this message
| Phill (phill-ridout) : | # |
review:
Approve
Revision history for this message
| Tim Bentley (trb143) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file '.bzrignore' |
| 2 | --- .bzrignore 2013-09-18 15:18:06 +0000 |
| 3 | +++ .bzrignore 2014-01-18 21:32:36 +0000 |
| 4 | @@ -1,26 +1,25 @@ |
| 5 | *.pyc |
| 6 | *.*~ |
| 7 | -\#*\# |
| 8 | *.eric4project |
| 9 | *.eric5project |
| 10 | *.ropeproject |
| 11 | *.e4* |
| 12 | +*.log* |
| 13 | +*.qm |
| 14 | +\#*\# |
| 15 | .eric4project |
| 16 | +.idea |
| 17 | +.pylint.d |
| 18 | +.directory |
| 19 | +_eric4project |
| 20 | list |
| 21 | -openlp.org 2.0.e4* |
| 22 | -documentation/build/html |
| 23 | -documentation/build/doctrees |
| 24 | -*.log* |
| 25 | dist |
| 26 | +build |
| 27 | OpenLP.egg-info |
| 28 | -build |
| 29 | -resources/innosetup/Output |
| 30 | -_eric4project |
| 31 | -.pylint.d |
| 32 | -*.qm |
| 33 | -openlp/core/resources.py.old |
| 34 | -*.qm |
| 35 | -resources/windows/warnOpenLP.txt |
| 36 | openlp.cfg |
| 37 | -.idea |
| 38 | openlp.pro |
| 39 | +documentation/build/html |
| 40 | +documentation/build/doctrees |
| 41 | +openlp/core/resources.py.old |
| 42 | +resources/innosetup/Output |
| 43 | +resources/windows/warnOpenLP.txt |
| 44 | \ No newline at end of file |
| 45 | |
| 46 | === modified file 'copyright.txt' |
| 47 | --- copyright.txt 2012-12-30 19:41:24 +0000 |
| 48 | +++ copyright.txt 2014-01-18 21:32:36 +0000 |
| 49 | @@ -4,8 +4,8 @@ |
| 50 | ############################################################################### |
| 51 | # OpenLP - Open Source Lyrics Projection # |
| 52 | # --------------------------------------------------------------------------- # |
| 53 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 54 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 55 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 56 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 57 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 58 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 59 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 60 | |
| 61 | === modified file 'openlp.pyw' |
| 62 | --- openlp.pyw 2012-12-30 19:41:24 +0000 |
| 63 | +++ openlp.pyw 2014-01-18 21:32:36 +0000 |
| 64 | @@ -5,8 +5,8 @@ |
| 65 | ############################################################################### |
| 66 | # OpenLP - Open Source Lyrics Projection # |
| 67 | # --------------------------------------------------------------------------- # |
| 68 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 69 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 70 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 71 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 72 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 73 | # Meinert Jordan, Armin Köhler, Edwin Lunando, Joshua Miller, Stevan Pettit, # |
| 74 | # Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # |
| 75 | |
| 76 | === modified file 'openlp/__init__.py' |
| 77 | --- openlp/__init__.py 2012-12-30 19:41:24 +0000 |
| 78 | +++ openlp/__init__.py 2014-01-18 21:32:36 +0000 |
| 79 | @@ -4,8 +4,8 @@ |
| 80 | ############################################################################### |
| 81 | # OpenLP - Open Source Lyrics Projection # |
| 82 | # --------------------------------------------------------------------------- # |
| 83 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 84 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 85 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 86 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 87 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 88 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 89 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 90 | |
| 91 | === modified file 'openlp/core/__init__.py' |
| 92 | --- openlp/core/__init__.py 2013-01-20 18:46:41 +0000 |
| 93 | +++ openlp/core/__init__.py 2014-01-18 21:32:36 +0000 |
| 94 | @@ -4,8 +4,8 @@ |
| 95 | ############################################################################### |
| 96 | # OpenLP - Open Source Lyrics Projection # |
| 97 | # --------------------------------------------------------------------------- # |
| 98 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 99 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 100 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 101 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 102 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 103 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 104 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 105 | |
| 106 | === modified file 'openlp/core/lib/__init__.py' |
| 107 | --- openlp/core/lib/__init__.py 2013-08-10 10:16:15 +0000 |
| 108 | +++ openlp/core/lib/__init__.py 2014-01-18 21:32:36 +0000 |
| 109 | @@ -4,8 +4,8 @@ |
| 110 | ############################################################################### |
| 111 | # OpenLP - Open Source Lyrics Projection # |
| 112 | # --------------------------------------------------------------------------- # |
| 113 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 114 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 115 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 116 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 117 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 118 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 119 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 120 | |
| 121 | === modified file 'openlp/core/lib/db.py' |
| 122 | --- openlp/core/lib/db.py 2012-12-30 19:41:24 +0000 |
| 123 | +++ openlp/core/lib/db.py 2014-01-18 21:32:36 +0000 |
| 124 | @@ -4,8 +4,8 @@ |
| 125 | ############################################################################### |
| 126 | # OpenLP - Open Source Lyrics Projection # |
| 127 | # --------------------------------------------------------------------------- # |
| 128 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 129 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 130 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 131 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 132 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 133 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 134 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 135 | |
| 136 | === modified file 'openlp/core/lib/dockwidget.py' |
| 137 | --- openlp/core/lib/dockwidget.py 2012-12-30 19:41:24 +0000 |
| 138 | +++ openlp/core/lib/dockwidget.py 2014-01-18 21:32:36 +0000 |
| 139 | @@ -4,8 +4,8 @@ |
| 140 | ############################################################################### |
| 141 | # OpenLP - Open Source Lyrics Projection # |
| 142 | # --------------------------------------------------------------------------- # |
| 143 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 144 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 145 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 146 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 147 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 148 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 149 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 150 | |
| 151 | === modified file 'openlp/core/lib/eventreceiver.py' |
| 152 | --- openlp/core/lib/eventreceiver.py 2012-12-30 19:41:24 +0000 |
| 153 | +++ openlp/core/lib/eventreceiver.py 2014-01-18 21:32:36 +0000 |
| 154 | @@ -4,8 +4,8 @@ |
| 155 | ############################################################################### |
| 156 | # OpenLP - Open Source Lyrics Projection # |
| 157 | # --------------------------------------------------------------------------- # |
| 158 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 159 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 160 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 161 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 162 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 163 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 164 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 165 | |
| 166 | === modified file 'openlp/core/lib/filedialog.py' |
| 167 | --- openlp/core/lib/filedialog.py 2013-08-20 19:38:50 +0000 |
| 168 | +++ openlp/core/lib/filedialog.py 2014-01-18 21:32:36 +0000 |
| 169 | @@ -4,8 +4,8 @@ |
| 170 | ############################################################################### |
| 171 | # OpenLP - Open Source Lyrics Projection # |
| 172 | # --------------------------------------------------------------------------- # |
| 173 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 174 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 175 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 176 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 177 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 178 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 179 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 180 | @@ -60,4 +60,4 @@ |
| 181 | UiStrings().FileNotFoundMessage % file) |
| 182 | continue |
| 183 | file_list.append(QtCore.QString(file)) |
| 184 | - return file_list |
| 185 | \ No newline at end of file |
| 186 | + return file_list |
| 187 | |
| 188 | === modified file 'openlp/core/lib/formattingtags.py' |
| 189 | --- openlp/core/lib/formattingtags.py 2013-06-30 05:12:57 +0000 |
| 190 | +++ openlp/core/lib/formattingtags.py 2014-01-18 21:32:36 +0000 |
| 191 | @@ -4,8 +4,8 @@ |
| 192 | ############################################################################### |
| 193 | # OpenLP - Open Source Lyrics Projection # |
| 194 | # --------------------------------------------------------------------------- # |
| 195 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 196 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 197 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 198 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 199 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 200 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 201 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 202 | |
| 203 | === modified file 'openlp/core/lib/htmlbuilder.py' |
| 204 | --- openlp/core/lib/htmlbuilder.py 2013-09-12 18:57:15 +0000 |
| 205 | +++ openlp/core/lib/htmlbuilder.py 2014-01-18 21:32:36 +0000 |
| 206 | @@ -4,8 +4,8 @@ |
| 207 | ############################################################################### |
| 208 | # OpenLP - Open Source Lyrics Projection # |
| 209 | # --------------------------------------------------------------------------- # |
| 210 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 211 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 212 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 213 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 214 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 215 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 216 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 217 | @@ -151,7 +151,7 @@ |
| 218 | newtext = '<span>' + newtext + '</span>'; |
| 219 | } |
| 220 | } |
| 221 | - |
| 222 | + |
| 223 | text_fade('lyricsmain', newtext); |
| 224 | text_fade('lyricsoutline', newtext); |
| 225 | text_fade('lyricsshadow', newtext.replace(match, '')); |
| 226 | |
| 227 | === modified file 'openlp/core/lib/imagemanager.py' |
| 228 | --- openlp/core/lib/imagemanager.py 2012-12-30 19:41:24 +0000 |
| 229 | +++ openlp/core/lib/imagemanager.py 2014-01-18 21:32:36 +0000 |
| 230 | @@ -4,8 +4,8 @@ |
| 231 | ############################################################################### |
| 232 | # OpenLP - Open Source Lyrics Projection # |
| 233 | # --------------------------------------------------------------------------- # |
| 234 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 235 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 236 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 237 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 238 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 239 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 240 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 241 | |
| 242 | === modified file 'openlp/core/lib/listwidgetwithdnd.py' |
| 243 | --- openlp/core/lib/listwidgetwithdnd.py 2012-12-30 19:41:24 +0000 |
| 244 | +++ openlp/core/lib/listwidgetwithdnd.py 2014-01-18 21:32:36 +0000 |
| 245 | @@ -4,8 +4,8 @@ |
| 246 | ############################################################################### |
| 247 | # OpenLP - Open Source Lyrics Projection # |
| 248 | # --------------------------------------------------------------------------- # |
| 249 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 250 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 251 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 252 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 253 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 254 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 255 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 256 | |
| 257 | === modified file 'openlp/core/lib/mediamanageritem.py' |
| 258 | --- openlp/core/lib/mediamanageritem.py 2013-08-11 20:16:27 +0000 |
| 259 | +++ openlp/core/lib/mediamanageritem.py 2014-01-18 21:32:36 +0000 |
| 260 | @@ -4,8 +4,8 @@ |
| 261 | ############################################################################### |
| 262 | # OpenLP - Open Source Lyrics Projection # |
| 263 | # --------------------------------------------------------------------------- # |
| 264 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 265 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 266 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 267 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 268 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 269 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 270 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 271 | |
| 272 | === modified file 'openlp/core/lib/mediaplayer.py' |
| 273 | --- openlp/core/lib/mediaplayer.py 2012-12-30 19:41:24 +0000 |
| 274 | +++ openlp/core/lib/mediaplayer.py 2014-01-18 21:32:36 +0000 |
| 275 | @@ -4,8 +4,8 @@ |
| 276 | ############################################################################### |
| 277 | # OpenLP - Open Source Lyrics Projection # |
| 278 | # --------------------------------------------------------------------------- # |
| 279 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 280 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 281 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 282 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 283 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 284 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 285 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 286 | |
| 287 | === modified file 'openlp/core/lib/plugin.py' |
| 288 | --- openlp/core/lib/plugin.py 2012-12-30 19:41:24 +0000 |
| 289 | +++ openlp/core/lib/plugin.py 2014-01-18 21:32:36 +0000 |
| 290 | @@ -4,8 +4,8 @@ |
| 291 | ############################################################################### |
| 292 | # OpenLP - Open Source Lyrics Projection # |
| 293 | # --------------------------------------------------------------------------- # |
| 294 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 295 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 296 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 297 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 298 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 299 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 300 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 301 | |
| 302 | === modified file 'openlp/core/lib/pluginmanager.py' |
| 303 | --- openlp/core/lib/pluginmanager.py 2012-12-30 19:41:24 +0000 |
| 304 | +++ openlp/core/lib/pluginmanager.py 2014-01-18 21:32:36 +0000 |
| 305 | @@ -4,8 +4,8 @@ |
| 306 | ############################################################################### |
| 307 | # OpenLP - Open Source Lyrics Projection # |
| 308 | # --------------------------------------------------------------------------- # |
| 309 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 310 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 311 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 312 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 313 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 314 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 315 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 316 | |
| 317 | === modified file 'openlp/core/lib/renderer.py' |
| 318 | --- openlp/core/lib/renderer.py 2012-12-30 19:41:24 +0000 |
| 319 | +++ openlp/core/lib/renderer.py 2014-01-18 21:32:36 +0000 |
| 320 | @@ -4,8 +4,8 @@ |
| 321 | ############################################################################### |
| 322 | # OpenLP - Open Source Lyrics Projection # |
| 323 | # --------------------------------------------------------------------------- # |
| 324 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 325 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 326 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 327 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 328 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 329 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 330 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 331 | |
| 332 | === modified file 'openlp/core/lib/searchedit.py' |
| 333 | --- openlp/core/lib/searchedit.py 2012-12-30 19:41:24 +0000 |
| 334 | +++ openlp/core/lib/searchedit.py 2014-01-18 21:32:36 +0000 |
| 335 | @@ -4,8 +4,8 @@ |
| 336 | ############################################################################### |
| 337 | # OpenLP - Open Source Lyrics Projection # |
| 338 | # --------------------------------------------------------------------------- # |
| 339 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 340 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 341 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 342 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 343 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 344 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 345 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 346 | |
| 347 | === modified file 'openlp/core/lib/serviceitem.py' |
| 348 | --- openlp/core/lib/serviceitem.py 2013-12-06 20:25:05 +0000 |
| 349 | +++ openlp/core/lib/serviceitem.py 2014-01-18 21:32:36 +0000 |
| 350 | @@ -4,8 +4,8 @@ |
| 351 | ############################################################################### |
| 352 | # OpenLP - Open Source Lyrics Projection # |
| 353 | # --------------------------------------------------------------------------- # |
| 354 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 355 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 356 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 357 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 358 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 359 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 360 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 361 | |
| 362 | === modified file 'openlp/core/lib/settings.py' |
| 363 | --- openlp/core/lib/settings.py 2012-12-30 19:41:24 +0000 |
| 364 | +++ openlp/core/lib/settings.py 2014-01-18 21:32:36 +0000 |
| 365 | @@ -4,8 +4,8 @@ |
| 366 | ############################################################################### |
| 367 | # OpenLP - Open Source Lyrics Projection # |
| 368 | # --------------------------------------------------------------------------- # |
| 369 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 370 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 371 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 372 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 373 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 374 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 375 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 376 | |
| 377 | === modified file 'openlp/core/lib/settingsmanager.py' |
| 378 | --- openlp/core/lib/settingsmanager.py 2012-12-30 19:41:24 +0000 |
| 379 | +++ openlp/core/lib/settingsmanager.py 2014-01-18 21:32:36 +0000 |
| 380 | @@ -4,8 +4,8 @@ |
| 381 | ############################################################################### |
| 382 | # OpenLP - Open Source Lyrics Projection # |
| 383 | # --------------------------------------------------------------------------- # |
| 384 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 385 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 386 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 387 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 388 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 389 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 390 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 391 | |
| 392 | === modified file 'openlp/core/lib/settingstab.py' |
| 393 | --- openlp/core/lib/settingstab.py 2012-12-30 19:41:24 +0000 |
| 394 | +++ openlp/core/lib/settingstab.py 2014-01-18 21:32:36 +0000 |
| 395 | @@ -4,8 +4,8 @@ |
| 396 | ############################################################################### |
| 397 | # OpenLP - Open Source Lyrics Projection # |
| 398 | # --------------------------------------------------------------------------- # |
| 399 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 400 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 401 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 402 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 403 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 404 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 405 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 406 | |
| 407 | === modified file 'openlp/core/lib/spelltextedit.py' |
| 408 | --- openlp/core/lib/spelltextedit.py 2012-12-30 19:41:24 +0000 |
| 409 | +++ openlp/core/lib/spelltextedit.py 2014-01-18 21:32:36 +0000 |
| 410 | @@ -4,8 +4,8 @@ |
| 411 | ############################################################################### |
| 412 | # OpenLP - Open Source Lyrics Projection # |
| 413 | # --------------------------------------------------------------------------- # |
| 414 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 415 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 416 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 417 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 418 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 419 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 420 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 421 | |
| 422 | === modified file 'openlp/core/lib/theme.py' |
| 423 | --- openlp/core/lib/theme.py 2012-12-30 19:41:24 +0000 |
| 424 | +++ openlp/core/lib/theme.py 2014-01-18 21:32:36 +0000 |
| 425 | @@ -4,8 +4,8 @@ |
| 426 | ############################################################################### |
| 427 | # OpenLP - Open Source Lyrics Projection # |
| 428 | # --------------------------------------------------------------------------- # |
| 429 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 430 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 431 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 432 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 433 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 434 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 435 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 436 | |
| 437 | === modified file 'openlp/core/lib/toolbar.py' |
| 438 | --- openlp/core/lib/toolbar.py 2012-12-30 19:41:24 +0000 |
| 439 | +++ openlp/core/lib/toolbar.py 2014-01-18 21:32:36 +0000 |
| 440 | @@ -4,8 +4,8 @@ |
| 441 | ############################################################################### |
| 442 | # OpenLP - Open Source Lyrics Projection # |
| 443 | # --------------------------------------------------------------------------- # |
| 444 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 445 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 446 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 447 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 448 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 449 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 450 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 451 | |
| 452 | === modified file 'openlp/core/lib/ui.py' |
| 453 | --- openlp/core/lib/ui.py 2013-08-16 05:20:21 +0000 |
| 454 | +++ openlp/core/lib/ui.py 2014-01-18 21:32:36 +0000 |
| 455 | @@ -4,8 +4,8 @@ |
| 456 | ############################################################################### |
| 457 | # OpenLP - Open Source Lyrics Projection # |
| 458 | # --------------------------------------------------------------------------- # |
| 459 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 460 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 461 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 462 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 463 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 464 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 465 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 466 | |
| 467 | === modified file 'openlp/core/resources.py' |
| 468 | --- openlp/core/resources.py 2012-12-30 19:41:24 +0000 |
| 469 | +++ openlp/core/resources.py 2014-01-18 21:32:36 +0000 |
| 470 | @@ -4,8 +4,8 @@ |
| 471 | ############################################################################### |
| 472 | # OpenLP - Open Source Lyrics Projection # |
| 473 | # --------------------------------------------------------------------------- # |
| 474 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 475 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 476 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 477 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 478 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 479 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 480 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 481 | @@ -54736,6 +54736,190 @@ |
| 482 | \x89\x3e\x62\x80\x70\x10\xc3\x84\x9d\xb0\x11\x66\xa2\x8b\xe8\x6c\ |
| 483 | \x7e\xaa\x0f\xd9\x9d\x89\x07\xa1\xb5\x4b\xa0\x00\x00\x00\x00\x49\ |
| 484 | \x45\x4e\x44\xae\x42\x60\x82\ |
| 485 | +\x00\x00\x0b\x5e\ |
| 486 | +\x00\ |
| 487 | +\x00\x36\x03\x78\x9c\xed\x5a\xdb\x6e\xdb\x48\x12\x7d\xcf\x57\x70\ |
| 488 | +\x95\x97\x04\x4b\xb6\xfa\x7e\x71\xec\x0c\x90\x09\x32\x18\x60\x17\ |
| 489 | +\x0b\xcc\x05\xfb\x38\xa0\x45\x5a\xe6\x86\x22\x05\x92\x8a\x65\x7f\ |
| 490 | +\xfd\x9e\xa6\x24\x5e\x6c\x3a\xbe\xc4\x03\x27\x99\xc9\x60\x60\xb1\ |
| 491 | +\xbb\xba\xbb\xea\x54\xd5\xe9\x6a\x36\x8f\x7f\xd8\xae\xf2\xe0\x53\ |
| 492 | +\x5a\xd5\x59\x59\x9c\xcc\x18\xa1\xb3\x20\x2d\x16\x65\x92\x15\xcb\ |
| 493 | +\x93\xd9\xef\xbf\x7d\x88\xec\x2c\xa8\x9b\xb8\x48\xe2\xbc\x2c\xd2\ |
| 494 | +\x93\x59\x51\xce\x7e\x78\xfb\xe2\xf8\x1f\x51\x14\xfc\x58\xa5\x71\ |
| 495 | +\x93\x26\xc1\x45\xd6\x9c\x07\x3f\x17\x1f\xeb\x45\xbc\x4e\x83\x57\ |
| 496 | +\xe7\x4d\xb3\x3e\x9a\xcf\x2f\x2e\x2e\x48\xb6\x6f\x24\x65\xb5\x9c\ |
| 497 | +\xbf\x0e\xa2\xe8\xed\x8b\x17\xc7\xf5\xa7\xe5\x8b\x20\x08\xb0\x6e\ |
| 498 | +\x51\x1f\x25\x8b\x93\xd9\x7e\xc0\x7a\x53\xe5\xad\x60\xb2\x98\xa7\ |
| 499 | +\x79\xba\x4a\x8b\xa6\x9e\x33\xc2\xe6\xb3\x5e\x7c\xd1\x8b\x2f\xfc\ |
| 500 | +\xea\xd9\xa7\x74\x51\xae\x56\x65\x51\xb7\x23\x8b\xfa\xe5\x40\xb8\ |
| 501 | +\x4a\xce\x3a\x69\xaf\xcd\x85\x68\x85\x98\x73\x6e\x4e\xf9\x9c\xf3\ |
| 502 | +\x08\x12\x51\x7d\x59\x34\xf1\x36\x1a\x0f\x85\x8e\x53\x43\x39\xa5\ |
| 503 | +\x74\x8e\xbe\x5e\xf2\x7e\x52\x47\xdb\x1c\x50\xdc\xaa\x4c\xdb\x3b\ |
| 504 | +\x5c\x1d\xf0\xaf\xf1\x7f\x37\xe0\xd0\x40\xea\x72\x53\x2d\xd2\x33\ |
| 505 | +\x8c\x4c\x49\x91\x36\xf3\xf7\xbf\xbd\xef\x3a\x23\x4a\x92\x26\x19\ |
| 506 | +\x4c\x73\x40\x7f\xb4\xee\xc8\x25\x45\xbc\x4a\xeb\x75\xbc\x48\xeb\ |
| 507 | +\xf9\xa1\xbd\x1d\x7f\x91\x25\xcd\xf9\xc9\x4c\x6a\x43\x84\x63\xc6\ |
| 508 | +\xb6\x8d\xe7\x69\xb6\x3c\x6f\xae\xb7\x66\xc9\xc9\x0c\xb6\x2a\x23\ |
| 509 | +\x69\xfb\x7c\xd0\xe6\xa8\x8b\x29\x4a\x04\xdf\x89\xee\x97\x18\x76\ |
| 510 | +\x49\x13\x54\x9c\x2b\x2b\x5a\x89\x51\x1c\x8e\x66\x4b\xca\x85\x57\ |
| 511 | +\xf6\x64\x56\xae\xd3\x22\x5f\x47\x79\xb9\x2c\xc9\x01\xe3\x6e\xe2\ |
| 512 | +\x72\xd3\xac\x37\xcd\x1f\xe9\xb6\x49\x8b\xdd\x44\xb0\x72\x60\x72\ |
| 513 | +\xdb\xed\x87\x91\x91\xb9\xdd\xf8\x74\xbb\x2e\xab\x26\x3a\xcb\xf2\ |
| 514 | +\x74\xb7\xda\xfc\xbc\x5c\xa5\xf3\x2a\x2e\x37\xf9\x7c\xb0\x32\xa0\ |
| 515 | +\xe6\x64\x5d\x2c\x27\x47\x6f\x93\x35\x3c\xe7\x18\xb1\x9a\x5a\x69\ |
| 516 | +\x26\x65\x2e\x27\x64\xea\xe6\x32\xc7\x92\x49\x56\xaf\xf3\xf8\x12\ |
| 517 | +\xde\x43\x54\xa4\xb3\xb7\xe8\x3a\x4e\xd2\xb3\xda\x8b\xec\xe0\xf6\ |
| 518 | +\x4f\xc0\x9b\xb7\x7d\xe8\xf5\x72\x71\xf5\x53\x15\x27\x19\x72\x66\ |
| 519 | +\x27\xb7\x93\x1c\xf7\x08\x4e\xed\x7e\x0c\x46\xd5\x4d\xb9\x3e\xc8\ |
| 520 | +\x76\x8b\xfb\xc6\x68\x51\xe6\x65\x75\xf4\xf2\xac\xfd\xf7\xa6\x6d\ |
| 521 | +\x2a\x11\x24\x59\x73\x79\x04\xbb\x15\x75\x96\x4a\xf6\x66\xd6\x0f\ |
| 522 | +\x2e\xcf\xce\xea\x14\x91\x41\x07\x6d\x6d\x5c\x60\xa8\xe0\x0c\x94\ |
| 523 | +\x32\xff\xc2\x65\xa7\x56\x63\xd3\xab\xf1\x6e\xb5\xe3\xf9\xd8\xfe\ |
| 524 | +\x87\xc2\xc5\x9c\x7a\x00\x5c\x8b\x64\x91\x5c\xd7\xfb\xfe\x28\x31\ |
| 525 | +\x67\x1e\x84\x52\x7a\x9a\x9e\xde\x6b\xb5\x49\x94\xc0\x3a\x4f\x85\ |
| 526 | +\x92\x16\xca\x3d\x00\x25\x50\x63\xc2\xf5\x23\x51\xd2\x42\xb3\x07\ |
| 527 | +\xa1\xa4\xa8\x39\x4b\xe2\x47\xa2\x84\xd5\xc4\x5d\x28\x75\x79\xbd\ |
| 528 | +\x06\x73\xad\xd3\x85\xdf\x90\x0e\x33\x75\xdc\xd5\x5c\x7a\x0e\x1e\ |
| 529 | +\x8b\x8a\xa4\x5b\xb1\xa7\xc5\xf5\x1f\x5b\x18\x1e\x1c\x05\x8a\x6b\ |
| 530 | +\xc2\x2c\xa3\x0e\xbf\xd9\xa4\xe0\xe5\x4e\x90\x01\x4f\xfc\xa1\x93\ |
| 531 | +\x32\x57\x27\x33\x23\x25\xa1\x4e\x4a\x7b\xf7\xa4\x7b\xb5\xa2\xb2\ |
| 532 | +\xca\x96\x19\x98\x53\x18\x4e\xa8\x34\x5c\x42\x5c\x28\x4a\x8c\x35\ |
| 533 | +\xe2\xda\x50\x00\x35\xb0\x1b\x94\x64\x7b\xbc\xc0\xa1\x4d\x5a\xdd\ |
| 534 | +\x58\x05\x8e\xc9\x21\x7e\x32\x8b\xf3\x8b\xf8\xb2\x1e\xcd\xb5\x1b\ |
| 535 | +\xa2\x1d\xd7\x5d\x73\xeb\xc7\x28\x2b\xd0\xbe\x2e\x73\xec\xf7\x65\ |
| 536 | +\x11\xed\xc4\xb0\xf3\xd6\xbf\xfc\xf4\xae\x0f\xbd\xb3\xf4\xa7\x78\ |
| 537 | +\x53\xd7\x59\x5c\xbc\xcb\x37\xd5\xc0\x9d\x77\x2d\xed\x23\x27\x79\ |
| 538 | +\x9f\x7e\xca\xda\xe9\x61\x38\x51\xc6\x30\x6b\xf8\xb5\x98\x18\x2f\ |
| 539 | +\x00\x35\x07\xd6\xce\x77\x4a\x7d\x3e\x77\xee\x52\xa4\x2d\x03\x8e\ |
| 540 | +\xce\xab\x14\x65\xcb\xcb\x09\xea\xfe\x1c\xb3\x33\xd9\x4f\xc3\xb0\ |
| 541 | +\x47\x1b\xcf\xd4\xd6\xf5\xce\xba\x44\x2b\x37\x9a\x68\x6b\x55\xdf\ |
| 542 | +\xba\xe5\x7e\x3f\x17\x84\x0b\x3a\x10\x45\x23\x93\xc4\x72\xae\x07\ |
| 543 | +\xad\xcb\xfd\x5a\xbf\x17\x59\x03\xf0\x37\x75\x5a\xfd\xea\x4b\x87\ |
| 544 | +\xff\x14\xbf\xd7\x69\x8f\xc4\x33\xd8\xce\xdd\x3d\x95\xfc\x93\x10\ |
| 545 | +\x7a\x4e\xdb\xcd\x5f\xd8\x76\x6b\x9e\xd7\xf6\xeb\x8b\xff\x56\xc5\ |
| 546 | +\x45\x8d\xda\x7c\x75\x32\x5b\xc5\x4d\x95\x6d\x5f\xe1\xf4\xc2\x38\ |
| 547 | +\x07\xfd\x86\x14\xff\x31\xc2\xa9\x30\x46\xd8\x30\x52\x86\x70\x67\ |
| 548 | +\xb9\x0a\x31\x99\x95\x4e\x30\xfb\xfa\x4f\x85\xd2\x97\x32\x9f\xad\ |
| 549 | +\x74\xf4\x23\xa0\x64\xcc\x10\x05\xb6\xe6\x23\x28\x85\xc5\x96\xa3\ |
| 550 | +\xcc\x60\xc1\x16\x4a\x66\x61\xbd\xb3\x63\x2c\xa5\xd0\x04\x90\x58\ |
| 551 | +\xf3\x67\x1a\xdf\x56\x28\x9f\x35\xde\x3e\xc2\x78\xcb\x14\x31\x6a\ |
| 552 | +\x64\xb9\xb4\x94\x28\x65\xa5\x1c\x59\xce\x29\xa2\x80\x6a\xce\x47\ |
| 553 | +\x96\x0b\x83\xda\x5f\x39\x61\x9f\x35\x83\x28\x7d\xa0\xe5\x4f\x14\ |
| 554 | +\xea\x8f\x4f\x48\x47\xa4\x74\x5c\x8d\x33\x92\x4a\x22\x28\xe5\xee\ |
| 555 | +\x39\x53\x88\x33\xf5\xd7\x4d\x21\xce\x1e\x43\xc5\xdf\x45\x0a\xb1\ |
| 556 | +\x87\x6e\xc0\x7f\xe1\x14\xfa\x3c\x96\x92\xb2\xa7\xa3\x23\x9c\x57\ |
| 557 | +\x38\x60\xb1\xba\xc5\xd2\x9f\x5e\xa4\x90\x5a\x86\x11\xce\x3f\x44\ |
| 558 | +\x72\xaa\x55\x18\x71\xc2\x04\x47\xf6\xc9\x6f\x12\xcd\x3b\x72\x12\ |
| 559 | +\x68\x8a\xe7\xcc\xc9\xfb\xb8\x48\x2b\xa6\x0c\x77\x7b\x17\x1d\x9e\ |
| 560 | +\x22\x7f\xf0\xb4\x5a\x6b\x1f\xf9\x44\x30\x25\x2d\xd3\xcf\x59\x1e\ |
| 561 | +\x49\x2a\x1f\x43\x6f\xdf\x07\xb7\xc3\xf8\xc7\x1c\x31\xbe\x03\x6e\ |
| 562 | +\x97\x54\xdd\xf7\xf4\xfb\x37\xb7\xdf\x99\x42\xea\x31\x6c\xf4\xbd\ |
| 563 | +\xa4\x90\x7a\x68\x6d\xf8\x64\xac\xf9\xfd\xe5\xe4\x43\xa9\xf8\x1b\ |
| 564 | +\xa9\x11\x8e\xe7\xfe\x5a\xa7\xfd\xd5\xbd\x38\xf6\x77\x50\xc9\xa7\ |
| 565 | +\x2c\xbd\x78\xd1\xc1\x71\x1a\x77\xa6\xad\xe3\x65\xda\xbe\x1f\x05\ |
| 566 | +\x88\xbb\x4b\x93\x7d\xc7\x69\x59\x25\x69\x75\xe8\xd2\xed\xbf\x51\ |
| 567 | +\xd7\xfe\x55\x78\x7f\xcd\xe6\x51\xca\x92\xa6\xcc\x53\x80\xb4\x48\ |
| 568 | +\xbd\x76\xb4\x3b\x1b\x2e\x37\x59\x92\x8e\xfa\xf6\x1d\xe5\xe9\xff\ |
| 569 | +\xe0\xdd\xa9\x9e\xfe\xa5\x32\x74\xec\x56\xa3\x64\xb2\xbf\x3e\x8f\ |
| 570 | +\x93\xf2\x02\xe8\x5d\xef\xbc\x2a\xcb\x55\xab\x23\x63\x4e\x5b\x71\ |
| 571 | +\xbd\x7b\xb1\x3d\x99\x29\x44\xaa\xe1\x42\xda\x1b\x9d\xde\x3a\x6b\ |
| 572 | +\x88\xd6\xec\x46\x5f\x52\x2e\x36\xfe\x76\x39\xda\xec\x02\x67\xbd\ |
| 573 | +\xbd\x31\x7a\x53\x55\x5e\x20\x8f\x2f\x53\x60\xd8\xfe\x39\x40\x58\ |
| 574 | +\x9f\x97\x17\x1e\xad\x93\xd9\x59\x9c\x77\xce\xe8\x86\x5e\x64\x05\ |
| 575 | +\xac\x89\xf6\x37\xa8\x4c\xd3\x1b\x36\xef\x25\x0e\xd7\xa9\x56\xb8\ |
| 576 | +\x5b\x24\xb6\x1e\x51\x7e\x03\x96\x7d\x2f\x0c\x8c\x6e\x60\xb2\xef\ |
| 577 | +\x5b\xc5\xdb\x6c\x95\x5d\xa5\x89\xbf\xd9\xd8\xc7\xd7\x2a\x6d\xe2\ |
| 578 | +\x24\x6e\xe2\x3e\x96\x0e\x2d\xca\xc8\xc3\x45\xd7\x71\x95\x9c\x1d\ |
| 579 | +\xfd\xf2\xfe\x43\xf7\x56\x7d\xb1\x38\xfa\x6f\x59\x7d\x3c\x44\x6e\ |
| 580 | +\x10\x78\x81\xf8\xb4\xdc\x40\xf3\xee\xdd\xbb\xbf\xa1\x5c\x1c\xf9\ |
| 581 | +\xdc\x8a\x9b\xb7\xd9\x0a\x3e\xf5\xd7\xdf\xff\xdc\xae\x72\x44\x75\ |
| 582 | +\xd7\x31\x12\xf6\x77\x22\xfd\xa4\xbb\x69\xab\x74\x77\xbd\x3d\xf9\ |
| 583 | +\x45\x40\xb2\x58\x65\x7e\xd0\xfc\xd7\x26\xcb\xf3\x9f\xfd\x22\xc3\ |
| 584 | +\xab\xa0\xf9\x5e\xd1\xc3\xfb\xf8\x81\x1d\xc7\xf3\x83\xa1\xed\xd3\ |
| 585 | +\xf2\x1a\x64\x79\x7c\x9a\xe6\x27\xb3\x5f\xdb\x28\xbc\x8e\xe7\xb2\ |
| 586 | +\x2a\x37\xeb\x55\x99\xa4\xfb\x20\x98\xf5\xe8\xb5\xcf\x87\x4c\x9f\ |
| 587 | +\xbe\xbb\xdd\xf5\x35\x3d\xf1\xb4\x3f\xf3\xb8\x49\x5f\x45\x0c\x64\ |
| 588 | +\x6a\x38\xc5\xc6\x1f\x31\x41\x98\x61\x56\xf1\x43\x91\x7b\x43\xc7\ |
| 589 | +\xbb\xd4\x50\xd7\xf5\xde\x1b\xf5\xae\x4d\xf7\xaf\x43\xc7\x1b\xb1\ |
| 590 | +\xba\xd7\xf1\x17\xec\x0c\xc1\xbb\x78\xf1\xd1\x4f\x50\x24\x5f\x87\ |
| 591 | +\xb2\x37\x92\x6e\xa8\xec\x87\xb2\x4a\xbf\x26\x65\xf5\x6d\xca\xa6\ |
| 592 | +\x67\x7e\xfb\xcd\xca\xe2\x89\xf5\xdc\x27\xd9\x72\xb8\x4f\x2f\x71\ |
| 593 | +\xe0\xec\x77\xee\xc9\xd9\x1c\x2a\x5c\x66\x04\xb7\x61\xf7\xeb\x75\ |
| 594 | +\x7f\x7f\xb7\x8e\x9b\xf3\x9e\x11\x6e\xf9\x60\x62\x74\x2b\x3c\xfd\ |
| 595 | +\xdd\xc5\xe7\x44\x1e\xf6\x61\xc7\x0d\x53\xfa\x12\x4c\x18\x67\x85\ |
| 596 | +\x3a\x94\x60\xfb\xa7\x48\xa3\x5a\x55\x52\x33\x0e\xb4\x14\x61\xd6\ |
| 597 | +\x71\xa7\x5e\x0f\xa6\xf2\x9c\x1b\x58\x21\x50\x91\x52\xaa\x43\xe1\ |
| 598 | +\x14\xe1\xda\x09\x1e\x2c\x02\x9c\x09\x1c\x46\x6b\xd4\x1a\x41\x84\ |
| 599 | +\x5d\x83\x30\xa5\x99\x08\x05\x8e\x07\xed\x5d\x64\x10\x75\x3f\x87\ |
| 600 | +\x8d\xdd\xa0\x90\x0e\x25\xfa\x19\x46\xad\xfd\x40\x1a\x1e\x86\xea\ |
| 601 | +\xa0\x5f\xad\x17\xe0\xc1\xd4\x30\x1e\x0c\xd7\xeb\x25\x0e\x33\x8c\ |
| 602 | +\x86\x0d\x46\x5d\x0d\x30\xe8\x8a\x9b\x0a\x1b\x58\x27\x33\x29\xb0\ |
| 603 | +\xbd\x43\xc0\xef\xf1\x1d\x86\x93\x02\x5b\x5f\xa9\xf9\x6a\x98\x09\ |
| 604 | +\x39\x0c\x0b\x7f\x71\x8d\x70\xd3\x8e\x8a\xe1\xb8\x5d\x7a\x20\x48\ |
| 605 | +\xf2\xf6\x43\x05\xfc\x7b\xe3\x1f\x06\x9f\x0e\xb4\x8f\xd5\x26\x4f\ |
| 606 | +\x8f\x8a\xb2\xb8\x42\x25\xf5\xa6\x6e\xaa\xf2\x63\xfb\x98\xbe\x19\ |
| 607 | +\x27\xd6\x9b\xdd\x9d\xf0\x11\x36\xb1\x57\x2f\xfb\xbb\xed\xd7\x53\ |
| 608 | +\x9a\xee\x3e\x11\x88\xab\xc5\x70\x4f\xfb\x5a\x33\x62\x42\xeb\xdb\ |
| 609 | +\x40\x54\x2c\x55\xfc\x4b\x40\x9c\xf6\x1a\x7d\x88\xb7\xef\x1f\x2f\ |
| 610 | +\x77\x46\xdc\x6d\x31\xfb\x77\x62\x3f\x01\x4f\x7e\x03\x91\x3f\x6d\ |
| 611 | +\x23\x33\xdc\x9a\xce\xc6\xdd\x53\xa4\x25\x51\x38\x81\x6b\x6f\x23\ |
| 612 | +\x07\x5e\xda\x59\xfb\xf7\x5e\xf0\x15\xef\x05\x62\x70\x87\x35\xa6\ |
| 613 | +\xb1\x96\xc0\x6f\xbe\xcf\x7a\xfd\x44\xbc\xf6\x6d\x6e\x02\x3d\x6e\ |
| 614 | +\xdc\x5c\x0f\x6b\x2e\x14\xd1\xc6\xf9\x68\xf0\x1f\x50\x08\x67\x25\ |
| 615 | +\xc2\x1a\xb1\x43\x1c\x37\x46\xfb\xf8\xd4\xbe\x04\xa4\xc6\x86\x96\ |
| 616 | +\x48\x6b\xb5\x52\x41\xe4\x1c\x71\x46\x61\x10\x17\xed\x3b\x29\x21\ |
| 617 | +\x82\x7f\x05\xdc\x69\x7f\xc0\x77\x1a\x81\x85\xe1\x5a\x1b\x19\x48\ |
| 618 | +\xc5\x09\x52\x4b\xb8\x90\x3b\x46\x98\xa3\x8e\x61\x7a\x49\x04\x97\ |
| 619 | +\x8a\x21\x98\x0d\x11\x48\x3d\x13\x68\xa2\x99\x51\xd2\x07\x2d\x51\ |
| 620 | +\x0c\xe1\xda\xb7\x28\x49\x50\xd5\xee\x83\xdf\xaf\x47\x5b\x15\x18\ |
| 621 | +\x85\xa1\xd2\x68\x1d\x46\x1c\xad\x10\xe5\x14\xcd\x87\xdf\x6c\xd0\ |
| 622 | +\xac\x83\xab\xe0\xdf\x81\x71\x84\x81\xbf\xb4\x0d\x8d\x21\x1c\xa7\ |
| 623 | +\x75\xe7\x82\x1f\x03\x03\xad\x40\x6f\x4c\x86\x56\x11\xca\x85\xe5\ |
| 624 | +\x32\xd0\x18\xa7\xa5\xe5\x3c\x74\x82\x48\xc1\x9c\x74\x01\x02\x9a\ |
| 625 | +\x72\x8d\xe3\x77\x88\x91\x50\x5a\x3b\xe9\x4d\x36\xd2\xd3\x88\xd2\ |
| 626 | +\x21\xa7\x8e\x80\x41\xac\x0a\xa4\xf0\x0a\x03\x94\x90\x5b\x4b\x84\ |
| 627 | +\xa6\x5a\x42\x0e\xd1\x4c\xc1\xa7\x0c\x33\x5a\xcd\x39\x9b\x54\xc7\ |
| 628 | +\xab\xc9\xe5\x0e\x65\x01\x14\x39\x71\x4a\x70\xde\x3a\x84\x68\x6e\ |
| 629 | +\x2c\xa0\xa5\x44\x40\x49\x03\xb7\x00\x09\x89\x89\x43\xce\xa0\x1a\ |
| 630 | +\xd5\x20\x20\xdb\xbe\x81\x65\x36\x14\x8c\x80\xc3\x98\xf6\x2a\xfa\ |
| 631 | +\x24\x37\xd2\xc0\x03\x0a\x39\xe7\x04\x78\x4b\x72\xcc\x8c\x35\x0c\ |
| 632 | +\xbc\x02\xbc\xb9\x81\x31\x5e\x8e\x33\x05\xaf\x70\xc9\xa0\xb6\x72\ |
| 633 | +\x6a\x52\x17\xaf\x23\x42\x45\x31\x01\x8a\x08\x39\xb0\x92\xce\x01\ |
| 634 | +\xe2\x45\x80\x51\xd4\xab\x14\xe2\x24\x42\x05\x96\x0c\x04\x11\xce\ |
| 635 | +\x08\xb0\x0e\x54\x84\xce\x40\x96\x70\x05\x53\x4d\x28\x80\x21\x03\ |
| 636 | +\x09\x04\x79\xc0\x39\xd4\x16\x8e\x39\x16\xc2\x24\xa6\x8c\x08\x70\ |
| 637 | +\xde\x20\x52\x53\x27\x42\x89\x38\xf2\x2e\x81\x1d\xca\x87\x9a\xc1\ |
| 638 | +\xf1\x86\x5b\x87\x48\xd5\xcc\x4d\xea\xe1\xf5\x93\x7e\x4a\x2a\x61\ |
| 639 | +\x1f\x98\x02\xbe\x04\xcb\xc3\x16\x47\x0c\x8a\x48\x19\x0a\xa1\x89\ |
| 640 | +\x95\xcc\x47\x27\x3a\x2d\x7c\x8e\x36\x85\xe0\xa6\x12\x6b\x2f\x02\ |
| 641 | +\xc4\x2e\x60\xa4\x0c\x47\x1f\xe6\x2c\xdc\x82\x4d\x41\x69\x69\x28\ |
| 642 | +\x7c\x6f\x88\x93\x8c\x4a\x10\x2a\x31\x86\x21\xce\x43\xff\xa5\xa6\ |
| 643 | +\x94\xa2\x85\x5a\x02\x2f\xa5\x60\xaf\x50\x30\x98\x1a\xc4\xe9\x94\ |
| 644 | +\x2a\x57\xc1\xca\xab\x6e\xac\xc4\xca\xf0\x09\xe3\xca\x22\xa0\xdb\ |
| 645 | +\x68\x51\x98\x12\x58\x33\x2b\xa5\xdf\x51\xfc\xa6\x83\xa8\xe4\xa1\ |
| 646 | +\x44\xdc\x38\xa4\x29\xf4\x43\x9b\x42\x2a\x23\xe4\x08\x03\x46\x3a\ |
| 647 | +\x30\x3e\xc7\x98\xe2\xde\xed\x88\x41\x61\x02\xc4\x33\x42\xdf\x72\ |
| 648 | +\x7b\x68\xb2\x01\x02\x0f\xbe\xb1\x16\x19\xcd\xfc\x00\xab\xfc\xdb\ |
| 649 | +\x67\x20\x01\x50\xe0\x69\x8a\x7c\xa3\x4e\x3b\x7f\x78\x84\x9e\x12\ |
| 650 | +\xfe\x1f\xf3\xff\x9d\x24\xab\xbe\x8c\x64\x6f\xe7\xd1\x3d\x7b\x09\ |
| 651 | +\x3e\x3a\x01\x3c\x2d\x7b\xe5\xd8\x4e\xfd\xdb\x4b\xe7\xd9\x8b\x3b\ |
| 652 | +\x9f\x31\x82\x8b\x00\xec\xa5\x94\x40\x48\x4b\xb8\x44\xfb\x58\x00\ |
| 653 | +\xfc\xe8\x95\x06\x65\x83\x04\x76\x8a\x22\x93\x51\x3e\x80\x2f\x54\ |
| 654 | +\x5b\x3d\x70\x64\x19\xf0\xa7\x6d\x24\x00\xff\x08\xa1\x2f\x25\xb5\ |
| 655 | +\x1c\x5c\x23\x05\x85\x13\xc1\x14\xa1\x05\xef\xc1\x3f\xce\x06\x02\ |
| 656 | +\xc9\x06\x16\x00\x8d\x1d\x2c\x50\x93\x56\xdd\xc6\x60\xb0\x16\x31\ |
| 657 | +\x89\x3a\x06\x54\x69\x10\x06\x42\x71\x4f\x8e\xa0\x1b\x25\x41\x6c\ |
| 658 | +\x48\x5c\xa8\x84\x38\xf5\xcc\x48\xa8\x03\x3d\x83\x97\x94\xe7\x3c\ |
| 659 | +\x2d\x99\xcf\x3e\x44\xa5\xa6\xd2\xb5\xd4\x62\x7c\x06\x83\xa1\x11\ |
| 660 | +\x88\xe0\x04\x58\x8d\xf5\x44\x9b\xdb\x58\x03\x53\xa3\xd4\x00\xfd\ |
| 661 | +\x58\x0a\x62\xf1\xf7\x13\xa0\x5f\xeb\x5b\xac\x02\xd6\xd0\x1a\x5c\ |
| 662 | +\x89\xc2\x04\x30\x10\x89\x6c\xe5\x2d\x3f\x7e\x29\xef\x71\xff\x5a\ |
| 663 | +\xd8\x13\x1f\x0a\x18\xab\x3c\xef\x81\x12\xa0\x34\xb8\xc1\x1b\x89\ |
| 664 | +\xe2\xc5\x7a\x2a\x34\x1a\x95\x99\xf3\x0e\x05\xc3\x21\x8b\xe1\x2f\ |
| 665 | +\x0d\x1e\x13\xc2\x43\x88\xcc\x63\x81\xdf\x9c\xe0\x59\x4f\xd5\xa8\ |
| 666 | +\xf1\xac\x37\x0b\xbc\x8d\x74\x36\x5e\x67\x64\xb1\x36\xc2\x98\x36\ |
| 667 | +\x8b\x27\x48\xef\x41\x99\x60\x9e\x26\x13\x8e\xe7\xcb\xdd\x3b\x51\ |
| 668 | +\xfc\x39\xf6\x6f\x69\xdf\xbe\xf8\x3f\x50\x2c\x24\x2d\ |
| 669 | \x00\x00\x0a\x90\ |
| 670 | \x89\ |
| 671 | \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ |
| 672 | @@ -71223,6 +71407,10 @@ |
| 673 | \x00\x62\ |
| 674 | \x00\x69\x00\x62\x00\x6c\x00\x65\x00\x73\x00\x5f\x00\x73\x00\x65\x00\x61\x00\x72\x00\x63\x00\x68\x00\x5f\x00\x75\x00\x6e\x00\x6c\ |
| 675 | \x00\x6f\x00\x63\x00\x6b\x00\x2e\x00\x70\x00\x6e\x00\x67\ |
| 676 | +\x00\x0f\ |
| 677 | +\x0d\x89\x9b\x07\ |
| 678 | +\x00\x6f\ |
| 679 | +\x00\x70\x00\x65\x00\x6e\x00\x6c\x00\x70\x00\x2d\x00\x6c\x00\x6f\x00\x67\x00\x6f\x00\x2e\x00\x73\x00\x76\x00\x67\ |
| 680 | \x00\x15\ |
| 681 | \x00\x76\xd9\xc7\ |
| 682 | \x00\x6f\ |
| 683 | @@ -71676,7 +71864,7 @@ |
| 684 | |
| 685 | qt_resource_struct = "\ |
| 686 | \x00\x00\x00\x00\x00\x02\x00\x00\x00\x12\x00\x00\x00\x01\ |
| 687 | -\x00\x00\x00\xe6\x00\x02\x00\x00\x00\x06\x00\x00\x00\x85\ |
| 688 | +\x00\x00\x00\xe6\x00\x02\x00\x00\x00\x07\x00\x00\x00\x85\ |
| 689 | \x00\x00\x00\x00\x00\x02\x00\x00\x00\x04\x00\x00\x00\x81\ |
| 690 | \x00\x00\x00\xb4\x00\x02\x00\x00\x00\x05\x00\x00\x00\x7c\ |
| 691 | \x00\x00\x00\xd6\x00\x02\x00\x00\x00\x14\x00\x00\x00\x68\ |
| 692 | @@ -71699,68 +71887,68 @@ |
| 693 | \x00\x00\x03\xec\x00\x00\x00\x00\x00\x01\x00\x05\x65\x6d\ |
| 694 | \x00\x00\x04\x1a\x00\x00\x00\x00\x00\x01\x00\x08\x06\x4f\ |
| 695 | \x00\x00\x03\xbc\x00\x00\x00\x00\x00\x01\x00\x02\xc4\x8b\ |
| 696 | -\x00\x00\x0f\x84\x00\x00\x00\x00\x00\x01\x00\x10\xce\x94\ |
| 697 | -\x00\x00\x0f\xf4\x00\x00\x00\x00\x00\x01\x00\x10\xd5\xdf\ |
| 698 | -\x00\x00\x0f\x34\x00\x00\x00\x00\x00\x01\x00\x10\xc9\x38\ |
| 699 | -\x00\x00\x10\xd2\x00\x00\x00\x00\x00\x01\x00\x10\xe8\x5d\ |
| 700 | -\x00\x00\x10\x54\x00\x00\x00\x00\x00\x01\x00\x10\xdd\xf5\ |
| 701 | -\x00\x00\x0e\xdc\x00\x00\x00\x00\x00\x01\x00\x10\xc2\x01\ |
| 702 | -\x00\x00\x11\x24\x00\x00\x00\x00\x00\x01\x00\x10\xee\x64\ |
| 703 | -\x00\x00\x10\x1c\x00\x00\x00\x00\x00\x01\x00\x10\xd9\x53\ |
| 704 | -\x00\x00\x11\x72\x00\x00\x00\x00\x00\x01\x00\x10\xf3\x90\ |
| 705 | -\x00\x00\x0f\x06\x00\x00\x00\x00\x00\x01\x00\x10\xc4\x9f\ |
| 706 | -\x00\x00\x10\xfe\x00\x00\x00\x00\x00\x01\x00\x10\xeb\x90\ |
| 707 | -\x00\x00\x10\xa8\x00\x00\x00\x00\x00\x01\x00\x10\xe5\xe5\ |
| 708 | -\x00\x00\x0f\x5a\x00\x00\x00\x00\x00\x01\x00\x10\xcc\x12\ |
| 709 | -\x00\x00\x11\x4e\x00\x00\x00\x00\x00\x01\x00\x10\xf1\x49\ |
| 710 | -\x00\x00\x10\x7c\x00\x00\x00\x00\x00\x01\x00\x10\xe1\x3a\ |
| 711 | -\x00\x00\x0f\xd0\x00\x00\x00\x00\x00\x01\x00\x10\xd2\xe2\ |
| 712 | -\x00\x00\x0f\xaa\x00\x00\x00\x00\x00\x01\x00\x10\xd0\xcb\ |
| 713 | +\x00\x00\x0f\xa8\x00\x00\x00\x00\x00\x01\x00\x10\xd9\xf6\ |
| 714 | +\x00\x00\x10\x18\x00\x00\x00\x00\x00\x01\x00\x10\xe1\x41\ |
| 715 | +\x00\x00\x0f\x58\x00\x00\x00\x00\x00\x01\x00\x10\xd4\x9a\ |
| 716 | +\x00\x00\x10\xf6\x00\x00\x00\x00\x00\x01\x00\x10\xf3\xbf\ |
| 717 | +\x00\x00\x10\x78\x00\x00\x00\x00\x00\x01\x00\x10\xe9\x57\ |
| 718 | +\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x01\x00\x10\xcd\x63\ |
| 719 | +\x00\x00\x11\x48\x00\x00\x00\x00\x00\x01\x00\x10\xf9\xc6\ |
| 720 | +\x00\x00\x10\x40\x00\x00\x00\x00\x00\x01\x00\x10\xe4\xb5\ |
| 721 | +\x00\x00\x11\x96\x00\x00\x00\x00\x00\x01\x00\x10\xfe\xf2\ |
| 722 | +\x00\x00\x0f\x2a\x00\x00\x00\x00\x00\x01\x00\x10\xd0\x01\ |
| 723 | +\x00\x00\x11\x22\x00\x00\x00\x00\x00\x01\x00\x10\xf6\xf2\ |
| 724 | +\x00\x00\x10\xcc\x00\x00\x00\x00\x00\x01\x00\x10\xf1\x47\ |
| 725 | +\x00\x00\x0f\x7e\x00\x00\x00\x00\x00\x01\x00\x10\xd7\x74\ |
| 726 | +\x00\x00\x11\x72\x00\x00\x00\x00\x00\x01\x00\x10\xfc\xab\ |
| 727 | +\x00\x00\x10\xa0\x00\x00\x00\x00\x00\x01\x00\x10\xec\x9c\ |
| 728 | +\x00\x00\x0f\xf4\x00\x00\x00\x00\x00\x01\x00\x10\xde\x44\ |
| 729 | +\x00\x00\x0f\xce\x00\x00\x00\x00\x00\x01\x00\x10\xdc\x2d\ |
| 730 | \x00\x00\x03\x66\x00\x00\x00\x00\x00\x01\x00\x00\x21\x92\ |
| 731 | -\x00\x00\x0b\x9c\x00\x00\x00\x00\x00\x01\x00\x0f\x43\x79\ |
| 732 | -\x00\x00\x0c\x1c\x00\x00\x00\x00\x00\x01\x00\x0f\x4a\x3f\ |
| 733 | -\x00\x00\x0b\x20\x00\x00\x00\x00\x00\x01\x00\x0f\x3c\x75\ |
| 734 | -\x00\x00\x0b\xc4\x00\x00\x00\x00\x00\x01\x00\x0f\x46\x19\ |
| 735 | -\x00\x00\x0c\x46\x00\x00\x00\x00\x00\x01\x00\x0f\x4d\x0a\ |
| 736 | -\x00\x00\x0b\x6a\x00\x00\x00\x00\x00\x01\x00\x0f\x41\x8f\ |
| 737 | -\x00\x00\x0b\x44\x00\x00\x00\x00\x00\x01\x00\x0f\x3f\x1c\ |
| 738 | -\x00\x00\x0b\xfa\x00\x00\x00\x00\x00\x01\x00\x0f\x47\x9b\ |
| 739 | +\x00\x00\x0b\xc0\x00\x00\x00\x00\x00\x01\x00\x0f\x4e\xdb\ |
| 740 | +\x00\x00\x0c\x40\x00\x00\x00\x00\x00\x01\x00\x0f\x55\xa1\ |
| 741 | +\x00\x00\x0b\x44\x00\x00\x00\x00\x00\x01\x00\x0f\x47\xd7\ |
| 742 | +\x00\x00\x0b\xe8\x00\x00\x00\x00\x00\x01\x00\x0f\x51\x7b\ |
| 743 | +\x00\x00\x0c\x6a\x00\x00\x00\x00\x00\x01\x00\x0f\x58\x6c\ |
| 744 | +\x00\x00\x0b\x8e\x00\x00\x00\x00\x00\x01\x00\x0f\x4c\xf1\ |
| 745 | +\x00\x00\x0b\x68\x00\x00\x00\x00\x00\x01\x00\x0f\x4a\x7e\ |
| 746 | +\x00\x00\x0c\x1e\x00\x00\x00\x00\x00\x01\x00\x0f\x52\xfd\ |
| 747 | \x00\x00\x01\x5c\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ |
| 748 | \x00\x00\x01\xc2\x00\x00\x00\x00\x00\x01\x00\x00\x05\xe6\ |
| 749 | \x00\x00\x01\x8e\x00\x00\x00\x00\x00\x01\x00\x00\x02\xfe\ |
| 750 | -\x00\x00\x0e\x2c\x00\x00\x00\x00\x00\x01\x00\x0f\x68\x58\ |
| 751 | -\x00\x00\x0e\x56\x00\x00\x00\x00\x00\x01\x00\x0f\x6d\xc2\ |
| 752 | -\x00\x00\x0e\x86\x00\x00\x00\x00\x00\x01\x00\x0f\xdc\x4b\ |
| 753 | -\x00\x00\x0e\xa6\x00\x00\x00\x00\x00\x01\x00\x0f\xe2\xfc\ |
| 754 | -\x00\x00\x11\xf4\x00\x00\x00\x00\x00\x01\x00\x10\xfa\xa4\ |
| 755 | -\x00\x00\x11\x9a\x00\x00\x00\x00\x00\x01\x00\x10\xf5\xa3\ |
| 756 | -\x00\x00\x14\x10\x00\x00\x00\x00\x00\x01\x00\x11\x24\xa9\ |
| 757 | -\x00\x00\x12\x9a\x00\x00\x00\x00\x00\x01\x00\x11\x02\xae\ |
| 758 | -\x00\x00\x12\x36\x00\x00\x00\x00\x00\x01\x00\x10\xfd\xf7\ |
| 759 | -\x00\x00\x11\xc0\x00\x00\x00\x00\x00\x01\x00\x10\xf8\xd4\ |
| 760 | -\x00\x00\x13\x62\x00\x00\x00\x00\x00\x01\x00\x11\x15\x84\ |
| 761 | -\x00\x00\x13\x00\x00\x00\x00\x00\x00\x01\x00\x11\x0d\x54\ |
| 762 | -\x00\x00\x14\x36\x00\x00\x00\x00\x00\x01\x00\x11\x27\x8b\ |
| 763 | -\x00\x00\x13\xdc\x00\x00\x00\x00\x00\x01\x00\x11\x20\xcc\ |
| 764 | -\x00\x00\x13\x2c\x00\x00\x00\x00\x00\x01\x00\x11\x12\x60\ |
| 765 | -\x00\x00\x14\x68\x00\x00\x00\x00\x00\x01\x00\x11\x2b\x48\ |
| 766 | -\x00\x00\x13\x84\x00\x00\x00\x00\x00\x01\x00\x11\x19\xf3\ |
| 767 | -\x00\x00\x12\xc8\x00\x00\x00\x00\x00\x01\x00\x11\x0a\xde\ |
| 768 | -\x00\x00\x13\xb2\x00\x00\x00\x00\x00\x01\x00\x11\x1e\x44\ |
| 769 | -\x00\x00\x12\x64\x00\x00\x00\x00\x00\x01\x00\x10\xff\xfe\ |
| 770 | -\x00\x00\x0a\x10\x00\x00\x00\x00\x00\x01\x00\x0e\xec\xf7\ |
| 771 | -\x00\x00\x0a\x30\x00\x00\x00\x00\x00\x01\x00\x0e\xf0\xd4\ |
| 772 | -\x00\x00\x09\xea\x00\x00\x00\x00\x00\x01\x00\x0e\xea\x59\ |
| 773 | -\x00\x00\x0d\x0a\x00\x00\x00\x00\x00\x01\x00\x0f\x57\x26\ |
| 774 | -\x00\x00\x0d\xa8\x00\x00\x00\x00\x00\x01\x00\x0f\x61\x9b\ |
| 775 | -\x00\x00\x0e\x02\x00\x00\x00\x00\x00\x01\x00\x0f\x66\x54\ |
| 776 | -\x00\x00\x0c\xa0\x00\x00\x00\x00\x00\x01\x00\x0f\x53\x36\ |
| 777 | -\x00\x00\x0d\x84\x00\x00\x00\x00\x00\x01\x00\x0f\x5e\x68\ |
| 778 | -\x00\x00\x0c\xd4\x00\x00\x00\x00\x00\x01\x00\x0f\x55\x2d\ |
| 779 | -\x00\x00\x0d\x3e\x00\x00\x00\x00\x00\x01\x00\x0f\x59\x24\ |
| 780 | -\x00\x00\x0d\x60\x00\x00\x00\x00\x00\x01\x00\x0f\x5b\x37\ |
| 781 | -\x00\x00\x0d\xde\x00\x00\x00\x00\x00\x01\x00\x0f\x63\x83\ |
| 782 | -\x00\x00\x0c\x78\x00\x00\x00\x00\x00\x01\x00\x0f\x50\x7a\ |
| 783 | +\x00\x00\x0e\x50\x00\x00\x00\x00\x00\x01\x00\x0f\x73\xba\ |
| 784 | +\x00\x00\x0e\x7a\x00\x00\x00\x00\x00\x01\x00\x0f\x79\x24\ |
| 785 | +\x00\x00\x0e\xaa\x00\x00\x00\x00\x00\x01\x00\x0f\xe7\xad\ |
| 786 | +\x00\x00\x0e\xca\x00\x00\x00\x00\x00\x01\x00\x0f\xee\x5e\ |
| 787 | +\x00\x00\x12\x18\x00\x00\x00\x00\x00\x01\x00\x11\x06\x06\ |
| 788 | +\x00\x00\x11\xbe\x00\x00\x00\x00\x00\x01\x00\x11\x01\x05\ |
| 789 | +\x00\x00\x14\x34\x00\x00\x00\x00\x00\x01\x00\x11\x30\x0b\ |
| 790 | +\x00\x00\x12\xbe\x00\x00\x00\x00\x00\x01\x00\x11\x0e\x10\ |
| 791 | +\x00\x00\x12\x5a\x00\x00\x00\x00\x00\x01\x00\x11\x09\x59\ |
| 792 | +\x00\x00\x11\xe4\x00\x00\x00\x00\x00\x01\x00\x11\x04\x36\ |
| 793 | +\x00\x00\x13\x86\x00\x00\x00\x00\x00\x01\x00\x11\x20\xe6\ |
| 794 | +\x00\x00\x13\x24\x00\x00\x00\x00\x00\x01\x00\x11\x18\xb6\ |
| 795 | +\x00\x00\x14\x5a\x00\x00\x00\x00\x00\x01\x00\x11\x32\xed\ |
| 796 | +\x00\x00\x14\x00\x00\x00\x00\x00\x00\x01\x00\x11\x2c\x2e\ |
| 797 | +\x00\x00\x13\x50\x00\x00\x00\x00\x00\x01\x00\x11\x1d\xc2\ |
| 798 | +\x00\x00\x14\x8c\x00\x00\x00\x00\x00\x01\x00\x11\x36\xaa\ |
| 799 | +\x00\x00\x13\xa8\x00\x00\x00\x00\x00\x01\x00\x11\x25\x55\ |
| 800 | +\x00\x00\x12\xec\x00\x00\x00\x00\x00\x01\x00\x11\x16\x40\ |
| 801 | +\x00\x00\x13\xd6\x00\x00\x00\x00\x00\x01\x00\x11\x29\xa6\ |
| 802 | +\x00\x00\x12\x88\x00\x00\x00\x00\x00\x01\x00\x11\x0b\x60\ |
| 803 | +\x00\x00\x0a\x34\x00\x00\x00\x00\x00\x01\x00\x0e\xf8\x59\ |
| 804 | +\x00\x00\x0a\x54\x00\x00\x00\x00\x00\x01\x00\x0e\xfc\x36\ |
| 805 | +\x00\x00\x0a\x0e\x00\x00\x00\x00\x00\x01\x00\x0e\xf5\xbb\ |
| 806 | +\x00\x00\x0d\x2e\x00\x00\x00\x00\x00\x01\x00\x0f\x62\x88\ |
| 807 | +\x00\x00\x0d\xcc\x00\x00\x00\x00\x00\x01\x00\x0f\x6c\xfd\ |
| 808 | +\x00\x00\x0e\x26\x00\x00\x00\x00\x00\x01\x00\x0f\x71\xb6\ |
| 809 | +\x00\x00\x0c\xc4\x00\x00\x00\x00\x00\x01\x00\x0f\x5e\x98\ |
| 810 | +\x00\x00\x0d\xa8\x00\x00\x00\x00\x00\x01\x00\x0f\x69\xca\ |
| 811 | +\x00\x00\x0c\xf8\x00\x00\x00\x00\x00\x01\x00\x0f\x60\x8f\ |
| 812 | +\x00\x00\x0d\x62\x00\x00\x00\x00\x00\x01\x00\x0f\x64\x86\ |
| 813 | +\x00\x00\x0d\x84\x00\x00\x00\x00\x00\x01\x00\x0f\x66\x99\ |
| 814 | +\x00\x00\x0e\x02\x00\x00\x00\x00\x00\x01\x00\x0f\x6e\xe5\ |
| 815 | +\x00\x00\x0c\x9c\x00\x00\x00\x00\x00\x01\x00\x0f\x5b\xdc\ |
| 816 | \x00\x00\x02\xee\x00\x00\x00\x00\x00\x01\x00\x00\x1b\x20\ |
| 817 | \x00\x00\x02\x72\x00\x00\x00\x00\x00\x01\x00\x00\x11\xc5\ |
| 818 | \x00\x00\x02\x16\x00\x00\x00\x00\x00\x01\x00\x00\x0c\x03\ |
| 819 | @@ -71775,45 +71963,46 @@ |
| 820 | \x00\x00\x04\xb8\x00\x00\x00\x00\x00\x01\x00\x0d\x50\x06\ |
| 821 | \x00\x00\x05\x52\x00\x00\x00\x00\x00\x01\x00\x0d\x56\x1f\ |
| 822 | \x00\x00\x05\x20\x00\x00\x00\x00\x00\x01\x00\x0d\x54\x57\ |
| 823 | -\x00\x00\x14\xd0\x00\x00\x00\x00\x00\x01\x00\x11\x34\x7c\ |
| 824 | -\x00\x00\x15\x04\x00\x00\x00\x00\x00\x01\x00\x11\x37\x4c\ |
| 825 | -\x00\x00\x14\x8c\x00\x00\x00\x00\x00\x01\x00\x11\x2e\xfb\ |
| 826 | -\x00\x00\x14\xb0\x00\x00\x00\x00\x00\x01\x00\x11\x31\xf9\ |
| 827 | -\x00\x00\x06\xde\x00\x00\x00\x00\x00\x01\x00\x0e\xaa\x8e\ |
| 828 | -\x00\x00\x07\xc4\x00\x00\x00\x00\x00\x01\x00\x0e\xbb\x82\ |
| 829 | -\x00\x00\x09\xca\x00\x00\x00\x00\x00\x01\x00\x0e\xe6\x66\ |
| 830 | -\x00\x00\x09\x98\x00\x00\x00\x00\x00\x01\x00\x0e\xdf\x50\ |
| 831 | -\x00\x00\x08\x7e\x00\x00\x00\x00\x00\x01\x00\x0e\xc4\x50\ |
| 832 | -\x00\x00\x09\x1e\x00\x00\x00\x00\x00\x01\x00\x0e\xd7\x0f\ |
| 833 | -\x00\x00\x09\x48\x00\x00\x00\x00\x00\x01\x00\x0e\xd9\x44\ |
| 834 | -\x00\x00\x08\x1e\x00\x00\x00\x00\x00\x01\x00\x0e\xc0\x33\ |
| 835 | -\x00\x00\x08\x4c\x00\x00\x00\x00\x00\x01\x00\x0e\xc2\xb3\ |
| 836 | -\x00\x00\x07\x52\x00\x00\x00\x00\x00\x01\x00\x0e\xb4\x35\ |
| 837 | -\x00\x00\x07\xa4\x00\x00\x00\x00\x00\x01\x00\x0e\xb8\x76\ |
| 838 | -\x00\x00\x07\xec\x00\x00\x00\x00\x00\x01\x00\x0e\xbe\xe0\ |
| 839 | -\x00\x00\x08\xd0\x00\x00\x00\x00\x00\x01\x00\x0e\xca\xc5\ |
| 840 | -\x00\x00\x08\xa4\x00\x00\x00\x00\x00\x01\x00\x0e\xc8\x62\ |
| 841 | -\x00\x00\x09\x6a\x00\x00\x00\x00\x00\x01\x00\x0e\xdd\x48\ |
| 842 | -\x00\x00\x06\xb0\x00\x00\x00\x00\x00\x01\x00\x0e\xa3\xd0\ |
| 843 | -\x00\x00\x07\x02\x00\x00\x00\x00\x00\x01\x00\x0e\xad\x7a\ |
| 844 | -\x00\x00\x07\x2e\x00\x00\x00\x00\x00\x01\x00\x0e\xb0\xbc\ |
| 845 | -\x00\x00\x07\x82\x00\x00\x00\x00\x00\x01\x00\x0e\xb5\x2e\ |
| 846 | -\x00\x00\x08\xee\x00\x00\x00\x00\x00\x01\x00\x0e\xcd\x67\ |
| 847 | -\x00\x00\x0a\x94\x00\x00\x00\x00\x00\x01\x00\x0f\x27\xb3\ |
| 848 | -\x00\x00\x0a\xda\x00\x00\x00\x00\x00\x01\x00\x0f\x32\xb8\ |
| 849 | -\x00\x00\x0a\xfc\x00\x00\x00\x00\x00\x01\x00\x0f\x35\x8e\ |
| 850 | -\x00\x00\x0a\x52\x00\x00\x00\x00\x00\x01\x00\x0e\xf4\x0e\ |
| 851 | -\x00\x00\x0a\xb6\x00\x00\x00\x00\x00\x01\x00\x0f\x2b\x86\ |
| 852 | -\x00\x00\x15\x34\x00\x00\x00\x00\x00\x01\x00\x11\x3a\x45\ |
| 853 | -\x00\x00\x15\x96\x00\x00\x00\x00\x00\x01\x00\x11\x40\xbb\ |
| 854 | -\x00\x00\x15\x68\x00\x00\x00\x00\x00\x01\x00\x11\x3d\xa7\ |
| 855 | -\x00\x00\x15\xbe\x00\x00\x00\x00\x00\x01\x00\x11\x43\x59\ |
| 856 | -\x00\x00\x06\x18\x00\x00\x00\x00\x00\x01\x00\x0d\x91\xaf\ |
| 857 | -\x00\x00\x05\xb8\x00\x00\x00\x00\x00\x01\x00\x0d\x62\x6f\ |
| 858 | -\x00\x00\x05\x88\x00\x00\x00\x00\x00\x01\x00\x0d\x57\xdb\ |
| 859 | -\x00\x00\x05\xe8\x00\x00\x00\x00\x00\x01\x00\x0d\x77\xa4\ |
| 860 | -\x00\x00\x06\x48\x00\x00\x00\x00\x00\x01\x00\x0d\x95\xcc\ |
| 861 | -\x00\x00\x06\x7c\x00\x00\x00\x00\x00\x01\x00\x0e\x5e\x65\ |
| 862 | +\x00\x00\x14\xf4\x00\x00\x00\x00\x00\x01\x00\x11\x3f\xde\ |
| 863 | +\x00\x00\x15\x28\x00\x00\x00\x00\x00\x01\x00\x11\x42\xae\ |
| 864 | +\x00\x00\x14\xb0\x00\x00\x00\x00\x00\x01\x00\x11\x3a\x5d\ |
| 865 | +\x00\x00\x14\xd4\x00\x00\x00\x00\x00\x01\x00\x11\x3d\x5b\ |
| 866 | +\x00\x00\x07\x02\x00\x00\x00\x00\x00\x01\x00\x0e\xb5\xf0\ |
| 867 | +\x00\x00\x07\xe8\x00\x00\x00\x00\x00\x01\x00\x0e\xc6\xe4\ |
| 868 | +\x00\x00\x09\xee\x00\x00\x00\x00\x00\x01\x00\x0e\xf1\xc8\ |
| 869 | +\x00\x00\x09\xbc\x00\x00\x00\x00\x00\x01\x00\x0e\xea\xb2\ |
| 870 | +\x00\x00\x08\xa2\x00\x00\x00\x00\x00\x01\x00\x0e\xcf\xb2\ |
| 871 | +\x00\x00\x09\x42\x00\x00\x00\x00\x00\x01\x00\x0e\xe2\x71\ |
| 872 | +\x00\x00\x09\x6c\x00\x00\x00\x00\x00\x01\x00\x0e\xe4\xa6\ |
| 873 | +\x00\x00\x08\x42\x00\x00\x00\x00\x00\x01\x00\x0e\xcb\x95\ |
| 874 | +\x00\x00\x08\x70\x00\x00\x00\x00\x00\x01\x00\x0e\xce\x15\ |
| 875 | +\x00\x00\x07\x76\x00\x00\x00\x00\x00\x01\x00\x0e\xbf\x97\ |
| 876 | +\x00\x00\x07\xc8\x00\x00\x00\x00\x00\x01\x00\x0e\xc3\xd8\ |
| 877 | +\x00\x00\x08\x10\x00\x00\x00\x00\x00\x01\x00\x0e\xca\x42\ |
| 878 | +\x00\x00\x08\xf4\x00\x00\x00\x00\x00\x01\x00\x0e\xd6\x27\ |
| 879 | +\x00\x00\x08\xc8\x00\x00\x00\x00\x00\x01\x00\x0e\xd3\xc4\ |
| 880 | +\x00\x00\x09\x8e\x00\x00\x00\x00\x00\x01\x00\x0e\xe8\xaa\ |
| 881 | +\x00\x00\x06\xd4\x00\x00\x00\x00\x00\x01\x00\x0e\xaf\x32\ |
| 882 | +\x00\x00\x07\x26\x00\x00\x00\x00\x00\x01\x00\x0e\xb8\xdc\ |
| 883 | +\x00\x00\x07\x52\x00\x00\x00\x00\x00\x01\x00\x0e\xbc\x1e\ |
| 884 | +\x00\x00\x07\xa6\x00\x00\x00\x00\x00\x01\x00\x0e\xc0\x90\ |
| 885 | +\x00\x00\x09\x12\x00\x00\x00\x00\x00\x01\x00\x0e\xd8\xc9\ |
| 886 | +\x00\x00\x0a\xb8\x00\x00\x00\x00\x00\x01\x00\x0f\x33\x15\ |
| 887 | +\x00\x00\x0a\xfe\x00\x00\x00\x00\x00\x01\x00\x0f\x3e\x1a\ |
| 888 | +\x00\x00\x0b\x20\x00\x00\x00\x00\x00\x01\x00\x0f\x40\xf0\ |
| 889 | +\x00\x00\x0a\x76\x00\x00\x00\x00\x00\x01\x00\x0e\xff\x70\ |
| 890 | +\x00\x00\x0a\xda\x00\x00\x00\x00\x00\x01\x00\x0f\x36\xe8\ |
| 891 | +\x00\x00\x15\x58\x00\x00\x00\x00\x00\x01\x00\x11\x45\xa7\ |
| 892 | +\x00\x00\x15\xba\x00\x00\x00\x00\x00\x01\x00\x11\x4c\x1d\ |
| 893 | +\x00\x00\x15\x8c\x00\x00\x00\x00\x00\x01\x00\x11\x49\x09\ |
| 894 | +\x00\x00\x15\xe2\x00\x00\x00\x00\x00\x01\x00\x11\x4e\xbb\ |
| 895 | +\x00\x00\x06\x3c\x00\x00\x00\x00\x00\x01\x00\x0d\x9d\x11\ |
| 896 | +\x00\x00\x05\xdc\x00\x00\x00\x00\x00\x01\x00\x0d\x6d\xd1\ |
| 897 | +\x00\x00\x05\xac\x00\x00\x00\x00\x00\x01\x00\x0d\x63\x3d\ |
| 898 | +\x00\x00\x06\x0c\x00\x00\x00\x00\x00\x01\x00\x0d\x83\x06\ |
| 899 | +\x00\x00\x06\x6c\x00\x00\x00\x00\x00\x01\x00\x0d\xa1\x2e\ |
| 900 | +\x00\x00\x06\xa0\x00\x00\x00\x00\x00\x01\x00\x0e\x69\xc7\ |
| 901 | +\x00\x00\x05\x88\x00\x01\x00\x00\x00\x01\x00\x0d\x57\xdb\ |
| 902 | " |
| 903 | |
| 904 | def qInitResources(): |
| 905 | |
| 906 | === modified file 'openlp/core/resources.py.orig' |
| 907 | --- openlp/core/resources.py.orig 2012-11-01 17:41:22 +0000 |
| 908 | +++ openlp/core/resources.py.orig 2014-01-18 21:32:36 +0000 |
| 909 | @@ -54711,6 +54711,190 @@ |
| 910 | \x89\x3e\x62\x80\x70\x10\xc3\x84\x9d\xb0\x11\x66\xa2\x8b\xe8\x6c\ |
| 911 | \x7e\xaa\x0f\xd9\x9d\x89\x07\xa1\xb5\x4b\xa0\x00\x00\x00\x00\x49\ |
| 912 | \x45\x4e\x44\xae\x42\x60\x82\ |
| 913 | +\x00\x00\x0b\x5e\ |
| 914 | +\x00\ |
| 915 | +\x00\x36\x03\x78\x9c\xed\x5a\xdb\x6e\xdb\x48\x12\x7d\xcf\x57\x70\ |
| 916 | +\x95\x97\x04\x4b\xb6\xfa\x7e\x71\xec\x0c\x90\x09\x32\x18\x60\x17\ |
| 917 | +\x0b\xcc\x05\xfb\x38\xa0\x45\x5a\xe6\x86\x22\x05\x92\x8a\x65\x7f\ |
| 918 | +\xfd\x9e\xa6\x24\x5e\x6c\x3a\xbe\xc4\x03\x27\x99\xc9\x60\x60\xb1\ |
| 919 | +\xbb\xba\xbb\xea\x54\xd5\xe9\x6a\x36\x8f\x7f\xd8\xae\xf2\xe0\x53\ |
| 920 | +\x5a\xd5\x59\x59\x9c\xcc\x18\xa1\xb3\x20\x2d\x16\x65\x92\x15\xcb\ |
| 921 | +\x93\xd9\xef\xbf\x7d\x88\xec\x2c\xa8\x9b\xb8\x48\xe2\xbc\x2c\xd2\ |
| 922 | +\x93\x59\x51\xce\x7e\x78\xfb\xe2\xf8\x1f\x51\x14\xfc\x58\xa5\x71\ |
| 923 | +\x93\x26\xc1\x45\xd6\x9c\x07\x3f\x17\x1f\xeb\x45\xbc\x4e\x83\x57\ |
| 924 | +\xe7\x4d\xb3\x3e\x9a\xcf\x2f\x2e\x2e\x48\xb6\x6f\x24\x65\xb5\x9c\ |
| 925 | +\xbf\x0e\xa2\xe8\xed\x8b\x17\xc7\xf5\xa7\xe5\x8b\x20\x08\xb0\x6e\ |
| 926 | +\x51\x1f\x25\x8b\x93\xd9\x7e\xc0\x7a\x53\xe5\xad\x60\xb2\x98\xa7\ |
| 927 | +\x79\xba\x4a\x8b\xa6\x9e\x33\xc2\xe6\xb3\x5e\x7c\xd1\x8b\x2f\xfc\ |
| 928 | +\xea\xd9\xa7\x74\x51\xae\x56\x65\x51\xb7\x23\x8b\xfa\xe5\x40\xb8\ |
| 929 | +\x4a\xce\x3a\x69\xaf\xcd\x85\x68\x85\x98\x73\x6e\x4e\xf9\x9c\xf3\ |
| 930 | +\x08\x12\x51\x7d\x59\x34\xf1\x36\x1a\x0f\x85\x8e\x53\x43\x39\xa5\ |
| 931 | +\x74\x8e\xbe\x5e\xf2\x7e\x52\x47\xdb\x1c\x50\xdc\xaa\x4c\xdb\x3b\ |
| 932 | +\x5c\x1d\xf0\xaf\xf1\x7f\x37\xe0\xd0\x40\xea\x72\x53\x2d\xd2\x33\ |
| 933 | +\x8c\x4c\x49\x91\x36\xf3\xf7\xbf\xbd\xef\x3a\x23\x4a\x92\x26\x19\ |
| 934 | +\x4c\x73\x40\x7f\xb4\xee\xc8\x25\x45\xbc\x4a\xeb\x75\xbc\x48\xeb\ |
| 935 | +\xf9\xa1\xbd\x1d\x7f\x91\x25\xcd\xf9\xc9\x4c\x6a\x43\x84\x63\xc6\ |
| 936 | +\xb6\x8d\xe7\x69\xb6\x3c\x6f\xae\xb7\x66\xc9\xc9\x0c\xb6\x2a\x23\ |
| 937 | +\x69\xfb\x7c\xd0\xe6\xa8\x8b\x29\x4a\x04\xdf\x89\xee\x97\x18\x76\ |
| 938 | +\x49\x13\x54\x9c\x2b\x2b\x5a\x89\x51\x1c\x8e\x66\x4b\xca\x85\x57\ |
| 939 | +\xf6\x64\x56\xae\xd3\x22\x5f\x47\x79\xb9\x2c\xc9\x01\xe3\x6e\xe2\ |
| 940 | +\x72\xd3\xac\x37\xcd\x1f\xe9\xb6\x49\x8b\xdd\x44\xb0\x72\x60\x72\ |
| 941 | +\xdb\xed\x87\x91\x91\xb9\xdd\xf8\x74\xbb\x2e\xab\x26\x3a\xcb\xf2\ |
| 942 | +\x74\xb7\xda\xfc\xbc\x5c\xa5\xf3\x2a\x2e\x37\xf9\x7c\xb0\x32\xa0\ |
| 943 | +\xe6\x64\x5d\x2c\x27\x47\x6f\x93\x35\x3c\xe7\x18\xb1\x9a\x5a\x69\ |
| 944 | +\x26\x65\x2e\x27\x64\xea\xe6\x32\xc7\x92\x49\x56\xaf\xf3\xf8\x12\ |
| 945 | +\xde\x43\x54\xa4\xb3\xb7\xe8\x3a\x4e\xd2\xb3\xda\x8b\xec\xe0\xf6\ |
| 946 | +\x4f\xc0\x9b\xb7\x7d\xe8\xf5\x72\x71\xf5\x53\x15\x27\x19\x72\x66\ |
| 947 | +\x27\xb7\x93\x1c\xf7\x08\x4e\xed\x7e\x0c\x46\xd5\x4d\xb9\x3e\xc8\ |
| 948 | +\x76\x8b\xfb\xc6\x68\x51\xe6\x65\x75\xf4\xf2\xac\xfd\xf7\xa6\x6d\ |
| 949 | +\x2a\x11\x24\x59\x73\x79\x04\xbb\x15\x75\x96\x4a\xf6\x66\xd6\x0f\ |
| 950 | +\x2e\xcf\xce\xea\x14\x91\x41\x07\x6d\x6d\x5c\x60\xa8\xe0\x0c\x94\ |
| 951 | +\x32\xff\xc2\x65\xa7\x56\x63\xd3\xab\xf1\x6e\xb5\xe3\xf9\xd8\xfe\ |
| 952 | +\x87\xc2\xc5\x9c\x7a\x00\x5c\x8b\x64\x91\x5c\xd7\xfb\xfe\x28\x31\ |
| 953 | +\x67\x1e\x84\x52\x7a\x9a\x9e\xde\x6b\xb5\x49\x94\xc0\x3a\x4f\x85\ |
| 954 | +\x92\x16\xca\x3d\x00\x25\x50\x63\xc2\xf5\x23\x51\xd2\x42\xb3\x07\ |
| 955 | +\xa1\xa4\xa8\x39\x4b\xe2\x47\xa2\x84\xd5\xc4\x5d\x28\x75\x79\xbd\ |
| 956 | +\x06\x73\xad\xd3\x85\xdf\x90\x0e\x33\x75\xdc\xd5\x5c\x7a\x0e\x1e\ |
| 957 | +\x8b\x8a\xa4\x5b\xb1\xa7\xc5\xf5\x1f\x5b\x18\x1e\x1c\x05\x8a\x6b\ |
| 958 | +\xc2\x2c\xa3\x0e\xbf\xd9\xa4\xe0\xe5\x4e\x90\x01\x4f\xfc\xa1\x93\ |
| 959 | +\x32\x57\x27\x33\x23\x25\xa1\x4e\x4a\x7b\xf7\xa4\x7b\xb5\xa2\xb2\ |
| 960 | +\xca\x96\x19\x98\x53\x18\x4e\xa8\x34\x5c\x42\x5c\x28\x4a\x8c\x35\ |
| 961 | +\xe2\xda\x50\x00\x35\xb0\x1b\x94\x64\x7b\xbc\xc0\xa1\x4d\x5a\xdd\ |
| 962 | +\x58\x05\x8e\xc9\x21\x7e\x32\x8b\xf3\x8b\xf8\xb2\x1e\xcd\xb5\x1b\ |
| 963 | +\xa2\x1d\xd7\x5d\x73\xeb\xc7\x28\x2b\xd0\xbe\x2e\x73\xec\xf7\x65\ |
| 964 | +\x11\xed\xc4\xb0\xf3\xd6\xbf\xfc\xf4\xae\x0f\xbd\xb3\xf4\xa7\x78\ |
| 965 | +\x53\xd7\x59\x5c\xbc\xcb\x37\xd5\xc0\x9d\x77\x2d\xed\x23\x27\x79\ |
| 966 | +\x9f\x7e\xca\xda\xe9\x61\x38\x51\xc6\x30\x6b\xf8\xb5\x98\x18\x2f\ |
| 967 | +\x00\x35\x07\xd6\xce\x77\x4a\x7d\x3e\x77\xee\x52\xa4\x2d\x03\x8e\ |
| 968 | +\xce\xab\x14\x65\xcb\xcb\x09\xea\xfe\x1c\xb3\x33\xd9\x4f\xc3\xb0\ |
| 969 | +\x47\x1b\xcf\xd4\xd6\xf5\xce\xba\x44\x2b\x37\x9a\x68\x6b\x55\xdf\ |
| 970 | +\xba\xe5\x7e\x3f\x17\x84\x0b\x3a\x10\x45\x23\x93\xc4\x72\xae\x07\ |
| 971 | +\xad\xcb\xfd\x5a\xbf\x17\x59\x03\xf0\x37\x75\x5a\xfd\xea\x4b\x87\ |
| 972 | +\xff\x14\xbf\xd7\x69\x8f\xc4\x33\xd8\xce\xdd\x3d\x95\xfc\x93\x10\ |
| 973 | +\x7a\x4e\xdb\xcd\x5f\xd8\x76\x6b\x9e\xd7\xf6\xeb\x8b\xff\x56\xc5\ |
| 974 | +\x45\x8d\xda\x7c\x75\x32\x5b\xc5\x4d\x95\x6d\x5f\xe1\xf4\xc2\x38\ |
| 975 | +\x07\xfd\x86\x14\xff\x31\xc2\xa9\x30\x46\xd8\x30\x52\x86\x70\x67\ |
| 976 | +\xb9\x0a\x31\x99\x95\x4e\x30\xfb\xfa\x4f\x85\xd2\x97\x32\x9f\xad\ |
| 977 | +\x74\xf4\x23\xa0\x64\xcc\x10\x05\xb6\xe6\x23\x28\x85\xc5\x96\xa3\ |
| 978 | +\xcc\x60\xc1\x16\x4a\x66\x61\xbd\xb3\x63\x2c\xa5\xd0\x04\x90\x58\ |
| 979 | +\xf3\x67\x1a\xdf\x56\x28\x9f\x35\xde\x3e\xc2\x78\xcb\x14\x31\x6a\ |
| 980 | +\x64\xb9\xb4\x94\x28\x65\xa5\x1c\x59\xce\x29\xa2\x80\x6a\xce\x47\ |
| 981 | +\x96\x0b\x83\xda\x5f\x39\x61\x9f\x35\x83\x28\x7d\xa0\xe5\x4f\x14\ |
| 982 | +\xea\x8f\x4f\x48\x47\xa4\x74\x5c\x8d\x33\x92\x4a\x22\x28\xe5\xee\ |
| 983 | +\x39\x53\x88\x33\xf5\xd7\x4d\x21\xce\x1e\x43\xc5\xdf\x45\x0a\xb1\ |
| 984 | +\x87\x6e\xc0\x7f\xe1\x14\xfa\x3c\x96\x92\xb2\xa7\xa3\x23\x9c\x57\ |
| 985 | +\x38\x60\xb1\xba\xc5\xd2\x9f\x5e\xa4\x90\x5a\x86\x11\xce\x3f\x44\ |
| 986 | +\x72\xaa\x55\x18\x71\xc2\x04\x47\xf6\xc9\x6f\x12\xcd\x3b\x72\x12\ |
| 987 | +\x68\x8a\xe7\xcc\xc9\xfb\xb8\x48\x2b\xa6\x0c\x77\x7b\x17\x1d\x9e\ |
| 988 | +\x22\x7f\xf0\xb4\x5a\x6b\x1f\xf9\x44\x30\x25\x2d\xd3\xcf\x59\x1e\ |
| 989 | +\x49\x2a\x1f\x43\x6f\xdf\x07\xb7\xc3\xf8\xc7\x1c\x31\xbe\x03\x6e\ |
| 990 | +\x97\x54\xdd\xf7\xf4\xfb\x37\xb7\xdf\x99\x42\xea\x31\x6c\xf4\xbd\ |
| 991 | +\xa4\x90\x7a\x68\x6d\xf8\x64\xac\xf9\xfd\xe5\xe4\x43\xa9\xf8\x1b\ |
| 992 | +\xa9\x11\x8e\xe7\xfe\x5a\xa7\xfd\xd5\xbd\x38\xf6\x77\x50\xc9\xa7\ |
| 993 | +\x2c\xbd\x78\xd1\xc1\x71\x1a\x77\xa6\xad\xe3\x65\xda\xbe\x1f\x05\ |
| 994 | +\x88\xbb\x4b\x93\x7d\xc7\x69\x59\x25\x69\x75\xe8\xd2\xed\xbf\x51\ |
| 995 | +\xd7\xfe\x55\x78\x7f\xcd\xe6\x51\xca\x92\xa6\xcc\x53\x80\xb4\x48\ |
| 996 | +\xbd\x76\xb4\x3b\x1b\x2e\x37\x59\x92\x8e\xfa\xf6\x1d\xe5\xe9\xff\ |
| 997 | +\xe0\xdd\xa9\x9e\xfe\xa5\x32\x74\xec\x56\xa3\x64\xb2\xbf\x3e\x8f\ |
| 998 | +\x93\xf2\x02\xe8\x5d\xef\xbc\x2a\xcb\x55\xab\x23\x63\x4e\x5b\x71\ |
| 999 | +\xbd\x7b\xb1\x3d\x99\x29\x44\xaa\xe1\x42\xda\x1b\x9d\xde\x3a\x6b\ |
| 1000 | +\x88\xd6\xec\x46\x5f\x52\x2e\x36\xfe\x76\x39\xda\xec\x02\x67\xbd\ |
| 1001 | +\xbd\x31\x7a\x53\x55\x5e\x20\x8f\x2f\x53\x60\xd8\xfe\x39\x40\x58\ |
| 1002 | +\x9f\x97\x17\x1e\xad\x93\xd9\x59\x9c\x77\xce\xe8\x86\x5e\x64\x05\ |
| 1003 | +\xac\x89\xf6\x37\xa8\x4c\xd3\x1b\x36\xef\x25\x0e\xd7\xa9\x56\xb8\ |
| 1004 | +\x5b\x24\xb6\x1e\x51\x7e\x03\x96\x7d\x2f\x0c\x8c\x6e\x60\xb2\xef\ |
| 1005 | +\x5b\xc5\xdb\x6c\x95\x5d\xa5\x89\xbf\xd9\xd8\xc7\xd7\x2a\x6d\xe2\ |
| 1006 | +\x24\x6e\xe2\x3e\x96\x0e\x2d\xca\xc8\xc3\x45\xd7\x71\x95\x9c\x1d\ |
| 1007 | +\xfd\xf2\xfe\x43\xf7\x56\x7d\xb1\x38\xfa\x6f\x59\x7d\x3c\x44\x6e\ |
| 1008 | +\x10\x78\x81\xf8\xb4\xdc\x40\xf3\xee\xdd\xbb\xbf\xa1\x5c\x1c\xf9\ |
| 1009 | +\xdc\x8a\x9b\xb7\xd9\x0a\x3e\xf5\xd7\xdf\xff\xdc\xae\x72\x44\x75\ |
| 1010 | +\xd7\x31\x12\xf6\x77\x22\xfd\xa4\xbb\x69\xab\x74\x77\xbd\x3d\xf9\ |
| 1011 | +\x45\x40\xb2\x58\x65\x7e\xd0\xfc\xd7\x26\xcb\xf3\x9f\xfd\x22\xc3\ |
| 1012 | +\xab\xa0\xf9\x5e\xd1\xc3\xfb\xf8\x81\x1d\xc7\xf3\x83\xa1\xed\xd3\ |
| 1013 | +\xf2\x1a\x64\x79\x7c\x9a\xe6\x27\xb3\x5f\xdb\x28\xbc\x8e\xe7\xb2\ |
| 1014 | +\x2a\x37\xeb\x55\x99\xa4\xfb\x20\x98\xf5\xe8\xb5\xcf\x87\x4c\x9f\ |
| 1015 | +\xbe\xbb\xdd\xf5\x35\x3d\xf1\xb4\x3f\xf3\xb8\x49\x5f\x45\x0c\x64\ |
| 1016 | +\x6a\x38\xc5\xc6\x1f\x31\x41\x98\x61\x56\xf1\x43\x91\x7b\x43\xc7\ |
| 1017 | +\xbb\xd4\x50\xd7\xf5\xde\x1b\xf5\xae\x4d\xf7\xaf\x43\xc7\x1b\xb1\ |
| 1018 | +\xba\xd7\xf1\x17\xec\x0c\xc1\xbb\x78\xf1\xd1\x4f\x50\x24\x5f\x87\ |
| 1019 | +\xb2\x37\x92\x6e\xa8\xec\x87\xb2\x4a\xbf\x26\x65\xf5\x6d\xca\xa6\ |
| 1020 | +\x67\x7e\xfb\xcd\xca\xe2\x89\xf5\xdc\x27\xd9\x72\xb8\x4f\x2f\x71\ |
| 1021 | +\xe0\xec\x77\xee\xc9\xd9\x1c\x2a\x5c\x66\x04\xb7\x61\xf7\xeb\x75\ |
| 1022 | +\x7f\x7f\xb7\x8e\x9b\xf3\x9e\x11\x6e\xf9\x60\x62\x74\x2b\x3c\xfd\ |
| 1023 | +\xdd\xc5\xe7\x44\x1e\xf6\x61\xc7\x0d\x53\xfa\x12\x4c\x18\x67\x85\ |
| 1024 | +\x3a\x94\x60\xfb\xa7\x48\xa3\x5a\x55\x52\x33\x0e\xb4\x14\x61\xd6\ |
| 1025 | +\x71\xa7\x5e\x0f\xa6\xf2\x9c\x1b\x58\x21\x50\x91\x52\xaa\x43\xe1\ |
| 1026 | +\x14\xe1\xda\x09\x1e\x2c\x02\x9c\x09\x1c\x46\x6b\xd4\x1a\x41\x84\ |
| 1027 | +\x5d\x83\x30\xa5\x99\x08\x05\x8e\x07\xed\x5d\x64\x10\x75\x3f\x87\ |
| 1028 | +\x8d\xdd\xa0\x90\x0e\x25\xfa\x19\x46\xad\xfd\x40\x1a\x1e\x86\xea\ |
| 1029 | +\xa0\x5f\xad\x17\xe0\xc1\xd4\x30\x1e\x0c\xd7\xeb\x25\x0e\x33\x8c\ |
| 1030 | +\x86\x0d\x46\x5d\x0d\x30\xe8\x8a\x9b\x0a\x1b\x58\x27\x33\x29\xb0\ |
| 1031 | +\xbd\x43\xc0\xef\xf1\x1d\x86\x93\x02\x5b\x5f\xa9\xf9\x6a\x98\x09\ |
| 1032 | +\x39\x0c\x0b\x7f\x71\x8d\x70\xd3\x8e\x8a\xe1\xb8\x5d\x7a\x20\x48\ |
| 1033 | +\xf2\xf6\x43\x05\xfc\x7b\xe3\x1f\x06\x9f\x0e\xb4\x8f\xd5\x26\x4f\ |
| 1034 | +\x8f\x8a\xb2\xb8\x42\x25\xf5\xa6\x6e\xaa\xf2\x63\xfb\x98\xbe\x19\ |
| 1035 | +\x27\xd6\x9b\xdd\x9d\xf0\x11\x36\xb1\x57\x2f\xfb\xbb\xed\xd7\x53\ |
| 1036 | +\x9a\xee\x3e\x11\x88\xab\xc5\x70\x4f\xfb\x5a\x33\x62\x42\xeb\xdb\ |
| 1037 | +\x40\x54\x2c\x55\xfc\x4b\x40\x9c\xf6\x1a\x7d\x88\xb7\xef\x1f\x2f\ |
| 1038 | +\x77\x46\xdc\x6d\x31\xfb\x77\x62\x3f\x01\x4f\x7e\x03\x91\x3f\x6d\ |
| 1039 | +\x23\x33\xdc\x9a\xce\xc6\xdd\x53\xa4\x25\x51\x38\x81\x6b\x6f\x23\ |
| 1040 | +\x07\x5e\xda\x59\xfb\xf7\x5e\xf0\x15\xef\x05\x62\x70\x87\x35\xa6\ |
| 1041 | +\xb1\x96\xc0\x6f\xbe\xcf\x7a\xfd\x44\xbc\xf6\x6d\x6e\x02\x3d\x6e\ |
| 1042 | +\xdc\x5c\x0f\x6b\x2e\x14\xd1\xc6\xf9\x68\xf0\x1f\x50\x08\x67\x25\ |
| 1043 | +\xc2\x1a\xb1\x43\x1c\x37\x46\xfb\xf8\xd4\xbe\x04\xa4\xc6\x86\x96\ |
| 1044 | +\x48\x6b\xb5\x52\x41\xe4\x1c\x71\x46\x61\x10\x17\xed\x3b\x29\x21\ |
| 1045 | +\x82\x7f\x05\xdc\x69\x7f\xc0\x77\x1a\x81\x85\xe1\x5a\x1b\x19\x48\ |
| 1046 | +\xc5\x09\x52\x4b\xb8\x90\x3b\x46\x98\xa3\x8e\x61\x7a\x49\x04\x97\ |
| 1047 | +\x8a\x21\x98\x0d\x11\x48\x3d\x13\x68\xa2\x99\x51\xd2\x07\x2d\x51\ |
| 1048 | +\x0c\xe1\xda\xb7\x28\x49\x50\xd5\xee\x83\xdf\xaf\x47\x5b\x15\x18\ |
| 1049 | +\x85\xa1\xd2\x68\x1d\x46\x1c\xad\x10\xe5\x14\xcd\x87\xdf\x6c\xd0\ |
| 1050 | +\xac\x83\xab\xe0\xdf\x81\x71\x84\x81\xbf\xb4\x0d\x8d\x21\x1c\xa7\ |
| 1051 | +\x75\xe7\x82\x1f\x03\x03\xad\x40\x6f\x4c\x86\x56\x11\xca\x85\xe5\ |
| 1052 | +\x32\xd0\x18\xa7\xa5\xe5\x3c\x74\x82\x48\xc1\x9c\x74\x01\x02\x9a\ |
| 1053 | +\x72\x8d\xe3\x77\x88\x91\x50\x5a\x3b\xe9\x4d\x36\xd2\xd3\x88\xd2\ |
| 1054 | +\x21\xa7\x8e\x80\x41\xac\x0a\xa4\xf0\x0a\x03\x94\x90\x5b\x4b\x84\ |
| 1055 | +\xa6\x5a\x42\x0e\xd1\x4c\xc1\xa7\x0c\x33\x5a\xcd\x39\x9b\x54\xc7\ |
| 1056 | +\xab\xc9\xe5\x0e\x65\x01\x14\x39\x71\x4a\x70\xde\x3a\x84\x68\x6e\ |
| 1057 | +\x2c\xa0\xa5\x44\x40\x49\x03\xb7\x00\x09\x89\x89\x43\xce\xa0\x1a\ |
| 1058 | +\xd5\x20\x20\xdb\xbe\x81\x65\x36\x14\x8c\x80\xc3\x98\xf6\x2a\xfa\ |
| 1059 | +\x24\x37\xd2\xc0\x03\x0a\x39\xe7\x04\x78\x4b\x72\xcc\x8c\x35\x0c\ |
| 1060 | +\xbc\x02\xbc\xb9\x81\x31\x5e\x8e\x33\x05\xaf\x70\xc9\xa0\xb6\x72\ |
| 1061 | +\x6a\x52\x17\xaf\x23\x42\x45\x31\x01\x8a\x08\x39\xb0\x92\xce\x01\ |
| 1062 | +\xe2\x45\x80\x51\xd4\xab\x14\xe2\x24\x42\x05\x96\x0c\x04\x11\xce\ |
| 1063 | +\x08\xb0\x0e\x54\x84\xce\x40\x96\x70\x05\x53\x4d\x28\x80\x21\x03\ |
| 1064 | +\x09\x04\x79\xc0\x39\xd4\x16\x8e\x39\x16\xc2\x24\xa6\x8c\x08\x70\ |
| 1065 | +\xde\x20\x52\x53\x27\x42\x89\x38\xf2\x2e\x81\x1d\xca\x87\x9a\xc1\ |
| 1066 | +\xf1\x86\x5b\x87\x48\xd5\xcc\x4d\xea\xe1\xf5\x93\x7e\x4a\x2a\x61\ |
| 1067 | +\x1f\x98\x02\xbe\x04\xcb\xc3\x16\x47\x0c\x8a\x48\x19\x0a\xa1\x89\ |
| 1068 | +\x95\xcc\x47\x27\x3a\x2d\x7c\x8e\x36\x85\xe0\xa6\x12\x6b\x2f\x02\ |
| 1069 | +\xc4\x2e\x60\xa4\x0c\x47\x1f\xe6\x2c\xdc\x82\x4d\x41\x69\x69\x28\ |
| 1070 | +\x7c\x6f\x88\x93\x8c\x4a\x10\x2a\x31\x86\x21\xce\x43\xff\xa5\xa6\ |
| 1071 | +\x94\xa2\x85\x5a\x02\x2f\xa5\x60\xaf\x50\x30\x98\x1a\xc4\xe9\x94\ |
| 1072 | +\x2a\x57\xc1\xca\xab\x6e\xac\xc4\xca\xf0\x09\xe3\xca\x22\xa0\xdb\ |
| 1073 | +\x68\x51\x98\x12\x58\x33\x2b\xa5\xdf\x51\xfc\xa6\x83\xa8\xe4\xa1\ |
| 1074 | +\x44\xdc\x38\xa4\x29\xf4\x43\x9b\x42\x2a\x23\xe4\x08\x03\x46\x3a\ |
| 1075 | +\x30\x3e\xc7\x98\xe2\xde\xed\x88\x41\x61\x02\xc4\x33\x42\xdf\x72\ |
| 1076 | +\x7b\x68\xb2\x01\x02\x0f\xbe\xb1\x16\x19\xcd\xfc\x00\xab\xfc\xdb\ |
| 1077 | +\x67\x20\x01\x50\xe0\x69\x8a\x7c\xa3\x4e\x3b\x7f\x78\x84\x9e\x12\ |
| 1078 | +\xfe\x1f\xf3\xff\x9d\x24\xab\xbe\x8c\x64\x6f\xe7\xd1\x3d\x7b\x09\ |
| 1079 | +\x3e\x3a\x01\x3c\x2d\x7b\xe5\xd8\x4e\xfd\xdb\x4b\xe7\xd9\x8b\x3b\ |
| 1080 | +\x9f\x31\x82\x8b\x00\xec\xa5\x94\x40\x48\x4b\xb8\x44\xfb\x58\x00\ |
| 1081 | +\xfc\xe8\x95\x06\x65\x83\x04\x76\x8a\x22\x93\x51\x3e\x80\x2f\x54\ |
| 1082 | +\x5b\x3d\x70\x64\x19\xf0\xa7\x6d\x24\x00\xff\x08\xa1\x2f\x25\xb5\ |
| 1083 | +\x1c\x5c\x23\x05\x85\x13\xc1\x14\xa1\x05\xef\xc1\x3f\xce\x06\x02\ |
| 1084 | +\xc9\x06\x16\x00\x8d\x1d\x2c\x50\x93\x56\xdd\xc6\x60\xb0\x16\x31\ |
| 1085 | +\x89\x3a\x06\x54\x69\x10\x06\x42\x71\x4f\x8e\xa0\x1b\x25\x41\x6c\ |
| 1086 | +\x48\x5c\xa8\x84\x38\xf5\xcc\x48\xa8\x03\x3d\x83\x97\x94\xe7\x3c\ |
| 1087 | +\x2d\x99\xcf\x3e\x44\xa5\xa6\xd2\xb5\xd4\x62\x7c\x06\x83\xa1\x11\ |
| 1088 | +\x88\xe0\x04\x58\x8d\xf5\x44\x9b\xdb\x58\x03\x53\xa3\xd4\x00\xfd\ |
| 1089 | +\x58\x0a\x62\xf1\xf7\x13\xa0\x5f\xeb\x5b\xac\x02\xd6\xd0\x1a\x5c\ |
| 1090 | +\x89\xc2\x04\x30\x10\x89\x6c\xe5\x2d\x3f\x7e\x29\xef\x71\xff\x5a\ |
| 1091 | +\xd8\x13\x1f\x0a\x18\xab\x3c\xef\x81\x12\xa0\x34\xb8\xc1\x1b\x89\ |
| 1092 | +\xe2\xc5\x7a\x2a\x34\x1a\x95\x99\xf3\x0e\x05\xc3\x21\x8b\xe1\x2f\ |
| 1093 | +\x0d\x1e\x13\xc2\x43\x88\xcc\x63\x81\xdf\x9c\xe0\x59\x4f\xd5\xa8\ |
| 1094 | +\xf1\xac\x37\x0b\xbc\x8d\x74\x36\x5e\x67\x64\xb1\x36\xc2\x98\x36\ |
| 1095 | +\x8b\x27\x48\xef\x41\x99\x60\x9e\x26\x13\x8e\xe7\xcb\xdd\x3b\x51\ |
| 1096 | +\xfc\x39\xf6\x6f\x69\xdf\xbe\xf8\x3f\x50\x2c\x24\x2d\ |
| 1097 | \x00\x00\x0a\x90\ |
| 1098 | \x89\ |
| 1099 | \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ |
| 1100 | @@ -71198,6 +71382,10 @@ |
| 1101 | \x00\x62\ |
| 1102 | \x00\x69\x00\x62\x00\x6c\x00\x65\x00\x73\x00\x5f\x00\x73\x00\x65\x00\x61\x00\x72\x00\x63\x00\x68\x00\x5f\x00\x75\x00\x6e\x00\x6c\ |
| 1103 | \x00\x6f\x00\x63\x00\x6b\x00\x2e\x00\x70\x00\x6e\x00\x67\ |
| 1104 | +\x00\x0f\ |
| 1105 | +\x0d\x89\x9b\x07\ |
| 1106 | +\x00\x6f\ |
| 1107 | +\x00\x70\x00\x65\x00\x6e\x00\x6c\x00\x70\x00\x2d\x00\x6c\x00\x6f\x00\x67\x00\x6f\x00\x2e\x00\x73\x00\x76\x00\x67\ |
| 1108 | \x00\x15\ |
| 1109 | \x00\x76\xd9\xc7\ |
| 1110 | \x00\x6f\ |
| 1111 | @@ -71651,7 +71839,7 @@ |
| 1112 | |
| 1113 | qt_resource_struct = "\ |
| 1114 | \x00\x00\x00\x00\x00\x02\x00\x00\x00\x12\x00\x00\x00\x01\ |
| 1115 | -\x00\x00\x00\xe6\x00\x02\x00\x00\x00\x06\x00\x00\x00\x85\ |
| 1116 | +\x00\x00\x00\xe6\x00\x02\x00\x00\x00\x07\x00\x00\x00\x85\ |
| 1117 | \x00\x00\x00\x00\x00\x02\x00\x00\x00\x04\x00\x00\x00\x81\ |
| 1118 | \x00\x00\x00\xb4\x00\x02\x00\x00\x00\x05\x00\x00\x00\x7c\ |
| 1119 | \x00\x00\x00\xd6\x00\x02\x00\x00\x00\x14\x00\x00\x00\x68\ |
| 1120 | @@ -71674,68 +71862,68 @@ |
| 1121 | \x00\x00\x03\xec\x00\x00\x00\x00\x00\x01\x00\x05\x65\x6d\ |
| 1122 | \x00\x00\x04\x1a\x00\x00\x00\x00\x00\x01\x00\x08\x06\x4f\ |
| 1123 | \x00\x00\x03\xbc\x00\x00\x00\x00\x00\x01\x00\x02\xc4\x8b\ |
| 1124 | -\x00\x00\x0f\x84\x00\x00\x00\x00\x00\x01\x00\x10\xce\x94\ |
| 1125 | -\x00\x00\x0f\xf4\x00\x00\x00\x00\x00\x01\x00\x10\xd5\xdf\ |
| 1126 | -\x00\x00\x0f\x34\x00\x00\x00\x00\x00\x01\x00\x10\xc9\x38\ |
| 1127 | -\x00\x00\x10\xd2\x00\x00\x00\x00\x00\x01\x00\x10\xe8\x5d\ |
| 1128 | -\x00\x00\x10\x54\x00\x00\x00\x00\x00\x01\x00\x10\xdd\xf5\ |
| 1129 | -\x00\x00\x0e\xdc\x00\x00\x00\x00\x00\x01\x00\x10\xc2\x01\ |
| 1130 | -\x00\x00\x11\x24\x00\x00\x00\x00\x00\x01\x00\x10\xee\x64\ |
| 1131 | -\x00\x00\x10\x1c\x00\x00\x00\x00\x00\x01\x00\x10\xd9\x53\ |
| 1132 | -\x00\x00\x11\x72\x00\x00\x00\x00\x00\x01\x00\x10\xf3\x90\ |
| 1133 | -\x00\x00\x0f\x06\x00\x00\x00\x00\x00\x01\x00\x10\xc4\x9f\ |
| 1134 | -\x00\x00\x10\xfe\x00\x00\x00\x00\x00\x01\x00\x10\xeb\x90\ |
| 1135 | -\x00\x00\x10\xa8\x00\x00\x00\x00\x00\x01\x00\x10\xe5\xe5\ |
| 1136 | -\x00\x00\x0f\x5a\x00\x00\x00\x00\x00\x01\x00\x10\xcc\x12\ |
| 1137 | -\x00\x00\x11\x4e\x00\x00\x00\x00\x00\x01\x00\x10\xf1\x49\ |
| 1138 | -\x00\x00\x10\x7c\x00\x00\x00\x00\x00\x01\x00\x10\xe1\x3a\ |
| 1139 | -\x00\x00\x0f\xd0\x00\x00\x00\x00\x00\x01\x00\x10\xd2\xe2\ |
| 1140 | -\x00\x00\x0f\xaa\x00\x00\x00\x00\x00\x01\x00\x10\xd0\xcb\ |
| 1141 | +\x00\x00\x0f\xa8\x00\x00\x00\x00\x00\x01\x00\x10\xd9\xf6\ |
| 1142 | +\x00\x00\x10\x18\x00\x00\x00\x00\x00\x01\x00\x10\xe1\x41\ |
| 1143 | +\x00\x00\x0f\x58\x00\x00\x00\x00\x00\x01\x00\x10\xd4\x9a\ |
| 1144 | +\x00\x00\x10\xf6\x00\x00\x00\x00\x00\x01\x00\x10\xf3\xbf\ |
| 1145 | +\x00\x00\x10\x78\x00\x00\x00\x00\x00\x01\x00\x10\xe9\x57\ |
| 1146 | +\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x01\x00\x10\xcd\x63\ |
| 1147 | +\x00\x00\x11\x48\x00\x00\x00\x00\x00\x01\x00\x10\xf9\xc6\ |
| 1148 | +\x00\x00\x10\x40\x00\x00\x00\x00\x00\x01\x00\x10\xe4\xb5\ |
| 1149 | +\x00\x00\x11\x96\x00\x00\x00\x00\x00\x01\x00\x10\xfe\xf2\ |
| 1150 | +\x00\x00\x0f\x2a\x00\x00\x00\x00\x00\x01\x00\x10\xd0\x01\ |
| 1151 | +\x00\x00\x11\x22\x00\x00\x00\x00\x00\x01\x00\x10\xf6\xf2\ |
| 1152 | +\x00\x00\x10\xcc\x00\x00\x00\x00\x00\x01\x00\x10\xf1\x47\ |
| 1153 | +\x00\x00\x0f\x7e\x00\x00\x00\x00\x00\x01\x00\x10\xd7\x74\ |
| 1154 | +\x00\x00\x11\x72\x00\x00\x00\x00\x00\x01\x00\x10\xfc\xab\ |
| 1155 | +\x00\x00\x10\xa0\x00\x00\x00\x00\x00\x01\x00\x10\xec\x9c\ |
| 1156 | +\x00\x00\x0f\xf4\x00\x00\x00\x00\x00\x01\x00\x10\xde\x44\ |
| 1157 | +\x00\x00\x0f\xce\x00\x00\x00\x00\x00\x01\x00\x10\xdc\x2d\ |
| 1158 | \x00\x00\x03\x66\x00\x00\x00\x00\x00\x01\x00\x00\x21\x92\ |
| 1159 | -\x00\x00\x0b\x9c\x00\x00\x00\x00\x00\x01\x00\x0f\x43\x79\ |
| 1160 | -\x00\x00\x0c\x1c\x00\x00\x00\x00\x00\x01\x00\x0f\x4a\x3f\ |
| 1161 | -\x00\x00\x0b\x20\x00\x00\x00\x00\x00\x01\x00\x0f\x3c\x75\ |
| 1162 | -\x00\x00\x0b\xc4\x00\x00\x00\x00\x00\x01\x00\x0f\x46\x19\ |
| 1163 | -\x00\x00\x0c\x46\x00\x00\x00\x00\x00\x01\x00\x0f\x4d\x0a\ |
| 1164 | -\x00\x00\x0b\x6a\x00\x00\x00\x00\x00\x01\x00\x0f\x41\x8f\ |
| 1165 | -\x00\x00\x0b\x44\x00\x00\x00\x00\x00\x01\x00\x0f\x3f\x1c\ |
| 1166 | -\x00\x00\x0b\xfa\x00\x00\x00\x00\x00\x01\x00\x0f\x47\x9b\ |
| 1167 | +\x00\x00\x0b\xc0\x00\x00\x00\x00\x00\x01\x00\x0f\x4e\xdb\ |
| 1168 | +\x00\x00\x0c\x40\x00\x00\x00\x00\x00\x01\x00\x0f\x55\xa1\ |
| 1169 | +\x00\x00\x0b\x44\x00\x00\x00\x00\x00\x01\x00\x0f\x47\xd7\ |
| 1170 | +\x00\x00\x0b\xe8\x00\x00\x00\x00\x00\x01\x00\x0f\x51\x7b\ |
| 1171 | +\x00\x00\x0c\x6a\x00\x00\x00\x00\x00\x01\x00\x0f\x58\x6c\ |
| 1172 | +\x00\x00\x0b\x8e\x00\x00\x00\x00\x00\x01\x00\x0f\x4c\xf1\ |
| 1173 | +\x00\x00\x0b\x68\x00\x00\x00\x00\x00\x01\x00\x0f\x4a\x7e\ |
| 1174 | +\x00\x00\x0c\x1e\x00\x00\x00\x00\x00\x01\x00\x0f\x52\xfd\ |
| 1175 | \x00\x00\x01\x5c\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ |
| 1176 | \x00\x00\x01\xc2\x00\x00\x00\x00\x00\x01\x00\x00\x05\xe6\ |
| 1177 | \x00\x00\x01\x8e\x00\x00\x00\x00\x00\x01\x00\x00\x02\xfe\ |
| 1178 | -\x00\x00\x0e\x2c\x00\x00\x00\x00\x00\x01\x00\x0f\x68\x58\ |
| 1179 | -\x00\x00\x0e\x56\x00\x00\x00\x00\x00\x01\x00\x0f\x6d\xc2\ |
| 1180 | -\x00\x00\x0e\x86\x00\x00\x00\x00\x00\x01\x00\x0f\xdc\x4b\ |
| 1181 | -\x00\x00\x0e\xa6\x00\x00\x00\x00\x00\x01\x00\x0f\xe2\xfc\ |
| 1182 | -\x00\x00\x11\xf4\x00\x00\x00\x00\x00\x01\x00\x10\xfa\xa4\ |
| 1183 | -\x00\x00\x11\x9a\x00\x00\x00\x00\x00\x01\x00\x10\xf5\xa3\ |
| 1184 | -\x00\x00\x14\x10\x00\x00\x00\x00\x00\x01\x00\x11\x24\xa9\ |
| 1185 | -\x00\x00\x12\x9a\x00\x00\x00\x00\x00\x01\x00\x11\x02\xae\ |
| 1186 | -\x00\x00\x12\x36\x00\x00\x00\x00\x00\x01\x00\x10\xfd\xf7\ |
| 1187 | -\x00\x00\x11\xc0\x00\x00\x00\x00\x00\x01\x00\x10\xf8\xd4\ |
| 1188 | -\x00\x00\x13\x62\x00\x00\x00\x00\x00\x01\x00\x11\x15\x84\ |
| 1189 | -\x00\x00\x13\x00\x00\x00\x00\x00\x00\x01\x00\x11\x0d\x54\ |
| 1190 | -\x00\x00\x14\x36\x00\x00\x00\x00\x00\x01\x00\x11\x27\x8b\ |
| 1191 | -\x00\x00\x13\xdc\x00\x00\x00\x00\x00\x01\x00\x11\x20\xcc\ |
| 1192 | -\x00\x00\x13\x2c\x00\x00\x00\x00\x00\x01\x00\x11\x12\x60\ |
| 1193 | -\x00\x00\x14\x68\x00\x00\x00\x00\x00\x01\x00\x11\x2b\x48\ |
| 1194 | -\x00\x00\x13\x84\x00\x00\x00\x00\x00\x01\x00\x11\x19\xf3\ |
| 1195 | -\x00\x00\x12\xc8\x00\x00\x00\x00\x00\x01\x00\x11\x0a\xde\ |
| 1196 | -\x00\x00\x13\xb2\x00\x00\x00\x00\x00\x01\x00\x11\x1e\x44\ |
| 1197 | -\x00\x00\x12\x64\x00\x00\x00\x00\x00\x01\x00\x10\xff\xfe\ |
| 1198 | -\x00\x00\x0a\x10\x00\x00\x00\x00\x00\x01\x00\x0e\xec\xf7\ |
| 1199 | -\x00\x00\x0a\x30\x00\x00\x00\x00\x00\x01\x00\x0e\xf0\xd4\ |
| 1200 | -\x00\x00\x09\xea\x00\x00\x00\x00\x00\x01\x00\x0e\xea\x59\ |
| 1201 | -\x00\x00\x0d\x0a\x00\x00\x00\x00\x00\x01\x00\x0f\x57\x26\ |
| 1202 | -\x00\x00\x0d\xa8\x00\x00\x00\x00\x00\x01\x00\x0f\x61\x9b\ |
| 1203 | -\x00\x00\x0e\x02\x00\x00\x00\x00\x00\x01\x00\x0f\x66\x54\ |
| 1204 | -\x00\x00\x0c\xa0\x00\x00\x00\x00\x00\x01\x00\x0f\x53\x36\ |
| 1205 | -\x00\x00\x0d\x84\x00\x00\x00\x00\x00\x01\x00\x0f\x5e\x68\ |
| 1206 | -\x00\x00\x0c\xd4\x00\x00\x00\x00\x00\x01\x00\x0f\x55\x2d\ |
| 1207 | -\x00\x00\x0d\x3e\x00\x00\x00\x00\x00\x01\x00\x0f\x59\x24\ |
| 1208 | -\x00\x00\x0d\x60\x00\x00\x00\x00\x00\x01\x00\x0f\x5b\x37\ |
| 1209 | -\x00\x00\x0d\xde\x00\x00\x00\x00\x00\x01\x00\x0f\x63\x83\ |
| 1210 | -\x00\x00\x0c\x78\x00\x00\x00\x00\x00\x01\x00\x0f\x50\x7a\ |
| 1211 | +\x00\x00\x0e\x50\x00\x00\x00\x00\x00\x01\x00\x0f\x73\xba\ |
| 1212 | +\x00\x00\x0e\x7a\x00\x00\x00\x00\x00\x01\x00\x0f\x79\x24\ |
| 1213 | +\x00\x00\x0e\xaa\x00\x00\x00\x00\x00\x01\x00\x0f\xe7\xad\ |
| 1214 | +\x00\x00\x0e\xca\x00\x00\x00\x00\x00\x01\x00\x0f\xee\x5e\ |
| 1215 | +\x00\x00\x12\x18\x00\x00\x00\x00\x00\x01\x00\x11\x06\x06\ |
| 1216 | +\x00\x00\x11\xbe\x00\x00\x00\x00\x00\x01\x00\x11\x01\x05\ |
| 1217 | +\x00\x00\x14\x34\x00\x00\x00\x00\x00\x01\x00\x11\x30\x0b\ |
| 1218 | +\x00\x00\x12\xbe\x00\x00\x00\x00\x00\x01\x00\x11\x0e\x10\ |
| 1219 | +\x00\x00\x12\x5a\x00\x00\x00\x00\x00\x01\x00\x11\x09\x59\ |
| 1220 | +\x00\x00\x11\xe4\x00\x00\x00\x00\x00\x01\x00\x11\x04\x36\ |
| 1221 | +\x00\x00\x13\x86\x00\x00\x00\x00\x00\x01\x00\x11\x20\xe6\ |
| 1222 | +\x00\x00\x13\x24\x00\x00\x00\x00\x00\x01\x00\x11\x18\xb6\ |
| 1223 | +\x00\x00\x14\x5a\x00\x00\x00\x00\x00\x01\x00\x11\x32\xed\ |
| 1224 | +\x00\x00\x14\x00\x00\x00\x00\x00\x00\x01\x00\x11\x2c\x2e\ |
| 1225 | +\x00\x00\x13\x50\x00\x00\x00\x00\x00\x01\x00\x11\x1d\xc2\ |
| 1226 | +\x00\x00\x14\x8c\x00\x00\x00\x00\x00\x01\x00\x11\x36\xaa\ |
| 1227 | +\x00\x00\x13\xa8\x00\x00\x00\x00\x00\x01\x00\x11\x25\x55\ |
| 1228 | +\x00\x00\x12\xec\x00\x00\x00\x00\x00\x01\x00\x11\x16\x40\ |
| 1229 | +\x00\x00\x13\xd6\x00\x00\x00\x00\x00\x01\x00\x11\x29\xa6\ |
| 1230 | +\x00\x00\x12\x88\x00\x00\x00\x00\x00\x01\x00\x11\x0b\x60\ |
| 1231 | +\x00\x00\x0a\x34\x00\x00\x00\x00\x00\x01\x00\x0e\xf8\x59\ |
| 1232 | +\x00\x00\x0a\x54\x00\x00\x00\x00\x00\x01\x00\x0e\xfc\x36\ |
| 1233 | +\x00\x00\x0a\x0e\x00\x00\x00\x00\x00\x01\x00\x0e\xf5\xbb\ |
| 1234 | +\x00\x00\x0d\x2e\x00\x00\x00\x00\x00\x01\x00\x0f\x62\x88\ |
| 1235 | +\x00\x00\x0d\xcc\x00\x00\x00\x00\x00\x01\x00\x0f\x6c\xfd\ |
| 1236 | +\x00\x00\x0e\x26\x00\x00\x00\x00\x00\x01\x00\x0f\x71\xb6\ |
| 1237 | +\x00\x00\x0c\xc4\x00\x00\x00\x00\x00\x01\x00\x0f\x5e\x98\ |
| 1238 | +\x00\x00\x0d\xa8\x00\x00\x00\x00\x00\x01\x00\x0f\x69\xca\ |
| 1239 | +\x00\x00\x0c\xf8\x00\x00\x00\x00\x00\x01\x00\x0f\x60\x8f\ |
| 1240 | +\x00\x00\x0d\x62\x00\x00\x00\x00\x00\x01\x00\x0f\x64\x86\ |
| 1241 | +\x00\x00\x0d\x84\x00\x00\x00\x00\x00\x01\x00\x0f\x66\x99\ |
| 1242 | +\x00\x00\x0e\x02\x00\x00\x00\x00\x00\x01\x00\x0f\x6e\xe5\ |
| 1243 | +\x00\x00\x0c\x9c\x00\x00\x00\x00\x00\x01\x00\x0f\x5b\xdc\ |
| 1244 | \x00\x00\x02\xee\x00\x00\x00\x00\x00\x01\x00\x00\x1b\x20\ |
| 1245 | \x00\x00\x02\x72\x00\x00\x00\x00\x00\x01\x00\x00\x11\xc5\ |
| 1246 | \x00\x00\x02\x16\x00\x00\x00\x00\x00\x01\x00\x00\x0c\x03\ |
| 1247 | @@ -71750,45 +71938,46 @@ |
| 1248 | \x00\x00\x04\xb8\x00\x00\x00\x00\x00\x01\x00\x0d\x50\x06\ |
| 1249 | \x00\x00\x05\x52\x00\x00\x00\x00\x00\x01\x00\x0d\x56\x1f\ |
| 1250 | \x00\x00\x05\x20\x00\x00\x00\x00\x00\x01\x00\x0d\x54\x57\ |
| 1251 | -\x00\x00\x14\xd0\x00\x00\x00\x00\x00\x01\x00\x11\x34\x7c\ |
| 1252 | -\x00\x00\x15\x04\x00\x00\x00\x00\x00\x01\x00\x11\x37\x4c\ |
| 1253 | -\x00\x00\x14\x8c\x00\x00\x00\x00\x00\x01\x00\x11\x2e\xfb\ |
| 1254 | -\x00\x00\x14\xb0\x00\x00\x00\x00\x00\x01\x00\x11\x31\xf9\ |
| 1255 | -\x00\x00\x06\xde\x00\x00\x00\x00\x00\x01\x00\x0e\xaa\x8e\ |
| 1256 | -\x00\x00\x07\xc4\x00\x00\x00\x00\x00\x01\x00\x0e\xbb\x82\ |
| 1257 | -\x00\x00\x09\xca\x00\x00\x00\x00\x00\x01\x00\x0e\xe6\x66\ |
| 1258 | -\x00\x00\x09\x98\x00\x00\x00\x00\x00\x01\x00\x0e\xdf\x50\ |
| 1259 | -\x00\x00\x08\x7e\x00\x00\x00\x00\x00\x01\x00\x0e\xc4\x50\ |
| 1260 | -\x00\x00\x09\x1e\x00\x00\x00\x00\x00\x01\x00\x0e\xd7\x0f\ |
| 1261 | -\x00\x00\x09\x48\x00\x00\x00\x00\x00\x01\x00\x0e\xd9\x44\ |
| 1262 | -\x00\x00\x08\x1e\x00\x00\x00\x00\x00\x01\x00\x0e\xc0\x33\ |
| 1263 | -\x00\x00\x08\x4c\x00\x00\x00\x00\x00\x01\x00\x0e\xc2\xb3\ |
| 1264 | -\x00\x00\x07\x52\x00\x00\x00\x00\x00\x01\x00\x0e\xb4\x35\ |
| 1265 | -\x00\x00\x07\xa4\x00\x00\x00\x00\x00\x01\x00\x0e\xb8\x76\ |
| 1266 | -\x00\x00\x07\xec\x00\x00\x00\x00\x00\x01\x00\x0e\xbe\xe0\ |
| 1267 | -\x00\x00\x08\xd0\x00\x00\x00\x00\x00\x01\x00\x0e\xca\xc5\ |
| 1268 | -\x00\x00\x08\xa4\x00\x00\x00\x00\x00\x01\x00\x0e\xc8\x62\ |
| 1269 | -\x00\x00\x09\x6a\x00\x00\x00\x00\x00\x01\x00\x0e\xdd\x48\ |
| 1270 | -\x00\x00\x06\xb0\x00\x00\x00\x00\x00\x01\x00\x0e\xa3\xd0\ |
| 1271 | -\x00\x00\x07\x02\x00\x00\x00\x00\x00\x01\x00\x0e\xad\x7a\ |
| 1272 | -\x00\x00\x07\x2e\x00\x00\x00\x00\x00\x01\x00\x0e\xb0\xbc\ |
| 1273 | -\x00\x00\x07\x82\x00\x00\x00\x00\x00\x01\x00\x0e\xb5\x2e\ |
| 1274 | -\x00\x00\x08\xee\x00\x00\x00\x00\x00\x01\x00\x0e\xcd\x67\ |
| 1275 | -\x00\x00\x0a\x94\x00\x00\x00\x00\x00\x01\x00\x0f\x27\xb3\ |
| 1276 | -\x00\x00\x0a\xda\x00\x00\x00\x00\x00\x01\x00\x0f\x32\xb8\ |
| 1277 | -\x00\x00\x0a\xfc\x00\x00\x00\x00\x00\x01\x00\x0f\x35\x8e\ |
| 1278 | -\x00\x00\x0a\x52\x00\x00\x00\x00\x00\x01\x00\x0e\xf4\x0e\ |
| 1279 | -\x00\x00\x0a\xb6\x00\x00\x00\x00\x00\x01\x00\x0f\x2b\x86\ |
| 1280 | -\x00\x00\x15\x34\x00\x00\x00\x00\x00\x01\x00\x11\x3a\x45\ |
| 1281 | -\x00\x00\x15\x96\x00\x00\x00\x00\x00\x01\x00\x11\x40\xbb\ |
| 1282 | -\x00\x00\x15\x68\x00\x00\x00\x00\x00\x01\x00\x11\x3d\xa7\ |
| 1283 | -\x00\x00\x15\xbe\x00\x00\x00\x00\x00\x01\x00\x11\x43\x59\ |
| 1284 | -\x00\x00\x06\x18\x00\x00\x00\x00\x00\x01\x00\x0d\x91\xaf\ |
| 1285 | -\x00\x00\x05\xb8\x00\x00\x00\x00\x00\x01\x00\x0d\x62\x6f\ |
| 1286 | -\x00\x00\x05\x88\x00\x00\x00\x00\x00\x01\x00\x0d\x57\xdb\ |
| 1287 | -\x00\x00\x05\xe8\x00\x00\x00\x00\x00\x01\x00\x0d\x77\xa4\ |
| 1288 | -\x00\x00\x06\x48\x00\x00\x00\x00\x00\x01\x00\x0d\x95\xcc\ |
| 1289 | -\x00\x00\x06\x7c\x00\x00\x00\x00\x00\x01\x00\x0e\x5e\x65\ |
| 1290 | +\x00\x00\x14\xf4\x00\x00\x00\x00\x00\x01\x00\x11\x3f\xde\ |
| 1291 | +\x00\x00\x15\x28\x00\x00\x00\x00\x00\x01\x00\x11\x42\xae\ |
| 1292 | +\x00\x00\x14\xb0\x00\x00\x00\x00\x00\x01\x00\x11\x3a\x5d\ |
| 1293 | +\x00\x00\x14\xd4\x00\x00\x00\x00\x00\x01\x00\x11\x3d\x5b\ |
| 1294 | +\x00\x00\x07\x02\x00\x00\x00\x00\x00\x01\x00\x0e\xb5\xf0\ |
| 1295 | +\x00\x00\x07\xe8\x00\x00\x00\x00\x00\x01\x00\x0e\xc6\xe4\ |
| 1296 | +\x00\x00\x09\xee\x00\x00\x00\x00\x00\x01\x00\x0e\xf1\xc8\ |
| 1297 | +\x00\x00\x09\xbc\x00\x00\x00\x00\x00\x01\x00\x0e\xea\xb2\ |
| 1298 | +\x00\x00\x08\xa2\x00\x00\x00\x00\x00\x01\x00\x0e\xcf\xb2\ |
| 1299 | +\x00\x00\x09\x42\x00\x00\x00\x00\x00\x01\x00\x0e\xe2\x71\ |
| 1300 | +\x00\x00\x09\x6c\x00\x00\x00\x00\x00\x01\x00\x0e\xe4\xa6\ |
| 1301 | +\x00\x00\x08\x42\x00\x00\x00\x00\x00\x01\x00\x0e\xcb\x95\ |
| 1302 | +\x00\x00\x08\x70\x00\x00\x00\x00\x00\x01\x00\x0e\xce\x15\ |
| 1303 | +\x00\x00\x07\x76\x00\x00\x00\x00\x00\x01\x00\x0e\xbf\x97\ |
| 1304 | +\x00\x00\x07\xc8\x00\x00\x00\x00\x00\x01\x00\x0e\xc3\xd8\ |
| 1305 | +\x00\x00\x08\x10\x00\x00\x00\x00\x00\x01\x00\x0e\xca\x42\ |
| 1306 | +\x00\x00\x08\xf4\x00\x00\x00\x00\x00\x01\x00\x0e\xd6\x27\ |
| 1307 | +\x00\x00\x08\xc8\x00\x00\x00\x00\x00\x01\x00\x0e\xd3\xc4\ |
| 1308 | +\x00\x00\x09\x8e\x00\x00\x00\x00\x00\x01\x00\x0e\xe8\xaa\ |
| 1309 | +\x00\x00\x06\xd4\x00\x00\x00\x00\x00\x01\x00\x0e\xaf\x32\ |
| 1310 | +\x00\x00\x07\x26\x00\x00\x00\x00\x00\x01\x00\x0e\xb8\xdc\ |
| 1311 | +\x00\x00\x07\x52\x00\x00\x00\x00\x00\x01\x00\x0e\xbc\x1e\ |
| 1312 | +\x00\x00\x07\xa6\x00\x00\x00\x00\x00\x01\x00\x0e\xc0\x90\ |
| 1313 | +\x00\x00\x09\x12\x00\x00\x00\x00\x00\x01\x00\x0e\xd8\xc9\ |
| 1314 | +\x00\x00\x0a\xb8\x00\x00\x00\x00\x00\x01\x00\x0f\x33\x15\ |
| 1315 | +\x00\x00\x0a\xfe\x00\x00\x00\x00\x00\x01\x00\x0f\x3e\x1a\ |
| 1316 | +\x00\x00\x0b\x20\x00\x00\x00\x00\x00\x01\x00\x0f\x40\xf0\ |
| 1317 | +\x00\x00\x0a\x76\x00\x00\x00\x00\x00\x01\x00\x0e\xff\x70\ |
| 1318 | +\x00\x00\x0a\xda\x00\x00\x00\x00\x00\x01\x00\x0f\x36\xe8\ |
| 1319 | +\x00\x00\x15\x58\x00\x00\x00\x00\x00\x01\x00\x11\x45\xa7\ |
| 1320 | +\x00\x00\x15\xba\x00\x00\x00\x00\x00\x01\x00\x11\x4c\x1d\ |
| 1321 | +\x00\x00\x15\x8c\x00\x00\x00\x00\x00\x01\x00\x11\x49\x09\ |
| 1322 | +\x00\x00\x15\xe2\x00\x00\x00\x00\x00\x01\x00\x11\x4e\xbb\ |
| 1323 | +\x00\x00\x06\x3c\x00\x00\x00\x00\x00\x01\x00\x0d\x9d\x11\ |
| 1324 | +\x00\x00\x05\xdc\x00\x00\x00\x00\x00\x01\x00\x0d\x6d\xd1\ |
| 1325 | +\x00\x00\x05\xac\x00\x00\x00\x00\x00\x01\x00\x0d\x63\x3d\ |
| 1326 | +\x00\x00\x06\x0c\x00\x00\x00\x00\x00\x01\x00\x0d\x83\x06\ |
| 1327 | +\x00\x00\x06\x6c\x00\x00\x00\x00\x00\x01\x00\x0d\xa1\x2e\ |
| 1328 | +\x00\x00\x06\xa0\x00\x00\x00\x00\x00\x01\x00\x0e\x69\xc7\ |
| 1329 | +\x00\x00\x05\x88\x00\x01\x00\x00\x00\x01\x00\x0d\x57\xdb\ |
| 1330 | " |
| 1331 | |
| 1332 | def qInitResources(): |
| 1333 | |
| 1334 | === modified file 'openlp/core/theme/__init__.py' |
| 1335 | --- openlp/core/theme/__init__.py 2012-12-30 19:41:24 +0000 |
| 1336 | +++ openlp/core/theme/__init__.py 2014-01-18 21:32:36 +0000 |
| 1337 | @@ -4,8 +4,8 @@ |
| 1338 | ############################################################################### |
| 1339 | # OpenLP - Open Source Lyrics Projection # |
| 1340 | # --------------------------------------------------------------------------- # |
| 1341 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1342 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1343 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1344 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1345 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1346 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1347 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1348 | |
| 1349 | === modified file 'openlp/core/theme/theme.py' |
| 1350 | --- openlp/core/theme/theme.py 2012-12-30 19:41:24 +0000 |
| 1351 | +++ openlp/core/theme/theme.py 2014-01-18 21:32:36 +0000 |
| 1352 | @@ -4,8 +4,8 @@ |
| 1353 | ############################################################################### |
| 1354 | # OpenLP - Open Source Lyrics Projection # |
| 1355 | # --------------------------------------------------------------------------- # |
| 1356 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1357 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1358 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1359 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1360 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1361 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1362 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1363 | |
| 1364 | === modified file 'openlp/core/ui/__init__.py' |
| 1365 | --- openlp/core/ui/__init__.py 2012-12-30 19:41:24 +0000 |
| 1366 | +++ openlp/core/ui/__init__.py 2014-01-18 21:32:36 +0000 |
| 1367 | @@ -4,8 +4,8 @@ |
| 1368 | ############################################################################### |
| 1369 | # OpenLP - Open Source Lyrics Projection # |
| 1370 | # --------------------------------------------------------------------------- # |
| 1371 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1372 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1373 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1374 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1375 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1376 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1377 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1378 | |
| 1379 | === modified file 'openlp/core/ui/aboutdialog.py' |
| 1380 | --- openlp/core/ui/aboutdialog.py 2012-12-30 19:41:24 +0000 |
| 1381 | +++ openlp/core/ui/aboutdialog.py 2014-01-18 21:32:36 +0000 |
| 1382 | @@ -4,8 +4,8 @@ |
| 1383 | ############################################################################### |
| 1384 | # OpenLP - Open Source Lyrics Projection # |
| 1385 | # --------------------------------------------------------------------------- # |
| 1386 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1387 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1388 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1389 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1390 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1391 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1392 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1393 | @@ -32,10 +32,11 @@ |
| 1394 | from openlp.core.lib import build_icon, translate |
| 1395 | from openlp.core.lib.ui import UiStrings, create_button, create_button_box |
| 1396 | |
| 1397 | + |
| 1398 | class Ui_AboutDialog(object): |
| 1399 | def setupUi(self, aboutDialog): |
| 1400 | aboutDialog.setObjectName(u'aboutDialog') |
| 1401 | - aboutDialog.setWindowIcon(build_icon(u':/icon/openlp-logo-16x16.png')) |
| 1402 | + aboutDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 1403 | self.aboutDialogLayout = QtGui.QVBoxLayout(aboutDialog) |
| 1404 | self.aboutDialogLayout.setObjectName(u'aboutDialogLayout') |
| 1405 | self.logoLabel = QtGui.QLabel(aboutDialog) |
| 1406 | |
| 1407 | === modified file 'openlp/core/ui/aboutform.py' |
| 1408 | --- openlp/core/ui/aboutform.py 2012-12-30 19:41:24 +0000 |
| 1409 | +++ openlp/core/ui/aboutform.py 2014-01-18 21:32:36 +0000 |
| 1410 | @@ -4,8 +4,8 @@ |
| 1411 | ############################################################################### |
| 1412 | # OpenLP - Open Source Lyrics Projection # |
| 1413 | # --------------------------------------------------------------------------- # |
| 1414 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1415 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1416 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1417 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1418 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1419 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1420 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1421 | |
| 1422 | === modified file 'openlp/core/ui/advancedtab.py' |
| 1423 | --- openlp/core/ui/advancedtab.py 2013-03-19 19:22:10 +0000 |
| 1424 | +++ openlp/core/ui/advancedtab.py 2014-01-18 21:32:36 +0000 |
| 1425 | @@ -4,8 +4,8 @@ |
| 1426 | ############################################################################### |
| 1427 | # OpenLP - Open Source Lyrics Projection # |
| 1428 | # --------------------------------------------------------------------------- # |
| 1429 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1430 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1431 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1432 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1433 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1434 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1435 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1436 | |
| 1437 | === modified file 'openlp/core/ui/exceptiondialog.py' |
| 1438 | --- openlp/core/ui/exceptiondialog.py 2012-12-30 19:41:24 +0000 |
| 1439 | +++ openlp/core/ui/exceptiondialog.py 2014-01-18 21:32:36 +0000 |
| 1440 | @@ -4,8 +4,8 @@ |
| 1441 | ############################################################################### |
| 1442 | # OpenLP - Open Source Lyrics Projection # |
| 1443 | # --------------------------------------------------------------------------- # |
| 1444 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1445 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1446 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1447 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1448 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1449 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1450 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1451 | @@ -32,9 +32,11 @@ |
| 1452 | from openlp.core.lib import translate, build_icon |
| 1453 | from openlp.core.lib.ui import create_button, create_button_box |
| 1454 | |
| 1455 | + |
| 1456 | class Ui_ExceptionDialog(object): |
| 1457 | def setupUi(self, exceptionDialog): |
| 1458 | exceptionDialog.setObjectName(u'exceptionDialog') |
| 1459 | + exceptionDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 1460 | self.exceptionLayout = QtGui.QVBoxLayout(exceptionDialog) |
| 1461 | self.exceptionLayout.setObjectName(u'exceptionLayout') |
| 1462 | self.messageLayout = QtGui.QHBoxLayout() |
| 1463 | |
| 1464 | === modified file 'openlp/core/ui/exceptionform.py' |
| 1465 | --- openlp/core/ui/exceptionform.py 2013-03-19 19:07:02 +0000 |
| 1466 | +++ openlp/core/ui/exceptionform.py 2014-01-18 21:32:36 +0000 |
| 1467 | @@ -4,8 +4,8 @@ |
| 1468 | ############################################################################### |
| 1469 | # OpenLP - Open Source Lyrics Projection # |
| 1470 | # --------------------------------------------------------------------------- # |
| 1471 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1472 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1473 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1474 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1475 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1476 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1477 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1478 | |
| 1479 | === modified file 'openlp/core/ui/filerenamedialog.py' |
| 1480 | --- openlp/core/ui/filerenamedialog.py 2012-12-30 19:41:24 +0000 |
| 1481 | +++ openlp/core/ui/filerenamedialog.py 2014-01-18 21:32:36 +0000 |
| 1482 | @@ -4,8 +4,8 @@ |
| 1483 | ############################################################################### |
| 1484 | # OpenLP - Open Source Lyrics Projection # |
| 1485 | # --------------------------------------------------------------------------- # |
| 1486 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1487 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1488 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1489 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1490 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1491 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1492 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1493 | @@ -29,12 +29,14 @@ |
| 1494 | |
| 1495 | from PyQt4 import QtCore, QtGui |
| 1496 | |
| 1497 | -from openlp.core.lib import translate |
| 1498 | +from openlp.core.lib import translate, build_icon |
| 1499 | from openlp.core.lib.ui import create_button_box |
| 1500 | |
| 1501 | + |
| 1502 | class Ui_FileRenameDialog(object): |
| 1503 | def setupUi(self, fileRenameDialog): |
| 1504 | fileRenameDialog.setObjectName(u'fileRenameDialog') |
| 1505 | + fileRenameDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 1506 | fileRenameDialog.resize(300, 10) |
| 1507 | self.dialogLayout = QtGui.QGridLayout(fileRenameDialog) |
| 1508 | self.dialogLayout.setObjectName(u'dialogLayout') |
| 1509 | |
| 1510 | === modified file 'openlp/core/ui/filerenameform.py' |
| 1511 | --- openlp/core/ui/filerenameform.py 2012-12-30 19:41:24 +0000 |
| 1512 | +++ openlp/core/ui/filerenameform.py 2014-01-18 21:32:36 +0000 |
| 1513 | @@ -4,8 +4,8 @@ |
| 1514 | ############################################################################### |
| 1515 | # OpenLP - Open Source Lyrics Projection # |
| 1516 | # --------------------------------------------------------------------------- # |
| 1517 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1518 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1519 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1520 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1521 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1522 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1523 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1524 | |
| 1525 | === modified file 'openlp/core/ui/firsttimeform.py' |
| 1526 | --- openlp/core/ui/firsttimeform.py 2013-12-20 19:36:31 +0000 |
| 1527 | +++ openlp/core/ui/firsttimeform.py 2014-01-18 21:32:36 +0000 |
| 1528 | @@ -4,8 +4,8 @@ |
| 1529 | ############################################################################### |
| 1530 | # OpenLP - Open Source Lyrics Projection # |
| 1531 | # --------------------------------------------------------------------------- # |
| 1532 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1533 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1534 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1535 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1536 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1537 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1538 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1539 | |
| 1540 | === modified file 'openlp/core/ui/firsttimelanguagedialog.py' |
| 1541 | --- openlp/core/ui/firsttimelanguagedialog.py 2012-12-30 19:41:24 +0000 |
| 1542 | +++ openlp/core/ui/firsttimelanguagedialog.py 2014-01-18 21:32:36 +0000 |
| 1543 | @@ -4,8 +4,8 @@ |
| 1544 | ############################################################################### |
| 1545 | # OpenLP - Open Source Lyrics Projection # |
| 1546 | # --------------------------------------------------------------------------- # |
| 1547 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1548 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1549 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1550 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1551 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1552 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1553 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1554 | @@ -29,12 +29,14 @@ |
| 1555 | |
| 1556 | from PyQt4 import QtGui |
| 1557 | |
| 1558 | -from openlp.core.lib import translate |
| 1559 | +from openlp.core.lib import translate, build_icon |
| 1560 | from openlp.core.lib.ui import create_button_box |
| 1561 | |
| 1562 | + |
| 1563 | class Ui_FirstTimeLanguageDialog(object): |
| 1564 | def setupUi(self, languageDialog): |
| 1565 | languageDialog.setObjectName(u'languageDialog') |
| 1566 | + languageDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 1567 | languageDialog.resize(300, 50) |
| 1568 | self.dialogLayout = QtGui.QVBoxLayout(languageDialog) |
| 1569 | self.dialogLayout.setContentsMargins(8, 8, 8, 8) |
| 1570 | |
| 1571 | === modified file 'openlp/core/ui/firsttimelanguageform.py' |
| 1572 | --- openlp/core/ui/firsttimelanguageform.py 2012-12-30 19:41:24 +0000 |
| 1573 | +++ openlp/core/ui/firsttimelanguageform.py 2014-01-18 21:32:36 +0000 |
| 1574 | @@ -4,8 +4,8 @@ |
| 1575 | ############################################################################### |
| 1576 | # OpenLP - Open Source Lyrics Projection # |
| 1577 | # --------------------------------------------------------------------------- # |
| 1578 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1579 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1580 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1581 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1582 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1583 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1584 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1585 | |
| 1586 | === modified file 'openlp/core/ui/firsttimewizard.py' |
| 1587 | --- openlp/core/ui/firsttimewizard.py 2013-08-19 21:09:52 +0000 |
| 1588 | +++ openlp/core/ui/firsttimewizard.py 2014-01-18 21:32:36 +0000 |
| 1589 | @@ -4,8 +4,8 @@ |
| 1590 | ############################################################################### |
| 1591 | # OpenLP - Open Source Lyrics Projection # |
| 1592 | # --------------------------------------------------------------------------- # |
| 1593 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1594 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1595 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1596 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1597 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1598 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1599 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1600 | @@ -31,7 +31,7 @@ |
| 1601 | |
| 1602 | import sys |
| 1603 | |
| 1604 | -from openlp.core.lib import translate |
| 1605 | +from openlp.core.lib import translate, build_icon |
| 1606 | from openlp.core.lib.ui import add_welcome_page |
| 1607 | |
| 1608 | |
| 1609 | @@ -59,6 +59,7 @@ |
| 1610 | QtGui.QWizard.NoBackButtonOnStartPage | |
| 1611 | QtGui.QWizard.NoBackButtonOnLastPage | |
| 1612 | QtGui.QWizard.HaveCustomButton1) |
| 1613 | + FirstTimeWizard.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 1614 | self.finishButton = self.button(QtGui.QWizard.FinishButton) |
| 1615 | self.noInternetFinishButton = self.button(QtGui.QWizard.CustomButton1) |
| 1616 | self.cancelButton = self.button(QtGui.QWizard.CancelButton) |
| 1617 | |
| 1618 | === modified file 'openlp/core/ui/formattingtagdialog.py' |
| 1619 | --- openlp/core/ui/formattingtagdialog.py 2012-12-30 19:41:24 +0000 |
| 1620 | +++ openlp/core/ui/formattingtagdialog.py 2014-01-18 21:32:36 +0000 |
| 1621 | @@ -4,8 +4,8 @@ |
| 1622 | ############################################################################### |
| 1623 | # OpenLP - Open Source Lyrics Projection # |
| 1624 | # --------------------------------------------------------------------------- # |
| 1625 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1626 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1627 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1628 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1629 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1630 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1631 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1632 | @@ -29,13 +29,15 @@ |
| 1633 | |
| 1634 | from PyQt4 import QtCore, QtGui |
| 1635 | |
| 1636 | -from openlp.core.lib import translate |
| 1637 | +from openlp.core.lib import translate, build_icon |
| 1638 | from openlp.core.lib.ui import UiStrings, create_button_box |
| 1639 | |
| 1640 | + |
| 1641 | class Ui_FormattingTagDialog(object): |
| 1642 | |
| 1643 | def setupUi(self, formattingTagDialog): |
| 1644 | formattingTagDialog.setObjectName(u'formattingTagDialog') |
| 1645 | + formattingTagDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 1646 | formattingTagDialog.resize(725, 548) |
| 1647 | self.listdataGridLayout = QtGui.QGridLayout(formattingTagDialog) |
| 1648 | self.listdataGridLayout.setMargin(8) |
| 1649 | |
| 1650 | === modified file 'openlp/core/ui/formattingtagform.py' |
| 1651 | --- openlp/core/ui/formattingtagform.py 2013-08-18 06:48:55 +0000 |
| 1652 | +++ openlp/core/ui/formattingtagform.py 2014-01-18 21:32:36 +0000 |
| 1653 | @@ -4,8 +4,8 @@ |
| 1654 | ############################################################################### |
| 1655 | # OpenLP - Open Source Lyrics Projection # |
| 1656 | # --------------------------------------------------------------------------- # |
| 1657 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1658 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1659 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1660 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1661 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1662 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1663 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1664 | |
| 1665 | === modified file 'openlp/core/ui/generaltab.py' |
| 1666 | --- openlp/core/ui/generaltab.py 2013-07-11 17:49:06 +0000 |
| 1667 | +++ openlp/core/ui/generaltab.py 2014-01-18 21:32:36 +0000 |
| 1668 | @@ -4,8 +4,8 @@ |
| 1669 | ############################################################################### |
| 1670 | # OpenLP - Open Source Lyrics Projection # |
| 1671 | # --------------------------------------------------------------------------- # |
| 1672 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1673 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1674 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1675 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1676 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1677 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1678 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1679 | |
| 1680 | === modified file 'openlp/core/ui/maindisplay.py' |
| 1681 | --- openlp/core/ui/maindisplay.py 2013-09-18 06:47:33 +0000 |
| 1682 | +++ openlp/core/ui/maindisplay.py 2014-01-18 21:32:36 +0000 |
| 1683 | @@ -4,8 +4,8 @@ |
| 1684 | ############################################################################### |
| 1685 | # OpenLP - Open Source Lyrics Projection # |
| 1686 | # --------------------------------------------------------------------------- # |
| 1687 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1688 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1689 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1690 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1691 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1692 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1693 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1694 | |
| 1695 | === modified file 'openlp/core/ui/mainwindow.py' |
| 1696 | --- openlp/core/ui/mainwindow.py 2013-02-19 13:58:55 +0000 |
| 1697 | +++ openlp/core/ui/mainwindow.py 2014-01-18 21:32:36 +0000 |
| 1698 | @@ -4,8 +4,8 @@ |
| 1699 | ############################################################################### |
| 1700 | # OpenLP - Open Source Lyrics Projection # |
| 1701 | # --------------------------------------------------------------------------- # |
| 1702 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1703 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1704 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1705 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1706 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1707 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1708 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1709 | @@ -82,13 +82,14 @@ |
| 1710 | } |
| 1711 | """ |
| 1712 | |
| 1713 | + |
| 1714 | class Ui_MainWindow(object): |
| 1715 | def setupUi(self, mainWindow): |
| 1716 | """ |
| 1717 | Set up the user interface |
| 1718 | """ |
| 1719 | mainWindow.setObjectName(u'MainWindow') |
| 1720 | - mainWindow.setWindowIcon(build_icon(u':/icon/openlp-logo-64x64.png')) |
| 1721 | + mainWindow.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 1722 | mainWindow.setDockNestingEnabled(True) |
| 1723 | # Set up the main container, which contains all the other form widgets. |
| 1724 | self.mainContent = QtGui.QWidget(mainWindow) |
| 1725 | |
| 1726 | === modified file 'openlp/core/ui/media/__init__.py' |
| 1727 | --- openlp/core/ui/media/__init__.py 2012-12-30 19:41:24 +0000 |
| 1728 | +++ openlp/core/ui/media/__init__.py 2014-01-18 21:32:36 +0000 |
| 1729 | @@ -4,8 +4,8 @@ |
| 1730 | ############################################################################### |
| 1731 | # OpenLP - Open Source Lyrics Projection # |
| 1732 | # --------------------------------------------------------------------------- # |
| 1733 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1734 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1735 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1736 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1737 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1738 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1739 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1740 | |
| 1741 | === modified file 'openlp/core/ui/media/mediacontroller.py' |
| 1742 | --- openlp/core/ui/media/mediacontroller.py 2013-09-18 15:18:06 +0000 |
| 1743 | +++ openlp/core/ui/media/mediacontroller.py 2014-01-18 21:32:36 +0000 |
| 1744 | @@ -4,8 +4,8 @@ |
| 1745 | ############################################################################### |
| 1746 | # OpenLP - Open Source Lyrics Projection # |
| 1747 | # --------------------------------------------------------------------------- # |
| 1748 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1749 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1750 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1751 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1752 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1753 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1754 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1755 | |
| 1756 | === modified file 'openlp/core/ui/media/phononplayer.py' |
| 1757 | --- openlp/core/ui/media/phononplayer.py 2013-03-19 18:57:44 +0000 |
| 1758 | +++ openlp/core/ui/media/phononplayer.py 2014-01-18 21:32:36 +0000 |
| 1759 | @@ -4,8 +4,8 @@ |
| 1760 | ############################################################################### |
| 1761 | # OpenLP - Open Source Lyrics Projection # |
| 1762 | # --------------------------------------------------------------------------- # |
| 1763 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1764 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1765 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1766 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1767 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1768 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1769 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1770 | |
| 1771 | === modified file 'openlp/core/ui/media/vlcplayer.py' |
| 1772 | --- openlp/core/ui/media/vlcplayer.py 2013-08-22 09:02:18 +0000 |
| 1773 | +++ openlp/core/ui/media/vlcplayer.py 2014-01-18 21:32:36 +0000 |
| 1774 | @@ -4,8 +4,8 @@ |
| 1775 | ############################################################################### |
| 1776 | # OpenLP - Open Source Lyrics Projection # |
| 1777 | # --------------------------------------------------------------------------- # |
| 1778 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1779 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1780 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1781 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1782 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1783 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1784 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1785 | @@ -163,7 +163,7 @@ |
| 1786 | # We need to set media_info.length during load because we want |
| 1787 | # to avoid start and stop the video twice. Once for real playback |
| 1788 | # and once to just get media length. |
| 1789 | - # |
| 1790 | + # |
| 1791 | # Media plugin depends on knowing media length before playback. |
| 1792 | controller.media_info.length = \ |
| 1793 | int(display.vlcMediaPlayer.get_media().get_duration() / 1000) |
| 1794 | |
| 1795 | === modified file 'openlp/core/ui/media/webkitplayer.py' |
| 1796 | --- openlp/core/ui/media/webkitplayer.py 2013-08-22 09:02:18 +0000 |
| 1797 | +++ openlp/core/ui/media/webkitplayer.py 2014-01-18 21:32:36 +0000 |
| 1798 | @@ -4,8 +4,8 @@ |
| 1799 | ############################################################################### |
| 1800 | # OpenLP - Open Source Lyrics Projection # |
| 1801 | # --------------------------------------------------------------------------- # |
| 1802 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1803 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1804 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1805 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1806 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1807 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1808 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1809 | |
| 1810 | === modified file 'openlp/core/ui/mediadockmanager.py' |
| 1811 | --- openlp/core/ui/mediadockmanager.py 2012-12-30 19:41:24 +0000 |
| 1812 | +++ openlp/core/ui/mediadockmanager.py 2014-01-18 21:32:36 +0000 |
| 1813 | @@ -4,8 +4,8 @@ |
| 1814 | ############################################################################### |
| 1815 | # OpenLP - Open Source Lyrics Projection # |
| 1816 | # --------------------------------------------------------------------------- # |
| 1817 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1818 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1819 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1820 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1821 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1822 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1823 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1824 | |
| 1825 | === modified file 'openlp/core/ui/plugindialog.py' |
| 1826 | --- openlp/core/ui/plugindialog.py 2012-12-30 19:41:24 +0000 |
| 1827 | +++ openlp/core/ui/plugindialog.py 2014-01-18 21:32:36 +0000 |
| 1828 | @@ -4,8 +4,8 @@ |
| 1829 | ############################################################################### |
| 1830 | # OpenLP - Open Source Lyrics Projection # |
| 1831 | # --------------------------------------------------------------------------- # |
| 1832 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1833 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1834 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1835 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1836 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1837 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1838 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1839 | @@ -29,13 +29,15 @@ |
| 1840 | |
| 1841 | from PyQt4 import QtCore, QtGui |
| 1842 | |
| 1843 | -from openlp.core.lib import translate |
| 1844 | +from openlp.core.lib import translate, build_icon |
| 1845 | from openlp.core.lib.ui import UiStrings, create_button_box |
| 1846 | |
| 1847 | + |
| 1848 | class Ui_PluginViewDialog(object): |
| 1849 | def setupUi(self, pluginViewDialog): |
| 1850 | pluginViewDialog.setObjectName(u'pluginViewDialog') |
| 1851 | pluginViewDialog.setWindowModality(QtCore.Qt.ApplicationModal) |
| 1852 | + pluginViewDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 1853 | self.pluginLayout = QtGui.QVBoxLayout(pluginViewDialog) |
| 1854 | self.pluginLayout.setObjectName(u'pluginLayout') |
| 1855 | self.listLayout = QtGui.QHBoxLayout() |
| 1856 | |
| 1857 | === modified file 'openlp/core/ui/pluginform.py' |
| 1858 | --- openlp/core/ui/pluginform.py 2012-12-30 19:41:24 +0000 |
| 1859 | +++ openlp/core/ui/pluginform.py 2014-01-18 21:32:36 +0000 |
| 1860 | @@ -4,8 +4,8 @@ |
| 1861 | ############################################################################### |
| 1862 | # OpenLP - Open Source Lyrics Projection # |
| 1863 | # --------------------------------------------------------------------------- # |
| 1864 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1865 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1866 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1867 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1868 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1869 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1870 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1871 | |
| 1872 | === modified file 'openlp/core/ui/printservicedialog.py' |
| 1873 | --- openlp/core/ui/printservicedialog.py 2012-12-30 19:41:24 +0000 |
| 1874 | +++ openlp/core/ui/printservicedialog.py 2014-01-18 21:32:36 +0000 |
| 1875 | @@ -4,8 +4,8 @@ |
| 1876 | ############################################################################### |
| 1877 | # OpenLP - Open Source Lyrics Projection # |
| 1878 | # --------------------------------------------------------------------------- # |
| 1879 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1880 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1881 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1882 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1883 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1884 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1885 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1886 | @@ -32,6 +32,7 @@ |
| 1887 | from openlp.core.lib import build_icon, translate, SpellTextEdit |
| 1888 | from openlp.core.lib.ui import UiStrings |
| 1889 | |
| 1890 | + |
| 1891 | class ZoomSize(object): |
| 1892 | """ |
| 1893 | Type enumeration for Combo Box sizes |
| 1894 | @@ -48,6 +49,7 @@ |
| 1895 | def setupUi(self, printServiceDialog): |
| 1896 | printServiceDialog.setObjectName(u'printServiceDialog') |
| 1897 | printServiceDialog.resize(664, 594) |
| 1898 | + printServiceDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 1899 | self.mainLayout = QtGui.QVBoxLayout(printServiceDialog) |
| 1900 | self.mainLayout.setSpacing(0) |
| 1901 | self.mainLayout.setMargin(0) |
| 1902 | |
| 1903 | === modified file 'openlp/core/ui/printserviceform.py' |
| 1904 | --- openlp/core/ui/printserviceform.py 2012-12-30 19:41:24 +0000 |
| 1905 | +++ openlp/core/ui/printserviceform.py 2014-01-18 21:32:36 +0000 |
| 1906 | @@ -4,8 +4,8 @@ |
| 1907 | ############################################################################### |
| 1908 | # OpenLP - Open Source Lyrics Projection # |
| 1909 | # --------------------------------------------------------------------------- # |
| 1910 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1911 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1912 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1913 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1914 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1915 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1916 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1917 | |
| 1918 | === modified file 'openlp/core/ui/screen.py' |
| 1919 | --- openlp/core/ui/screen.py 2012-12-30 19:41:24 +0000 |
| 1920 | +++ openlp/core/ui/screen.py 2014-01-18 21:32:36 +0000 |
| 1921 | @@ -4,8 +4,8 @@ |
| 1922 | ############################################################################### |
| 1923 | # OpenLP - Open Source Lyrics Projection # |
| 1924 | # --------------------------------------------------------------------------- # |
| 1925 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1926 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1927 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1928 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1929 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1930 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1931 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1932 | |
| 1933 | === modified file 'openlp/core/ui/serviceitemeditdialog.py' |
| 1934 | --- openlp/core/ui/serviceitemeditdialog.py 2012-12-30 19:41:24 +0000 |
| 1935 | +++ openlp/core/ui/serviceitemeditdialog.py 2014-01-18 21:32:36 +0000 |
| 1936 | @@ -4,8 +4,8 @@ |
| 1937 | ############################################################################### |
| 1938 | # OpenLP - Open Source Lyrics Projection # |
| 1939 | # --------------------------------------------------------------------------- # |
| 1940 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1941 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1942 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1943 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1944 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1945 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1946 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1947 | @@ -29,12 +29,14 @@ |
| 1948 | |
| 1949 | from PyQt4 import QtGui |
| 1950 | |
| 1951 | -from openlp.core.lib import translate |
| 1952 | +from openlp.core.lib import translate, build_icon |
| 1953 | from openlp.core.lib.ui import create_button_box, create_button |
| 1954 | |
| 1955 | + |
| 1956 | class Ui_ServiceItemEditDialog(object): |
| 1957 | def setupUi(self, serviceItemEditDialog): |
| 1958 | serviceItemEditDialog.setObjectName(u'serviceItemEditDialog') |
| 1959 | + serviceItemEditDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 1960 | self.dialogLayout = QtGui.QGridLayout(serviceItemEditDialog) |
| 1961 | self.dialogLayout.setContentsMargins(8, 8, 8, 8) |
| 1962 | self.dialogLayout.setSpacing(8) |
| 1963 | |
| 1964 | === modified file 'openlp/core/ui/serviceitemeditform.py' |
| 1965 | --- openlp/core/ui/serviceitemeditform.py 2012-12-30 19:41:24 +0000 |
| 1966 | +++ openlp/core/ui/serviceitemeditform.py 2014-01-18 21:32:36 +0000 |
| 1967 | @@ -4,8 +4,8 @@ |
| 1968 | ############################################################################### |
| 1969 | # OpenLP - Open Source Lyrics Projection # |
| 1970 | # --------------------------------------------------------------------------- # |
| 1971 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1972 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1973 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1974 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1975 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1976 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1977 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1978 | |
| 1979 | === modified file 'openlp/core/ui/servicemanager.py' |
| 1980 | --- openlp/core/ui/servicemanager.py 2013-08-26 19:18:36 +0000 |
| 1981 | +++ openlp/core/ui/servicemanager.py 2014-01-18 21:32:36 +0000 |
| 1982 | @@ -4,8 +4,8 @@ |
| 1983 | ############################################################################### |
| 1984 | # OpenLP - Open Source Lyrics Projection # |
| 1985 | # --------------------------------------------------------------------------- # |
| 1986 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 1987 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 1988 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 1989 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 1990 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 1991 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 1992 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 1993 | |
| 1994 | === modified file 'openlp/core/ui/servicenoteform.py' |
| 1995 | --- openlp/core/ui/servicenoteform.py 2013-08-26 19:18:36 +0000 |
| 1996 | +++ openlp/core/ui/servicenoteform.py 2014-01-18 21:32:36 +0000 |
| 1997 | @@ -4,8 +4,8 @@ |
| 1998 | ############################################################################### |
| 1999 | # OpenLP - Open Source Lyrics Projection # |
| 2000 | # --------------------------------------------------------------------------- # |
| 2001 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2002 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2003 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2004 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2005 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2006 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2007 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2008 | |
| 2009 | === modified file 'openlp/core/ui/settingsdialog.py' |
| 2010 | --- openlp/core/ui/settingsdialog.py 2012-12-30 19:41:24 +0000 |
| 2011 | +++ openlp/core/ui/settingsdialog.py 2014-01-18 21:32:36 +0000 |
| 2012 | @@ -4,8 +4,8 @@ |
| 2013 | ############################################################################### |
| 2014 | # OpenLP - Open Source Lyrics Projection # |
| 2015 | # --------------------------------------------------------------------------- # |
| 2016 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2017 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2018 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2019 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2020 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2021 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2022 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2023 | @@ -32,12 +32,12 @@ |
| 2024 | from openlp.core.lib import translate, build_icon |
| 2025 | from openlp.core.lib.ui import create_button_box |
| 2026 | |
| 2027 | + |
| 2028 | class Ui_SettingsDialog(object): |
| 2029 | def setupUi(self, settingsDialog): |
| 2030 | settingsDialog.setObjectName(u'settingsDialog') |
| 2031 | settingsDialog.resize(800, 500) |
| 2032 | - settingsDialog.setWindowIcon( |
| 2033 | - build_icon(u':/system/system_settings.png')) |
| 2034 | + settingsDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 2035 | self.dialogLayout = QtGui.QGridLayout(settingsDialog) |
| 2036 | self.dialogLayout.setObjectName(u'dialogLayout') |
| 2037 | self.dialogLayout.setMargin(8) |
| 2038 | |
| 2039 | === modified file 'openlp/core/ui/settingsform.py' |
| 2040 | --- openlp/core/ui/settingsform.py 2012-12-30 19:41:24 +0000 |
| 2041 | +++ openlp/core/ui/settingsform.py 2014-01-18 21:32:36 +0000 |
| 2042 | @@ -4,8 +4,8 @@ |
| 2043 | ############################################################################### |
| 2044 | # OpenLP - Open Source Lyrics Projection # |
| 2045 | # --------------------------------------------------------------------------- # |
| 2046 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2047 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2048 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2049 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2050 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2051 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2052 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2053 | |
| 2054 | === modified file 'openlp/core/ui/shortcutlistdialog.py' |
| 2055 | --- openlp/core/ui/shortcutlistdialog.py 2012-12-30 19:41:24 +0000 |
| 2056 | +++ openlp/core/ui/shortcutlistdialog.py 2014-01-18 21:32:36 +0000 |
| 2057 | @@ -4,8 +4,8 @@ |
| 2058 | ############################################################################### |
| 2059 | # OpenLP - Open Source Lyrics Projection # |
| 2060 | # --------------------------------------------------------------------------- # |
| 2061 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2062 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2063 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2064 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2065 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2066 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2067 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2068 | @@ -32,6 +32,7 @@ |
| 2069 | from openlp.core.lib import translate, build_icon |
| 2070 | from openlp.core.lib.ui import create_button_box |
| 2071 | |
| 2072 | + |
| 2073 | class CaptureShortcutButton(QtGui.QPushButton): |
| 2074 | """ |
| 2075 | A class to encapsulate a ``QPushButton``. |
| 2076 | @@ -54,6 +55,7 @@ |
| 2077 | def setupUi(self, shortcutListDialog): |
| 2078 | shortcutListDialog.setObjectName(u'shortcutListDialog') |
| 2079 | shortcutListDialog.resize(500, 438) |
| 2080 | + shortcutListDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 2081 | self.shortcutListLayout = QtGui.QVBoxLayout(shortcutListDialog) |
| 2082 | self.shortcutListLayout.setObjectName(u'shortcutListLayout') |
| 2083 | self.descriptionLabel = QtGui.QLabel(shortcutListDialog) |
| 2084 | |
| 2085 | === modified file 'openlp/core/ui/shortcutlistform.py' |
| 2086 | --- openlp/core/ui/shortcutlistform.py 2013-12-09 12:24:21 +0000 |
| 2087 | +++ openlp/core/ui/shortcutlistform.py 2014-01-18 21:32:36 +0000 |
| 2088 | @@ -4,8 +4,8 @@ |
| 2089 | ############################################################################### |
| 2090 | # OpenLP - Open Source Lyrics Projection # |
| 2091 | # --------------------------------------------------------------------------- # |
| 2092 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2093 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2094 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2095 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2096 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2097 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2098 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2099 | |
| 2100 | === modified file 'openlp/core/ui/slidecontroller.py' |
| 2101 | --- openlp/core/ui/slidecontroller.py 2014-01-18 07:56:50 +0000 |
| 2102 | +++ openlp/core/ui/slidecontroller.py 2014-01-18 21:32:36 +0000 |
| 2103 | @@ -4,8 +4,8 @@ |
| 2104 | ############################################################################### |
| 2105 | # OpenLP - Open Source Lyrics Projection # |
| 2106 | # --------------------------------------------------------------------------- # |
| 2107 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2108 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2109 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2110 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2111 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2112 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2113 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2114 | |
| 2115 | === modified file 'openlp/core/ui/splashscreen.py' |
| 2116 | --- openlp/core/ui/splashscreen.py 2012-12-30 19:41:24 +0000 |
| 2117 | +++ openlp/core/ui/splashscreen.py 2014-01-18 21:32:36 +0000 |
| 2118 | @@ -4,8 +4,8 @@ |
| 2119 | ############################################################################### |
| 2120 | # OpenLP - Open Source Lyrics Projection # |
| 2121 | # --------------------------------------------------------------------------- # |
| 2122 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2123 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2124 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2125 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2126 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2127 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2128 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2129 | |
| 2130 | === modified file 'openlp/core/ui/starttimedialog.py' |
| 2131 | --- openlp/core/ui/starttimedialog.py 2012-12-30 19:41:24 +0000 |
| 2132 | +++ openlp/core/ui/starttimedialog.py 2014-01-18 21:32:36 +0000 |
| 2133 | @@ -4,8 +4,8 @@ |
| 2134 | ############################################################################### |
| 2135 | # OpenLP - Open Source Lyrics Projection # |
| 2136 | # --------------------------------------------------------------------------- # |
| 2137 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2138 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2139 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2140 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2141 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2142 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2143 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2144 | @@ -29,13 +29,15 @@ |
| 2145 | |
| 2146 | from PyQt4 import QtCore, QtGui |
| 2147 | |
| 2148 | -from openlp.core.lib import translate |
| 2149 | +from openlp.core.lib import translate, build_icon |
| 2150 | from openlp.core.lib.ui import UiStrings, create_button_box |
| 2151 | |
| 2152 | + |
| 2153 | class Ui_StartTimeDialog(object): |
| 2154 | def setupUi(self, StartTimeDialog): |
| 2155 | StartTimeDialog.setObjectName(u'StartTimeDialog') |
| 2156 | StartTimeDialog.resize(350, 10) |
| 2157 | + StartTimeDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 2158 | self.dialogLayout = QtGui.QGridLayout(StartTimeDialog) |
| 2159 | self.dialogLayout.setObjectName(u'dialogLayout') |
| 2160 | self.startLabel = QtGui.QLabel(StartTimeDialog) |
| 2161 | |
| 2162 | === modified file 'openlp/core/ui/starttimeform.py' |
| 2163 | --- openlp/core/ui/starttimeform.py 2012-12-30 19:41:24 +0000 |
| 2164 | +++ openlp/core/ui/starttimeform.py 2014-01-18 21:32:36 +0000 |
| 2165 | @@ -4,8 +4,8 @@ |
| 2166 | ############################################################################### |
| 2167 | # OpenLP - Open Source Lyrics Projection # |
| 2168 | # --------------------------------------------------------------------------- # |
| 2169 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2170 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2171 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2172 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2173 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2174 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2175 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2176 | |
| 2177 | === modified file 'openlp/core/ui/themeform.py' |
| 2178 | --- openlp/core/ui/themeform.py 2013-07-25 19:27:43 +0000 |
| 2179 | +++ openlp/core/ui/themeform.py 2014-01-18 21:32:36 +0000 |
| 2180 | @@ -4,8 +4,8 @@ |
| 2181 | ############################################################################### |
| 2182 | # OpenLP - Open Source Lyrics Projection # |
| 2183 | # --------------------------------------------------------------------------- # |
| 2184 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2185 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2186 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2187 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2188 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2189 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2190 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2191 | |
| 2192 | === modified file 'openlp/core/ui/themelayoutdialog.py' |
| 2193 | --- openlp/core/ui/themelayoutdialog.py 2012-12-30 19:41:24 +0000 |
| 2194 | +++ openlp/core/ui/themelayoutdialog.py 2014-01-18 21:32:36 +0000 |
| 2195 | @@ -4,8 +4,8 @@ |
| 2196 | ############################################################################### |
| 2197 | # OpenLP - Open Source Lyrics Projection # |
| 2198 | # --------------------------------------------------------------------------- # |
| 2199 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2200 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2201 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2202 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2203 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2204 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2205 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2206 | @@ -29,14 +29,14 @@ |
| 2207 | |
| 2208 | from PyQt4 import QtGui |
| 2209 | |
| 2210 | -from openlp.core.lib import translate |
| 2211 | +from openlp.core.lib import translate, build_icon |
| 2212 | from openlp.core.lib.ui import create_button_box |
| 2213 | |
| 2214 | |
| 2215 | class Ui_ThemeLayoutDialog(object): |
| 2216 | def setupUi(self, themeLayoutDialog): |
| 2217 | themeLayoutDialog.setObjectName(u'themeLayoutDialogDialog') |
| 2218 | - #themeLayoutDialog.resize(300, 200) |
| 2219 | + themeLayoutDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 2220 | self.previewLayout = QtGui.QVBoxLayout(themeLayoutDialog) |
| 2221 | self.previewLayout.setObjectName(u'previewLayout') |
| 2222 | self.previewArea = QtGui.QWidget(themeLayoutDialog) |
| 2223 | |
| 2224 | === modified file 'openlp/core/ui/themelayoutform.py' |
| 2225 | --- openlp/core/ui/themelayoutform.py 2012-12-30 19:41:24 +0000 |
| 2226 | +++ openlp/core/ui/themelayoutform.py 2014-01-18 21:32:36 +0000 |
| 2227 | @@ -4,8 +4,8 @@ |
| 2228 | ############################################################################### |
| 2229 | # OpenLP - Open Source Lyrics Projection # |
| 2230 | # --------------------------------------------------------------------------- # |
| 2231 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2232 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2233 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2234 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2235 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2236 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2237 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2238 | |
| 2239 | === modified file 'openlp/core/ui/thememanager.py' |
| 2240 | --- openlp/core/ui/thememanager.py 2013-08-11 20:16:27 +0000 |
| 2241 | +++ openlp/core/ui/thememanager.py 2014-01-18 21:32:36 +0000 |
| 2242 | @@ -4,8 +4,8 @@ |
| 2243 | ############################################################################### |
| 2244 | # OpenLP - Open Source Lyrics Projection # |
| 2245 | # --------------------------------------------------------------------------- # |
| 2246 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2247 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2248 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2249 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2250 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2251 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2252 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2253 | |
| 2254 | === modified file 'openlp/core/ui/themestab.py' |
| 2255 | --- openlp/core/ui/themestab.py 2012-12-30 19:41:24 +0000 |
| 2256 | +++ openlp/core/ui/themestab.py 2014-01-18 21:32:36 +0000 |
| 2257 | @@ -4,8 +4,8 @@ |
| 2258 | ############################################################################### |
| 2259 | # OpenLP - Open Source Lyrics Projection # |
| 2260 | # --------------------------------------------------------------------------- # |
| 2261 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2262 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2263 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2264 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2265 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2266 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2267 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2268 | |
| 2269 | === modified file 'openlp/core/ui/themewizard.py' |
| 2270 | --- openlp/core/ui/themewizard.py 2013-06-14 09:54:59 +0000 |
| 2271 | +++ openlp/core/ui/themewizard.py 2014-01-18 21:32:36 +0000 |
| 2272 | @@ -4,8 +4,8 @@ |
| 2273 | ############################################################################### |
| 2274 | # OpenLP - Open Source Lyrics Projection # |
| 2275 | # --------------------------------------------------------------------------- # |
| 2276 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2277 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2278 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2279 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2280 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2281 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2282 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2283 | @@ -35,6 +35,7 @@ |
| 2284 | from openlp.core.lib.ui import UiStrings, add_welcome_page, \ |
| 2285 | create_valign_selection_widgets |
| 2286 | |
| 2287 | + |
| 2288 | class Ui_ThemeWizard(object): |
| 2289 | def setupUi(self, themeWizard): |
| 2290 | themeWizard.setObjectName(u'OpenLP.ThemeWizard') |
| 2291 | @@ -43,6 +44,7 @@ |
| 2292 | themeWizard.setOptions(QtGui.QWizard.IndependentPages | |
| 2293 | QtGui.QWizard.NoBackButtonOnStartPage | |
| 2294 | QtGui.QWizard.HaveCustomButton1) |
| 2295 | + themeWizard.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 2296 | self.spacer = QtGui.QSpacerItem(10, 0, |
| 2297 | QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum) |
| 2298 | # Welcome Page |
| 2299 | |
| 2300 | === modified file 'openlp/core/ui/wizard.py' |
| 2301 | --- openlp/core/ui/wizard.py 2012-12-30 19:41:24 +0000 |
| 2302 | +++ openlp/core/ui/wizard.py 2014-01-18 21:32:36 +0000 |
| 2303 | @@ -4,8 +4,8 @@ |
| 2304 | ############################################################################### |
| 2305 | # OpenLP - Open Source Lyrics Projection # |
| 2306 | # --------------------------------------------------------------------------- # |
| 2307 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2308 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2309 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2310 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2311 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2312 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2313 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2314 | @@ -39,6 +39,7 @@ |
| 2315 | |
| 2316 | log = logging.getLogger(__name__) |
| 2317 | |
| 2318 | + |
| 2319 | class WizardStrings(object): |
| 2320 | """ |
| 2321 | Provide standard strings for wizards to use. |
| 2322 | @@ -103,6 +104,7 @@ |
| 2323 | """ |
| 2324 | Set up the wizard UI. |
| 2325 | """ |
| 2326 | + self.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 2327 | self.setModal(True) |
| 2328 | self.setWizardStyle(QtGui.QWizard.ModernStyle) |
| 2329 | self.setOptions(QtGui.QWizard.IndependentPages | |
| 2330 | |
| 2331 | === modified file 'openlp/core/utils/__init__.py' |
| 2332 | --- openlp/core/utils/__init__.py 2013-12-28 22:23:30 +0000 |
| 2333 | +++ openlp/core/utils/__init__.py 2014-01-18 21:32:36 +0000 |
| 2334 | @@ -4,8 +4,8 @@ |
| 2335 | ############################################################################### |
| 2336 | # OpenLP - Open Source Lyrics Projection # |
| 2337 | # --------------------------------------------------------------------------- # |
| 2338 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2339 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2340 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2341 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2342 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2343 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2344 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2345 | |
| 2346 | === modified file 'openlp/core/utils/actions.py' |
| 2347 | --- openlp/core/utils/actions.py 2012-12-30 19:41:24 +0000 |
| 2348 | +++ openlp/core/utils/actions.py 2014-01-18 21:32:36 +0000 |
| 2349 | @@ -4,8 +4,8 @@ |
| 2350 | ############################################################################### |
| 2351 | # OpenLP - Open Source Lyrics Projection # |
| 2352 | # --------------------------------------------------------------------------- # |
| 2353 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2354 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2355 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2356 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2357 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2358 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2359 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2360 | |
| 2361 | === modified file 'openlp/core/utils/languagemanager.py' |
| 2362 | --- openlp/core/utils/languagemanager.py 2012-12-30 19:41:24 +0000 |
| 2363 | +++ openlp/core/utils/languagemanager.py 2014-01-18 21:32:36 +0000 |
| 2364 | @@ -4,8 +4,8 @@ |
| 2365 | ############################################################################### |
| 2366 | # OpenLP - Open Source Lyrics Projection # |
| 2367 | # --------------------------------------------------------------------------- # |
| 2368 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2369 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2370 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2371 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2372 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2373 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2374 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2375 | |
| 2376 | === modified file 'openlp/plugins/__init__.py' |
| 2377 | --- openlp/plugins/__init__.py 2012-12-30 19:41:24 +0000 |
| 2378 | +++ openlp/plugins/__init__.py 2014-01-18 21:32:36 +0000 |
| 2379 | @@ -4,8 +4,8 @@ |
| 2380 | ############################################################################### |
| 2381 | # OpenLP - Open Source Lyrics Projection # |
| 2382 | # --------------------------------------------------------------------------- # |
| 2383 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2384 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2385 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2386 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2387 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2388 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2389 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2390 | |
| 2391 | === modified file 'openlp/plugins/alerts/__init__.py' |
| 2392 | --- openlp/plugins/alerts/__init__.py 2012-12-30 19:41:24 +0000 |
| 2393 | +++ openlp/plugins/alerts/__init__.py 2014-01-18 21:32:36 +0000 |
| 2394 | @@ -4,8 +4,8 @@ |
| 2395 | ############################################################################### |
| 2396 | # OpenLP - Open Source Lyrics Projection # |
| 2397 | # --------------------------------------------------------------------------- # |
| 2398 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2399 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2400 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2401 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2402 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2403 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2404 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2405 | |
| 2406 | === modified file 'openlp/plugins/alerts/alertsplugin.py' |
| 2407 | --- openlp/plugins/alerts/alertsplugin.py 2012-12-30 19:41:24 +0000 |
| 2408 | +++ openlp/plugins/alerts/alertsplugin.py 2014-01-18 21:32:36 +0000 |
| 2409 | @@ -4,8 +4,8 @@ |
| 2410 | ############################################################################### |
| 2411 | # OpenLP - Open Source Lyrics Projection # |
| 2412 | # --------------------------------------------------------------------------- # |
| 2413 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2414 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2415 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2416 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2417 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2418 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2419 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2420 | |
| 2421 | === modified file 'openlp/plugins/alerts/forms/__init__.py' |
| 2422 | --- openlp/plugins/alerts/forms/__init__.py 2012-12-30 19:41:24 +0000 |
| 2423 | +++ openlp/plugins/alerts/forms/__init__.py 2014-01-18 21:32:36 +0000 |
| 2424 | @@ -4,8 +4,8 @@ |
| 2425 | ############################################################################### |
| 2426 | # OpenLP - Open Source Lyrics Projection # |
| 2427 | # --------------------------------------------------------------------------- # |
| 2428 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2429 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2430 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2431 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2432 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2433 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2434 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2435 | |
| 2436 | === modified file 'openlp/plugins/alerts/forms/alertdialog.py' |
| 2437 | --- openlp/plugins/alerts/forms/alertdialog.py 2012-12-30 19:41:24 +0000 |
| 2438 | +++ openlp/plugins/alerts/forms/alertdialog.py 2014-01-18 21:32:36 +0000 |
| 2439 | @@ -4,8 +4,8 @@ |
| 2440 | ############################################################################### |
| 2441 | # OpenLP - Open Source Lyrics Projection # |
| 2442 | # --------------------------------------------------------------------------- # |
| 2443 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2444 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2445 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2446 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2447 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2448 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2449 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2450 | @@ -36,7 +36,7 @@ |
| 2451 | def setupUi(self, alertDialog): |
| 2452 | alertDialog.setObjectName(u'alertDialog') |
| 2453 | alertDialog.resize(400, 300) |
| 2454 | - alertDialog.setWindowIcon(build_icon(u':/icon/openlp-logo-16x16.png')) |
| 2455 | + alertDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 2456 | self.alertDialogLayout = QtGui.QGridLayout(alertDialog) |
| 2457 | self.alertDialogLayout.setObjectName(u'alertDialogLayout') |
| 2458 | self.alertTextLayout = QtGui.QFormLayout() |
| 2459 | |
| 2460 | === modified file 'openlp/plugins/alerts/forms/alertform.py' |
| 2461 | --- openlp/plugins/alerts/forms/alertform.py 2012-12-30 19:41:24 +0000 |
| 2462 | +++ openlp/plugins/alerts/forms/alertform.py 2014-01-18 21:32:36 +0000 |
| 2463 | @@ -4,8 +4,8 @@ |
| 2464 | ############################################################################### |
| 2465 | # OpenLP - Open Source Lyrics Projection # |
| 2466 | # --------------------------------------------------------------------------- # |
| 2467 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2468 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2469 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2470 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2471 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2472 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2473 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2474 | |
| 2475 | === modified file 'openlp/plugins/alerts/lib/__init__.py' |
| 2476 | --- openlp/plugins/alerts/lib/__init__.py 2012-12-30 19:41:24 +0000 |
| 2477 | +++ openlp/plugins/alerts/lib/__init__.py 2014-01-18 21:32:36 +0000 |
| 2478 | @@ -4,8 +4,8 @@ |
| 2479 | ############################################################################### |
| 2480 | # OpenLP - Open Source Lyrics Projection # |
| 2481 | # --------------------------------------------------------------------------- # |
| 2482 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2483 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2484 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2485 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2486 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2487 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2488 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2489 | |
| 2490 | === modified file 'openlp/plugins/alerts/lib/alertsmanager.py' |
| 2491 | --- openlp/plugins/alerts/lib/alertsmanager.py 2012-12-30 19:41:24 +0000 |
| 2492 | +++ openlp/plugins/alerts/lib/alertsmanager.py 2014-01-18 21:32:36 +0000 |
| 2493 | @@ -4,8 +4,8 @@ |
| 2494 | ############################################################################### |
| 2495 | # OpenLP - Open Source Lyrics Projection # |
| 2496 | # --------------------------------------------------------------------------- # |
| 2497 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2498 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2499 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2500 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2501 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2502 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2503 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2504 | |
| 2505 | === modified file 'openlp/plugins/alerts/lib/alertstab.py' |
| 2506 | --- openlp/plugins/alerts/lib/alertstab.py 2012-12-30 19:41:24 +0000 |
| 2507 | +++ openlp/plugins/alerts/lib/alertstab.py 2014-01-18 21:32:36 +0000 |
| 2508 | @@ -4,8 +4,8 @@ |
| 2509 | ############################################################################### |
| 2510 | # OpenLP - Open Source Lyrics Projection # |
| 2511 | # --------------------------------------------------------------------------- # |
| 2512 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2513 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2514 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2515 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2516 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2517 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2518 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2519 | |
| 2520 | === modified file 'openlp/plugins/alerts/lib/db.py' |
| 2521 | --- openlp/plugins/alerts/lib/db.py 2012-12-30 19:41:24 +0000 |
| 2522 | +++ openlp/plugins/alerts/lib/db.py 2014-01-18 21:32:36 +0000 |
| 2523 | @@ -4,8 +4,8 @@ |
| 2524 | ############################################################################### |
| 2525 | # OpenLP - Open Source Lyrics Projection # |
| 2526 | # --------------------------------------------------------------------------- # |
| 2527 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2528 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2529 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2530 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2531 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2532 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2533 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2534 | |
| 2535 | === modified file 'openlp/plugins/bibles/__init__.py' |
| 2536 | --- openlp/plugins/bibles/__init__.py 2012-12-30 19:41:24 +0000 |
| 2537 | +++ openlp/plugins/bibles/__init__.py 2014-01-18 21:32:36 +0000 |
| 2538 | @@ -4,8 +4,8 @@ |
| 2539 | ############################################################################### |
| 2540 | # OpenLP - Open Source Lyrics Projection # |
| 2541 | # --------------------------------------------------------------------------- # |
| 2542 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2543 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2544 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2545 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2546 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2547 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2548 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2549 | |
| 2550 | === modified file 'openlp/plugins/bibles/bibleplugin.py' |
| 2551 | --- openlp/plugins/bibles/bibleplugin.py 2012-12-30 19:41:24 +0000 |
| 2552 | +++ openlp/plugins/bibles/bibleplugin.py 2014-01-18 21:32:36 +0000 |
| 2553 | @@ -4,8 +4,8 @@ |
| 2554 | ############################################################################### |
| 2555 | # OpenLP - Open Source Lyrics Projection # |
| 2556 | # --------------------------------------------------------------------------- # |
| 2557 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2558 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2559 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2560 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2561 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2562 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2563 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2564 | |
| 2565 | === modified file 'openlp/plugins/bibles/forms/__init__.py' |
| 2566 | --- openlp/plugins/bibles/forms/__init__.py 2012-12-30 19:41:24 +0000 |
| 2567 | +++ openlp/plugins/bibles/forms/__init__.py 2014-01-18 21:32:36 +0000 |
| 2568 | @@ -4,8 +4,8 @@ |
| 2569 | ############################################################################### |
| 2570 | # OpenLP - Open Source Lyrics Projection # |
| 2571 | # --------------------------------------------------------------------------- # |
| 2572 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2573 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2574 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2575 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2576 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2577 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2578 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2579 | |
| 2580 | === modified file 'openlp/plugins/bibles/forms/bibleimportform.py' |
| 2581 | --- openlp/plugins/bibles/forms/bibleimportform.py 2012-12-30 19:41:24 +0000 |
| 2582 | +++ openlp/plugins/bibles/forms/bibleimportform.py 2014-01-18 21:32:36 +0000 |
| 2583 | @@ -4,8 +4,8 @@ |
| 2584 | ############################################################################### |
| 2585 | # OpenLP - Open Source Lyrics Projection # |
| 2586 | # --------------------------------------------------------------------------- # |
| 2587 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2588 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2589 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2590 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2591 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2592 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2593 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2594 | @@ -45,6 +45,7 @@ |
| 2595 | |
| 2596 | log = logging.getLogger(__name__) |
| 2597 | |
| 2598 | + |
| 2599 | class WebDownload(object): |
| 2600 | """ |
| 2601 | Provides an enumeration for the web bible types available to OpenLP. |
| 2602 | |
| 2603 | === modified file 'openlp/plugins/bibles/forms/bibleupgradeform.py' |
| 2604 | --- openlp/plugins/bibles/forms/bibleupgradeform.py 2012-12-30 19:41:24 +0000 |
| 2605 | +++ openlp/plugins/bibles/forms/bibleupgradeform.py 2014-01-18 21:32:36 +0000 |
| 2606 | @@ -4,8 +4,8 @@ |
| 2607 | ############################################################################### |
| 2608 | # OpenLP - Open Source Lyrics Projection # |
| 2609 | # --------------------------------------------------------------------------- # |
| 2610 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2611 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2612 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2613 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2614 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2615 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2616 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2617 | |
| 2618 | === modified file 'openlp/plugins/bibles/forms/booknamedialog.py' |
| 2619 | --- openlp/plugins/bibles/forms/booknamedialog.py 2012-12-30 19:41:24 +0000 |
| 2620 | +++ openlp/plugins/bibles/forms/booknamedialog.py 2014-01-18 21:32:36 +0000 |
| 2621 | @@ -4,8 +4,8 @@ |
| 2622 | ############################################################################### |
| 2623 | # OpenLP - Open Source Lyrics Projection # |
| 2624 | # --------------------------------------------------------------------------- # |
| 2625 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2626 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2627 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2628 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2629 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2630 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2631 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2632 | @@ -29,13 +29,15 @@ |
| 2633 | |
| 2634 | from PyQt4 import QtCore, QtGui |
| 2635 | |
| 2636 | -from openlp.core.lib import translate |
| 2637 | +from openlp.core.lib import translate, build_icon |
| 2638 | from openlp.core.lib.ui import create_button_box |
| 2639 | |
| 2640 | + |
| 2641 | class Ui_BookNameDialog(object): |
| 2642 | def setupUi(self, bookNameDialog): |
| 2643 | bookNameDialog.setObjectName(u'bookNameDialog') |
| 2644 | bookNameDialog.resize(400, 271) |
| 2645 | + bookNameDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 2646 | self.bookNameLayout = QtGui.QVBoxLayout(bookNameDialog) |
| 2647 | self.bookNameLayout.setSpacing(8) |
| 2648 | self.bookNameLayout.setMargin(8) |
| 2649 | |
| 2650 | === modified file 'openlp/plugins/bibles/forms/booknameform.py' |
| 2651 | --- openlp/plugins/bibles/forms/booknameform.py 2012-12-30 19:41:24 +0000 |
| 2652 | +++ openlp/plugins/bibles/forms/booknameform.py 2014-01-18 21:32:36 +0000 |
| 2653 | @@ -4,8 +4,8 @@ |
| 2654 | ############################################################################### |
| 2655 | # OpenLP - Open Source Lyrics Projection # |
| 2656 | # --------------------------------------------------------------------------- # |
| 2657 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2658 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2659 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2660 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2661 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2662 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2663 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2664 | |
| 2665 | === modified file 'openlp/plugins/bibles/forms/editbibledialog.py' |
| 2666 | --- openlp/plugins/bibles/forms/editbibledialog.py 2012-12-30 19:41:24 +0000 |
| 2667 | +++ openlp/plugins/bibles/forms/editbibledialog.py 2014-01-18 21:32:36 +0000 |
| 2668 | @@ -4,8 +4,8 @@ |
| 2669 | ############################################################################### |
| 2670 | # OpenLP - Open Source Lyrics Projection # |
| 2671 | # --------------------------------------------------------------------------- # |
| 2672 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2673 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2674 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2675 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2676 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2677 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2678 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2679 | @@ -39,8 +39,7 @@ |
| 2680 | def setupUi(self, editBibleDialog): |
| 2681 | editBibleDialog.setObjectName(u'editBibleDialog') |
| 2682 | editBibleDialog.resize(520, 400) |
| 2683 | - editBibleDialog.setWindowIcon( |
| 2684 | - build_icon(u':/icon/openlp-logo-16x16.png')) |
| 2685 | + editBibleDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 2686 | editBibleDialog.setModal(True) |
| 2687 | self.dialogLayout = QtGui.QVBoxLayout(editBibleDialog) |
| 2688 | self.dialogLayout.setSpacing(8) |
| 2689 | @@ -128,7 +127,7 @@ |
| 2690 | self.bookNameEdit[book[u'abbreviation']].setObjectName( |
| 2691 | u'bookNameEdit[%s]' % book[u'abbreviation']) |
| 2692 | self.bookNameWidgetLayout.addRow( |
| 2693 | - self.bookNameLabel[book[u'abbreviation']], |
| 2694 | + self.bookNameLabel[book[u'abbreviation']], |
| 2695 | self.bookNameEdit[book[u'abbreviation']]) |
| 2696 | self.scrollArea.setWidget(self.bookNameWidget) |
| 2697 | self.bookNameTabLayout.addWidget(self.scrollArea) |
| 2698 | |
| 2699 | === modified file 'openlp/plugins/bibles/forms/editbibleform.py' |
| 2700 | --- openlp/plugins/bibles/forms/editbibleform.py 2012-12-30 19:41:24 +0000 |
| 2701 | +++ openlp/plugins/bibles/forms/editbibleform.py 2014-01-18 21:32:36 +0000 |
| 2702 | @@ -4,8 +4,8 @@ |
| 2703 | ############################################################################### |
| 2704 | # OpenLP - Open Source Lyrics Projection # |
| 2705 | # --------------------------------------------------------------------------- # |
| 2706 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2707 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2708 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2709 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2710 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2711 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2712 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2713 | |
| 2714 | === modified file 'openlp/plugins/bibles/forms/languagedialog.py' |
| 2715 | --- openlp/plugins/bibles/forms/languagedialog.py 2012-12-30 19:41:24 +0000 |
| 2716 | +++ openlp/plugins/bibles/forms/languagedialog.py 2014-01-18 21:32:36 +0000 |
| 2717 | @@ -4,8 +4,8 @@ |
| 2718 | ############################################################################### |
| 2719 | # OpenLP - Open Source Lyrics Projection # |
| 2720 | # --------------------------------------------------------------------------- # |
| 2721 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2722 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2723 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2724 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2725 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2726 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2727 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2728 | @@ -29,13 +29,15 @@ |
| 2729 | |
| 2730 | from PyQt4 import QtGui |
| 2731 | |
| 2732 | -from openlp.core.lib import translate |
| 2733 | +from openlp.core.lib import translate, build_icon |
| 2734 | from openlp.core.lib.ui import create_button_box |
| 2735 | |
| 2736 | + |
| 2737 | class Ui_LanguageDialog(object): |
| 2738 | def setupUi(self, languageDialog): |
| 2739 | languageDialog.setObjectName(u'languageDialog') |
| 2740 | languageDialog.resize(400, 165) |
| 2741 | + languageDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 2742 | self.languageLayout = QtGui.QVBoxLayout(languageDialog) |
| 2743 | self.languageLayout.setSpacing(8) |
| 2744 | self.languageLayout.setMargin(8) |
| 2745 | |
| 2746 | === modified file 'openlp/plugins/bibles/forms/languageform.py' |
| 2747 | --- openlp/plugins/bibles/forms/languageform.py 2012-12-30 19:41:24 +0000 |
| 2748 | +++ openlp/plugins/bibles/forms/languageform.py 2014-01-18 21:32:36 +0000 |
| 2749 | @@ -4,8 +4,8 @@ |
| 2750 | ############################################################################### |
| 2751 | # OpenLP - Open Source Lyrics Projection # |
| 2752 | # --------------------------------------------------------------------------- # |
| 2753 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2754 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2755 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2756 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2757 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2758 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2759 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2760 | |
| 2761 | === modified file 'openlp/plugins/bibles/lib/__init__.py' |
| 2762 | --- openlp/plugins/bibles/lib/__init__.py 2012-12-30 19:41:24 +0000 |
| 2763 | +++ openlp/plugins/bibles/lib/__init__.py 2014-01-18 21:32:36 +0000 |
| 2764 | @@ -4,8 +4,8 @@ |
| 2765 | ############################################################################### |
| 2766 | # OpenLP - Open Source Lyrics Projection # |
| 2767 | # --------------------------------------------------------------------------- # |
| 2768 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2769 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2770 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2771 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2772 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2773 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2774 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2775 | |
| 2776 | === modified file 'openlp/plugins/bibles/lib/biblestab.py' |
| 2777 | --- openlp/plugins/bibles/lib/biblestab.py 2014-01-01 16:02:12 +0000 |
| 2778 | +++ openlp/plugins/bibles/lib/biblestab.py 2014-01-18 21:32:36 +0000 |
| 2779 | @@ -4,8 +4,8 @@ |
| 2780 | ############################################################################### |
| 2781 | # OpenLP - Open Source Lyrics Projection # |
| 2782 | # --------------------------------------------------------------------------- # |
| 2783 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2784 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2785 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2786 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2787 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2788 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2789 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2790 | |
| 2791 | === modified file 'openlp/plugins/bibles/lib/csvbible.py' |
| 2792 | --- openlp/plugins/bibles/lib/csvbible.py 2012-12-30 19:41:24 +0000 |
| 2793 | +++ openlp/plugins/bibles/lib/csvbible.py 2014-01-18 21:32:36 +0000 |
| 2794 | @@ -4,8 +4,8 @@ |
| 2795 | ############################################################################### |
| 2796 | # OpenLP - Open Source Lyrics Projection # |
| 2797 | # --------------------------------------------------------------------------- # |
| 2798 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2799 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2800 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2801 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2802 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2803 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2804 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2805 | |
| 2806 | === modified file 'openlp/plugins/bibles/lib/db.py' |
| 2807 | --- openlp/plugins/bibles/lib/db.py 2013-12-29 21:55:54 +0000 |
| 2808 | +++ openlp/plugins/bibles/lib/db.py 2014-01-18 21:32:36 +0000 |
| 2809 | @@ -4,8 +4,8 @@ |
| 2810 | ############################################################################### |
| 2811 | # OpenLP - Open Source Lyrics Projection # |
| 2812 | # --------------------------------------------------------------------------- # |
| 2813 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2814 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2815 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2816 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2817 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2818 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2819 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2820 | |
| 2821 | === modified file 'openlp/plugins/bibles/lib/http.py' |
| 2822 | --- openlp/plugins/bibles/lib/http.py 2013-08-20 19:56:17 +0000 |
| 2823 | +++ openlp/plugins/bibles/lib/http.py 2014-01-18 21:32:36 +0000 |
| 2824 | @@ -4,8 +4,8 @@ |
| 2825 | ############################################################################### |
| 2826 | # OpenLP - Open Source Lyrics Projection # |
| 2827 | # --------------------------------------------------------------------------- # |
| 2828 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2829 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2830 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2831 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2832 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2833 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2834 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2835 | |
| 2836 | === modified file 'openlp/plugins/bibles/lib/manager.py' |
| 2837 | --- openlp/plugins/bibles/lib/manager.py 2012-12-30 19:41:24 +0000 |
| 2838 | +++ openlp/plugins/bibles/lib/manager.py 2014-01-18 21:32:36 +0000 |
| 2839 | @@ -4,8 +4,8 @@ |
| 2840 | ############################################################################### |
| 2841 | # OpenLP - Open Source Lyrics Projection # |
| 2842 | # --------------------------------------------------------------------------- # |
| 2843 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2844 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2845 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2846 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2847 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2848 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2849 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2850 | @@ -436,7 +436,7 @@ |
| 2851 | }) |
| 2852 | return None |
| 2853 | |
| 2854 | - def save_meta_data(self, bible, version, copyright, permissions, |
| 2855 | + def save_meta_data(self, bible, version, copyright, permissions, |
| 2856 | book_name_language=None): |
| 2857 | """ |
| 2858 | Saves the bibles meta data. |
| 2859 | @@ -455,7 +455,7 @@ |
| 2860 | """ |
| 2861 | log.debug(u'get_meta %s,%s', bible, key) |
| 2862 | return self.db_cache[bible].get_object(BibleMeta, key) |
| 2863 | - |
| 2864 | + |
| 2865 | def update_book(self, bible, book): |
| 2866 | """ |
| 2867 | Update a book of the bible. |
| 2868 | |
| 2869 | === modified file 'openlp/plugins/bibles/lib/mediaitem.py' |
| 2870 | --- openlp/plugins/bibles/lib/mediaitem.py 2014-01-01 16:02:12 +0000 |
| 2871 | +++ openlp/plugins/bibles/lib/mediaitem.py 2014-01-18 21:32:36 +0000 |
| 2872 | @@ -4,8 +4,8 @@ |
| 2873 | ############################################################################### |
| 2874 | # OpenLP - Open Source Lyrics Projection # |
| 2875 | # --------------------------------------------------------------------------- # |
| 2876 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2877 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2878 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2879 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2880 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2881 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2882 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2883 | |
| 2884 | === modified file 'openlp/plugins/bibles/lib/openlp1.py' |
| 2885 | --- openlp/plugins/bibles/lib/openlp1.py 2012-12-30 19:41:24 +0000 |
| 2886 | +++ openlp/plugins/bibles/lib/openlp1.py 2014-01-18 21:32:36 +0000 |
| 2887 | @@ -4,8 +4,8 @@ |
| 2888 | ############################################################################### |
| 2889 | # OpenLP - Open Source Lyrics Projection # |
| 2890 | # --------------------------------------------------------------------------- # |
| 2891 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2892 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2893 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2894 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2895 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2896 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2897 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2898 | |
| 2899 | === modified file 'openlp/plugins/bibles/lib/opensong.py' |
| 2900 | --- openlp/plugins/bibles/lib/opensong.py 2012-12-30 19:41:24 +0000 |
| 2901 | +++ openlp/plugins/bibles/lib/opensong.py 2014-01-18 21:32:36 +0000 |
| 2902 | @@ -4,8 +4,8 @@ |
| 2903 | ############################################################################### |
| 2904 | # OpenLP - Open Source Lyrics Projection # |
| 2905 | # --------------------------------------------------------------------------- # |
| 2906 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2907 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2908 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2909 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2910 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2911 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2912 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2913 | @@ -63,7 +63,7 @@ |
| 2914 | verse_text += self.get_text(sub_element) |
| 2915 | if element.tail: |
| 2916 | verse_text += element.tail |
| 2917 | - return verse_text |
| 2918 | + return verse_text |
| 2919 | |
| 2920 | def do_import(self, bible_name=None): |
| 2921 | """ |
| 2922 | |
| 2923 | === modified file 'openlp/plugins/bibles/lib/osis.py' |
| 2924 | --- openlp/plugins/bibles/lib/osis.py 2013-08-21 20:14:11 +0000 |
| 2925 | +++ openlp/plugins/bibles/lib/osis.py 2014-01-18 21:32:36 +0000 |
| 2926 | @@ -4,8 +4,8 @@ |
| 2927 | ############################################################################### |
| 2928 | # OpenLP - Open Source Lyrics Projection # |
| 2929 | # --------------------------------------------------------------------------- # |
| 2930 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2931 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2932 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2933 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2934 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2935 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2936 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2937 | @@ -103,7 +103,7 @@ |
| 2938 | osis = codecs.open(self.filename, u'r', details['encoding']) |
| 2939 | repl = replacement |
| 2940 | language_id = False |
| 2941 | - # Decide if the bible propably contains only NT or AT and NT or |
| 2942 | + # Decide if the bible propably contains only NT or AT and NT or |
| 2943 | # AT, NT and Apocrypha |
| 2944 | if lines_in_file < 11500: |
| 2945 | book_count = 27 |
| 2946 | |
| 2947 | === modified file 'openlp/plugins/bibles/lib/upgrade.py' |
| 2948 | --- openlp/plugins/bibles/lib/upgrade.py 2012-12-30 19:41:24 +0000 |
| 2949 | +++ openlp/plugins/bibles/lib/upgrade.py 2014-01-18 21:32:36 +0000 |
| 2950 | @@ -4,8 +4,8 @@ |
| 2951 | ############################################################################### |
| 2952 | # OpenLP - Open Source Lyrics Projection # |
| 2953 | # --------------------------------------------------------------------------- # |
| 2954 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2955 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2956 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2957 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2958 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2959 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2960 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2961 | |
| 2962 | === modified file 'openlp/plugins/bibles/lib/versereferencelist.py' |
| 2963 | --- openlp/plugins/bibles/lib/versereferencelist.py 2012-12-30 19:41:24 +0000 |
| 2964 | +++ openlp/plugins/bibles/lib/versereferencelist.py 2014-01-18 21:32:36 +0000 |
| 2965 | @@ -4,8 +4,8 @@ |
| 2966 | ############################################################################### |
| 2967 | # OpenLP - Open Source Lyrics Projection # |
| 2968 | # --------------------------------------------------------------------------- # |
| 2969 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2970 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2971 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2972 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2973 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2974 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2975 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2976 | |
| 2977 | === modified file 'openlp/plugins/custom/__init__.py' |
| 2978 | --- openlp/plugins/custom/__init__.py 2012-12-30 19:41:24 +0000 |
| 2979 | +++ openlp/plugins/custom/__init__.py 2014-01-18 21:32:36 +0000 |
| 2980 | @@ -4,8 +4,8 @@ |
| 2981 | ############################################################################### |
| 2982 | # OpenLP - Open Source Lyrics Projection # |
| 2983 | # --------------------------------------------------------------------------- # |
| 2984 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 2985 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 2986 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 2987 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 2988 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 2989 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 2990 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 2991 | |
| 2992 | === modified file 'openlp/plugins/custom/customplugin.py' |
| 2993 | --- openlp/plugins/custom/customplugin.py 2012-12-30 19:41:24 +0000 |
| 2994 | +++ openlp/plugins/custom/customplugin.py 2014-01-18 21:32:36 +0000 |
| 2995 | @@ -4,8 +4,8 @@ |
| 2996 | ############################################################################### |
| 2997 | # OpenLP - Open Source Lyrics Projection # |
| 2998 | # --------------------------------------------------------------------------- # |
| 2999 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3000 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3001 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3002 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3003 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3004 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3005 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3006 | |
| 3007 | === modified file 'openlp/plugins/custom/forms/__init__.py' |
| 3008 | --- openlp/plugins/custom/forms/__init__.py 2012-12-30 19:41:24 +0000 |
| 3009 | +++ openlp/plugins/custom/forms/__init__.py 2014-01-18 21:32:36 +0000 |
| 3010 | @@ -4,8 +4,8 @@ |
| 3011 | ############################################################################### |
| 3012 | # OpenLP - Open Source Lyrics Projection # |
| 3013 | # --------------------------------------------------------------------------- # |
| 3014 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3015 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3016 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3017 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3018 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3019 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3020 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3021 | |
| 3022 | === modified file 'openlp/plugins/custom/forms/editcustomdialog.py' |
| 3023 | --- openlp/plugins/custom/forms/editcustomdialog.py 2012-12-30 19:41:40 +0000 |
| 3024 | +++ openlp/plugins/custom/forms/editcustomdialog.py 2014-01-18 21:32:36 +0000 |
| 3025 | @@ -4,8 +4,8 @@ |
| 3026 | ############################################################################### |
| 3027 | # OpenLP - Open Source Lyrics Projection # |
| 3028 | # --------------------------------------------------------------------------- # |
| 3029 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3030 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3031 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3032 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3033 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3034 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3035 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3036 | @@ -32,12 +32,12 @@ |
| 3037 | from openlp.core.lib import build_icon, translate |
| 3038 | from openlp.core.lib.ui import UiStrings, create_button_box, create_button |
| 3039 | |
| 3040 | + |
| 3041 | class Ui_CustomEditDialog(object): |
| 3042 | def setupUi(self, customEditDialog): |
| 3043 | customEditDialog.setObjectName(u'customEditDialog') |
| 3044 | customEditDialog.resize(450, 350) |
| 3045 | - customEditDialog.setWindowIcon( |
| 3046 | - build_icon(u':/icon/openlp-logo-16x16.png')) |
| 3047 | + customEditDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 3048 | self.dialogLayout = QtGui.QVBoxLayout(customEditDialog) |
| 3049 | self.dialogLayout.setObjectName(u'dialogLayout') |
| 3050 | self.titleLayout = QtGui.QHBoxLayout() |
| 3051 | |
| 3052 | === modified file 'openlp/plugins/custom/forms/editcustomform.py' |
| 3053 | --- openlp/plugins/custom/forms/editcustomform.py 2012-12-30 19:41:24 +0000 |
| 3054 | +++ openlp/plugins/custom/forms/editcustomform.py 2014-01-18 21:32:36 +0000 |
| 3055 | @@ -4,8 +4,8 @@ |
| 3056 | ############################################################################### |
| 3057 | # OpenLP - Open Source Lyrics Projection # |
| 3058 | # --------------------------------------------------------------------------- # |
| 3059 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3060 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3061 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3062 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3063 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3064 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3065 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3066 | |
| 3067 | === modified file 'openlp/plugins/custom/forms/editcustomslidedialog.py' |
| 3068 | --- openlp/plugins/custom/forms/editcustomslidedialog.py 2012-12-30 19:41:24 +0000 |
| 3069 | +++ openlp/plugins/custom/forms/editcustomslidedialog.py 2014-01-18 21:32:36 +0000 |
| 3070 | @@ -4,8 +4,8 @@ |
| 3071 | ############################################################################### |
| 3072 | # OpenLP - Open Source Lyrics Projection # |
| 3073 | # --------------------------------------------------------------------------- # |
| 3074 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3075 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3076 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3077 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3078 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3079 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3080 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3081 | @@ -32,10 +32,12 @@ |
| 3082 | from openlp.core.lib import translate, SpellTextEdit, build_icon |
| 3083 | from openlp.core.lib.ui import UiStrings, create_button, create_button_box |
| 3084 | |
| 3085 | + |
| 3086 | class Ui_CustomSlideEditDialog(object): |
| 3087 | def setupUi(self, customSlideEditDialog): |
| 3088 | customSlideEditDialog.setObjectName(u'customSlideEditDialog') |
| 3089 | customSlideEditDialog.resize(350, 300) |
| 3090 | + customSlideEditDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 3091 | self.dialogLayout = QtGui.QVBoxLayout(customSlideEditDialog) |
| 3092 | self.slideTextEdit = SpellTextEdit(self) |
| 3093 | self.slideTextEdit.setObjectName(u'slideTextEdit') |
| 3094 | |
| 3095 | === modified file 'openlp/plugins/custom/forms/editcustomslideform.py' |
| 3096 | --- openlp/plugins/custom/forms/editcustomslideform.py 2012-12-30 19:41:24 +0000 |
| 3097 | +++ openlp/plugins/custom/forms/editcustomslideform.py 2014-01-18 21:32:36 +0000 |
| 3098 | @@ -4,8 +4,8 @@ |
| 3099 | ############################################################################### |
| 3100 | # OpenLP - Open Source Lyrics Projection # |
| 3101 | # --------------------------------------------------------------------------- # |
| 3102 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3103 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3104 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3105 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3106 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3107 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3108 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3109 | |
| 3110 | === modified file 'openlp/plugins/custom/lib/__init__.py' |
| 3111 | --- openlp/plugins/custom/lib/__init__.py 2012-12-30 19:41:24 +0000 |
| 3112 | +++ openlp/plugins/custom/lib/__init__.py 2014-01-18 21:32:36 +0000 |
| 3113 | @@ -4,8 +4,8 @@ |
| 3114 | ############################################################################### |
| 3115 | # OpenLP - Open Source Lyrics Projection # |
| 3116 | # --------------------------------------------------------------------------- # |
| 3117 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3118 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3119 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3120 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3121 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3122 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3123 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3124 | |
| 3125 | === modified file 'openlp/plugins/custom/lib/customtab.py' |
| 3126 | --- openlp/plugins/custom/lib/customtab.py 2012-12-30 19:41:24 +0000 |
| 3127 | +++ openlp/plugins/custom/lib/customtab.py 2014-01-18 21:32:36 +0000 |
| 3128 | @@ -4,8 +4,8 @@ |
| 3129 | ############################################################################### |
| 3130 | # OpenLP - Open Source Lyrics Projection # |
| 3131 | # --------------------------------------------------------------------------- # |
| 3132 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3133 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3134 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3135 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3136 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3137 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3138 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3139 | |
| 3140 | === modified file 'openlp/plugins/custom/lib/customxmlhandler.py' |
| 3141 | --- openlp/plugins/custom/lib/customxmlhandler.py 2012-12-30 19:41:24 +0000 |
| 3142 | +++ openlp/plugins/custom/lib/customxmlhandler.py 2014-01-18 21:32:36 +0000 |
| 3143 | @@ -4,8 +4,8 @@ |
| 3144 | ############################################################################### |
| 3145 | # OpenLP - Open Source Lyrics Projection # |
| 3146 | # --------------------------------------------------------------------------- # |
| 3147 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3148 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3149 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3150 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3151 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3152 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3153 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3154 | |
| 3155 | === modified file 'openlp/plugins/custom/lib/db.py' |
| 3156 | --- openlp/plugins/custom/lib/db.py 2012-12-30 19:41:24 +0000 |
| 3157 | +++ openlp/plugins/custom/lib/db.py 2014-01-18 21:32:36 +0000 |
| 3158 | @@ -4,8 +4,8 @@ |
| 3159 | ############################################################################### |
| 3160 | # OpenLP - Open Source Lyrics Projection # |
| 3161 | # --------------------------------------------------------------------------- # |
| 3162 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3163 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3164 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3165 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3166 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3167 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3168 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3169 | |
| 3170 | === modified file 'openlp/plugins/custom/lib/mediaitem.py' |
| 3171 | --- openlp/plugins/custom/lib/mediaitem.py 2012-12-30 19:41:24 +0000 |
| 3172 | +++ openlp/plugins/custom/lib/mediaitem.py 2014-01-18 21:32:36 +0000 |
| 3173 | @@ -4,8 +4,8 @@ |
| 3174 | ############################################################################### |
| 3175 | # OpenLP - Open Source Lyrics Projection # |
| 3176 | # --------------------------------------------------------------------------- # |
| 3177 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3178 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3179 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3180 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3181 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3182 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3183 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3184 | |
| 3185 | === modified file 'openlp/plugins/images/__init__.py' |
| 3186 | --- openlp/plugins/images/__init__.py 2012-12-30 19:41:24 +0000 |
| 3187 | +++ openlp/plugins/images/__init__.py 2014-01-18 21:32:36 +0000 |
| 3188 | @@ -4,8 +4,8 @@ |
| 3189 | ############################################################################### |
| 3190 | # OpenLP - Open Source Lyrics Projection # |
| 3191 | # --------------------------------------------------------------------------- # |
| 3192 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3193 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3194 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3195 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3196 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3197 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3198 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3199 | |
| 3200 | === modified file 'openlp/plugins/images/imageplugin.py' |
| 3201 | --- openlp/plugins/images/imageplugin.py 2012-12-30 19:41:24 +0000 |
| 3202 | +++ openlp/plugins/images/imageplugin.py 2014-01-18 21:32:36 +0000 |
| 3203 | @@ -4,8 +4,8 @@ |
| 3204 | ############################################################################### |
| 3205 | # OpenLP - Open Source Lyrics Projection # |
| 3206 | # --------------------------------------------------------------------------- # |
| 3207 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3208 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3209 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3210 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3211 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3212 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3213 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3214 | |
| 3215 | === modified file 'openlp/plugins/images/lib/__init__.py' |
| 3216 | --- openlp/plugins/images/lib/__init__.py 2012-12-30 19:41:24 +0000 |
| 3217 | +++ openlp/plugins/images/lib/__init__.py 2014-01-18 21:32:36 +0000 |
| 3218 | @@ -4,8 +4,8 @@ |
| 3219 | ############################################################################### |
| 3220 | # OpenLP - Open Source Lyrics Projection # |
| 3221 | # --------------------------------------------------------------------------- # |
| 3222 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3223 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3224 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3225 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3226 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3227 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3228 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3229 | |
| 3230 | === modified file 'openlp/plugins/images/lib/imagetab.py' |
| 3231 | --- openlp/plugins/images/lib/imagetab.py 2012-12-30 19:41:24 +0000 |
| 3232 | +++ openlp/plugins/images/lib/imagetab.py 2014-01-18 21:32:36 +0000 |
| 3233 | @@ -4,8 +4,8 @@ |
| 3234 | ############################################################################### |
| 3235 | # OpenLP - Open Source Lyrics Projection # |
| 3236 | # --------------------------------------------------------------------------- # |
| 3237 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3238 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3239 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3240 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3241 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3242 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3243 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3244 | |
| 3245 | === modified file 'openlp/plugins/images/lib/mediaitem.py' |
| 3246 | --- openlp/plugins/images/lib/mediaitem.py 2013-03-19 19:22:10 +0000 |
| 3247 | +++ openlp/plugins/images/lib/mediaitem.py 2014-01-18 21:32:36 +0000 |
| 3248 | @@ -4,8 +4,8 @@ |
| 3249 | ############################################################################### |
| 3250 | # OpenLP - Open Source Lyrics Projection # |
| 3251 | # --------------------------------------------------------------------------- # |
| 3252 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3253 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3254 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3255 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3256 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3257 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3258 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3259 | |
| 3260 | === modified file 'openlp/plugins/media/__init__.py' |
| 3261 | --- openlp/plugins/media/__init__.py 2012-12-30 19:41:24 +0000 |
| 3262 | +++ openlp/plugins/media/__init__.py 2014-01-18 21:32:36 +0000 |
| 3263 | @@ -4,8 +4,8 @@ |
| 3264 | ############################################################################### |
| 3265 | # OpenLP - Open Source Lyrics Projection # |
| 3266 | # --------------------------------------------------------------------------- # |
| 3267 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3268 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3269 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3270 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3271 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3272 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3273 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3274 | |
| 3275 | === modified file 'openlp/plugins/media/lib/__init__.py' |
| 3276 | --- openlp/plugins/media/lib/__init__.py 2012-12-30 19:41:24 +0000 |
| 3277 | +++ openlp/plugins/media/lib/__init__.py 2014-01-18 21:32:36 +0000 |
| 3278 | @@ -4,8 +4,8 @@ |
| 3279 | ############################################################################### |
| 3280 | # OpenLP - Open Source Lyrics Projection # |
| 3281 | # --------------------------------------------------------------------------- # |
| 3282 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3283 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3284 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3285 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3286 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3287 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3288 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3289 | |
| 3290 | === modified file 'openlp/plugins/media/lib/mediaitem.py' |
| 3291 | --- openlp/plugins/media/lib/mediaitem.py 2013-01-05 11:31:02 +0000 |
| 3292 | +++ openlp/plugins/media/lib/mediaitem.py 2014-01-18 21:32:36 +0000 |
| 3293 | @@ -4,8 +4,8 @@ |
| 3294 | ############################################################################### |
| 3295 | # OpenLP - Open Source Lyrics Projection # |
| 3296 | # --------------------------------------------------------------------------- # |
| 3297 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3298 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3299 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3300 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3301 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3302 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3303 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3304 | |
| 3305 | === modified file 'openlp/plugins/media/lib/mediatab.py' |
| 3306 | --- openlp/plugins/media/lib/mediatab.py 2012-12-30 19:41:24 +0000 |
| 3307 | +++ openlp/plugins/media/lib/mediatab.py 2014-01-18 21:32:36 +0000 |
| 3308 | @@ -4,8 +4,8 @@ |
| 3309 | ############################################################################### |
| 3310 | # OpenLP - Open Source Lyrics Projection # |
| 3311 | # --------------------------------------------------------------------------- # |
| 3312 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3313 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3314 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3315 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3316 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3317 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3318 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3319 | |
| 3320 | === modified file 'openlp/plugins/media/mediaplugin.py' |
| 3321 | --- openlp/plugins/media/mediaplugin.py 2012-12-30 19:41:24 +0000 |
| 3322 | +++ openlp/plugins/media/mediaplugin.py 2014-01-18 21:32:36 +0000 |
| 3323 | @@ -4,8 +4,8 @@ |
| 3324 | ############################################################################### |
| 3325 | # OpenLP - Open Source Lyrics Projection # |
| 3326 | # --------------------------------------------------------------------------- # |
| 3327 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3328 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3329 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3330 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3331 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3332 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3333 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3334 | |
| 3335 | === modified file 'openlp/plugins/presentations/__init__.py' |
| 3336 | --- openlp/plugins/presentations/__init__.py 2012-12-30 19:41:24 +0000 |
| 3337 | +++ openlp/plugins/presentations/__init__.py 2014-01-18 21:32:36 +0000 |
| 3338 | @@ -4,8 +4,8 @@ |
| 3339 | ############################################################################### |
| 3340 | # OpenLP - Open Source Lyrics Projection # |
| 3341 | # --------------------------------------------------------------------------- # |
| 3342 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3343 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3344 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3345 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3346 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3347 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3348 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3349 | |
| 3350 | === modified file 'openlp/plugins/presentations/lib/__init__.py' |
| 3351 | --- openlp/plugins/presentations/lib/__init__.py 2012-12-30 19:41:24 +0000 |
| 3352 | +++ openlp/plugins/presentations/lib/__init__.py 2014-01-18 21:32:36 +0000 |
| 3353 | @@ -4,8 +4,8 @@ |
| 3354 | ############################################################################### |
| 3355 | # OpenLP - Open Source Lyrics Projection # |
| 3356 | # --------------------------------------------------------------------------- # |
| 3357 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3358 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3359 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3360 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3361 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3362 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3363 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3364 | |
| 3365 | === modified file 'openlp/plugins/presentations/lib/impresscontroller.py' |
| 3366 | --- openlp/plugins/presentations/lib/impresscontroller.py 2013-08-20 18:30:15 +0000 |
| 3367 | +++ openlp/plugins/presentations/lib/impresscontroller.py 2014-01-18 21:32:36 +0000 |
| 3368 | @@ -4,8 +4,8 @@ |
| 3369 | ############################################################################### |
| 3370 | # OpenLP - Open Source Lyrics Projection # |
| 3371 | # --------------------------------------------------------------------------- # |
| 3372 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3373 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3374 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3375 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3376 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3377 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3378 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3379 | |
| 3380 | === modified file 'openlp/plugins/presentations/lib/mediaitem.py' |
| 3381 | --- openlp/plugins/presentations/lib/mediaitem.py 2013-11-19 22:04:51 +0000 |
| 3382 | +++ openlp/plugins/presentations/lib/mediaitem.py 2014-01-18 21:32:36 +0000 |
| 3383 | @@ -4,8 +4,8 @@ |
| 3384 | ############################################################################### |
| 3385 | # OpenLP - Open Source Lyrics Projection # |
| 3386 | # --------------------------------------------------------------------------- # |
| 3387 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3388 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3389 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3390 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3391 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3392 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3393 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3394 | |
| 3395 | === modified file 'openlp/plugins/presentations/lib/messagelistener.py' |
| 3396 | --- openlp/plugins/presentations/lib/messagelistener.py 2012-12-30 19:41:24 +0000 |
| 3397 | +++ openlp/plugins/presentations/lib/messagelistener.py 2014-01-18 21:32:36 +0000 |
| 3398 | @@ -4,8 +4,8 @@ |
| 3399 | ############################################################################### |
| 3400 | # OpenLP - Open Source Lyrics Projection # |
| 3401 | # --------------------------------------------------------------------------- # |
| 3402 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3403 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3404 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3405 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3406 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3407 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3408 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3409 | |
| 3410 | === modified file 'openlp/plugins/presentations/lib/powerpointcontroller.py' |
| 3411 | --- openlp/plugins/presentations/lib/powerpointcontroller.py 2013-08-20 18:30:15 +0000 |
| 3412 | +++ openlp/plugins/presentations/lib/powerpointcontroller.py 2014-01-18 21:32:36 +0000 |
| 3413 | @@ -4,8 +4,8 @@ |
| 3414 | ############################################################################### |
| 3415 | # OpenLP - Open Source Lyrics Projection # |
| 3416 | # --------------------------------------------------------------------------- # |
| 3417 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3418 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3419 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3420 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3421 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3422 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3423 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3424 | |
| 3425 | === modified file 'openlp/plugins/presentations/lib/pptviewcontroller.py' |
| 3426 | --- openlp/plugins/presentations/lib/pptviewcontroller.py 2013-10-17 20:15:35 +0000 |
| 3427 | +++ openlp/plugins/presentations/lib/pptviewcontroller.py 2014-01-18 21:32:36 +0000 |
| 3428 | @@ -4,8 +4,8 @@ |
| 3429 | ############################################################################### |
| 3430 | # OpenLP - Open Source Lyrics Projection # |
| 3431 | # --------------------------------------------------------------------------- # |
| 3432 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3433 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3434 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3435 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3436 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3437 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3438 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3439 | |
| 3440 | === modified file 'openlp/plugins/presentations/lib/pptviewlib/ppttest.py' |
| 3441 | --- openlp/plugins/presentations/lib/pptviewlib/ppttest.py 2013-10-17 20:15:35 +0000 |
| 3442 | +++ openlp/plugins/presentations/lib/pptviewlib/ppttest.py 2014-01-18 21:32:36 +0000 |
| 3443 | @@ -4,8 +4,8 @@ |
| 3444 | ############################################################################### |
| 3445 | # OpenLP - Open Source Lyrics Projection # |
| 3446 | # --------------------------------------------------------------------------- # |
| 3447 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3448 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3449 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3450 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3451 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3452 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3453 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3454 | |
| 3455 | === modified file 'openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp' |
| 3456 | --- openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp 2013-10-17 20:15:35 +0000 |
| 3457 | +++ openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp 2014-01-18 21:32:36 +0000 |
| 3458 | @@ -1,8 +1,8 @@ |
| 3459 | /****************************************************************************** |
| 3460 | * OpenLP - Open Source Lyrics Projection * |
| 3461 | * --------------------------------------------------------------------------- * |
| 3462 | -* Copyright (c) 2008-2013 Raoul Snyman * |
| 3463 | -* Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan * |
| 3464 | +* Copyright (c) 2008-2014 Raoul Snyman * |
| 3465 | +* Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan * |
| 3466 | * Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, * |
| 3467 | * Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. * |
| 3468 | * Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, * |
| 3469 | @@ -409,7 +409,7 @@ |
| 3470 | // The following registry settings are for, respectively, (I think) |
| 3471 | // PPT Viewer 2007 (older versions. Latest not in registry) & PPT Viewer 2010 |
| 3472 | // PPT Viewer 2003 (recent versions) |
| 3473 | - // PPT Viewer 2003 (older versions) |
| 3474 | + // PPT Viewer 2003 (older versions) |
| 3475 | // PPT Viewer 97 |
| 3476 | if ((RegOpenKeyExW(HKEY_CLASSES_ROOT, |
| 3477 | L"PowerPointViewer.Show.12\\shell\\Show\\command", 0, KEY_READ, &hKey) |
| 3478 | |
| 3479 | === modified file 'openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h' |
| 3480 | --- openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h 2013-10-15 19:29:22 +0000 |
| 3481 | +++ openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h 2014-01-18 21:32:36 +0000 |
| 3482 | @@ -1,8 +1,8 @@ |
| 3483 | /****************************************************************************** |
| 3484 | * OpenLP - Open Source Lyrics Projection * |
| 3485 | * --------------------------------------------------------------------------- * |
| 3486 | -* Copyright (c) 2008-2013 Raoul Snyman * |
| 3487 | -* Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan * |
| 3488 | +* Copyright (c) 2008-2014 Raoul Snyman * |
| 3489 | +* Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan * |
| 3490 | * Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, * |
| 3491 | * Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. * |
| 3492 | * Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, * |
| 3493 | |
| 3494 | === modified file 'openlp/plugins/presentations/lib/presentationcontroller.py' |
| 3495 | --- openlp/plugins/presentations/lib/presentationcontroller.py 2012-12-30 19:41:24 +0000 |
| 3496 | +++ openlp/plugins/presentations/lib/presentationcontroller.py 2014-01-18 21:32:36 +0000 |
| 3497 | @@ -4,8 +4,8 @@ |
| 3498 | ############################################################################### |
| 3499 | # OpenLP - Open Source Lyrics Projection # |
| 3500 | # --------------------------------------------------------------------------- # |
| 3501 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3502 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3503 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3504 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3505 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3506 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3507 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3508 | |
| 3509 | === modified file 'openlp/plugins/presentations/lib/presentationtab.py' |
| 3510 | --- openlp/plugins/presentations/lib/presentationtab.py 2012-12-30 19:41:24 +0000 |
| 3511 | +++ openlp/plugins/presentations/lib/presentationtab.py 2014-01-18 21:32:36 +0000 |
| 3512 | @@ -4,8 +4,8 @@ |
| 3513 | ############################################################################### |
| 3514 | # OpenLP - Open Source Lyrics Projection # |
| 3515 | # --------------------------------------------------------------------------- # |
| 3516 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3517 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3518 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3519 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3520 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3521 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3522 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3523 | |
| 3524 | === modified file 'openlp/plugins/presentations/presentationplugin.py' |
| 3525 | --- openlp/plugins/presentations/presentationplugin.py 2012-12-30 19:41:24 +0000 |
| 3526 | +++ openlp/plugins/presentations/presentationplugin.py 2014-01-18 21:32:36 +0000 |
| 3527 | @@ -4,8 +4,8 @@ |
| 3528 | ############################################################################### |
| 3529 | # OpenLP - Open Source Lyrics Projection # |
| 3530 | # --------------------------------------------------------------------------- # |
| 3531 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3532 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3533 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3534 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3535 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3536 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3537 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3538 | |
| 3539 | === modified file 'openlp/plugins/remotes/__init__.py' |
| 3540 | --- openlp/plugins/remotes/__init__.py 2012-12-30 19:41:24 +0000 |
| 3541 | +++ openlp/plugins/remotes/__init__.py 2014-01-18 21:32:36 +0000 |
| 3542 | @@ -4,8 +4,8 @@ |
| 3543 | ############################################################################### |
| 3544 | # OpenLP - Open Source Lyrics Projection # |
| 3545 | # --------------------------------------------------------------------------- # |
| 3546 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3547 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3548 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3549 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3550 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3551 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3552 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3553 | |
| 3554 | === modified file 'openlp/plugins/remotes/html/index.html' |
| 3555 | --- openlp/plugins/remotes/html/index.html 2012-12-30 19:41:24 +0000 |
| 3556 | +++ openlp/plugins/remotes/html/index.html 2014-01-18 21:32:36 +0000 |
| 3557 | @@ -4,8 +4,8 @@ |
| 3558 | ############################################################################### |
| 3559 | # OpenLP - Open Source Lyrics Projection # |
| 3560 | # --------------------------------------------------------------------------- # |
| 3561 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3562 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3563 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3564 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3565 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3566 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3567 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3568 | |
| 3569 | === modified file 'openlp/plugins/remotes/html/openlp.css' |
| 3570 | --- openlp/plugins/remotes/html/openlp.css 2012-12-30 19:41:24 +0000 |
| 3571 | +++ openlp/plugins/remotes/html/openlp.css 2014-01-18 21:32:36 +0000 |
| 3572 | @@ -1,8 +1,8 @@ |
| 3573 | /****************************************************************************** |
| 3574 | * OpenLP - Open Source Lyrics Projection * |
| 3575 | * --------------------------------------------------------------------------- * |
| 3576 | -* Copyright (c) 2008-2013 Raoul Snyman * |
| 3577 | -* Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan * |
| 3578 | +* Copyright (c) 2008-2014 Raoul Snyman * |
| 3579 | +* Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan * |
| 3580 | * Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, * |
| 3581 | * Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. * |
| 3582 | * Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, * |
| 3583 | |
| 3584 | === modified file 'openlp/plugins/remotes/html/openlp.js' |
| 3585 | --- openlp/plugins/remotes/html/openlp.js 2012-12-30 19:41:24 +0000 |
| 3586 | +++ openlp/plugins/remotes/html/openlp.js 2014-01-18 21:32:36 +0000 |
| 3587 | @@ -1,8 +1,8 @@ |
| 3588 | /****************************************************************************** |
| 3589 | * OpenLP - Open Source Lyrics Projection * |
| 3590 | * --------------------------------------------------------------------------- * |
| 3591 | - * Copyright (c) 2008-2013 Raoul Snyman * |
| 3592 | - * Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan * |
| 3593 | + * Copyright (c) 2008-2014 Raoul Snyman * |
| 3594 | + * Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan * |
| 3595 | * Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, * |
| 3596 | * Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. * |
| 3597 | * Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, * |
| 3598 | |
| 3599 | === modified file 'openlp/plugins/remotes/html/stage.css' |
| 3600 | --- openlp/plugins/remotes/html/stage.css 2012-12-30 19:41:24 +0000 |
| 3601 | +++ openlp/plugins/remotes/html/stage.css 2014-01-18 21:32:36 +0000 |
| 3602 | @@ -1,8 +1,8 @@ |
| 3603 | /****************************************************************************** |
| 3604 | * OpenLP - Open Source Lyrics Projection * |
| 3605 | * --------------------------------------------------------------------------- * |
| 3606 | -* Copyright (c) 2008-2013 Raoul Snyman * |
| 3607 | -* Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan * |
| 3608 | +* Copyright (c) 2008-2014 Raoul Snyman * |
| 3609 | +* Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan * |
| 3610 | * Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, * |
| 3611 | * Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. * |
| 3612 | * Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, * |
| 3613 | |
| 3614 | === modified file 'openlp/plugins/remotes/html/stage.html' |
| 3615 | --- openlp/plugins/remotes/html/stage.html 2012-12-30 19:41:24 +0000 |
| 3616 | +++ openlp/plugins/remotes/html/stage.html 2014-01-18 21:32:36 +0000 |
| 3617 | @@ -4,8 +4,8 @@ |
| 3618 | ############################################################################### |
| 3619 | # OpenLP - Open Source Lyrics Projection # |
| 3620 | # --------------------------------------------------------------------------- # |
| 3621 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3622 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3623 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3624 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3625 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3626 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3627 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3628 | |
| 3629 | === modified file 'openlp/plugins/remotes/html/stage.js' |
| 3630 | --- openlp/plugins/remotes/html/stage.js 2012-12-30 19:41:24 +0000 |
| 3631 | +++ openlp/plugins/remotes/html/stage.js 2014-01-18 21:32:36 +0000 |
| 3632 | @@ -1,8 +1,8 @@ |
| 3633 | /****************************************************************************** |
| 3634 | * OpenLP - Open Source Lyrics Projection * |
| 3635 | * --------------------------------------------------------------------------- * |
| 3636 | - * Copyright (c) 2008-2013 Raoul Snyman * |
| 3637 | - * Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan * |
| 3638 | + * Copyright (c) 2008-2014 Raoul Snyman * |
| 3639 | + * Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan * |
| 3640 | * Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, * |
| 3641 | * Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. * |
| 3642 | * Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, * |
| 3643 | |
| 3644 | === modified file 'openlp/plugins/remotes/lib/__init__.py' |
| 3645 | --- openlp/plugins/remotes/lib/__init__.py 2012-12-30 19:41:24 +0000 |
| 3646 | +++ openlp/plugins/remotes/lib/__init__.py 2014-01-18 21:32:36 +0000 |
| 3647 | @@ -4,8 +4,8 @@ |
| 3648 | ############################################################################### |
| 3649 | # OpenLP - Open Source Lyrics Projection # |
| 3650 | # --------------------------------------------------------------------------- # |
| 3651 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3652 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3653 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3654 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3655 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3656 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3657 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3658 | |
| 3659 | === modified file 'openlp/plugins/remotes/lib/httpserver.py' |
| 3660 | --- openlp/plugins/remotes/lib/httpserver.py 2013-12-29 21:55:54 +0000 |
| 3661 | +++ openlp/plugins/remotes/lib/httpserver.py 2014-01-18 21:32:36 +0000 |
| 3662 | @@ -4,8 +4,8 @@ |
| 3663 | ############################################################################### |
| 3664 | # OpenLP - Open Source Lyrics Projection # |
| 3665 | # --------------------------------------------------------------------------- # |
| 3666 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3667 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3668 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3669 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3670 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3671 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3672 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3673 | |
| 3674 | === modified file 'openlp/plugins/remotes/lib/remotetab.py' |
| 3675 | --- openlp/plugins/remotes/lib/remotetab.py 2012-12-30 19:41:24 +0000 |
| 3676 | +++ openlp/plugins/remotes/lib/remotetab.py 2014-01-18 21:32:36 +0000 |
| 3677 | @@ -4,8 +4,8 @@ |
| 3678 | ############################################################################### |
| 3679 | # OpenLP - Open Source Lyrics Projection # |
| 3680 | # --------------------------------------------------------------------------- # |
| 3681 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3682 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3683 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3684 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3685 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3686 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3687 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3688 | |
| 3689 | === modified file 'openlp/plugins/remotes/remoteplugin.py' |
| 3690 | --- openlp/plugins/remotes/remoteplugin.py 2012-12-30 19:41:24 +0000 |
| 3691 | +++ openlp/plugins/remotes/remoteplugin.py 2014-01-18 21:32:36 +0000 |
| 3692 | @@ -4,8 +4,8 @@ |
| 3693 | ############################################################################### |
| 3694 | # OpenLP - Open Source Lyrics Projection # |
| 3695 | # --------------------------------------------------------------------------- # |
| 3696 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3697 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3698 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3699 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3700 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3701 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3702 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3703 | |
| 3704 | === modified file 'openlp/plugins/songs/__init__.py' |
| 3705 | --- openlp/plugins/songs/__init__.py 2012-12-30 19:41:24 +0000 |
| 3706 | +++ openlp/plugins/songs/__init__.py 2014-01-18 21:32:36 +0000 |
| 3707 | @@ -4,8 +4,8 @@ |
| 3708 | ############################################################################### |
| 3709 | # OpenLP - Open Source Lyrics Projection # |
| 3710 | # --------------------------------------------------------------------------- # |
| 3711 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3712 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3713 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3714 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3715 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3716 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3717 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3718 | |
| 3719 | === modified file 'openlp/plugins/songs/forms/__init__.py' |
| 3720 | --- openlp/plugins/songs/forms/__init__.py 2012-12-30 19:41:24 +0000 |
| 3721 | +++ openlp/plugins/songs/forms/__init__.py 2014-01-18 21:32:36 +0000 |
| 3722 | @@ -4,8 +4,8 @@ |
| 3723 | ############################################################################### |
| 3724 | # OpenLP - Open Source Lyrics Projection # |
| 3725 | # --------------------------------------------------------------------------- # |
| 3726 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3727 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3728 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3729 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3730 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3731 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3732 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3733 | |
| 3734 | === modified file 'openlp/plugins/songs/forms/authorsdialog.py' |
| 3735 | --- openlp/plugins/songs/forms/authorsdialog.py 2012-12-30 19:41:24 +0000 |
| 3736 | +++ openlp/plugins/songs/forms/authorsdialog.py 2014-01-18 21:32:36 +0000 |
| 3737 | @@ -4,8 +4,8 @@ |
| 3738 | ############################################################################### |
| 3739 | # OpenLP - Open Source Lyrics Projection # |
| 3740 | # --------------------------------------------------------------------------- # |
| 3741 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3742 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3743 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3744 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3745 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3746 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3747 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3748 | @@ -29,13 +29,15 @@ |
| 3749 | |
| 3750 | from PyQt4 import QtGui |
| 3751 | |
| 3752 | -from openlp.core.lib import translate |
| 3753 | +from openlp.core.lib import translate, build_icon |
| 3754 | from openlp.core.lib.ui import create_button_box |
| 3755 | |
| 3756 | + |
| 3757 | class Ui_AuthorsDialog(object): |
| 3758 | def setupUi(self, authorsDialog): |
| 3759 | authorsDialog.setObjectName(u'AuthorsDialog') |
| 3760 | authorsDialog.resize(300, 10) |
| 3761 | + authorsDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 3762 | self.dialogLayout = QtGui.QVBoxLayout(authorsDialog) |
| 3763 | self.dialogLayout.setObjectName(u'dialogLayout') |
| 3764 | self.authorLayout = QtGui.QFormLayout() |
| 3765 | |
| 3766 | === modified file 'openlp/plugins/songs/forms/authorsform.py' |
| 3767 | --- openlp/plugins/songs/forms/authorsform.py 2012-12-30 19:41:24 +0000 |
| 3768 | +++ openlp/plugins/songs/forms/authorsform.py 2014-01-18 21:32:36 +0000 |
| 3769 | @@ -4,8 +4,8 @@ |
| 3770 | ############################################################################### |
| 3771 | # OpenLP - Open Source Lyrics Projection # |
| 3772 | # --------------------------------------------------------------------------- # |
| 3773 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3774 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3775 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3776 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3777 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3778 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3779 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3780 | |
| 3781 | === modified file 'openlp/plugins/songs/forms/editsongdialog.py' |
| 3782 | --- openlp/plugins/songs/forms/editsongdialog.py 2013-06-16 17:19:32 +0000 |
| 3783 | +++ openlp/plugins/songs/forms/editsongdialog.py 2014-01-18 21:32:36 +0000 |
| 3784 | @@ -4,8 +4,8 @@ |
| 3785 | ############################################################################### |
| 3786 | # OpenLP - Open Source Lyrics Projection # |
| 3787 | # --------------------------------------------------------------------------- # |
| 3788 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3789 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3790 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3791 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3792 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3793 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3794 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3795 | @@ -33,12 +33,12 @@ |
| 3796 | from openlp.core.lib.ui import UiStrings, create_button_box, create_button |
| 3797 | from openlp.plugins.songs.lib.ui import SongStrings |
| 3798 | |
| 3799 | + |
| 3800 | class Ui_EditSongDialog(object): |
| 3801 | def setupUi(self, editSongDialog): |
| 3802 | editSongDialog.setObjectName(u'editSongDialog') |
| 3803 | editSongDialog.resize(650, 400) |
| 3804 | - editSongDialog.setWindowIcon( |
| 3805 | - build_icon(u':/icon/openlp-logo-16x16.png')) |
| 3806 | + editSongDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 3807 | editSongDialog.setModal(True) |
| 3808 | self.dialogLayout = QtGui.QVBoxLayout(editSongDialog) |
| 3809 | self.dialogLayout.setSpacing(8) |
| 3810 | |
| 3811 | === modified file 'openlp/plugins/songs/forms/editsongform.py' |
| 3812 | --- openlp/plugins/songs/forms/editsongform.py 2013-10-10 16:20:59 +0000 |
| 3813 | +++ openlp/plugins/songs/forms/editsongform.py 2014-01-18 21:32:36 +0000 |
| 3814 | @@ -4,8 +4,8 @@ |
| 3815 | ############################################################################### |
| 3816 | # OpenLP - Open Source Lyrics Projection # |
| 3817 | # --------------------------------------------------------------------------- # |
| 3818 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3819 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3820 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3821 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3822 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3823 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3824 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3825 | @@ -746,11 +746,11 @@ |
| 3826 | return True |
| 3827 | |
| 3828 | def _validate_tags(self, _tags): |
| 3829 | - """ |
| 3830 | + """ |
| 3831 | Validates a list of tags |
| 3832 | Deletes the first affiliated tag pair which is located side by side in the list |
| 3833 | - and call itself recursively with the shortened tag list. |
| 3834 | - If there is any misplaced tag in the list, either the lenght of the tag list is not even, |
| 3835 | + and call itself recursively with the shortened tag list. |
| 3836 | + If there is any misplaced tag in the list, either the lenght of the tag list is not even, |
| 3837 | or the function won't find any tag pairs side by side. |
| 3838 | If there is no misplaced tag, the length of the list will be zero on any recursive run. |
| 3839 | |
| 3840 | |
| 3841 | === modified file 'openlp/plugins/songs/forms/editversedialog.py' |
| 3842 | --- openlp/plugins/songs/forms/editversedialog.py 2012-12-30 19:41:24 +0000 |
| 3843 | +++ openlp/plugins/songs/forms/editversedialog.py 2014-01-18 21:32:36 +0000 |
| 3844 | @@ -4,8 +4,8 @@ |
| 3845 | ############################################################################### |
| 3846 | # OpenLP - Open Source Lyrics Projection # |
| 3847 | # --------------------------------------------------------------------------- # |
| 3848 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3849 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3850 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3851 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3852 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3853 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3854 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3855 | @@ -33,11 +33,13 @@ |
| 3856 | from openlp.core.lib.ui import create_button_box, UiStrings |
| 3857 | from openlp.plugins.songs.lib import VerseType |
| 3858 | |
| 3859 | + |
| 3860 | class Ui_EditVerseDialog(object): |
| 3861 | def setupUi(self, editVerseDialog): |
| 3862 | editVerseDialog.setObjectName(u'editVerseDialog') |
| 3863 | editVerseDialog.resize(400, 400) |
| 3864 | editVerseDialog.setModal(True) |
| 3865 | + editVerseDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 3866 | self.dialogLayout = QtGui.QVBoxLayout(editVerseDialog) |
| 3867 | self.dialogLayout.setObjectName(u'dialogLayout') |
| 3868 | self.verseTextEdit = SpellTextEdit(editVerseDialog) |
| 3869 | |
| 3870 | === modified file 'openlp/plugins/songs/forms/editverseform.py' |
| 3871 | --- openlp/plugins/songs/forms/editverseform.py 2012-12-30 19:41:24 +0000 |
| 3872 | +++ openlp/plugins/songs/forms/editverseform.py 2014-01-18 21:32:36 +0000 |
| 3873 | @@ -4,8 +4,8 @@ |
| 3874 | ############################################################################### |
| 3875 | # OpenLP - Open Source Lyrics Projection # |
| 3876 | # --------------------------------------------------------------------------- # |
| 3877 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3878 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3879 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3880 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3881 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3882 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3883 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3884 | |
| 3885 | === modified file 'openlp/plugins/songs/forms/mediafilesdialog.py' |
| 3886 | --- openlp/plugins/songs/forms/mediafilesdialog.py 2012-12-30 19:41:24 +0000 |
| 3887 | +++ openlp/plugins/songs/forms/mediafilesdialog.py 2014-01-18 21:32:36 +0000 |
| 3888 | @@ -4,8 +4,8 @@ |
| 3889 | ############################################################################### |
| 3890 | # OpenLP - Open Source Lyrics Projection # |
| 3891 | # --------------------------------------------------------------------------- # |
| 3892 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3893 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3894 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3895 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3896 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3897 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3898 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3899 | @@ -32,14 +32,14 @@ |
| 3900 | from openlp.core.lib import translate, build_icon |
| 3901 | from openlp.core.lib.ui import create_button_box |
| 3902 | |
| 3903 | + |
| 3904 | class Ui_MediaFilesDialog(object): |
| 3905 | def setupUi(self, mediaFilesDialog): |
| 3906 | mediaFilesDialog.setObjectName(u'mediaFilesDialog') |
| 3907 | mediaFilesDialog.setWindowModality(QtCore.Qt.ApplicationModal) |
| 3908 | mediaFilesDialog.resize(400, 300) |
| 3909 | mediaFilesDialog.setModal(True) |
| 3910 | - mediaFilesDialog.setWindowIcon( |
| 3911 | - build_icon(u':/icon/openlp-logo-16x16.png')) |
| 3912 | + mediaFilesDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 3913 | self.filesVerticalLayout = QtGui.QVBoxLayout(mediaFilesDialog) |
| 3914 | self.filesVerticalLayout.setSpacing(8) |
| 3915 | self.filesVerticalLayout.setMargin(8) |
| 3916 | |
| 3917 | === modified file 'openlp/plugins/songs/forms/mediafilesform.py' |
| 3918 | --- openlp/plugins/songs/forms/mediafilesform.py 2012-12-30 19:41:24 +0000 |
| 3919 | +++ openlp/plugins/songs/forms/mediafilesform.py 2014-01-18 21:32:36 +0000 |
| 3920 | @@ -4,8 +4,8 @@ |
| 3921 | ############################################################################### |
| 3922 | # OpenLP - Open Source Lyrics Projection # |
| 3923 | # --------------------------------------------------------------------------- # |
| 3924 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3925 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3926 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3927 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3928 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3929 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3930 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3931 | |
| 3932 | === modified file 'openlp/plugins/songs/forms/songbookdialog.py' |
| 3933 | --- openlp/plugins/songs/forms/songbookdialog.py 2012-12-30 19:41:24 +0000 |
| 3934 | +++ openlp/plugins/songs/forms/songbookdialog.py 2014-01-18 21:32:36 +0000 |
| 3935 | @@ -4,8 +4,8 @@ |
| 3936 | ############################################################################### |
| 3937 | # OpenLP - Open Source Lyrics Projection # |
| 3938 | # --------------------------------------------------------------------------- # |
| 3939 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3940 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3941 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3942 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3943 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3944 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3945 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3946 | @@ -29,13 +29,15 @@ |
| 3947 | |
| 3948 | from PyQt4 import QtGui |
| 3949 | |
| 3950 | -from openlp.core.lib import translate |
| 3951 | +from openlp.core.lib import translate, build_icon |
| 3952 | from openlp.core.lib.ui import create_button_box |
| 3953 | |
| 3954 | + |
| 3955 | class Ui_SongBookDialog(object): |
| 3956 | def setupUi(self, songBookDialog): |
| 3957 | songBookDialog.setObjectName(u'songBookDialog') |
| 3958 | songBookDialog.resize(300, 10) |
| 3959 | + songBookDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 3960 | self.dialogLayout = QtGui.QVBoxLayout(songBookDialog) |
| 3961 | self.dialogLayout.setObjectName(u'dialogLayout') |
| 3962 | self.bookLayout = QtGui.QFormLayout() |
| 3963 | |
| 3964 | === modified file 'openlp/plugins/songs/forms/songbookform.py' |
| 3965 | --- openlp/plugins/songs/forms/songbookform.py 2012-12-30 19:41:24 +0000 |
| 3966 | +++ openlp/plugins/songs/forms/songbookform.py 2014-01-18 21:32:36 +0000 |
| 3967 | @@ -4,8 +4,8 @@ |
| 3968 | ############################################################################### |
| 3969 | # OpenLP - Open Source Lyrics Projection # |
| 3970 | # --------------------------------------------------------------------------- # |
| 3971 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3972 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3973 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3974 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3975 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3976 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3977 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3978 | |
| 3979 | === modified file 'openlp/plugins/songs/forms/songexportform.py' |
| 3980 | --- openlp/plugins/songs/forms/songexportform.py 2012-12-30 19:41:24 +0000 |
| 3981 | +++ openlp/plugins/songs/forms/songexportform.py 2014-01-18 21:32:36 +0000 |
| 3982 | @@ -4,8 +4,8 @@ |
| 3983 | ############################################################################### |
| 3984 | # OpenLP - Open Source Lyrics Projection # |
| 3985 | # --------------------------------------------------------------------------- # |
| 3986 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 3987 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 3988 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 3989 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 3990 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 3991 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 3992 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 3993 | |
| 3994 | === modified file 'openlp/plugins/songs/forms/songimportform.py' |
| 3995 | --- openlp/plugins/songs/forms/songimportform.py 2013-08-11 20:16:27 +0000 |
| 3996 | +++ openlp/plugins/songs/forms/songimportform.py 2014-01-18 21:32:36 +0000 |
| 3997 | @@ -4,8 +4,8 @@ |
| 3998 | ############################################################################### |
| 3999 | # OpenLP - Open Source Lyrics Projection # |
| 4000 | # --------------------------------------------------------------------------- # |
| 4001 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4002 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4003 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4004 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4005 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4006 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4007 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4008 | |
| 4009 | === modified file 'openlp/plugins/songs/forms/songmaintenancedialog.py' |
| 4010 | --- openlp/plugins/songs/forms/songmaintenancedialog.py 2012-12-30 19:41:24 +0000 |
| 4011 | +++ openlp/plugins/songs/forms/songmaintenancedialog.py 2014-01-18 21:32:36 +0000 |
| 4012 | @@ -4,8 +4,8 @@ |
| 4013 | ############################################################################### |
| 4014 | # OpenLP - Open Source Lyrics Projection # |
| 4015 | # --------------------------------------------------------------------------- # |
| 4016 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4017 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4018 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4019 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4020 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4021 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4022 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4023 | @@ -33,11 +33,14 @@ |
| 4024 | from openlp.core.lib.ui import UiStrings, create_button_box |
| 4025 | from openlp.plugins.songs.lib.ui import SongStrings |
| 4026 | |
| 4027 | + |
| 4028 | class Ui_SongMaintenanceDialog(object): |
| 4029 | def setupUi(self, songMaintenanceDialog): |
| 4030 | songMaintenanceDialog.setObjectName(u'songMaintenanceDialog') |
| 4031 | songMaintenanceDialog.setWindowModality(QtCore.Qt.ApplicationModal) |
| 4032 | songMaintenanceDialog.resize(10, 350) |
| 4033 | + songMaintenanceDialog.setWindowIcon( |
| 4034 | + build_icon(u':/icon/openlp-logo.svg')) |
| 4035 | self.dialogLayout = QtGui.QGridLayout(songMaintenanceDialog) |
| 4036 | self.dialogLayout.setObjectName(u'dialogLayout') |
| 4037 | self.typeListWidget = QtGui.QListWidget(songMaintenanceDialog) |
| 4038 | |
| 4039 | === modified file 'openlp/plugins/songs/forms/songmaintenanceform.py' |
| 4040 | --- openlp/plugins/songs/forms/songmaintenanceform.py 2012-12-30 19:41:24 +0000 |
| 4041 | +++ openlp/plugins/songs/forms/songmaintenanceform.py 2014-01-18 21:32:36 +0000 |
| 4042 | @@ -4,8 +4,8 @@ |
| 4043 | ############################################################################### |
| 4044 | # OpenLP - Open Source Lyrics Projection # |
| 4045 | # --------------------------------------------------------------------------- # |
| 4046 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4047 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4048 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4049 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4050 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4051 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4052 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4053 | |
| 4054 | === modified file 'openlp/plugins/songs/forms/topicsdialog.py' |
| 4055 | --- openlp/plugins/songs/forms/topicsdialog.py 2012-12-30 19:41:24 +0000 |
| 4056 | +++ openlp/plugins/songs/forms/topicsdialog.py 2014-01-18 21:32:36 +0000 |
| 4057 | @@ -4,8 +4,8 @@ |
| 4058 | ############################################################################### |
| 4059 | # OpenLP - Open Source Lyrics Projection # |
| 4060 | # --------------------------------------------------------------------------- # |
| 4061 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4062 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4063 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4064 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4065 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4066 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4067 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4068 | @@ -29,13 +29,15 @@ |
| 4069 | |
| 4070 | from PyQt4 import QtGui |
| 4071 | |
| 4072 | -from openlp.core.lib import translate |
| 4073 | +from openlp.core.lib import translate, build_icon |
| 4074 | from openlp.core.lib.ui import create_button_box |
| 4075 | |
| 4076 | + |
| 4077 | class Ui_TopicsDialog(object): |
| 4078 | def setupUi(self, topicsDialog): |
| 4079 | topicsDialog.setObjectName(u'topicsDialog') |
| 4080 | topicsDialog.resize(300, 10) |
| 4081 | + topicsDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) |
| 4082 | self.dialogLayout = QtGui.QVBoxLayout(topicsDialog) |
| 4083 | self.dialogLayout.setObjectName(u'dialogLayout') |
| 4084 | self.nameLayout = QtGui.QFormLayout() |
| 4085 | |
| 4086 | === modified file 'openlp/plugins/songs/forms/topicsform.py' |
| 4087 | --- openlp/plugins/songs/forms/topicsform.py 2012-12-30 19:41:24 +0000 |
| 4088 | +++ openlp/plugins/songs/forms/topicsform.py 2014-01-18 21:32:36 +0000 |
| 4089 | @@ -4,8 +4,8 @@ |
| 4090 | ############################################################################### |
| 4091 | # OpenLP - Open Source Lyrics Projection # |
| 4092 | # --------------------------------------------------------------------------- # |
| 4093 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4094 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4095 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4096 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4097 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4098 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4099 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4100 | |
| 4101 | === modified file 'openlp/plugins/songs/lib/__init__.py' |
| 4102 | --- openlp/plugins/songs/lib/__init__.py 2013-02-04 18:27:43 +0000 |
| 4103 | +++ openlp/plugins/songs/lib/__init__.py 2014-01-18 21:32:36 +0000 |
| 4104 | @@ -4,8 +4,8 @@ |
| 4105 | ############################################################################### |
| 4106 | # OpenLP - Open Source Lyrics Projection # |
| 4107 | # --------------------------------------------------------------------------- # |
| 4108 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4109 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4110 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4111 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4112 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4113 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4114 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4115 | @@ -41,7 +41,7 @@ |
| 4116 | r"([0-9a-f]{2})|\\([^a-z])|([{}])|[\r\n]+|(.)", re.I) |
| 4117 | # RTF control words which specify a "destination" to be ignored. |
| 4118 | DESTINATIONS = frozenset(( |
| 4119 | - u'aftncn', u'aftnsep', u'aftnsepc', u'annotation', u'atnauthor', |
| 4120 | + u'aftncn', u'aftnsep', u'aftnsepc', u'annotation', u'atnauthor', |
| 4121 | u'atndate', u'atnicn', u'atnid', u'atnparent', u'atnref', u'atntime', |
| 4122 | u'atrfend', u'atrfstart', u'author', u'background', u'bkmkend', |
| 4123 | u'bkmkstart', u'blipuid', u'buptim', u'category', |
| 4124 | @@ -579,7 +579,7 @@ |
| 4125 | failed = False |
| 4126 | while True: |
| 4127 | try: |
| 4128 | - encoding, default_encoding = get_encoding(font, |
| 4129 | + encoding, default_encoding = get_encoding(font, |
| 4130 | font_table, default_encoding, failed=failed) |
| 4131 | if not encoding: |
| 4132 | return None |
| 4133 | |
| 4134 | === modified file 'openlp/plugins/songs/lib/cclifileimport.py' |
| 4135 | --- openlp/plugins/songs/lib/cclifileimport.py 2012-12-30 19:41:24 +0000 |
| 4136 | +++ openlp/plugins/songs/lib/cclifileimport.py 2014-01-18 21:32:36 +0000 |
| 4137 | @@ -4,8 +4,8 @@ |
| 4138 | ############################################################################### |
| 4139 | # OpenLP - Open Source Lyrics Projection # |
| 4140 | # --------------------------------------------------------------------------- # |
| 4141 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4142 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4143 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4144 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4145 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4146 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4147 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4148 | |
| 4149 | === modified file 'openlp/plugins/songs/lib/db.py' |
| 4150 | --- openlp/plugins/songs/lib/db.py 2012-12-30 19:41:24 +0000 |
| 4151 | +++ openlp/plugins/songs/lib/db.py 2014-01-18 21:32:36 +0000 |
| 4152 | @@ -4,8 +4,8 @@ |
| 4153 | ############################################################################### |
| 4154 | # OpenLP - Open Source Lyrics Projection # |
| 4155 | # --------------------------------------------------------------------------- # |
| 4156 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4157 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4158 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4159 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4160 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4161 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4162 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4163 | |
| 4164 | === modified file 'openlp/plugins/songs/lib/dreambeamimport.py' |
| 4165 | --- openlp/plugins/songs/lib/dreambeamimport.py 2012-12-30 19:41:24 +0000 |
| 4166 | +++ openlp/plugins/songs/lib/dreambeamimport.py 2014-01-18 21:32:36 +0000 |
| 4167 | @@ -4,8 +4,8 @@ |
| 4168 | ############################################################################### |
| 4169 | # OpenLP - Open Source Lyrics Projection # |
| 4170 | # --------------------------------------------------------------------------- # |
| 4171 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4172 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4173 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4174 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4175 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4176 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4177 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4178 | @@ -46,11 +46,11 @@ |
| 4179 | """ |
| 4180 | The :class:`DreamBeamImport` class provides the ability to import song files from |
| 4181 | DreamBeam. |
| 4182 | - |
| 4183 | + |
| 4184 | An example of DreamBeam xml mark-up:: |
| 4185 | - |
| 4186 | + |
| 4187 | <?xml version="1.0"?> |
| 4188 | - <DreamSong xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
| 4189 | + <DreamSong xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
| 4190 | xmlns:xsd="http://www.w3.org/2001/XMLSchema"> |
| 4191 | <WordWrap>false</WordWrap> |
| 4192 | <Version>0.80</Version> |
| 4193 | @@ -84,7 +84,7 @@ |
| 4194 | |
| 4195 | * \*.xml |
| 4196 | """ |
| 4197 | - |
| 4198 | + |
| 4199 | def doImport(self): |
| 4200 | """ |
| 4201 | Receive a single file or a list of files to import. |
| 4202 | @@ -125,7 +125,7 @@ |
| 4203 | verse_type = lyrics_item.get(u'Type') |
| 4204 | verse_number = lyrics_item.get(u'Number') |
| 4205 | verse_text = unicode(lyrics_item.text) |
| 4206 | - self.addVerse(verse_text, |
| 4207 | + self.addVerse(verse_text, |
| 4208 | (u'%s%s' % (verse_type[:1], verse_number))) |
| 4209 | if hasattr(song_xml, u'Collection'): |
| 4210 | self.songBookName = unicode(song_xml.Collection.text) |
| 4211 | @@ -135,7 +135,7 @@ |
| 4212 | for LyricsSequenceItem in ( |
| 4213 | song_xml.Sequence.iterchildren()): |
| 4214 | self.verseOrderList.append( |
| 4215 | - "%s%s" % (LyricsSequenceItem.get(u'Type')[:1], |
| 4216 | + "%s%s" % (LyricsSequenceItem.get(u'Type')[:1], |
| 4217 | LyricsSequenceItem.get(u'Number'))) |
| 4218 | if hasattr(song_xml, u'Notes'): |
| 4219 | self.comments = unicode(song_xml.Notes.text) |
| 4220 | |
| 4221 | === modified file 'openlp/plugins/songs/lib/easyslidesimport.py' |
| 4222 | --- openlp/plugins/songs/lib/easyslidesimport.py 2012-12-30 19:41:24 +0000 |
| 4223 | +++ openlp/plugins/songs/lib/easyslidesimport.py 2014-01-18 21:32:36 +0000 |
| 4224 | @@ -4,8 +4,8 @@ |
| 4225 | ############################################################################### |
| 4226 | # OpenLP - Open Source Lyrics Projection # |
| 4227 | # --------------------------------------------------------------------------- # |
| 4228 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4229 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4230 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4231 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4232 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4233 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4234 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4235 | |
| 4236 | === modified file 'openlp/plugins/songs/lib/ewimport.py' |
| 4237 | --- openlp/plugins/songs/lib/ewimport.py 2013-02-19 21:57:46 +0000 |
| 4238 | +++ openlp/plugins/songs/lib/ewimport.py 2014-01-18 21:32:36 +0000 |
| 4239 | @@ -4,8 +4,8 @@ |
| 4240 | ############################################################################### |
| 4241 | # OpenLP - Open Source Lyrics Projection # |
| 4242 | # --------------------------------------------------------------------------- # |
| 4243 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4244 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4245 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4246 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4247 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4248 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4249 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4250 | |
| 4251 | === modified file 'openlp/plugins/songs/lib/foilpresenterimport.py' |
| 4252 | --- openlp/plugins/songs/lib/foilpresenterimport.py 2013-07-24 20:05:36 +0000 |
| 4253 | +++ openlp/plugins/songs/lib/foilpresenterimport.py 2014-01-18 21:32:36 +0000 |
| 4254 | @@ -4,8 +4,8 @@ |
| 4255 | ############################################################################### |
| 4256 | # OpenLP - Open Source Lyrics Projection # |
| 4257 | # --------------------------------------------------------------------------- # |
| 4258 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4259 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4260 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4261 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4262 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4263 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4264 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4265 | |
| 4266 | === modified file 'openlp/plugins/songs/lib/importer.py' |
| 4267 | --- openlp/plugins/songs/lib/importer.py 2012-12-30 19:41:24 +0000 |
| 4268 | +++ openlp/plugins/songs/lib/importer.py 2014-01-18 21:32:36 +0000 |
| 4269 | @@ -4,8 +4,8 @@ |
| 4270 | ############################################################################### |
| 4271 | # OpenLP - Open Source Lyrics Projection # |
| 4272 | # --------------------------------------------------------------------------- # |
| 4273 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4274 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4275 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4276 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4277 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4278 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4279 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4280 | |
| 4281 | === modified file 'openlp/plugins/songs/lib/mediaitem.py' |
| 4282 | --- openlp/plugins/songs/lib/mediaitem.py 2012-12-30 19:41:24 +0000 |
| 4283 | +++ openlp/plugins/songs/lib/mediaitem.py 2014-01-18 21:32:36 +0000 |
| 4284 | @@ -4,8 +4,8 @@ |
| 4285 | ############################################################################### |
| 4286 | # OpenLP - Open Source Lyrics Projection # |
| 4287 | # --------------------------------------------------------------------------- # |
| 4288 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4289 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4290 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4291 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4292 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4293 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4294 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4295 | |
| 4296 | === modified file 'openlp/plugins/songs/lib/mediashoutimport.py' |
| 4297 | --- openlp/plugins/songs/lib/mediashoutimport.py 2012-12-30 19:41:24 +0000 |
| 4298 | +++ openlp/plugins/songs/lib/mediashoutimport.py 2014-01-18 21:32:36 +0000 |
| 4299 | @@ -4,8 +4,8 @@ |
| 4300 | ############################################################################### |
| 4301 | # OpenLP - Open Source Lyrics Projection # |
| 4302 | # --------------------------------------------------------------------------- # |
| 4303 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4304 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4305 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4306 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4307 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4308 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4309 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4310 | |
| 4311 | === modified file 'openlp/plugins/songs/lib/olp1import.py' |
| 4312 | --- openlp/plugins/songs/lib/olp1import.py 2012-12-30 19:41:24 +0000 |
| 4313 | +++ openlp/plugins/songs/lib/olp1import.py 2014-01-18 21:32:36 +0000 |
| 4314 | @@ -4,8 +4,8 @@ |
| 4315 | ############################################################################### |
| 4316 | # OpenLP - Open Source Lyrics Projection # |
| 4317 | # --------------------------------------------------------------------------- # |
| 4318 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4319 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4320 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4321 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4322 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4323 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4324 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4325 | |
| 4326 | === modified file 'openlp/plugins/songs/lib/olpimport.py' |
| 4327 | --- openlp/plugins/songs/lib/olpimport.py 2012-12-30 19:41:24 +0000 |
| 4328 | +++ openlp/plugins/songs/lib/olpimport.py 2014-01-18 21:32:36 +0000 |
| 4329 | @@ -4,8 +4,8 @@ |
| 4330 | ############################################################################### |
| 4331 | # OpenLP - Open Source Lyrics Projection # |
| 4332 | # --------------------------------------------------------------------------- # |
| 4333 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4334 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4335 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4336 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4337 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4338 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4339 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4340 | |
| 4341 | === modified file 'openlp/plugins/songs/lib/oooimport.py' |
| 4342 | --- openlp/plugins/songs/lib/oooimport.py 2012-12-30 19:41:24 +0000 |
| 4343 | +++ openlp/plugins/songs/lib/oooimport.py 2014-01-18 21:32:36 +0000 |
| 4344 | @@ -4,8 +4,8 @@ |
| 4345 | ############################################################################### |
| 4346 | # OpenLP - Open Source Lyrics Projection # |
| 4347 | # --------------------------------------------------------------------------- # |
| 4348 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4349 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4350 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4351 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4352 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4353 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4354 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4355 | |
| 4356 | === modified file 'openlp/plugins/songs/lib/openlyricsexport.py' |
| 4357 | --- openlp/plugins/songs/lib/openlyricsexport.py 2012-12-30 19:41:24 +0000 |
| 4358 | +++ openlp/plugins/songs/lib/openlyricsexport.py 2014-01-18 21:32:36 +0000 |
| 4359 | @@ -4,8 +4,8 @@ |
| 4360 | ############################################################################### |
| 4361 | # OpenLP - Open Source Lyrics Projection # |
| 4362 | # --------------------------------------------------------------------------- # |
| 4363 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4364 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4365 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4366 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4367 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4368 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4369 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4370 | |
| 4371 | === modified file 'openlp/plugins/songs/lib/openlyricsimport.py' |
| 4372 | --- openlp/plugins/songs/lib/openlyricsimport.py 2012-12-30 19:41:24 +0000 |
| 4373 | +++ openlp/plugins/songs/lib/openlyricsimport.py 2014-01-18 21:32:36 +0000 |
| 4374 | @@ -4,8 +4,8 @@ |
| 4375 | ############################################################################### |
| 4376 | # OpenLP - Open Source Lyrics Projection # |
| 4377 | # --------------------------------------------------------------------------- # |
| 4378 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4379 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4380 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4381 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4382 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4383 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4384 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4385 | |
| 4386 | === modified file 'openlp/plugins/songs/lib/opensongimport.py' |
| 4387 | --- openlp/plugins/songs/lib/opensongimport.py 2013-08-04 12:11:30 +0000 |
| 4388 | +++ openlp/plugins/songs/lib/opensongimport.py 2014-01-18 21:32:36 +0000 |
| 4389 | @@ -4,8 +4,8 @@ |
| 4390 | ############################################################################### |
| 4391 | # OpenLP - Open Source Lyrics Projection # |
| 4392 | # --------------------------------------------------------------------------- # |
| 4393 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4394 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4395 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4396 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4397 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4398 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4399 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4400 | |
| 4401 | === modified file 'openlp/plugins/songs/lib/powersongimport.py' |
| 4402 | --- openlp/plugins/songs/lib/powersongimport.py 2012-12-30 19:41:24 +0000 |
| 4403 | +++ openlp/plugins/songs/lib/powersongimport.py 2014-01-18 21:32:36 +0000 |
| 4404 | @@ -4,8 +4,8 @@ |
| 4405 | ############################################################################### |
| 4406 | # OpenLP - Open Source Lyrics Projection # |
| 4407 | # --------------------------------------------------------------------------- # |
| 4408 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4409 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4410 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4411 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4412 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4413 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4414 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4415 | |
| 4416 | === modified file 'openlp/plugins/songs/lib/sofimport.py' |
| 4417 | --- openlp/plugins/songs/lib/sofimport.py 2012-12-30 19:41:24 +0000 |
| 4418 | +++ openlp/plugins/songs/lib/sofimport.py 2014-01-18 21:32:36 +0000 |
| 4419 | @@ -4,8 +4,8 @@ |
| 4420 | ############################################################################### |
| 4421 | # OpenLP - Open Source Lyrics Projection # |
| 4422 | # --------------------------------------------------------------------------- # |
| 4423 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4424 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4425 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4426 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4427 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4428 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4429 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4430 | |
| 4431 | === modified file 'openlp/plugins/songs/lib/songbeamerimport.py' |
| 4432 | --- openlp/plugins/songs/lib/songbeamerimport.py 2012-12-30 19:41:24 +0000 |
| 4433 | +++ openlp/plugins/songs/lib/songbeamerimport.py 2014-01-18 21:32:36 +0000 |
| 4434 | @@ -4,8 +4,8 @@ |
| 4435 | ############################################################################### |
| 4436 | # OpenLP - Open Source Lyrics Projection # |
| 4437 | # --------------------------------------------------------------------------- # |
| 4438 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4439 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4440 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4441 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4442 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4443 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4444 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4445 | |
| 4446 | === modified file 'openlp/plugins/songs/lib/songimport.py' |
| 4447 | --- openlp/plugins/songs/lib/songimport.py 2013-02-15 19:04:50 +0000 |
| 4448 | +++ openlp/plugins/songs/lib/songimport.py 2014-01-18 21:32:36 +0000 |
| 4449 | @@ -4,8 +4,8 @@ |
| 4450 | ############################################################################### |
| 4451 | # OpenLP - Open Source Lyrics Projection # |
| 4452 | # --------------------------------------------------------------------------- # |
| 4453 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4454 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4455 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4456 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4457 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4458 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4459 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4460 | |
| 4461 | === modified file 'openlp/plugins/songs/lib/songproimport.py' |
| 4462 | --- openlp/plugins/songs/lib/songproimport.py 2013-02-03 21:00:22 +0000 |
| 4463 | +++ openlp/plugins/songs/lib/songproimport.py 2014-01-18 21:32:36 +0000 |
| 4464 | @@ -4,8 +4,8 @@ |
| 4465 | ############################################################################### |
| 4466 | # OpenLP - Open Source Lyrics Projection # |
| 4467 | # --------------------------------------------------------------------------- # |
| 4468 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4469 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4470 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4471 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4472 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4473 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4474 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4475 | |
| 4476 | === modified file 'openlp/plugins/songs/lib/songshowplusimport.py' |
| 4477 | --- openlp/plugins/songs/lib/songshowplusimport.py 2013-08-21 05:30:11 +0000 |
| 4478 | +++ openlp/plugins/songs/lib/songshowplusimport.py 2014-01-18 21:32:36 +0000 |
| 4479 | @@ -4,8 +4,8 @@ |
| 4480 | ############################################################################### |
| 4481 | # OpenLP - Open Source Lyrics Projection # |
| 4482 | # --------------------------------------------------------------------------- # |
| 4483 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4484 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4485 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4486 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4487 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4488 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4489 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4490 | @@ -27,7 +27,7 @@ |
| 4491 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
| 4492 | ############################################################################### |
| 4493 | """ |
| 4494 | -The :mod:`songshowplusimport` module provides the functionality for importing |
| 4495 | +The :mod:`songshowplusimport` module provides the functionality for importing |
| 4496 | SongShow Plus songs into the OpenLP database. |
| 4497 | """ |
| 4498 | import chardet |
| 4499 | |
| 4500 | === modified file 'openlp/plugins/songs/lib/songstab.py' |
| 4501 | --- openlp/plugins/songs/lib/songstab.py 2012-12-30 19:41:24 +0000 |
| 4502 | +++ openlp/plugins/songs/lib/songstab.py 2014-01-18 21:32:36 +0000 |
| 4503 | @@ -4,8 +4,8 @@ |
| 4504 | ############################################################################### |
| 4505 | # OpenLP - Open Source Lyrics Projection # |
| 4506 | # --------------------------------------------------------------------------- # |
| 4507 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4508 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4509 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4510 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4511 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4512 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4513 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4514 | |
| 4515 | === modified file 'openlp/plugins/songs/lib/sundayplusimport.py' |
| 4516 | --- openlp/plugins/songs/lib/sundayplusimport.py 2013-08-18 20:44:48 +0000 |
| 4517 | +++ openlp/plugins/songs/lib/sundayplusimport.py 2014-01-18 21:32:36 +0000 |
| 4518 | @@ -4,8 +4,8 @@ |
| 4519 | ############################################################################### |
| 4520 | # OpenLP - Open Source Lyrics Projection # |
| 4521 | # --------------------------------------------------------------------------- # |
| 4522 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4523 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4524 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4525 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4526 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4527 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4528 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4529 | |
| 4530 | === modified file 'openlp/plugins/songs/lib/test/test_import_file.py' |
| 4531 | --- openlp/plugins/songs/lib/test/test_import_file.py 2012-12-30 19:41:24 +0000 |
| 4532 | +++ openlp/plugins/songs/lib/test/test_import_file.py 2014-01-18 21:32:36 +0000 |
| 4533 | @@ -4,8 +4,8 @@ |
| 4534 | ############################################################################### |
| 4535 | # OpenLP - Open Source Lyrics Projection # |
| 4536 | # --------------------------------------------------------------------------- # |
| 4537 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4538 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4539 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4540 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4541 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4542 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4543 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4544 | |
| 4545 | === modified file 'openlp/plugins/songs/lib/test/test_importing_lots.py' |
| 4546 | --- openlp/plugins/songs/lib/test/test_importing_lots.py 2012-12-30 19:41:24 +0000 |
| 4547 | +++ openlp/plugins/songs/lib/test/test_importing_lots.py 2014-01-18 21:32:36 +0000 |
| 4548 | @@ -4,8 +4,8 @@ |
| 4549 | ############################################################################### |
| 4550 | # OpenLP - Open Source Lyrics Projection # |
| 4551 | # --------------------------------------------------------------------------- # |
| 4552 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4553 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4554 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4555 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4556 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4557 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4558 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4559 | |
| 4560 | === modified file 'openlp/plugins/songs/lib/test/test_opensongimport.py' |
| 4561 | --- openlp/plugins/songs/lib/test/test_opensongimport.py 2012-12-30 19:41:24 +0000 |
| 4562 | +++ openlp/plugins/songs/lib/test/test_opensongimport.py 2014-01-18 21:32:36 +0000 |
| 4563 | @@ -4,8 +4,8 @@ |
| 4564 | ############################################################################### |
| 4565 | # OpenLP - Open Source Lyrics Projection # |
| 4566 | # --------------------------------------------------------------------------- # |
| 4567 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4568 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4569 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4570 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4571 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4572 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4573 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4574 | |
| 4575 | === modified file 'openlp/plugins/songs/lib/ui.py' |
| 4576 | --- openlp/plugins/songs/lib/ui.py 2012-12-30 19:41:24 +0000 |
| 4577 | +++ openlp/plugins/songs/lib/ui.py 2014-01-18 21:32:36 +0000 |
| 4578 | @@ -4,8 +4,8 @@ |
| 4579 | ############################################################################### |
| 4580 | # OpenLP - Open Source Lyrics Projection # |
| 4581 | # --------------------------------------------------------------------------- # |
| 4582 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4583 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4584 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4585 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4586 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4587 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4588 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4589 | |
| 4590 | === modified file 'openlp/plugins/songs/lib/upgrade.py' |
| 4591 | --- openlp/plugins/songs/lib/upgrade.py 2012-12-30 19:41:24 +0000 |
| 4592 | +++ openlp/plugins/songs/lib/upgrade.py 2014-01-18 21:32:36 +0000 |
| 4593 | @@ -4,8 +4,8 @@ |
| 4594 | ############################################################################### |
| 4595 | # OpenLP - Open Source Lyrics Projection # |
| 4596 | # --------------------------------------------------------------------------- # |
| 4597 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4598 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4599 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4600 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4601 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4602 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4603 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4604 | |
| 4605 | === modified file 'openlp/plugins/songs/lib/wowimport.py' |
| 4606 | --- openlp/plugins/songs/lib/wowimport.py 2012-12-30 19:41:24 +0000 |
| 4607 | +++ openlp/plugins/songs/lib/wowimport.py 2014-01-18 21:32:36 +0000 |
| 4608 | @@ -4,8 +4,8 @@ |
| 4609 | ############################################################################### |
| 4610 | # OpenLP - Open Source Lyrics Projection # |
| 4611 | # --------------------------------------------------------------------------- # |
| 4612 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4613 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4614 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4615 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4616 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4617 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4618 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4619 | |
| 4620 | === modified file 'openlp/plugins/songs/lib/xml.py' |
| 4621 | --- openlp/plugins/songs/lib/xml.py 2013-08-24 00:07:23 +0000 |
| 4622 | +++ openlp/plugins/songs/lib/xml.py 2014-01-18 21:32:36 +0000 |
| 4623 | @@ -4,8 +4,8 @@ |
| 4624 | ############################################################################### |
| 4625 | # OpenLP - Open Source Lyrics Projection # |
| 4626 | # --------------------------------------------------------------------------- # |
| 4627 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4628 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4629 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4630 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4631 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4632 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4633 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4634 | |
| 4635 | === modified file 'openlp/plugins/songs/lib/zionworximport.py' |
| 4636 | --- openlp/plugins/songs/lib/zionworximport.py 2012-12-30 19:41:24 +0000 |
| 4637 | +++ openlp/plugins/songs/lib/zionworximport.py 2014-01-18 21:32:36 +0000 |
| 4638 | @@ -4,8 +4,8 @@ |
| 4639 | ############################################################################### |
| 4640 | # OpenLP - Open Source Lyrics Projection # |
| 4641 | # --------------------------------------------------------------------------- # |
| 4642 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4643 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4644 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4645 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4646 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4647 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4648 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4649 | |
| 4650 | === modified file 'openlp/plugins/songs/songsplugin.py' |
| 4651 | --- openlp/plugins/songs/songsplugin.py 2012-12-30 19:41:24 +0000 |
| 4652 | +++ openlp/plugins/songs/songsplugin.py 2014-01-18 21:32:36 +0000 |
| 4653 | @@ -4,8 +4,8 @@ |
| 4654 | ############################################################################### |
| 4655 | # OpenLP - Open Source Lyrics Projection # |
| 4656 | # --------------------------------------------------------------------------- # |
| 4657 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4658 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4659 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4660 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4661 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4662 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4663 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4664 | |
| 4665 | === modified file 'openlp/plugins/songusage/__init__.py' |
| 4666 | --- openlp/plugins/songusage/__init__.py 2012-12-30 19:41:24 +0000 |
| 4667 | +++ openlp/plugins/songusage/__init__.py 2014-01-18 21:32:36 +0000 |
| 4668 | @@ -4,8 +4,8 @@ |
| 4669 | ############################################################################### |
| 4670 | # OpenLP - Open Source Lyrics Projection # |
| 4671 | # --------------------------------------------------------------------------- # |
| 4672 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4673 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4674 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4675 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4676 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4677 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4678 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4679 | |
| 4680 | === modified file 'openlp/plugins/songusage/forms/__init__.py' |
| 4681 | --- openlp/plugins/songusage/forms/__init__.py 2012-12-30 19:41:24 +0000 |
| 4682 | +++ openlp/plugins/songusage/forms/__init__.py 2014-01-18 21:32:36 +0000 |
| 4683 | @@ -4,8 +4,8 @@ |
| 4684 | ############################################################################### |
| 4685 | # OpenLP - Open Source Lyrics Projection # |
| 4686 | # --------------------------------------------------------------------------- # |
| 4687 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4688 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4689 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4690 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4691 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4692 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4693 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4694 | |
| 4695 | === modified file 'openlp/plugins/songusage/forms/songusagedeletedialog.py' |
| 4696 | --- openlp/plugins/songusage/forms/songusagedeletedialog.py 2012-12-30 19:41:24 +0000 |
| 4697 | +++ openlp/plugins/songusage/forms/songusagedeletedialog.py 2014-01-18 21:32:36 +0000 |
| 4698 | @@ -4,8 +4,8 @@ |
| 4699 | ############################################################################### |
| 4700 | # OpenLP - Open Source Lyrics Projection # |
| 4701 | # --------------------------------------------------------------------------- # |
| 4702 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4703 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4704 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4705 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4706 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4707 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4708 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4709 | @@ -29,13 +29,16 @@ |
| 4710 | |
| 4711 | from PyQt4 import QtCore, QtGui |
| 4712 | |
| 4713 | -from openlp.core.lib import translate |
| 4714 | +from openlp.core.lib import translate, build_icon |
| 4715 | from openlp.core.lib.ui import create_button_box |
| 4716 | |
| 4717 | + |
| 4718 | class Ui_SongUsageDeleteDialog(object): |
| 4719 | def setupUi(self, songUsageDeleteDialog): |
| 4720 | songUsageDeleteDialog.setObjectName(u'songUsageDeleteDialog') |
| 4721 | songUsageDeleteDialog.resize(291, 243) |
| 4722 | + songUsageDeleteDialog.setWindowIcon( |
| 4723 | + build_icon(u':/icon/openlp-logo.svg')) |
| 4724 | self.verticalLayout = QtGui.QVBoxLayout(songUsageDeleteDialog) |
| 4725 | self.verticalLayout.setSpacing(8) |
| 4726 | self.verticalLayout.setContentsMargins(8, 8, 8, 8) |
| 4727 | |
| 4728 | === modified file 'openlp/plugins/songusage/forms/songusagedeleteform.py' |
| 4729 | --- openlp/plugins/songusage/forms/songusagedeleteform.py 2012-12-30 19:41:24 +0000 |
| 4730 | +++ openlp/plugins/songusage/forms/songusagedeleteform.py 2014-01-18 21:32:36 +0000 |
| 4731 | @@ -4,8 +4,8 @@ |
| 4732 | ############################################################################### |
| 4733 | # OpenLP - Open Source Lyrics Projection # |
| 4734 | # --------------------------------------------------------------------------- # |
| 4735 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4736 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4737 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4738 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4739 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4740 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4741 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4742 | |
| 4743 | === modified file 'openlp/plugins/songusage/forms/songusagedetaildialog.py' |
| 4744 | --- openlp/plugins/songusage/forms/songusagedetaildialog.py 2012-12-30 19:41:24 +0000 |
| 4745 | +++ openlp/plugins/songusage/forms/songusagedetaildialog.py 2014-01-18 21:32:36 +0000 |
| 4746 | @@ -4,8 +4,8 @@ |
| 4747 | ############################################################################### |
| 4748 | # OpenLP - Open Source Lyrics Projection # |
| 4749 | # --------------------------------------------------------------------------- # |
| 4750 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4751 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4752 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4753 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4754 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4755 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4756 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4757 | @@ -32,10 +32,13 @@ |
| 4758 | from openlp.core.lib import build_icon, translate |
| 4759 | from openlp.core.lib.ui import create_button_box |
| 4760 | |
| 4761 | + |
| 4762 | class Ui_SongUsageDetailDialog(object): |
| 4763 | def setupUi(self, songUsageDetailDialog): |
| 4764 | songUsageDetailDialog.setObjectName(u'songUsageDetailDialog') |
| 4765 | songUsageDetailDialog.resize(609, 413) |
| 4766 | + songUsageDetailDialog.setWindowIcon( |
| 4767 | + build_icon(u':/icon/openlp-logo.svg')) |
| 4768 | self.verticalLayout = QtGui.QVBoxLayout(songUsageDetailDialog) |
| 4769 | self.verticalLayout.setSpacing(8) |
| 4770 | self.verticalLayout.setContentsMargins(8, 8, 8, 8) |
| 4771 | |
| 4772 | === modified file 'openlp/plugins/songusage/forms/songusagedetailform.py' |
| 4773 | --- openlp/plugins/songusage/forms/songusagedetailform.py 2012-12-30 19:41:24 +0000 |
| 4774 | +++ openlp/plugins/songusage/forms/songusagedetailform.py 2014-01-18 21:32:36 +0000 |
| 4775 | @@ -4,8 +4,8 @@ |
| 4776 | ############################################################################### |
| 4777 | # OpenLP - Open Source Lyrics Projection # |
| 4778 | # --------------------------------------------------------------------------- # |
| 4779 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4780 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4781 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4782 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4783 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4784 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4785 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4786 | |
| 4787 | === modified file 'openlp/plugins/songusage/lib/__init__.py' |
| 4788 | --- openlp/plugins/songusage/lib/__init__.py 2012-12-30 19:41:24 +0000 |
| 4789 | +++ openlp/plugins/songusage/lib/__init__.py 2014-01-18 21:32:36 +0000 |
| 4790 | @@ -4,8 +4,8 @@ |
| 4791 | ############################################################################### |
| 4792 | # OpenLP - Open Source Lyrics Projection # |
| 4793 | # --------------------------------------------------------------------------- # |
| 4794 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4795 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4796 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4797 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4798 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4799 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4800 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4801 | |
| 4802 | === modified file 'openlp/plugins/songusage/lib/db.py' |
| 4803 | --- openlp/plugins/songusage/lib/db.py 2012-12-30 19:41:24 +0000 |
| 4804 | +++ openlp/plugins/songusage/lib/db.py 2014-01-18 21:32:36 +0000 |
| 4805 | @@ -4,8 +4,8 @@ |
| 4806 | ############################################################################### |
| 4807 | # OpenLP - Open Source Lyrics Projection # |
| 4808 | # --------------------------------------------------------------------------- # |
| 4809 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4810 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4811 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4812 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4813 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4814 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4815 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4816 | |
| 4817 | === modified file 'openlp/plugins/songusage/lib/upgrade.py' |
| 4818 | --- openlp/plugins/songusage/lib/upgrade.py 2012-12-30 19:41:24 +0000 |
| 4819 | +++ openlp/plugins/songusage/lib/upgrade.py 2014-01-18 21:32:36 +0000 |
| 4820 | @@ -4,8 +4,8 @@ |
| 4821 | ############################################################################### |
| 4822 | # OpenLP - Open Source Lyrics Projection # |
| 4823 | # --------------------------------------------------------------------------- # |
| 4824 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4825 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4826 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4827 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4828 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4829 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4830 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4831 | |
| 4832 | === modified file 'openlp/plugins/songusage/songusageplugin.py' |
| 4833 | --- openlp/plugins/songusage/songusageplugin.py 2012-12-30 19:41:24 +0000 |
| 4834 | +++ openlp/plugins/songusage/songusageplugin.py 2014-01-18 21:32:36 +0000 |
| 4835 | @@ -4,8 +4,8 @@ |
| 4836 | ############################################################################### |
| 4837 | # OpenLP - Open Source Lyrics Projection # |
| 4838 | # --------------------------------------------------------------------------- # |
| 4839 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4840 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4841 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4842 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4843 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4844 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4845 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4846 | |
| 4847 | === modified file 'resources/__init__.py' |
| 4848 | --- resources/__init__.py 2012-12-30 19:41:24 +0000 |
| 4849 | +++ resources/__init__.py 2014-01-18 21:32:36 +0000 |
| 4850 | @@ -4,8 +4,8 @@ |
| 4851 | ############################################################################### |
| 4852 | # OpenLP - Open Source Lyrics Projection # |
| 4853 | # --------------------------------------------------------------------------- # |
| 4854 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4855 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4856 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4857 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4858 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4859 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4860 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4861 | |
| 4862 | === modified file 'resources/images/openlp-2.qrc' |
| 4863 | --- resources/images/openlp-2.qrc 2012-11-01 17:41:22 +0000 |
| 4864 | +++ resources/images/openlp-2.qrc 2014-01-18 21:32:36 +0000 |
| 4865 | @@ -75,6 +75,7 @@ |
| 4866 | <file>openlp-logo-32x32.png</file> |
| 4867 | <file>openlp-logo-48x48.png</file> |
| 4868 | <file>openlp-logo-64x64.png</file> |
| 4869 | + <file>openlp-logo.svg</file> |
| 4870 | <file>openlp-logo-128x128.png</file> |
| 4871 | <file>openlp-logo-256x256.png</file> |
| 4872 | </qresource> |
| 4873 | |
| 4874 | === modified file 'resources/pyinstaller/hook-openlp.core.ui.media.py' |
| 4875 | --- resources/pyinstaller/hook-openlp.core.ui.media.py 2012-12-30 19:41:24 +0000 |
| 4876 | +++ resources/pyinstaller/hook-openlp.core.ui.media.py 2014-01-18 21:32:36 +0000 |
| 4877 | @@ -4,8 +4,8 @@ |
| 4878 | ############################################################################### |
| 4879 | # OpenLP - Open Source Lyrics Projection # |
| 4880 | # --------------------------------------------------------------------------- # |
| 4881 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4882 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4883 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4884 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4885 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4886 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4887 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4888 | |
| 4889 | === modified file 'resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py' |
| 4890 | --- resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py 2012-12-30 19:41:24 +0000 |
| 4891 | +++ resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py 2014-01-18 21:32:36 +0000 |
| 4892 | @@ -4,8 +4,8 @@ |
| 4893 | ############################################################################### |
| 4894 | # OpenLP - Open Source Lyrics Projection # |
| 4895 | # --------------------------------------------------------------------------- # |
| 4896 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4897 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4898 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4899 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4900 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4901 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4902 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4903 | |
| 4904 | === modified file 'resources/pyinstaller/hook-openlp.py' |
| 4905 | --- resources/pyinstaller/hook-openlp.py 2012-12-30 19:41:24 +0000 |
| 4906 | +++ resources/pyinstaller/hook-openlp.py 2014-01-18 21:32:36 +0000 |
| 4907 | @@ -4,8 +4,8 @@ |
| 4908 | ############################################################################### |
| 4909 | # OpenLP - Open Source Lyrics Projection # |
| 4910 | # --------------------------------------------------------------------------- # |
| 4911 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4912 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4913 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4914 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4915 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4916 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4917 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4918 | |
| 4919 | === modified file 'scripts/check_dependencies.py' |
| 4920 | --- scripts/check_dependencies.py 2013-01-07 09:20:00 +0000 |
| 4921 | +++ scripts/check_dependencies.py 2014-01-18 21:32:36 +0000 |
| 4922 | @@ -5,8 +5,8 @@ |
| 4923 | ############################################################################### |
| 4924 | # OpenLP - Open Source Lyrics Projection # |
| 4925 | # --------------------------------------------------------------------------- # |
| 4926 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4927 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4928 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4929 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4930 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4931 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4932 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4933 | |
| 4934 | === modified file 'scripts/generate_resources.sh' |
| 4935 | --- scripts/generate_resources.sh 2012-12-30 19:41:24 +0000 |
| 4936 | +++ scripts/generate_resources.sh 2014-01-18 21:32:36 +0000 |
| 4937 | @@ -4,8 +4,8 @@ |
| 4938 | ############################################################################### |
| 4939 | # OpenLP - Open Source Lyrics Projection # |
| 4940 | # --------------------------------------------------------------------------- # |
| 4941 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4942 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4943 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4944 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4945 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4946 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4947 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4948 | |
| 4949 | === modified file 'scripts/openlp-remoteclient.py' |
| 4950 | --- scripts/openlp-remoteclient.py 2012-12-30 19:41:24 +0000 |
| 4951 | +++ scripts/openlp-remoteclient.py 2014-01-18 21:32:36 +0000 |
| 4952 | @@ -5,8 +5,8 @@ |
| 4953 | ############################################################################### |
| 4954 | # OpenLP - Open Source Lyrics Projection # |
| 4955 | # --------------------------------------------------------------------------- # |
| 4956 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4957 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4958 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4959 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4960 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4961 | # Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4962 | # Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4963 | |
| 4964 | === modified file 'scripts/resources.patch' |
| 4965 | --- scripts/resources.patch 2012-12-30 19:41:24 +0000 |
| 4966 | +++ scripts/resources.patch 2014-01-18 21:32:36 +0000 |
| 4967 | @@ -12,8 +12,8 @@ |
| 4968 | +############################################################################### |
| 4969 | +# OpenLP - Open Source Lyrics Projection # |
| 4970 | +# --------------------------------------------------------------------------- # |
| 4971 | -+# Copyright (c) 2008-2013 Raoul Snyman # |
| 4972 | -+# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4973 | ++# Copyright (c) 2008-2014 Raoul Snyman # |
| 4974 | ++# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4975 | +# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4976 | +# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # |
| 4977 | +# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # |
| 4978 | |
| 4979 | === modified file 'scripts/translation_utils.py' |
| 4980 | --- scripts/translation_utils.py 2012-12-30 19:41:24 +0000 |
| 4981 | +++ scripts/translation_utils.py 2014-01-18 21:32:36 +0000 |
| 4982 | @@ -5,8 +5,8 @@ |
| 4983 | ############################################################################### |
| 4984 | # OpenLP - Open Source Lyrics Projection # |
| 4985 | # --------------------------------------------------------------------------- # |
| 4986 | -# Copyright (c) 2008-2013 Raoul Snyman # |
| 4987 | -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # |
| 4988 | +# Copyright (c) 2008-2014 Raoul Snyman # |
| 4989 | +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # |
| 4990 | # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # |
| 4991 | # Meinert Jordan, Armin Köhler, Edwin Lunando, Joshua Miller, Stevan Pettit, # |
| 4992 | # Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # |
| 4993 | |
| 4994 | === modified file 'setup.py' |
| 4995 | --- setup.py 2012-12-30 19:41:24 +0000 |
| 4996 | +++ setup.py 2014-01-18 21:32:36 +0000 |
| 4997 | @@ -5,8 +5,8 @@ |
| 4998 | ############################################################################### |
| 4999 | # OpenLP - Open Source Lyrics Projection # |
| 5000 | # --------------------------------------------------------------------------- # |
The diff has been truncated for viewing.
It looks good other than I don't think we really need .directory files, maybe add a new pattern to .gitignore?
4816
4817 === added file 'resources/
4818 --- resources/
4819 +++ resources/
4820 @@ -0,0 +1,4 @@
4821 +[Dolphin]
4822 +PreviewsShown=true
4823 +Timestamp=
4824 +Version=3