Tim Bentley has proposed merging lp:~trb143/openlp/bugs into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Related bugs:
#693150 Custom Slide Display footer option
https://bugs.launchpad.net/bugs/693150
#693202 delete theme
https://bugs.launchpad.net/bugs/693202
For more details, see:
https://code.launchpad.net/~trb143/openlp/bugs/+merge/52317
Fix code in service manager so DND is flagged as a change to saved service
--
https://code.launchpad.net/~trb143/openlp/bugs/+merge/52317
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-02 17:56:06 +0000
+++ openlp.pyw 2011-03-06 08:04:58 +0000
@@ -149,10 +149,6 @@
log.info(u'Openlp version %s' % app_version[u'version'])
return app_version
-# def notify(self, obj, evt):
-# #TODO needed for presentation exceptions
-# return QtGui.QApplication.notify(self, obj, evt)
-
def run(self):
"""
Run the OpenLP application.
=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py 2011-02-24 05:47:38 +0000
+++ openlp/core/ui/servicemanager.py 2011-03-06 08:04:58 +0000
@@ -943,6 +943,7 @@
for item in self.serviceItems:
if item[u'service_item']._uuid == uuid:
item[u'service_item'].edit_id = editId
+ self.setModified(True)
def replaceServiceItem(self, newItem):
"""
@@ -1123,13 +1124,14 @@
self.serviceItems.remove(serviceItem)
self.serviceItems.insert(endpos, serviceItem)
self.repaintServiceList(endpos, child)
+ self.setModified(True)
else:
# we are not over anything so drop
replace = False
if item is None:
self.dropPosition = len(self.serviceItems)
else:
- # we are over somthing so lets investigate
+ # we are over something so lets investigate
pos = self._getParentItemData(item) - 1
serviceItem = self.serviceItems[pos]
if (plugin == serviceItem[u'service_item'].name and
_______________________________________________
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
