openlp-core team mailing list archive

[Jon Tibble <meths@xxxxxxxxxxxxxx>]

Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


Fix message passing (Tim is this fix correct?)
Cleanup match naming
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/30986
Your team OpenLP Core is requested to review the proposed merge of lp:~meths/openlp/trivialfixes into lp:openlp.

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2010-07-25 08:54:58 +0000
+++ openlp/core/ui/maindisplay.py	2010-07-26 20:35:54 +0000
@@ -92,12 +92,12 @@
         self.videoDisplay.mediaHide(message)
         self.mainDisplay.hideDisplay(message)
 
-    def showDisplay(self, message):
+    def showDisplay(self):
         """
         Hide the output displays
         """
-        self.videoDisplay.mediaShow(message)
-        self.mainDisplay.showDisplay(message)
+        self.videoDisplay.mediaShow()
+        self.mainDisplay.showDisplay()
 
     def addAlert(self, alertMessage, location):
         """
@@ -623,7 +623,7 @@
         self.hidden = True
         self.setVisible(False)
 
-    def mediaShow(self, message=''):
+    def mediaShow(self):
         """
         Show the video display if it was already hidden
         """

=== modified file 'openlp/plugins/bibles/lib/common.py'
--- openlp/plugins/bibles/lib/common.py	2010-07-25 11:47:53 +0000
+++ openlp/plugins/bibles/lib/common.py	2010-07-26 20:35:54 +0000
@@ -64,7 +64,7 @@
         to_verse = match.group(5)
         if int(match.group(2)) == int(match.group(4)):
             reference_list.append(
-                (match.group(1), int(match.group(2)), from_verse, to_verse)
+                (book, int(match.group(2)), from_verse, to_verse)
             )
         else:
             if int(match.group(2)) > int(match.group(4)):
@@ -75,17 +75,11 @@
                 to_chapter = int(match.group(4))
             for chapter in xrange(from_chapter, to_chapter + 1):
                 if chapter == from_chapter:
-                    reference_list.append(
-                        (match.group(1), chapter, from_verse, -1)
-                    )
+                    reference_list.append((book, chapter, from_verse, -1))
                 elif chapter == to_chapter:
-                    reference_list.append(
-                        (match.group(1), chapter, 1, to_verse)
-                    )
+                    reference_list.append((book, chapter, 1, to_verse))
                 else:
-                    reference_list.append(
-                        (match.group(1), chapter, 1, -1)
-                    )
+                    reference_list.append((book, chapter, 1, -1))
     else:
         match = only_verses.match(reference)
         if match: