From 40523ed0f62be8a00b531e26b830ddba0a8d3ec7 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sun, 6 Dec 2009 08:39:56 +0000
Subject: [PATCH] Toolbar fixups

---
 openlp/core/lib/toolbar.py        | 27 ++++++++++++++++++---------
 openlp/core/ui/slidecontroller.py |  5 +++--
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/openlp/core/lib/toolbar.py b/openlp/core/lib/toolbar.py
index d5d91ca6d..c287c432f 100644
--- a/openlp/core/lib/toolbar.py
+++ b/openlp/core/lib/toolbar.py
@@ -68,21 +68,30 @@ class OpenLPToolbar(QtGui.QToolBar):
         ``objectname``
             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 slot and not checkable:
                 ToolbarButton = self.addAction(ButtonIcon, title, slot)
             else:
                 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.actions[title] = ToolbarButton
-            return ToolbarButton
+        else:
+            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):
         """
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 6eb17e397..81e1b9db2 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -209,7 +209,7 @@ class SlideController(QtGui.QWidget):
         # Build the Song Toolbar
         if isLive:
             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.Songbar.addToolbarButton(u'Bridge:1',  u'B',
                 self.trUtf8('Bridge'),self.onSongBarHandler)
@@ -353,7 +353,8 @@ class SlideController(QtGui.QWidget):
             if item.is_song() and \
                 str_to_bool(self.songsconfig.get_config(u'show songbar', True)):
                 for action in self.Songbar.actions:
-                    self.Songbar.actions[action].setVisible(False)
+                    pass
+                    #self.Songbar.actions[action].setVisible(False)
                 hasButtons = False
                 for slide in self.slideList:
                     if slide is not None: