openlp-core team mailing list archive

[rimach <crichter@xxxxxx>]

rimach has proposed merging lp:~crichter/openlp/testing into lp:openlp.

    Requested reviews:
    OpenLP Core (openlp-core)


This is my first try to add some code! I'm nervous.
-- 
https://code.launchpad.net/~crichter/openlp/testing/+merge/20523
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file '.bzrignore' (properties changed: -x to +x)
=== modified file 'LICENSE' (properties changed: -x to +x)
=== modified file 'MANIFEST.in' (properties changed: -x to +x)
=== modified file 'copyright.txt' (properties changed: -x to +x)
=== modified file 'demo_theme.xml' (properties changed: -x to +x)
=== modified file 'documentation/Makefile' (properties changed: -x to +x)
=== modified file 'documentation/PluginDevelopersGuide.txt' (properties changed: -x to +x)
=== modified file 'documentation/SongFormat.txt' (properties changed: -x to +x)
=== modified file 'documentation/make.bat' (properties changed: -x to +x)
=== modified file 'documentation/pyqt-sql-py2exe.txt' (properties changed: -x to +x)
=== modified file 'documentation/source/conf.py' (properties changed: -x to +x)
=== modified file 'documentation/source/core/index.rst' (properties changed: -x to +x)
=== modified file 'documentation/source/core/lib.rst' (properties changed: -x to +x)
=== modified file 'documentation/source/core/theme.rst' (properties changed: -x to +x)
=== modified file 'documentation/source/index.rst' (properties changed: -x to +x)
=== modified file 'documentation/source/migration/index.rst' (properties changed: -x to +x)
=== modified file 'documentation/source/openlp.rst' (properties changed: -x to +x)
=== modified file 'documentation/source/plugins/index.rst' (properties changed: -x to +x)
=== modified file 'documentation/source/plugins/songs.rst' (properties changed: -x to +x)
=== modified file 'openlp.pyw'
--- openlp.pyw	2010-02-21 06:32:43 +0000
+++ openlp.pyw	2010-03-03 09:10:26 +0000
@@ -157,13 +157,6 @@
                            "off a USB flash drive.")
     parser.add_option("-s", "--style", dest="style",
                       help="Set the Qt4 style (passed directly to Qt4).")
-    # Set up logging
-    filename = os.path.join(get_config_directory(), u'openlp.log')
-    logfile = FileHandler(filename, u'w')
-    logfile.setFormatter(logging.Formatter(
-        u'%(asctime)s %(name)-15s %(levelname)-8s %(message)s'))
-    log.addHandler(logfile)
-    logging.addLevelName(15, u'Timer')
     # Parse command line options and deal with them.
     (options, args) = parser.parse_args()
     qt_args = []
@@ -175,8 +168,18 @@
         log.setLevel(logging.INFO)
     if options.style:
         qt_args.extend(['-style', options.style])
+    if options.portable:
+        os.environ['PORTABLE'] = '1'
     # Throw the rest of the arguments at Qt, just in case.
     qt_args.extend(args)
+
+    # Set up logging
+    filename = os.path.join(get_config_directory(), u'openlp.log')
+    logfile = FileHandler(filename, u'w')
+    logfile.setFormatter(logging.Formatter(
+        u'%(asctime)s %(name)-15s %(levelname)-8s %(message)s'))
+    log.addHandler(logfile)
+    logging.addLevelName(15, u'Timer')
     # Initialise the resources
     qInitResources()
     # Now create and actually run the application.

=== modified file 'openlp/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/core/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/core/lib/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/core/lib/baselistwithdnd.py' (properties changed: -x to +x)
=== modified file 'openlp/core/lib/dockwidget.py' (properties changed: -x to +x)
=== modified file 'openlp/core/lib/eventreceiver.py' (properties changed: -x to +x)
=== modified file 'openlp/core/lib/mediamanageritem.py' (properties changed: -x to +x)
=== modified file 'openlp/core/lib/plugin.py' (properties changed: -x to +x)
=== modified file 'openlp/core/lib/pluginconfig.py' (properties changed: -x to +x)
=== modified file 'openlp/core/lib/pluginmanager.py' (properties changed: -x to +x)
=== modified file 'openlp/core/lib/renderer.py' (properties changed: -x to +x)
=== modified file 'openlp/core/lib/rendermanager.py' (properties changed: -x to +x)
=== modified file 'openlp/core/lib/serviceitem.py' (properties changed: -x to +x)
=== modified file 'openlp/core/lib/settingsmanager.py' (properties changed: -x to +x)
=== modified file 'openlp/core/lib/settingstab.py' (properties changed: -x to +x)
=== modified file 'openlp/core/lib/songxmlhandler.py' (properties changed: -x to +x)
=== modified file 'openlp/core/lib/themexmlhandler.py' (properties changed: -x to +x)
=== modified file 'openlp/core/lib/toolbar.py' (properties changed: -x to +x)
=== modified file 'openlp/core/lib/xmlrootclass.py' (properties changed: -x to +x)
=== modified file 'openlp/core/resources.py' (properties changed: -x to +x)
=== modified file 'openlp/core/test/data_for_tests/render_theme.xml' (properties changed: -x to +x)
=== modified file 'openlp/core/test/data_for_tests/snowbig.jpg' (properties changed: -x to +x)
=== modified file 'openlp/core/test/data_for_tests/snowsmall.jpg' (properties changed: -x to +x)
=== modified file 'openlp/core/test/data_for_tests/sunset1.jpg' (properties changed: -x to +x)
=== modified file 'openlp/core/test/data_for_tests/treesbig.jpg' (properties changed: -x to +x)
=== modified file 'openlp/core/test/data_for_tests/treessmall.jpg' (properties changed: -x to +x)
=== modified file 'openlp/core/test/golden_bitmaps/test_bg_shrink_x.bmp' (properties changed: -x to +x)
=== modified file 'openlp/core/test/golden_bitmaps/test_bg_shrink_y.bmp' (properties changed: -x to +x)
=== modified file 'openlp/core/test/golden_bitmaps/test_bg_stretch_x.bmp' (properties changed: -x to +x)
=== modified file 'openlp/core/test/golden_bitmaps/test_bg_stretch_y.bmp' (properties changed: -x to +x)
=== modified file 'openlp/core/test/golden_bitmaps/test_gradient_h.bmp' (properties changed: -x to +x)
=== modified file 'openlp/core/test/golden_bitmaps/test_gradient_v.bmp' (properties changed: -x to +x)
=== modified file 'openlp/core/test/golden_bitmaps/test_theme_basic.bmp' (properties changed: -x to +x)
=== modified file 'openlp/core/test/golden_bitmaps/test_theme_font.bmp' (properties changed: -x to +x)
=== modified file 'openlp/core/test/golden_bitmaps/test_theme_horizontal_align_centre.bmp' (properties changed: -x to +x)
=== modified file 'openlp/core/test/golden_bitmaps/test_theme_horizontal_align_left.bmp' (properties changed: -x to +x)
=== modified file 'openlp/core/test/golden_bitmaps/test_theme_horizontal_align_left_lyric.bmp' (properties changed: -x to +x)
=== modified file 'openlp/core/test/golden_bitmaps/test_theme_horizontal_align_right.bmp' (properties changed: -x to +x)
=== modified file 'openlp/core/test/golden_bitmaps/test_theme_shadow_outline.bmp' (properties changed: -x to +x)
=== modified file 'openlp/core/test/golden_bitmaps/test_theme_vertical_align_bot.bmp' (properties changed: -x to +x)
=== modified file 'openlp/core/test/golden_bitmaps/test_theme_vertical_align_cen.bmp' (properties changed: -x to +x)
=== modified file 'openlp/core/test/golden_bitmaps/test_theme_vertical_align_top.bmp' (properties changed: -x to +x)
=== modified file 'openlp/core/test/test_mediamanageritem.py' (properties changed: -x to +x)
=== modified file 'openlp/core/test/test_plugin_manager.py' (properties changed: -x to +x)
=== modified file 'openlp/core/test/test_render.py' (properties changed: -x to +x)
=== modified file 'openlp/core/test/test_render_theme.py' (properties changed: -x to +x)
=== modified file 'openlp/core/test/testplugins/deeper/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/core/test/testplugins/deeper/toodeep/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/core/test/testplugins/deeper/toodeep/plugin3toodeep.py' (properties changed: -x to +x)
=== modified file 'openlp/core/test/testplugins/testplugin1.py' (properties changed: -x to +x)
=== modified file 'openlp/core/test/testplugins/testplugin2/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/core/test/testplugins/testplugin2/testplugin2.py' (properties changed: -x to +x)
=== modified file 'openlp/core/theme/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/core/theme/test/test_theme.py' (properties changed: -x to +x)
=== modified file 'openlp/core/theme/test/test_theme.xml' (properties changed: -x to +x)
=== modified file 'openlp/core/theme/theme.py' (properties changed: -x to +x)
=== modified file 'openlp/core/ui/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/core/ui/aboutdialog.py' (properties changed: -x to +x)
=== modified file 'openlp/core/ui/aboutform.py' (properties changed: -x to +x)
=== modified file 'openlp/core/ui/amendthemedialog.py' (properties changed: -x to +x)
=== modified file 'openlp/core/ui/amendthemeform.py' (properties changed: -x to +x)
=== modified file 'openlp/core/ui/generaltab.py' (properties changed: -x to +x)
=== modified file 'openlp/core/ui/maindisplay.py' (properties changed: -x to +x)
=== modified file 'openlp/core/ui/mainwindow.py' (properties changed: -x to +x)
=== modified file 'openlp/core/ui/mediadockmanager.py' (properties changed: -x to +x)
=== modified file 'openlp/core/ui/plugindialog.py' (properties changed: -x to +x)
=== modified file 'openlp/core/ui/pluginform.py' (properties changed: -x to +x)
=== modified file 'openlp/core/ui/screen.py' (properties changed: -x to +x)
=== modified file 'openlp/core/ui/servicemanager.py' (properties changed: -x to +x)
=== modified file 'openlp/core/ui/settingsdialog.py' (properties changed: -x to +x)
=== modified file 'openlp/core/ui/settingsform.py' (properties changed: -x to +x)
=== modified file 'openlp/core/ui/slidecontroller.py' (properties changed: -x to +x)
=== modified file 'openlp/core/ui/splashscreen.py' (properties changed: -x to +x)
=== modified file 'openlp/core/ui/test/test_service_manager.py' (properties changed: -x to +x)
=== modified file 'openlp/core/ui/thememanager.py' (properties changed: -x to +x)
=== modified file 'openlp/core/ui/themestab.py' (properties changed: -x to +x)
=== modified file 'openlp/core/utils/__init__.py' (properties changed: -x to +x)
--- openlp/core/utils/__init__.py	2010-02-21 06:32:43 +0000
+++ openlp/core/utils/__init__.py	2010-03-03 09:10:27 +0000
@@ -24,6 +24,7 @@
 ###############################################################################
 
 import os
+import sys
 import logging
 import urllib2
 from datetime import datetime
@@ -52,7 +53,10 @@
 
 def get_config_directory():
     path = u''
-    if os.name == u'nt':
+    if os.getenv(u'PORTABLE')  is not None:
+        path = os.path.split(os.path.abspath(sys.argv[0]))[0]
+        path = os.path.join(path, u'..',  u'openlp-data')
+    elif os.name == u'nt':
         path = os.path.join(os.getenv(u'APPDATA'), u'openlp')
     elif os.name == u'mac':
         path = os.path.join(os.getenv(u'HOME'), u'Library',
@@ -67,7 +71,10 @@
 
 def get_data_directory():
     path = u''
-    if os.name == u'nt':
+    if os.getenv(u'PORTABLE')  is not None:
+        path = os.path.split(os.path.abspath(sys.argv[0]))[0]
+        path = os.path.join(path, u'..',  u'openlp-data',  u'data')
+    elif os.name == u'nt':
         # ask OS for path to application data, set on Windows XP and Vista
         path = os.path.join(os.getenv(u'APPDATA'), u'openlp', u'data')
     elif os.name == u'mac':

=== modified file 'openlp/core/utils/confighelper.py' (properties changed: -x to +x)
=== modified file 'openlp/core/utils/registry.py' (properties changed: -x to +x)
=== modified file 'openlp/migration/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/migration/display.py' (properties changed: -x to +x)
=== modified file 'openlp/migration/migratebibles.py' (properties changed: -x to +x)
=== modified file 'openlp/migration/migratefiles.py' (properties changed: -x to +x)
=== modified file 'openlp/migration/migratesongs.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/alerts/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/alerts/alertsplugin.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/alerts/forms/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/alerts/forms/alertdialog.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/alerts/forms/alerteditdialog.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/alerts/forms/alerteditform.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/alerts/forms/alertform.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/alerts/forms/alertstab.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/alerts/lib/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/alerts/lib/alertsmanager.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/alerts/lib/classes.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/alerts/lib/manager.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/alerts/lib/meta.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/alerts/lib/models.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/alerts/lib/tables.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/bibleplugin.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/forms/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/forms/bibleimportwizard.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/forms/importwizardform.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/lib/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/lib/biblestab.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/lib/common.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/lib/csvbible.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/lib/db.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/lib/http.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/lib/manager.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/lib/mediaitem.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/lib/models.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/lib/opensong.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/lib/osis.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/resources/biblegateway.csv' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/resources/crosswalkbooks.csv' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/resources/httpbooks.sqlite' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/resources/osisbooks.csv' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/test/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/test/biblebooks_msg_short.csv' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/test/biblebooks_niv_short.csv' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/test/bibleverses_msg_short.csv' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/test/bibleverses_niv_short.csv' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/test/test_bibleManager.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/test/test_bibleManagerAPI.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/test/test_bibleManagerCSV.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/bibles/test/test_bibleManagerOSIS.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/custom/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/custom/customplugin.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/custom/forms/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/custom/forms/editcustomdialog.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/custom/forms/editcustomform.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/custom/lib/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/custom/lib/classes.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/custom/lib/customtab.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/custom/lib/manager.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/custom/lib/mediaitem.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/custom/lib/meta.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/custom/lib/models.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/custom/lib/tables.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/images/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/images/imageplugin.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/images/lib/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/images/lib/imagetab.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/images/lib/mediaitem.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/media/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/media/lib/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/media/lib/mediaitem.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/media/mediaplugin.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/plugin.txt' (properties changed: -x to +x)
=== modified file 'openlp/plugins/presentations/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/presentations/lib/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/presentations/lib/impresscontroller.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/presentations/lib/mediaitem.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/presentations/lib/messagelistener.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/presentations/lib/powerpointcontroller.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/presentations/lib/pptviewcontroller.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/presentations/lib/pptviewlib/README.TXT' (properties changed: -x to +x)
=== modified file 'openlp/plugins/presentations/lib/pptviewlib/ppttest.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp' (properties changed: -x to +x)
=== modified file 'openlp/plugins/presentations/lib/pptviewlib/pptviewlib.dll' (properties changed: -x to +x)
=== modified file 'openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h' (properties changed: -x to +x)
=== modified file 'openlp/plugins/presentations/lib/pptviewlib/pptviewlib.vcproj' (properties changed: -x to +x)
=== modified file 'openlp/plugins/presentations/lib/pptviewlib/test.ppt' (properties changed: -x to +x)
=== modified file 'openlp/plugins/presentations/lib/presentationcontroller.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/presentations/lib/presentationtab.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/presentations/presentationplugin.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/red-x.png' (properties changed: -x to +x)
=== modified file 'openlp/plugins/remotes/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/remotes/lib/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/remotes/lib/remotetab.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/remotes/remoteplugin.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/forms/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/forms/authorsdialog.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/forms/authorsform.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/forms/editsongdialog.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/forms/editsongform.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/forms/editversedialog.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/forms/editverseform.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/forms/openlpexportdialog.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/forms/openlpexportform.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/forms/openlpimportdialog.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/forms/openlpimportform.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/forms/opensongexportdialog.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/forms/opensongexportform.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/forms/opensongimportdialog.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/forms/opensongimportform.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/forms/songbookdialog.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/forms/songbookform.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/forms/songmaintenancedialog.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/forms/songmaintenanceform.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/forms/topicsdialog.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/forms/topicsform.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/lib/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/lib/classes.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/lib/manager.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/lib/mediaitem.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/lib/meta.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/lib/models.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/lib/songstab.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/lib/songxml.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/lib/tables.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/songsplugin.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/test/data_openlp1/amazing.olp' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/test/data_openlp1/sample3.olp' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/test/data_opensong/Amazing Grace' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/test/data_opensong/På en fjern ensom høj' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/test/data_opensong/The Solid Rock' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/test/data_text/CCLI example.txt' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/test/data_text/PÃ¥EnFjern.txt' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/test/data_xml/amazing1.xml' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/test/data_xml/amazing2.xml' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/test/data_xml/danish1.xml' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/test/data_xml/danish2.xml' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/test/data_xml/format1.xml' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/test/data_xml/sample1.xml' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/test/test_song_basic.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/test/test_song_opensong.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/test/test_song_text.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songs/test/test_song_verse.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songusage/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songusage/forms/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songusage/forms/songusagedeletedialog.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songusage/forms/songusagedeleteform.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songusage/forms/songusagedetaildialog.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songusage/forms/songusagedetailform.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songusage/lib/__init__.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songusage/lib/classes.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songusage/lib/manager.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songusage/lib/meta.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songusage/lib/models.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songusage/lib/tables.py' (properties changed: -x to +x)
=== modified file 'openlp/plugins/songusage/songusageplugin.py' (properties changed: -x to +x)
=== modified file 'resources/.config/openlp/openlp.conf' (properties changed: -x to +x)
=== modified file 'resources/.local/share/openlp/bibles/asv.sqlite' (properties changed: -x to +x)
=== modified file 'resources/.local/share/openlp/themes/Bible Readings.png' (properties changed: -x to +x)
=== modified file 'resources/.local/share/openlp/themes/Bible Readings/Bible Readings.xml' (properties changed: -x to +x)
=== modified file 'resources/.local/share/openlp/themes/Bible Readings/open6_2.jpg' (properties changed: -x to +x)
=== modified file 'resources/.local/share/openlp/themes/Blue.png' (properties changed: -x to +x)
=== modified file 'resources/.local/share/openlp/themes/Blue/Blue.xml' (properties changed: -x to +x)
=== modified file 'resources/.local/share/openlp/themes/theme1.png' (properties changed: -x to +x)
=== modified file 'resources/.local/share/openlp/themes/theme1/theme1.xml' (properties changed: -x to +x)
=== modified file 'resources/.local/share/openlp/themes/theme2.png' (properties changed: -x to +x)
=== modified file 'resources/.local/share/openlp/themes/theme2/theme2.xml' (properties changed: -x to +x)
=== modified file 'resources/.local/share/openlp/themes/theme3.png' (properties changed: -x to +x)
=== modified file 'resources/.local/share/openlp/themes/theme3/sunset2.jpg' (properties changed: -x to +x)
=== modified file 'resources/.local/share/openlp/themes/theme3/theme3.xml' (properties changed: -x to +x)
=== modified file 'resources/.openlp/data/bible/asv.sqlite' (properties changed: -x to +x)
=== modified file 'resources/.openlp/openlp.conf' (properties changed: -x to +x)
=== modified file 'resources/.openlp/openlp.conf_posix' (properties changed: -x to +x)
=== modified file 'resources/.openlp/openlp.conf_win' (properties changed: -x to +x)
=== modified file 'resources/bibles/afr1953.osis' (properties changed: -x to +x)
=== modified file 'resources/bibles/kjc.osis' (properties changed: -x to +x)
=== modified file 'resources/bibles/osisbooks_en.txt' (properties changed: -x to +x)
=== modified file 'resources/forms/about.ui' (properties changed: -x to +x)
=== modified file 'resources/forms/alertdialog.ui' (properties changed: -x to +x)
=== modified file 'resources/forms/alerteditdialog.ui' (properties changed: -x to +x)
=== modified file 'resources/forms/amendthemedialog.ui' (properties changed: -x to +x)
=== modified file 'resources/forms/authorsdialog.ui' (properties changed: -x to +x)
=== modified file 'resources/forms/bibleimportdialog.ui' (properties changed: -x to +x)
=== modified file 'resources/forms/bibleimportwizard.ui' (properties changed: -x to +x)
=== modified file 'resources/forms/editcustomdialog.ui' (properties changed: -x to +x)
=== modified file 'resources/forms/editsongdialog.ui' (properties changed: -x to +x)
=== modified file 'resources/forms/editversedialog.ui' (properties changed: -x to +x)
=== modified file 'resources/forms/mainwindow.ui' (properties changed: -x to +x)
=== modified file 'resources/forms/openlpexportform.ui' (properties changed: -x to +x)
=== modified file 'resources/forms/openlpimportform.ui' (properties changed: -x to +x)
=== modified file 'resources/forms/opensongexportform.ui' (properties changed: -x to +x)
=== modified file 'resources/forms/opensongimportform.ui' (properties changed: -x to +x)
=== modified file 'resources/forms/plugindialoglistform.ui' (properties changed: -x to +x)
=== modified file 'resources/forms/settings.ui' (properties changed: -x to +x)
=== modified file 'resources/forms/songbookdialog.ui' (properties changed: -x to +x)
=== modified file 'resources/forms/songexport.ui' (properties changed: -x to +x)
=== modified file 'resources/forms/songmaintenance.ui' (properties changed: -x to +x)
=== modified file 'resources/forms/songusagedeletedialog.ui' (properties changed: -x to +x)
=== modified file 'resources/forms/songusagedetaildialog.ui' (properties changed: -x to +x)
=== modified file 'resources/forms/splashscreen.ui' (properties changed: -x to +x)
=== modified file 'resources/forms/themewizard.ui' (properties changed: -x to +x)
=== modified file 'resources/forms/topicsdialog.ui' (properties changed: -x to +x)
=== modified file 'resources/i18n/openlp_en.ts' (properties changed: -x to +x)
=== modified file 'resources/images/author_add.png' (properties changed: -x to +x)
=== modified file 'resources/images/author_delete.png' (properties changed: -x to +x)
=== modified file 'resources/images/author_edit.png' (properties changed: -x to +x)
=== modified file 'resources/images/author_maintenance.png' (properties changed: -x to +x)
=== modified file 'resources/images/book_add.png' (properties changed: -x to +x)
=== modified file 'resources/images/book_delete.png' (properties changed: -x to +x)
=== modified file 'resources/images/book_edit.png' (properties changed: -x to +x)
=== modified file 'resources/images/book_maintenance.png' (properties changed: -x to +x)
=== modified file 'resources/images/custom_delete.png' (properties changed: -x to +x)
=== modified file 'resources/images/custom_edit.png' (properties changed: -x to +x)
=== modified file 'resources/images/custom_new.png' (properties changed: -x to +x)
=== modified file 'resources/images/export_load.png' (properties changed: -x to +x)
=== modified file 'resources/images/export_move_to_list.png' (properties changed: -x to +x)
=== modified file 'resources/images/export_remove.png' (properties changed: -x to +x)
=== modified file 'resources/images/export_selectall.png' (properties changed: -x to +x)
=== modified file 'resources/images/image_clapperboard.png' (properties changed: -x to +x)
=== modified file 'resources/images/image_delete.png' (properties changed: -x to +x)
=== modified file 'resources/images/image_load.png' (properties changed: -x to +x)
=== modified file 'resources/images/import_load.png' (properties changed: -x to +x)
=== modified file 'resources/images/import_move_to_list.png' (properties changed: -x to +x)
=== modified file 'resources/images/import_remove.png' (properties changed: -x to +x)
=== modified file 'resources/images/import_selectall.png' (properties changed: -x to +x)
=== modified file 'resources/images/media_bible.png' (properties changed: -x to +x)
=== modified file 'resources/images/media_custom.png' (properties changed: -x to +x)
=== modified file 'resources/images/media_image.png' (properties changed: -x to +x)
=== modified file 'resources/images/media_playback_pause.png' (properties changed: -x to +x)
=== modified file 'resources/images/media_playback_start.png' (properties changed: -x to +x)
=== modified file 'resources/images/media_playback_stop.png' (properties changed: -x to +x)
=== modified file 'resources/images/media_presentation.png' (properties changed: -x to +x)
=== modified file 'resources/images/media_song.png' (properties changed: -x to +x)
=== modified file 'resources/images/media_stop.png' (properties changed: -x to +x)
=== modified file 'resources/images/media_time.png' (properties changed: -x to +x)
=== modified file 'resources/images/media_video.png' (properties changed: -x to +x)
=== modified file 'resources/images/messagebox_critical.png' (properties changed: -x to +x)
=== modified file 'resources/images/messagebox_info.png' (properties changed: -x to +x)
=== modified file 'resources/images/messagebox_warning.png' (properties changed: -x to +x)
=== modified file 'resources/images/openlp-2.qrc' (properties changed: -x to +x)
=== modified file 'resources/images/openlp-about-logo.png' (properties changed: -x to +x)
=== modified file 'resources/images/openlp-about-logo.svg' (properties changed: -x to +x)
=== modified file 'resources/images/openlp-default-dualdisplay.svg' (properties changed: -x to +x)
=== modified file 'resources/images/openlp-logo-128x128.png' (properties changed: -x to +x)
=== modified file 'resources/images/openlp-logo-16x16.png' (properties changed: -x to +x)
=== modified file 'resources/images/openlp-logo-256x256.png' (properties changed: -x to +x)
=== modified file 'resources/images/openlp-logo-32x32.png' (properties changed: -x to +x)
=== modified file 'resources/images/openlp-logo-420x420.png' (properties changed: -x to +x)
=== modified file 'resources/images/openlp-logo-48x48.png' (properties changed: -x to +x)
=== modified file 'resources/images/openlp-logo-64x64.png' (properties changed: -x to +x)
=== modified file 'resources/images/openlp-logo.svg' (properties changed: -x to +x)
=== modified file 'resources/images/openlp-splash-screen.png' (properties changed: -x to +x)
=== modified file 'resources/images/openlp-splash-screen.svg' (properties changed: -x to +x)
=== modified file 'resources/images/openlp.org-icon-32.bmp' (properties changed: -x to +x)
=== modified file 'resources/images/openlp.org.ico' (properties changed: -x to +x)
=== modified file 'resources/images/presentation_delete.png' (properties changed: -x to +x)
=== modified file 'resources/images/presentation_load.png' (properties changed: -x to +x)
=== modified file 'resources/images/service_bottom.png' (properties changed: -x to +x)
=== modified file 'resources/images/service_delete.png' (properties changed: -x to +x)
=== modified file 'resources/images/service_down.png' (properties changed: -x to +x)
=== modified file 'resources/images/service_new.png' (properties changed: -x to +x)
=== modified file 'resources/images/service_open.png' (properties changed: -x to +x)
=== modified file 'resources/images/service_save.png' (properties changed: -x to +x)
=== modified file 'resources/images/service_top.png' (properties changed: -x to +x)
=== modified file 'resources/images/service_up.png' (properties changed: -x to +x)
=== modified file 'resources/images/slide_close.png' (properties changed: -x to +x)
=== modified file 'resources/images/slide_first.png' (properties changed: -x to +x)
=== modified file 'resources/images/slide_last.png' (properties changed: -x to +x)
=== modified file 'resources/images/slide_next.png' (properties changed: -x to +x)
=== modified file 'resources/images/slide_previous.png' (properties changed: -x to +x)
=== modified file 'resources/images/song_author_edit.png' (properties changed: -x to +x)
=== modified file 'resources/images/song_book_edit.png' (properties changed: -x to +x)
=== modified file 'resources/images/song_delete.png' (properties changed: -x to +x)
=== modified file 'resources/images/song_edit.png' (properties changed: -x to +x)
=== modified file 'resources/images/song_export.png' (properties changed: -x to +x)
=== modified file 'resources/images/song_maintenance.png' (properties changed: -x to +x)
=== modified file 'resources/images/song_new.png' (properties changed: -x to +x)
=== modified file 'resources/images/song_topic_edit.png' (properties changed: -x to +x)
=== modified file 'resources/images/splash-screen-new.bmp' (properties changed: -x to +x)
=== modified file 'resources/images/system_about.png' (properties changed: -x to +x)
=== modified file 'resources/images/system_add.png' (properties changed: -x to +x)
=== modified file 'resources/images/system_close.png' (properties changed: -x to +x)
=== modified file 'resources/images/system_contribute.png' (properties changed: -x to +x)
=== modified file 'resources/images/system_exit.png' (properties changed: -x to +x)
=== modified file 'resources/images/system_help_contents.png' (properties changed: -x to +x)
=== modified file 'resources/images/system_live.png' (properties changed: -x to +x)
=== modified file 'resources/images/system_mediamanager.png' (properties changed: -x to +x)
=== modified file 'resources/images/system_preview.png' (properties changed: -x to +x)
=== modified file 'resources/images/system_servicemanager.png' (properties changed: -x to +x)
=== modified file 'resources/images/system_settings.png' (properties changed: -x to +x)
=== modified file 'resources/images/system_thememanager.png' (properties changed: -x to +x)
=== modified file 'resources/images/theme_delete.png' (properties changed: -x to +x)
=== modified file 'resources/images/theme_edit.png' (properties changed: -x to +x)
=== modified file 'resources/images/theme_export.png' (properties changed: -x to +x)
=== modified file 'resources/images/theme_import.png' (properties changed: -x to +x)
=== modified file 'resources/images/theme_new.png' (properties changed: -x to +x)
=== modified file 'resources/images/tools_add.png' (properties changed: -x to +x)
=== modified file 'resources/images/tools_alert.png' (properties changed: -x to +x)
=== modified file 'resources/images/topic_add.png' (properties changed: -x to +x)
=== modified file 'resources/images/topic_delete.png' (properties changed: -x to +x)
=== modified file 'resources/images/topic_edit.png' (properties changed: -x to +x)
=== modified file 'resources/images/topic_maintenance.png' (properties changed: -x to +x)
=== modified file 'resources/images/video_delete.png' (properties changed: -x to +x)
=== modified file 'resources/images/video_load.png' (properties changed: -x to +x)
=== modified file 'resources/images/wizard_importbible.bmp' (properties changed: -x to +x)
=== modified file 'resources/openlp.desktop' (properties changed: -x to +x)
=== modified file 'resources/songs/songs.sqlite' (properties changed: -x to +x)
=== modified file 'resources/videos/AspectRatioTest-16-9-ana.h264.mp4' (properties changed: -x to +x)
=== modified file 'resources/videos/AspectRatioTest-16-9-squ.h264.mp4' (properties changed: -x to +x)
=== modified file 'resources/videos/AspectRatioTest-16-9-squ.xvid.avi' (properties changed: -x to +x)
=== modified file 'resources/videos/AspectRatioTest-4-3-ana.h264.mp4' (properties changed: -x to +x)
=== modified file 'resources/videos/AspectRatioTest-4-3-squ.h264.mp4' (properties changed: -x to +x)
=== modified file 'resources/videos/AspectRatioTest-4-3-squ.xvid.avi' (properties changed: -x to +x)
=== modified file 'resources/videos/AspectRatioTest-rand-squ.h264.mp4' (properties changed: -x to +x)
=== modified file 'resources/videos/left-720.png' (properties changed: -x to +x)
=== modified file 'resources/videos/normal-720.png' (properties changed: -x to +x)
=== modified file 'resources/videos/right-720.png' (properties changed: -x to +x)
=== modified file 'resources/videos/synctest.24.avs' (properties changed: -x to +x)
=== modified file 'resources/videos/synctest.24.muxed.avi' (properties changed: -x to +x)
=== modified file 'resources/videos/synctest.24.muxed.mp4' (properties changed: -x to +x)
=== modified file 'resources/videos/synctest.25.avs' (properties changed: -x to +x)
=== modified file 'resources/videos/synctest.25.muxed.avi' (properties changed: -x to +x)
=== modified file 'resources/videos/synctest.30.avs' (properties changed: -x to +x)
=== modified file 'resources/videos/synctest.30.muxed.avi' (properties changed: -x to +x)
=== modified file 'resources/videos/synctest.30.small.avs' (properties changed: -x to +x)
=== modified file 'resources/videos/synctest.30.small.muxed.avi' (properties changed: -x to +x)
=== modified file 'resources/videos/synctest.avsi' (properties changed: -x to +x)
=== modified file 'version.txt' (properties changed: -x to +x)