OpenLP

Merge lp:~trb143/openlp/bugfixes into lp:openlp

  1. bugfixes
  2. Merge into trunk
Proposed by Tim Bentley
Status: Merged
Merged at revision: not available
Proposed branch: lp:~trb143/openlp/bugfixes
Merge into: lp:openlp
Diff against target: None lines
To merge this branch: bzr merge lp:~trb143/openlp/bugfixes
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Review via email: mp+12027@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

Fix presentation messaging : issue by using an array

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

50 + if desktop==None:
51 + return

Change that to "if desktop is None:" next time please.

review: Approve
lp:~trb143/openlp/bugfixes updated
548. By Tim Bentley

presentation fixes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/core/lib/rendermanager.py'
2--- openlp/core/lib/rendermanager.py 2009-09-08 19:58:05 +0000
3+++ openlp/core/lib/rendermanager.py 2009-09-16 19:00:17 +0000
4@@ -63,7 +63,7 @@
5 else:
6 self.current_display = screen_number
7 self.renderer = Renderer()
8- #self.calculate_default(self.screen_list[self.current_display][u'size'])
9+ self.calculate_default(self.screen_list[self.current_display][u'size'])
10 self.theme = u''
11 self.service_theme = u''
12 self.global_style = u''
13
14=== modified file 'openlp/core/ui/slidecontroller.py'
15--- openlp/core/ui/slidecontroller.py 2009-09-15 20:06:39 +0000
16+++ openlp/core/ui/slidecontroller.py 2009-09-18 06:07:10 +0000
17@@ -254,7 +254,7 @@
18 self.enableToolBar(item)
19 if item.service_item_type == ServiceType.Command:
20 Receiver().send_message(u'%s_start'%item.name.lower(), \
21- u'%s:%s:%s' % (item.shortname, item.service_item_path, item.service_frames[0][u'title']))
22+ [item.shortname, item.service_item_path, item.service_frames[0][u'title']])
23 else:
24 self.displayServiceManagerItems(item, 0)
25
26@@ -272,7 +272,7 @@
27 self.enableToolBar(item)
28 if item.service_item_type == ServiceType.Command:
29 Receiver().send_message(u'%s_start'%item.name.lower(), \
30- u'%s:%s:%s' % (item.shortname, item.service_item_path, item.service_frames[0][u'title']))
31+ [item.shortname, item.service_item_path, item.service_frames[0][u'title']])
32 else:
33 self.displayServiceManagerItems(item, slideno)
34
35
36=== modified file 'openlp/plugins/presentations/lib/impresscontroller.py'
37--- openlp/plugins/presentations/lib/impresscontroller.py 2009-09-17 07:28:47 +0000
38+++ openlp/plugins/presentations/lib/impresscontroller.py 2009-09-18 06:07:10 +0000
39@@ -89,12 +89,12 @@
40 log.debug(u'LoadPresentation')
41 if os.name == u'nt':
42 desktop = self.getCOMDesktop()
43- url = u'file:///' + presentation.replace(u'\\', u'/').replace(u':', u'|').replace(u' ', u'%20')
44+ url = u'file:///' + presentation.replace(u'\\', u'/').replace(u':', u'|').replace(u' ', u'%20')
45 else:
46 desktop = self.getUNODesktop()
47 url = uno.systemPathToFileUrl(presentation)
48- if(desktop==None):
49- return
50+ if desktop==None:
51+ return
52 try:
53 properties = []
54 properties = tuple(properties)
55
56=== modified file 'openlp/plugins/presentations/lib/messagelistener.py'
57--- openlp/plugins/presentations/lib/messagelistener.py 2009-09-07 05:13:39 +0000
58+++ openlp/plugins/presentations/lib/messagelistener.py 2009-09-18 06:07:10 +0000
59@@ -83,6 +83,5 @@
60 ``message``
61 Message containing Presentaion handler name and file to be presented.
62 """
63- bits = message.split(u':')
64- file = os.path.join(bits[1], bits[2])
65- return bits[0], file
66+ file = os.path.join(message[1], message[2])
67+ return message[0], file