forked from openlp/openlp
Toolbar fixups
This commit is contained in:
parent
a745d15a98
commit
40523ed0f6
@ -68,21 +68,30 @@ class OpenLPToolbar(QtGui.QToolBar):
|
|||||||
``objectname``
|
``objectname``
|
||||||
The name of the object, as used in `<button>.setObjectName()`.
|
The name of the object, as used in `<button>.setObjectName()`.
|
||||||
"""
|
"""
|
||||||
ButtonIcon = build_icon(icon)
|
ToolbarButton = None
|
||||||
|
if icon:
|
||||||
|
ButtonIcon = build_icon(icon)
|
||||||
|
else:
|
||||||
|
ButtonIcon = None
|
||||||
if ButtonIcon:
|
if ButtonIcon:
|
||||||
if slot and not checkable:
|
if slot and not checkable:
|
||||||
ToolbarButton = self.addAction(ButtonIcon, title, slot)
|
ToolbarButton = self.addAction(ButtonIcon, title, slot)
|
||||||
else:
|
else:
|
||||||
ToolbarButton = self.addAction(ButtonIcon, title)
|
ToolbarButton = self.addAction(ButtonIcon, title)
|
||||||
if tooltip:
|
|
||||||
ToolbarButton.setToolTip(tooltip)
|
|
||||||
if checkable:
|
|
||||||
ToolbarButton.setCheckable(True)
|
|
||||||
QtCore.QObject.connect(ToolbarButton,
|
|
||||||
QtCore.SIGNAL(u'toggled(bool)'), slot)
|
|
||||||
self.icons[title] = ButtonIcon
|
self.icons[title] = ButtonIcon
|
||||||
self.actions[title] = ToolbarButton
|
else:
|
||||||
return ToolbarButton
|
ToolbarButton = QtGui.QAction(title, ToolbarButton)
|
||||||
|
self.addAction(ToolbarButton)
|
||||||
|
QtCore.QObject.connect(ToolbarButton,
|
||||||
|
QtCore.SIGNAL(u'triggered()'), slot)
|
||||||
|
if tooltip:
|
||||||
|
ToolbarButton.setToolTip(tooltip)
|
||||||
|
if checkable:
|
||||||
|
ToolbarButton.setCheckable(True)
|
||||||
|
QtCore.QObject.connect(ToolbarButton,
|
||||||
|
QtCore.SIGNAL(u'toggled(bool)'), slot)
|
||||||
|
self.actions[title] = ToolbarButton
|
||||||
|
return ToolbarButton
|
||||||
|
|
||||||
def addToolbarSeparator(self, handle):
|
def addToolbarSeparator(self, handle):
|
||||||
"""
|
"""
|
||||||
|
@ -209,7 +209,7 @@ class SlideController(QtGui.QWidget):
|
|||||||
# Build the Song Toolbar
|
# Build the Song Toolbar
|
||||||
if isLive:
|
if isLive:
|
||||||
self.Songbar = OpenLPToolbar(self)
|
self.Songbar = OpenLPToolbar(self)
|
||||||
self.Songbar.addToolbarButton(u'Intro:1', u'I',
|
self.Songbar.addToolbarButton( u'I', u':/pages/slide.png',
|
||||||
self.trUtf8('Intro'),self.onSongBarHandler)
|
self.trUtf8('Intro'),self.onSongBarHandler)
|
||||||
self.Songbar.addToolbarButton(u'Bridge:1', u'B',
|
self.Songbar.addToolbarButton(u'Bridge:1', u'B',
|
||||||
self.trUtf8('Bridge'),self.onSongBarHandler)
|
self.trUtf8('Bridge'),self.onSongBarHandler)
|
||||||
@ -353,7 +353,8 @@ class SlideController(QtGui.QWidget):
|
|||||||
if item.is_song() and \
|
if item.is_song() and \
|
||||||
str_to_bool(self.songsconfig.get_config(u'show songbar', True)):
|
str_to_bool(self.songsconfig.get_config(u'show songbar', True)):
|
||||||
for action in self.Songbar.actions:
|
for action in self.Songbar.actions:
|
||||||
self.Songbar.actions[action].setVisible(False)
|
pass
|
||||||
|
#self.Songbar.actions[action].setVisible(False)
|
||||||
hasButtons = False
|
hasButtons = False
|
||||||
for slide in self.slideList:
|
for slide in self.slideList:
|
||||||
if slide is not None:
|
if slide is not None:
|
||||||
|
Loading…
Reference in New Issue
Block a user