OpenLP

Merge lp:~googol-deactivatedaccount/openlp/bug-1112587-2 into lp:openlp/2.0

  1. bug-1112587-2
  2. Merge into release-2.0
Proposed by Andreas Preikschat
Status: Merged
Merged at revision: 2132
Proposed branch: lp:~googol-deactivatedaccount/openlp/bug-1112587-2
Merge into: lp:openlp/2.0
Diff against target: 45 lines (+4/-3)
1 file modified
openlp/core/ui/slidecontroller.py (+4/-3)
To merge this branch: bzr merge lp:~googol-deactivatedaccount/openlp/bug-1112587-2
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Review via email: mp+147572@code.launchpad.net

Description of the change

Hello,

- fixed bug #1112587 ('Display verses on live tool bar' ignored)

To post a comment you must log in.
Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/core/ui/slidecontroller.py'
2--- openlp/core/ui/slidecontroller.py 2012-12-30 19:41:24 +0000
3+++ openlp/core/ui/slidecontroller.py 2013-02-10 18:54:21 +0000
4@@ -101,7 +101,6 @@
5 u'delaySpinBox'
6 ]
7 self.audioList = [
8- u'songMenu',
9 u'audioPauseItem',
10 u'audioTimeLabel'
11 ]
12@@ -287,7 +286,7 @@
13 text=translate('OpenLP.SlideController', 'Pause Audio'),
14 tooltip=translate('OpenLP.SlideController', 'Pause audio.'),
15 checked=False, visible=False, category=self.category,
16- context=QtCore.Qt.WindowShortcut,
17+ context=QtCore.Qt.WindowShortcut,
18 shortcuts=[], triggers=self.onAudioPauseClicked)
19 self.audioMenu = QtGui.QMenu(
20 translate('OpenLP.SlideController', 'Background Audio'), self.toolbar)
21@@ -319,6 +318,7 @@
22 self.audioTimeLabel.setObjectName(u'audioTimeLabel')
23 self.toolbar.addToolbarWidget(self.audioTimeLabel)
24 self.toolbar.setWidgetVisible(self.audioList, False)
25+ self.toolbar.setWidgetVisible([u'songMenu'], False)
26 # Screen preview area
27 self.previewFrame = QtGui.QFrame(self.splitter)
28 self.previewFrame.setGeometry(QtCore.QRect(0, 0, 300, 300 * self.ratio))
29@@ -689,6 +689,7 @@
30 self.toolbar.hide()
31 self.mediabar.hide()
32 self.songMenu.hide()
33+ self.toolbar.setWidgetVisible([u'songMenu'], False)
34 self.toolbar.setWidgetVisible(self.loopList, False)
35 # Reset the button
36 self.playSlidesOnce.setChecked(False)
37@@ -699,7 +700,7 @@
38 if Settings().value(
39 self.parent().songsSettingsSection + u'/display songbar',
40 QtCore.QVariant(True)).toBool() and self.slideList:
41- self.songMenu.show()
42+ self.toolbar.setWidgetVisible([u'songMenu'], True)
43 if item.is_capable(ItemCapabilities.CanLoop) and \
44 len(item.get_frames()) > 1:
45 self.toolbar.setWidgetVisible(self.loopList)

Subscribers

People subscribed via source and target branches