Andreas Preikschat has proposed merging lp:~googol/openlp/short-lines into lp:openlp.
Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~googol/openlp/short-lines/+merge/152848 Hello, - updated the resources.patch file, so that the resources.py file is conform to our standards Note: I didn't regenerate the resources file, because there are other proposals which do this (conflicts), but it works: [andreas@andylaptop short-lines]$ sh scripts/generate_resources.sh [andreas@andylaptop short-lines]$ bzr diff === modified file 'openlp/core/resources.py' --- openlp/core/resources.py 2013-03-12 08:47:14 +0000 +++ openlp/core/resources.py 2013-03-12 08:54:11 +0000 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 ############################################################################### # OpenLP - Open Source Lyrics Projection # @@ -71981,13 +71981,11 @@ """ Initialise OpenLP resources at application startup. """ - QtCore.qRegisterResourceData(0x01, qt_resource_struct, qt_resource_name, - qt_resource_data) + QtCore.qRegisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data) def qCleanupResources(): """ Cleanup OpenLP resources when the application shuts down. """ - QtCore.qUnregisterResourceData(0x01, qt_resource_struct, qt_resource_name, - qt_resource_data) + QtCore.qUnregisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data) -- https://code.launchpad.net/~googol/openlp/short-lines/+merge/152848 Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/short-lines into lp:openlp.
=== modified file 'scripts/resources.patch' --- scripts/resources.patch 2012-12-29 20:56:56 +0000 +++ scripts/resources.patch 2013-03-12 08:58:22 +0000 @@ -1,14 +1,16 @@ ---- openlp/core/resources.py.old Mon Jun 21 23:16:19 2010 -+++ openlp/core/resources.py Mon Jun 21 23:27:48 2010 +=== modified file 'openlp/core/resources.py' +--- openlp/core/resources.py 2013-03-12 08:44:54 +0000 ++++ openlp/core/resources.py 2013-03-12 08:45:42 +0000 @@ -1,10 +1,35 @@ # -*- coding: utf-8 -*- -+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 - +- -# Resource object code -# -# -# WARNING! All changes made in this file will be lost! - ++# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 ++ +############################################################################### +# OpenLP - Open Source Lyrics Projection # +# --------------------------------------------------------------------------- # @@ -41,23 +43,21 @@ from PyQt4 import QtCore qt_resource_data = "\ -@@ -48643,9 +48664,16 @@ +@@ -71953,9 +71978,14 @@ " def qInitResources(): -- QtCore.qRegisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data) + """ + Initialise OpenLP resources at application startup. + """ -+ QtCore.qRegisterResourceData(0x01, qt_resource_struct, qt_resource_name, -+ qt_resource_data) + QtCore.qRegisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data) def qCleanupResources(): -- QtCore.qUnregisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data) + """ + Cleanup OpenLP resources when the application shuts down. + """ -+ QtCore.qUnregisterResourceData(0x01, qt_resource_struct, qt_resource_name, -+ qt_resource_data) + QtCore.qUnregisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data) -qInitResources() + +
_______________________________________________ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
