openlp-core team mailing list archive

[matysek <mzibricky@xxxxxxxxx>]

matysek has proposed merging lp:~mzibricky/openlp/bug-1067703 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1067703 in OpenLP: "First Time Wizard Crashes on Mac"
  https://bugs.launchpad.net/openlp/+bug/1067703

For more details, see:
https://code.launchpad.net/~mzibricky/openlp/bug-1067703/+merge/130241

This fixes the issue with firsttimewizard on osx where the presentation plugin is hidden.
-- 
https://code.launchpad.net/~mzibricky/openlp/bug-1067703/+merge/130241
Your team OpenLP Core is requested to review the proposed merge of lp:~mzibricky/openlp/bug-1067703 into lp:openlp.

=== modified file 'openlp/core/ui/firsttimeform.py'
--- openlp/core/ui/firsttimeform.py	2012-10-13 17:05:55 +0000
+++ openlp/core/ui/firsttimeform.py	2012-10-17 22:03:20 +0000
@@ -430,8 +430,11 @@
             'Enabling selected plugins...'))
         self._setPluginStatus(self.songsCheckBox, u'songs/status')
         self._setPluginStatus(self.bibleCheckBox, u'bibles/status')
-        self._setPluginStatus(self.presentationCheckBox,
-            u'presentations/status')
+        # TODO Presentation plugin is not yet working on Mac OS X.
+        # For now just ignore it.
+        if sys.platform != 'darwin':
+            self._setPluginStatus(self.presentationCheckBox,
+                u'presentations/status')
         self._setPluginStatus(self.imageCheckBox, u'images/status')
         self._setPluginStatus(self.mediaCheckBox, u'media/status')
         self._setPluginStatus(self.remoteCheckBox, u'remotes/status')