Tim Bentley has proposed merging lp:~trb143/openlp/bugs into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Related bugs:
Bug #693150 in OpenLP: "Custom Slide Display footer option"
https://bugs.launchpad.net/openlp/+bug/693150
Bug #693202 in OpenLP: "delete theme"
https://bugs.launchpad.net/openlp/+bug/693202
Bug #712252 in OpenLP: "Service song already in database detection logic
broken"
https://bugs.launchpad.net/openlp/+bug/712252
For more details, see:
https://code.launchpad.net/~trb143/openlp/bugs/+merge/53135
Additional debugging messages
Remove two objects not needed.
--
https://code.launchpad.net/~trb143/openlp/bugs/+merge/53135
Your team OpenLP Core is requested to review the proposed merge of
lp:~trb143/openlp/bugs into lp:openlp.
=== modified file 'openlp.pyw'
--- openlp.pyw 2011-03-11 20:51:29 +0000
+++ openlp.pyw 2011-03-12 17:11:36 +0000
@@ -184,9 +184,14 @@
# make sure Qt really display the splash screen
self.processEvents()
# start the main app window
+<<<<<<< TREE
self.appClipboard = self.clipboard()
self.mainWindow = MainWindow(screens, app_version, self.appClipboard,
not has_run_wizard)
+=======
+ self.mainWindow = MainWindow(screens, app_version, self.clipboard(),
+ has_run_wizard)
+>>>>>>> MERGE-SOURCE
self.mainWindow.show()
if show_splash:
# now kill the splashscreen
=== modified file 'openlp/core/lib/pluginmanager.py'
--- openlp/core/lib/pluginmanager.py 2011-02-24 05:47:38 +0000
+++ openlp/core/lib/pluginmanager.py 2011-03-12 17:11:36 +0000
@@ -55,10 +55,7 @@
sys.path.insert(0, plugin_dir)
self.basepath = os.path.abspath(plugin_dir)
log.debug(u'Base path %s ', self.basepath)
- self.plugin_helpers = []
self.plugins = []
- # this has to happen after the UI is sorted
- # self.find_plugins(plugin_dir)
log.info(u'Plugin manager Initialised')
def find_plugins(self, plugin_dir, plugin_helpers):
@@ -73,7 +70,7 @@
A list of helper objects to pass to the plugins.
"""
- self.plugin_helpers = plugin_helpers
+ log.info(u'Finding plugins')
startdepth = len(os.path.abspath(plugin_dir).split(os.sep))
log.debug(u'finding plugins in %s at depth %d',
unicode(plugin_dir), startdepth)
@@ -102,11 +99,11 @@
plugin_objects = []
for p in plugin_classes:
try:
- plugin = p(self.plugin_helpers)
- log.debug(u'Loaded plugin %s with helpers', unicode(p))
+ plugin = p(plugin_helpers)
+ log.debug(u'Loaded plugin %s', unicode(p))
plugin_objects.append(plugin)
except TypeError:
- log.exception(u'loaded plugin %s has no helpers', unicode(p))
+ log.exception(u'Failed to load plugin %s', unicode(p))
plugins_list = sorted(plugin_objects, self.order_by_weight)
for plugin in plugins_list:
if plugin.checkPreConditions():
@@ -203,6 +200,7 @@
Loop through all the plugins and give them an opportunity to
initialise themselves.
"""
+ log.info(u'Initialise Plugings - Started')
for plugin in self.plugins:
log.info(u'initialising plugins %s in a %s state'
% (plugin.name, plugin.isActive()))
@@ -211,6 +209,7 @@
log.info(u'Initialisation Complete for %s ' % plugin.name)
if not plugin.isActive():
plugin.removeToolboxItem()
+ log.info(u'Initialise Plugings - Finished')
def finalise_plugins(self):
"""
=== modified file 'openlp/core/lib/toolbar.py'
--- openlp/core/lib/toolbar.py 2011-02-24 05:47:38 +0000
+++ openlp/core/lib/toolbar.py 2011-03-12 17:11:36 +0000
@@ -48,7 +48,7 @@
self.icons = {}
self.setIconSize(QtCore.QSize(20, 20))
self.actions = {}
- log.debug(u'Init done')
+ log.debug(u'Init done for %s' % parent.__class__.__name__)
def addToolbarButton(self, title, icon, tooltip=None, slot=None,
checkable=False, shortcut=0, alternate=0,
_______________________________________________
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
