openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/192onl into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


Minor updates
-- 
https://code.launchpad.net/~trb143/openlp/192onl/+merge/28334
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/192onl into lp:openlp.

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2010-06-22 17:12:47 +0000
+++ openlp/core/ui/slidecontroller.py	2010-06-23 18:36:59 +0000
@@ -655,6 +655,7 @@
         """
         Allow the main display to blank the main display at startup time
         """
+        log.debug(u'mainDisplaySetBackground')
         if not self.mainDisplay.primary:
             self.blankButton.setChecked(True)
 
@@ -672,12 +673,12 @@
 
     def onBlankDisplay(self, checked):
         """
-        Handle the blank screen button
+        Handle the blank screen button actions
         """
         log.debug(u'onBlankDisplay %d' % checked)
         self.hideButton.setChecked(False)
         self.themeButton.setChecked(False)
-        self.canDisplay =  not checked
+        self.canDisplay = not checked
         QtCore.QSettings().setValue(
             self.parent.generalSettingsSection + u'/screen blank',
             QtCore.QVariant(checked))
@@ -722,6 +723,7 @@
         """
         Blank the display screen within a plugin if required.
         """
+        log.debug(u'blankPlugin %d ', blank)
         if self.serviceItem is not None:
             if blank:
                 Receiver.send_message(u'%s_blank'

=== modified file 'openlp/plugins/alerts/alertsplugin.py'
--- openlp/plugins/alerts/alertsplugin.py	2010-06-21 18:28:36 +0000
+++ openlp/plugins/alerts/alertsplugin.py	2010-06-23 18:36:59 +0000
@@ -37,7 +37,7 @@
     log.info(u'Alerts Plugin loaded')
 
     def __init__(self, plugin_helpers):
-        Plugin.__init__(self, u'Alerts', u'1.9.1', plugin_helpers)
+        Plugin.__init__(self, u'Alerts', u'1.9.2', plugin_helpers)
         self.weight = -3
         self.icon = build_icon(u':/media/media_image.png')
         self.alertsmanager = AlertsManager(self)
@@ -97,4 +97,4 @@
         about_text = translate('AlertsPlugin',
             '<b>Alerts Plugin</b><br>This plugin '
             'controls the displaying of alerts on the presentations screen')
-        return about_text
+        return about_text
\ No newline at end of file

=== modified file 'openlp/plugins/bibles/bibleplugin.py'
--- openlp/plugins/bibles/bibleplugin.py	2010-06-21 21:04:56 +0000
+++ openlp/plugins/bibles/bibleplugin.py	2010-06-23 18:36:59 +0000
@@ -36,7 +36,7 @@
     log.info(u'Bible Plugin loaded')
 
     def __init__(self, plugin_helpers):
-        Plugin.__init__(self, u'Bibles', u'1.9.1', plugin_helpers)
+        Plugin.__init__(self, u'Bibles', u'1.9.2', plugin_helpers)
         self.weight = -9
         self.icon = build_icon(u':/media/media_bible.png')
         #Register the bible Manager
@@ -99,4 +99,4 @@
     def can_delete_theme(self, theme):
         if self.settings_tab.bible_theme == theme:
             return False
-        return True
+        return True
\ No newline at end of file

=== modified file 'openlp/plugins/custom/customplugin.py'
--- openlp/plugins/custom/customplugin.py	2010-06-21 18:28:36 +0000
+++ openlp/plugins/custom/customplugin.py	2010-06-23 18:36:59 +0000
@@ -43,7 +43,7 @@
     log.info(u'Custom Plugin loaded')
 
     def __init__(self, plugin_helpers):
-        Plugin.__init__(self, u'Custom', u'1.9.1', plugin_helpers)
+        Plugin.__init__(self, u'Custom', u'1.9.2', plugin_helpers)
         self.weight = -5
         self.custommanager = CustomManager()
         self.edit_custom_form = EditCustomForm(self.custommanager)
@@ -77,4 +77,4 @@
     def can_delete_theme(self, theme):
         if len(self.custommanager.get_customs_for_theme(theme)) == 0:
             return True
-        return False
+        return False
\ No newline at end of file

=== modified file 'openlp/plugins/images/imageplugin.py'
--- openlp/plugins/images/imageplugin.py	2010-06-19 03:43:10 +0000
+++ openlp/plugins/images/imageplugin.py	2010-06-23 18:36:59 +0000
@@ -34,7 +34,7 @@
     log.info(u'Image Plugin loaded')
 
     def __init__(self, plugin_helpers):
-        Plugin.__init__(self, u'Images', u'1.9.1', plugin_helpers)
+        Plugin.__init__(self, u'Images', u'1.9.2', plugin_helpers)
         self.weight = -7
         self.icon = build_icon(u':/media/media_image.png')
         self.status = PluginStatus.Active
@@ -64,4 +64,4 @@
             'an image is selected any songs which are rendered will use the '
             'selected image from the background instead of the one provied by '
             'the theme.<br>')
-        return about_text
+        return about_text
\ No newline at end of file

=== modified file 'openlp/plugins/media/mediaplugin.py'
--- openlp/plugins/media/mediaplugin.py	2010-06-19 03:43:10 +0000
+++ openlp/plugins/media/mediaplugin.py	2010-06-23 18:36:59 +0000
@@ -36,7 +36,7 @@
     log.info(u'%s MediaPlugin loaded', __name__)
 
     def __init__(self, plugin_helpers):
-        Plugin.__init__(self, u'Media', u'1.9.1', plugin_helpers)
+        Plugin.__init__(self, u'Media', u'1.9.2', plugin_helpers)
         self.weight = -6
         self.icon = build_icon(u':/media/media_video.png')
         # passed with drag and drop messages
@@ -85,4 +85,3 @@
             '<b>Media Plugin</b><br>This plugin '
             'allows the playing of audio and video media')
         return about_text
-

=== modified file 'openlp/plugins/presentations/presentationplugin.py'
--- openlp/plugins/presentations/presentationplugin.py	2010-06-21 18:28:36 +0000
+++ openlp/plugins/presentations/presentationplugin.py	2010-06-23 18:36:59 +0000
@@ -38,7 +38,7 @@
     def __init__(self, plugin_helpers):
         log.debug(u'Initialised')
         self.controllers = {}
-        Plugin.__init__(self, u'Presentations', u'1.9.1', plugin_helpers)
+        Plugin.__init__(self, u'Presentations', u'1.9.2', plugin_helpers)
         self.weight = -8
         self.icon = build_icon(u':/media/media_presentation.png')
         self.status = PluginStatus.Active
@@ -114,4 +114,3 @@
             'programs. The choice of available presentation programs is '
             'available to the user in a drop down box.')
         return about_text
-

=== modified file 'openlp/plugins/remotes/remoteplugin.py'
--- openlp/plugins/remotes/remoteplugin.py	2010-06-21 18:28:36 +0000
+++ openlp/plugins/remotes/remoteplugin.py	2010-06-23 18:36:59 +0000
@@ -37,7 +37,7 @@
         """
         remotes constructor
         """
-        Plugin.__init__(self, u'Remotes', u'1.9.1', plugin_helpers)
+        Plugin.__init__(self, u'Remotes', u'1.9.2', plugin_helpers)
         self.weight = -1
         self.server = None
 
@@ -74,4 +74,4 @@
             'provides the ability to send messages to a running version of '
             'openlp on a different computer via a web browser or other app<br>'
             'The Primary use for this would be to send alerts from a creche')
-        return about_text
+        return about_text
\ No newline at end of file

=== modified file 'openlp/plugins/songs/songsplugin.py'
--- openlp/plugins/songs/songsplugin.py	2010-06-21 21:04:56 +0000
+++ openlp/plugins/songs/songsplugin.py	2010-06-23 18:36:59 +0000
@@ -49,7 +49,7 @@
         """
         Create and set up the Songs plugin.
         """
-        Plugin.__init__(self, u'Songs', u'1.9.1', plugin_helpers)
+        Plugin.__init__(self, u'Songs', u'1.9.2', plugin_helpers)
         self.weight = -10
         self.manager = SongManager()
         self.icon = build_icon(u':/media/media_song.png')
@@ -194,4 +194,3 @@
         if len(self.manager.get_songs_for_theme(theme)) == 0:
             return True
         return False
-

=== modified file 'openlp/plugins/songusage/songusageplugin.py'
--- openlp/plugins/songusage/songusageplugin.py	2010-06-22 07:13:29 +0000
+++ openlp/plugins/songusage/songusageplugin.py	2010-06-23 18:36:59 +0000
@@ -40,7 +40,7 @@
     log.info(u'SongUsage Plugin loaded')
 
     def __init__(self, plugin_helpers):
-        Plugin.__init__(self, u'SongUsage', u'1.9.1', plugin_helpers)
+        Plugin.__init__(self, u'SongUsage', u'1.9.2', plugin_helpers)
         self.weight = -4
         self.icon = build_icon(u':/media/media_image.png')
         self.songusagemanager = None
@@ -162,4 +162,4 @@
             '<b>SongUsage Plugin</b><br>This plugin '
             'records the use of songs and when they have been used during '
             'a live service')
-        return about_text
+        return about_text
\ No newline at end of file