openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/bug-1112587-2 into lp:openlp/2.0.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1112587 in OpenLP: ""Display verses on live tool bar" ignored"
  https://bugs.launchpad.net/openlp/+bug/1112587

For more details, see:
https://code.launchpad.net/~googol/openlp/bug-1112587-2/+merge/147572

Hello,

- fixed bug #1112587 ('Display verses on live tool bar' ignored)
-- 
https://code.launchpad.net/~googol/openlp/bug-1112587-2/+merge/147572
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/bug-1112587-2 into lp:openlp/2.0.

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2012-12-30 19:41:24 +0000
+++ openlp/core/ui/slidecontroller.py	2013-02-10 18:54:21 +0000
@@ -101,7 +101,6 @@
             u'delaySpinBox'
         ]
         self.audioList = [
-            u'songMenu',
             u'audioPauseItem',
             u'audioTimeLabel'
         ]
@@ -287,7 +286,7 @@
                 text=translate('OpenLP.SlideController', 'Pause Audio'),
                 tooltip=translate('OpenLP.SlideController', 'Pause audio.'),
                 checked=False, visible=False, category=self.category,
-                context=QtCore.Qt.WindowShortcut, 
+                context=QtCore.Qt.WindowShortcut,
                 shortcuts=[], triggers=self.onAudioPauseClicked)
             self.audioMenu = QtGui.QMenu(
                 translate('OpenLP.SlideController', 'Background Audio'), self.toolbar)
@@ -319,6 +318,7 @@
             self.audioTimeLabel.setObjectName(u'audioTimeLabel')
             self.toolbar.addToolbarWidget(self.audioTimeLabel)
             self.toolbar.setWidgetVisible(self.audioList, False)
+            self.toolbar.setWidgetVisible([u'songMenu'], False)
         # Screen preview area
         self.previewFrame = QtGui.QFrame(self.splitter)
         self.previewFrame.setGeometry(QtCore.QRect(0, 0, 300, 300 * self.ratio))
@@ -689,6 +689,7 @@
         self.toolbar.hide()
         self.mediabar.hide()
         self.songMenu.hide()
+        self.toolbar.setWidgetVisible([u'songMenu'], False)
         self.toolbar.setWidgetVisible(self.loopList, False)
         # Reset the button
         self.playSlidesOnce.setChecked(False)
@@ -699,7 +700,7 @@
             if Settings().value(
                 self.parent().songsSettingsSection + u'/display songbar',
                 QtCore.QVariant(True)).toBool() and self.slideList:
-                self.songMenu.show()
+                self.toolbar.setWidgetVisible([u'songMenu'], True)
         if item.is_capable(ItemCapabilities.CanLoop) and \
             len(item.get_frames()) > 1:
             self.toolbar.setWidgetVisible(self.loopList)