OpenLP

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

  1. audit
  2. Merge into trunk
Proposed by Tim Bentley
Status: Merged
Merged at revision: not available
Proposed branch: lp:~trb143/openlp/audit
Merge into: lp:openlp
Diff against target: 552 lines
21 files modified
openlp/core/lib/plugin.py (+1/-2)
openlp/core/lib/serviceitem.py (+18/-5)
openlp/core/lib/settingsmanager.py (+3/-3)
openlp/core/lib/xmlrootclass.py (+2/-2)
openlp/core/ui/about.py (+1/-0)
openlp/core/ui/maindisplay.py (+1/-1)
openlp/plugins/audit/auditplugin.py (+1/-1)
openlp/plugins/audit/lib/manager.py (+1/-1)
openlp/plugins/bibles/bibleplugin.py (+1/-1)
openlp/plugins/bibles/lib/bibleCSVimpl.py (+1/-1)
openlp/plugins/bibles/lib/bibleHTTPimpl.py (+14/-15)
openlp/plugins/bibles/lib/bibleOSISimpl.py (+6/-4)
openlp/plugins/bibles/lib/common.py (+3/-3)
openlp/plugins/bibles/lib/manager.py (+7/-9)
openlp/plugins/bibles/lib/mediaitem.py (+10/-13)
openlp/plugins/custom/customplugin.py (+1/-1)
openlp/plugins/custom/lib/mediaitem.py (+1/-1)
openlp/plugins/presentations/lib/mediaitem.py (+1/-1)
openlp/plugins/presentations/lib/messagelistener.py (+1/-1)
openlp/plugins/presentations/presentationplugin.py (+2/-2)
openlp/plugins/remotes/remoteplugin.py (+1/-1)
To merge this branch: bzr merge lp:~trb143/openlp/audit
Reviewer Review Type Date Requested Status
Jon Tibble (community) Approve
Review via email: mp+12602@code.launchpad.net

This proposal supersedes a proposal from 2009-09-29.

To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote : Posted in a previous version of this proposal

Caught Jon's bug and done some cleanups.
Added Jon About screen so he gets some well aimed blame!
Next request may do something useful

Revision history for this message
Jonathan Corwin (j-corwin) wrote : Posted in a previous version of this proposal

Given the list of developers appears to be in alphabetical order, shouldn't Jon appear a few lines further down?

Revision history for this message
Jon Tibble (meths) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/core/lib/plugin.py'
2--- openlp/core/lib/plugin.py 2009-09-29 12:51:38 +0000
3+++ openlp/core/lib/plugin.py 2009-09-29 17:25:26 +0000
4@@ -200,8 +200,7 @@
5
6 def process_add_service_event(self):
7 """
8- Proxy method as method is not defined early enough
9- in the processing
10+ Generic Drag and drop handler triggered from service_manager.
11 """
12 log.debug(u'process_add_service_event event called for plugin %s' % self.name)
13 self.media_item.onAddClick()
14
15=== modified file 'openlp/core/lib/serviceitem.py'
16--- openlp/core/lib/serviceitem.py 2009-09-25 23:06:54 +0000
17+++ openlp/core/lib/serviceitem.py 2009-09-29 17:25:26 +0000
18@@ -24,12 +24,16 @@
19
20 import logging
21 import os
22+import time
23
24 from PyQt4 import QtGui
25
26 from openlp.core.lib import buildIcon
27
28 class ServiceType(object):
29+ """
30+ Defines the type of service item
31+ """
32 Text = 1
33 Image = 2
34 Command = 3
35@@ -82,7 +86,7 @@
36
37 def render(self):
38 """
39- The render method is what renders the frames for the screen.
40+ The render method is what generates the frames for the screen.
41 """
42 log.debug(u'Render called')
43 self.frames = []
44@@ -93,6 +97,7 @@
45 else:
46 self.RenderManager.set_override_theme(self.theme)
47 for slide in self.service_frames:
48+ before = time.time()
49 formated = self.RenderManager.format_slide(slide[u'raw_slide'])
50 for format in formated:
51 frame = None
52@@ -102,6 +107,7 @@
53 title = lines.split(u'\n')[0]
54 self.frames.append({u'title': title, u'text': lines,
55 u'image': frame})
56+ log.info(u'Formatting took %4s' % (time.time() - before))
57 elif self.service_item_type == ServiceType.Command:
58 self.frames = self.service_frames
59 elif self.service_item_type == ServiceType.Image:
60@@ -113,6 +119,11 @@
61 log.error(u'Invalid value renderer :%s' % self.service_item_type)
62
63 def render_individual(self, row):
64+ """
65+ Takes an array of text and geneates an Image from the
66+ theme. It assumes the text will fit on the screen as it
67+ has generated by the render method above.
68+ """
69 log.debug(u'render individual')
70 if self.theme is None:
71 self.RenderManager.set_override_theme(None)
72@@ -138,7 +149,8 @@
73 """
74 self.service_item_type = ServiceType.Image
75 self.service_item_path = path
76- self.service_frames.append({u'title': frame_title, u'text':None, u'image': image})
77+ self.service_frames.append(
78+ {u'title': frame_title, u'text':None, u'image': image})
79
80 def add_from_text(self, frame_title, raw_slide):
81 """
82@@ -152,8 +164,8 @@
83 """
84 self.service_item_type = ServiceType.Text
85 frame_title = frame_title.split(u'\n')[0]
86- self.service_frames.append({u'title': frame_title,
87- u'raw_slide': raw_slide})
88+ self.service_frames.append(
89+ {u'title': frame_title, u'raw_slide': raw_slide})
90
91 def add_from_command(self, path, frame_title):
92 """
93@@ -167,7 +179,8 @@
94 """
95 self.service_item_type = ServiceType.Command
96 self.service_item_path = path
97- self.service_frames.append({u'title': frame_title, u'command': None})
98+ self.service_frames.append(
99+ {u'title': frame_title, u'command': None})
100
101 def get_service_repr(self):
102 """
103
104=== modified file 'openlp/core/lib/settingsmanager.py'
105--- openlp/core/lib/settingsmanager.py 2009-09-29 02:54:32 +0000
106+++ openlp/core/lib/settingsmanager.py 2009-09-29 17:25:26 +0000
107@@ -67,13 +67,13 @@
108 def setUIItemVisibility(self, item=u'', isVisible=True):
109 if item != u'':
110 if item == u'ThemeManagerDock':
111- ConfigHelper.set_config('user interface',
112+ ConfigHelper.set_config(u'user interface',
113 u'display thememanager', isVisible)
114 elif item == u'ServiceManagerDock':
115- ConfigHelper.set_config('user interface',
116+ ConfigHelper.set_config(u'user interface',
117 u'display servicemanager', isVisible)
118 elif item == u'MediaManagerDock':
119- ConfigHelper.set_config('user interface',
120+ ConfigHelper.set_config(u'user interface',
121 u'display mediamanager', isVisible)
122
123 def togglePreviewPanel(self, isVisible):
124
125=== modified file 'openlp/core/lib/xmlrootclass.py'
126--- openlp/core/lib/xmlrootclass.py 2009-09-25 00:43:42 +0000
127+++ openlp/core/lib/xmlrootclass.py 2009-09-29 17:25:26 +0000
128@@ -28,7 +28,7 @@
129
130 from xml.etree.ElementTree import ElementTree, XML
131
132-sys.path.append(os.path.abspath(os.path.join('.', '..', '..')))
133+sys.path.append(os.path.abspath(os.path.join(u'.', u'..', u'..')))
134
135 class XmlRootClass(object):
136 """
137@@ -61,7 +61,7 @@
138 val = text
139 elif type(text) is StringType:
140 # Strings need special handling to sort the colours out
141- if text[0] == '$':
142+ if text[0] == u'$':
143 # This might be a hex number, let's try to convert it.
144 try:
145 val = int(text[1:], 16)
146
147=== modified file 'openlp/core/ui/about.py'
148--- openlp/core/ui/about.py 2009-09-29 02:54:32 +0000
149+++ openlp/core/ui/about.py 2009-09-29 17:25:26 +0000
150@@ -162,6 +162,7 @@
151 u' Scott \"sguerrieri\" Guerrieri\n'
152 u' Raoul \"superfly\" Snyman\n'
153 u' Martin \"mijiti\" Thompson\n'
154+ u' Jon \"Meths\" Tibble\n'
155 u' Carsten \"catini\" Tingaard'))
156 self.AboutNotebook.setTabText(
157 self.AboutNotebook.indexOf(self.CreditsTab),
158
159=== modified file 'openlp/core/ui/maindisplay.py'
160--- openlp/core/ui/maindisplay.py 2009-09-25 00:43:42 +0000
161+++ openlp/core/ui/maindisplay.py 2009-09-29 17:25:26 +0000
162@@ -32,7 +32,7 @@
163 This is the form that is used to display things on the projector.
164 """
165 global log
166- log=logging.getLogger(u'MainDisplay')
167+ log = logging.getLogger(u'MainDisplay')
168 log.info(u'MainDisplay Loaded')
169
170 def __init__(self, parent, screens):
171
172=== modified file 'openlp/plugins/audit/auditplugin.py'
173--- openlp/plugins/audit/auditplugin.py 2009-09-29 02:54:32 +0000
174+++ openlp/plugins/audit/auditplugin.py 2009-09-29 17:25:26 +0000
175@@ -49,7 +49,7 @@
176 """
177 Check to see if auditing is required
178 """
179- log.debug('check_pre_conditions')
180+ log.debug(u'check_pre_conditions')
181 #Lets see if audit is required
182 if int(self.config.get_config(u'startup', 0)) == QtCore.Qt.Checked:
183 return True
184
185=== modified file 'openlp/plugins/audit/lib/manager.py'
186--- openlp/plugins/audit/lib/manager.py 2009-09-26 06:46:26 +0000
187+++ openlp/plugins/audit/lib/manager.py 2009-09-29 17:25:26 +0000
188@@ -33,7 +33,7 @@
189 """
190
191 global log
192- log=logging.getLogger(u'AuditManager')
193+ log = logging.getLogger(u'AuditManager')
194 log.info(u'Audit manager loaded')
195
196 def __init__(self, config):
197
198=== modified file 'openlp/plugins/bibles/bibleplugin.py'
199--- openlp/plugins/bibles/bibleplugin.py 2009-09-29 02:54:32 +0000
200+++ openlp/plugins/bibles/bibleplugin.py 2009-09-29 17:25:26 +0000
201@@ -31,7 +31,7 @@
202
203 class BiblePlugin(Plugin):
204 global log
205- log=logging.getLogger(u'BiblePlugin')
206+ log = logging.getLogger(u'BiblePlugin')
207 log.info(u'Bible Plugin loaded')
208
209 def __init__(self, plugin_helpers):
210
211=== modified file 'openlp/plugins/bibles/lib/bibleCSVimpl.py'
212--- openlp/plugins/bibles/lib/bibleCSVimpl.py 2009-09-25 00:43:42 +0000
213+++ openlp/plugins/bibles/lib/bibleCSVimpl.py 2009-09-29 17:25:26 +0000
214@@ -30,7 +30,7 @@
215
216 class BibleCSVImpl(BibleCommon):
217 global log
218- log=logging.getLogger(u'BibleCSVImpl')
219+ log = logging.getLogger(u'BibleCSVImpl')
220 log.info(u'BibleCVSImpl loaded')
221 def __init__(self, bibledb):
222 """
223
224=== modified file 'openlp/plugins/bibles/lib/bibleHTTPimpl.py'
225--- openlp/plugins/bibles/lib/bibleHTTPimpl.py 2009-09-26 18:22:10 +0000
226+++ openlp/plugins/bibles/lib/bibleHTTPimpl.py 2009-09-29 17:25:26 +0000
227@@ -28,7 +28,7 @@
228
229 class BGExtract(BibleCommon):
230 global log
231- log=logging.getLogger(u'BibleHTTPMgr(BG_extract)')
232+ log = logging.getLogger(u'BibleHTTPMgr(BG_extract)')
233 log.info(u'BG_extract loaded')
234
235 def __init__(self, proxyurl= None):
236@@ -65,7 +65,7 @@
237 bible = {}
238 while versePos > -1:
239 # clear out string
240- verseText = ''
241+ verseText = u''
242 versePos = xml_string.find(u'</span', versePos)
243 i = xml_string.find(VerseSearch, versePos+1)
244 if i == -1:
245@@ -88,7 +88,7 @@
246
247 class CWExtract(BibleCommon):
248 global log
249- log=logging.getLogger(u'BibleHTTPMgr(CWExtract)')
250+ log = logging.getLogger(u'BibleHTTPMgr(CWExtract)')
251 log.info(u'CWExtract loaded')
252
253 def __init__(self, proxyurl=None):
254@@ -121,8 +121,8 @@
255 xml_string = self._get_web_text(urlstring, self.proxyurl)
256 ## Strip Book Title from Heading to return it to system
257 ##
258- i= xml_string.find(u'<title>')
259- j= xml_string.find(u'-', i)
260+ i = xml_string.find(u'<title>')
261+ j = xml_string.find(u'-', i)
262 book_title = xml_string[i + 7:j]
263 book_title = book_title.rstrip()
264 log.debug(u'Book Title %s', book_title)
265@@ -133,15 +133,15 @@
266 log.debug(u'Book Chapter %s', book_chapter)
267 # Strip Verse Data from Page and build an array
268
269- i= xml_string.find(u'NavCurrentChapter')
270- xml_string = xml_string[i:len(xml_string)]
271- i= xml_string.find(u'<TABLE')
272- xml_string = xml_string[i:len(xml_string)]
273- i= xml_string.find(u'<B>')
274+ i = xml_string.find(u'NavCurrentChapter')
275+ xml_string = xml_string[i:len(xml_string)]
276+ i = xml_string.find(u'<TABLE')
277+ xml_string = xml_string[i:len(xml_string)]
278+ i = xml_string.find(u'<B>')
279 #remove the <B> at the front
280 xml_string = xml_string[i + 3 :len(xml_string)]
281 # Remove the heading for the book
282- i= xml_string.find(u'<B>')
283+ i = xml_string.find(u'<B>')
284 #remove the <B> at the front
285 xml_string = xml_string[i + 3 :len(xml_string)]
286 versePos = xml_string.find(u'<BLOCKQUOTE>')
287@@ -151,7 +151,7 @@
288 versePos = xml_string.find(u'<B><I>', versePos) + 6
289 i = xml_string.find(u'</I></B>', versePos)
290 # Got the Chapter
291- verse= xml_string[versePos:i]
292+ verse = xml_string[versePos:i]
293 # move the starting position to begining of the text
294 versePos = i + 8
295 # find the start of the next verse
296@@ -168,7 +168,7 @@
297
298 class BibleHTTPImpl():
299 global log
300- log=logging.getLogger(u'BibleHTTPMgr')
301+ log = logging.getLogger(u'BibleHTTPMgr')
302 log.info(u'BibleHTTP manager loaded')
303 def __init__(self):
304 """
305@@ -180,8 +180,7 @@
306
307 Init confirms the bible exists and stores the database path.
308 """
309- #bible = {}
310- self.biblesource = ''
311+ self.biblesource = u''
312 self.proxyurl = None
313 self.bibleid = None
314
315
316=== modified file 'openlp/plugins/bibles/lib/bibleOSISimpl.py'
317--- openlp/plugins/bibles/lib/bibleOSISimpl.py 2009-09-26 14:36:08 +0000
318+++ openlp/plugins/bibles/lib/bibleOSISimpl.py 2009-09-29 17:25:26 +0000
319@@ -60,7 +60,7 @@
320 filepath = os.path.split(os.path.abspath(__file__))[0]
321 filepath = os.path.abspath(os.path.join(
322 filepath, u'..', u'resources',u'osisbooks.csv'))
323- fbibles=open(filepath, u'r')
324+ fbibles = open(filepath, u'r')
325 for line in fbibles:
326 p = line.split(u',')
327 self.booksOfBible[p[0]] = p[1].replace(u'\n', u'')
328@@ -99,9 +99,11 @@
329 if self.loadbible == False:
330 break
331 pos = file_record.find(verseText)
332- if pos > -1: # we have a verse
333- epos= file_record.find(u'>', pos)
334- ref = file_record[pos+15:epos-1] # Book Reference
335+ # we have a verse
336+ if pos > -1:
337+ epos = file_record.find(u'>', pos)
338+ # Book Reference
339+ ref = file_record[pos+15:epos-1]
340 #lets find the bible text only
341 # find start of text
342 pos = epos + 1
343
344=== modified file 'openlp/plugins/bibles/lib/common.py'
345--- openlp/plugins/bibles/lib/common.py 2009-09-26 18:22:10 +0000
346+++ openlp/plugins/bibles/lib/common.py 2009-09-29 17:25:26 +0000
347@@ -104,15 +104,15 @@
348 urllib2.install_opener(opener)
349 xml_string = u''
350 req = urllib2.Request(urlstring)
351- req.add_header('User-Agent', 'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT)')
352+ req.add_header(u'User-Agent', u'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT)')
353 try:
354 handle = urllib2.urlopen(req)
355 html = handle.read()
356 details = chardet.detect(html)
357- xml_string = unicode(html, details['encoding'])
358+ xml_string = unicode(html, details[u'encoding'])
359 except IOError, e:
360 if hasattr(e, u'reason'):
361- log.error(u'Reason : %s', e.reason)
362+ log.exception(u'Reason for failure: %s', e.reason)
363 return xml_string
364
365 def _clean_text(self, text):
366
367=== modified file 'openlp/plugins/bibles/lib/manager.py'
368--- openlp/plugins/bibles/lib/manager.py 2009-09-26 18:22:10 +0000
369+++ openlp/plugins/bibles/lib/manager.py 2009-09-29 17:25:26 +0000
370@@ -322,8 +322,7 @@
371 Rest can be guessed at !
372 """
373 text = []
374- self.media.setQuickMsg1(u'')
375- self.media.setQuickMsg2(u'')
376+ self.media.setQuickMessage(u'')
377 log.debug(u'get_verse_text %s,%s,%s,%s,%s,%s',
378 bible, bookname, schapter, echapter, sverse, everse)
379 # check to see if book/chapter exists fow HTTP bibles and load cache
380@@ -331,10 +330,10 @@
381 if self.bible_http_cache[bible] is not None:
382 book = self.bible_db_cache[bible].get_bible_book(bookname)
383 if book is None:
384- self.media.setQuickMsg1(u'Downloading')
385 log.debug(u'get_verse_text : new book')
386 for chapter in range(schapter, echapter + 1):
387- self.media.setQuickMsg2(u'%s: %s'% (bookname, chapter))
388+ self.media.setQuickMessage \
389+ (u'Downloading %s: %s'% (bookname, chapter))
390 search_results = \
391 self.bible_http_cache[bible].get_bible_chapter(
392 bible, 0, bookname, chapter)
393@@ -362,8 +361,8 @@
394 v = self.bible_db_cache[bible].get_bible_chapter(
395 book.id, chapter)
396 if v is None:
397- self.media.setQuickMsg2(u'%s: %s'% (
398- bookname, chapter))
399+ self.media.setQuickMessage \
400+ (u'%Downloading %s: %s'% (bookname, chapter))
401 self.bible_db_cache[bible].create_chapter(
402 book.id, chapter,
403 search_results.get_verselist())
404@@ -374,9 +373,8 @@
405 book.id, chapter)
406 if v is None:
407 try:
408- self.media.setQuickMsg1(u'Downloading')
409- self.media.setQuickMsg2(u'%s: %s'% \
410- (bookname, chapter))
411+ self.media.setQuickMessage \
412+ (u'Downloading %s: %s'% (bookname, chapter))
413 search_results = \
414 self.bible_http_cache[bible].get_bible_chapter(
415 bible, book.id, bookname, chapter)
416
417=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
418--- openlp/plugins/bibles/lib/mediaitem.py 2009-09-29 02:54:32 +0000
419+++ openlp/plugins/bibles/lib/mediaitem.py 2009-09-29 17:25:26 +0000
420@@ -76,7 +76,9 @@
421 # Add the Quick Search tab
422 self.QuickTab = QtGui.QWidget()
423 self.QuickTab.setObjectName(u'QuickTab')
424- self.QuickLayout = QtGui.QGridLayout(self.QuickTab)
425+ self.QuickVerticalLayout = QtGui.QVBoxLayout(self.QuickTab)
426+ self.QuickVerticalLayout.setObjectName("verticalLayout")
427+ self.QuickLayout = QtGui.QGridLayout()
428 self.QuickLayout.setMargin(5)
429 self.QuickLayout.setSpacing(4)
430 self.QuickLayout.setObjectName(u'QuickLayout')
431@@ -107,12 +109,10 @@
432 self.ClearQuickSearchComboBox = QtGui.QComboBox(self.QuickTab)
433 self.ClearQuickSearchComboBox.setObjectName(u'ClearQuickSearchComboBox')
434 self.QuickLayout.addWidget(self.ClearQuickSearchComboBox, 3, 1, 1, 1)
435- self.QuickMsg1 = QtGui.QLabel(self.QuickTab)
436- self.QuickMsg1.setObjectName(u'QuickSearchLabel')
437- self.QuickLayout.addWidget(self.QuickMsg1, 4, 0, 1, 1)
438- self.QuickMsg2 = QtGui.QLabel(self.QuickTab)
439- self.QuickMsg2.setObjectName(u'QuickSearchLabel')
440- self.QuickLayout.addWidget(self.QuickMsg2, 4, 1, 1, 1)
441+ self.QuickVerticalLayout.addLayout(self.QuickLayout)
442+ self.QuickMessage = QtGui.QLabel(self.QuickTab)
443+ self.QuickMessage.setObjectName(u'QuickMessage')
444+ self.QuickVerticalLayout.addWidget(self.QuickMessage)
445 self.SearchTabWidget.addTab(self.QuickTab, 'Quick')
446 QuickSpacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum,
447 QtGui.QSizePolicy.Expanding)
448@@ -230,14 +230,11 @@
449 self.loadBibles()
450 self.parent.biblemanager.set_media_manager(self)
451
452- def setQuickMsg1(self, text):
453- self.QuickMsg1.setText(translate(u'BibleMediaItem', unicode(text)))
454-
455- def setQuickMsg2(self, text):
456- self.QuickMsg2.setText(translate(u'BibleMediaItem', unicode(text)))
457+ def setQuickMessage(self, text):
458+ self.QuickMessage.setText(translate(u'BibleMediaItem', unicode(text)))
459 Receiver().send_message(u'process_events')
460 #minor delay to get the events processed
461- time.sleep(0.5)
462+ time.sleep(0.1)
463
464 def loadBibles(self):
465 log.debug(u'Loading Bibles')
466
467=== modified file 'openlp/plugins/custom/customplugin.py'
468--- openlp/plugins/custom/customplugin.py 2009-09-29 02:54:32 +0000
469+++ openlp/plugins/custom/customplugin.py 2009-09-29 17:25:26 +0000
470@@ -40,7 +40,7 @@
471 """
472
473 global log
474- log=logging.getLogger(u'CustomPlugin')
475+ log = logging.getLogger(u'CustomPlugin')
476 log.info(u'Custom Plugin loaded')
477
478 def __init__(self, plugin_helpers):
479
480=== modified file 'openlp/plugins/custom/lib/mediaitem.py'
481--- openlp/plugins/custom/lib/mediaitem.py 2009-09-26 09:11:39 +0000
482+++ openlp/plugins/custom/lib/mediaitem.py 2009-09-29 17:25:26 +0000
483@@ -38,7 +38,7 @@
484 This is the custom media manager item for Custom Slides.
485 """
486 global log
487- log=logging.getLogger(u'CustomMediaItem')
488+ log = logging.getLogger(u'CustomMediaItem')
489 log.info(u'Custom Media Item loaded')
490
491 def __init__(self, parent, icon, title):
492
493=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
494--- openlp/plugins/presentations/lib/mediaitem.py 2009-09-26 09:11:39 +0000
495+++ openlp/plugins/presentations/lib/mediaitem.py 2009-09-29 17:25:26 +0000
496@@ -43,7 +43,7 @@
497 It can present files using Openoffice
498 """
499 global log
500- log=logging.getLogger(u'PresentationsMediaItem')
501+ log = logging.getLogger(u'PresentationsMediaItem')
502 log.info(u'Presentations Media Item loaded')
503
504 def __init__(self, parent, icon, title, controllers):
505
506=== modified file 'openlp/plugins/presentations/lib/messagelistener.py'
507--- openlp/plugins/presentations/lib/messagelistener.py 2009-09-25 22:20:34 +0000
508+++ openlp/plugins/presentations/lib/messagelistener.py 2009-09-29 17:25:26 +0000
509@@ -30,7 +30,7 @@
510 controller and passes the messages on the the correct presentation handlers
511 """
512 global log
513- log=logging.getLogger(u'MessageListener')
514+ log = logging.getLogger(u'MessageListener')
515 log.info(u'Message Listener loaded')
516
517 def __init__(self, controllers):
518
519=== modified file 'openlp/plugins/presentations/presentationplugin.py'
520--- openlp/plugins/presentations/presentationplugin.py 2009-09-29 02:54:32 +0000
521+++ openlp/plugins/presentations/presentationplugin.py 2009-09-29 17:25:26 +0000
522@@ -36,7 +36,7 @@
523
524 def __init__(self, plugin_helpers):
525 # Call the parent constructor
526- log.debug('Initialised')
527+ log.debug(u'Initialised')
528 self.controllers = {}
529 Plugin.__init__(self, u'Presentations', u'1.9.0', plugin_helpers)
530 self.weight = -8
531@@ -66,7 +66,7 @@
532 Check to see if we have any presentation software available
533 If Not do not install the plugin.
534 """
535- log.debug('check_pre_conditions')
536+ log.debug(u'check_pre_conditions')
537 #Lets see if Powerpoint is required (Default is Not wanted)
538 controller = PowerpointController(self)
539 if int(self.config.get_config(
540
541=== modified file 'openlp/plugins/remotes/remoteplugin.py'
542--- openlp/plugins/remotes/remoteplugin.py 2009-09-25 00:43:42 +0000
543+++ openlp/plugins/remotes/remoteplugin.py 2009-09-29 17:25:26 +0000
544@@ -39,7 +39,7 @@
545 """
546 Check to see if remotes is required
547 """
548- log.debug('check_pre_conditions')
549+ log.debug(u'check_pre_conditions')
550 #Lets see if Remote is required
551 if int(self.config.get_config(u'startup', 0)) == QtCore.Qt.Checked:
552 return True