From 92e90b91e5c8d3f0f02ea637d4574a12534e4c29 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Fri, 26 Mar 2010 20:20:09 +0000
Subject: [PATCH] Fixes and cleanups

---
 openlp/core/lib/mediamanageritem.py    |  4 ++--
 openlp/core/ui/slidecontroller.py      |  2 +-
 openlp/plugins/bibles/lib/mediaitem.py |  1 +
 openlp/plugins/images/lib/mediaitem.py | 18 ++++++++++++++----
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index 58a50557f..7d410c10f 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -114,7 +114,7 @@ class MediaManagerItem(QtGui.QWidget):
         self.Toolbar = None
         self.remoteTriggered = None
         self.ServiceItemIconName = None
-        self.addToServiceItem = True
+        self.addToServiceItem = False
         self.PageLayout = QtGui.QVBoxLayout(self)
         self.PageLayout.setSpacing(0)
         self.PageLayout.setContentsMargins(4, 0, 4, 0)
@@ -303,7 +303,7 @@ class MediaManagerItem(QtGui.QWidget):
         if self.addToServiceItem:
             self.ListView.addAction(
                 contextMenuAction(
-                    self.ListView, u':/system/system_add.png',
+                    self.ListView, u':/general/general_add.png',
                     self.trUtf8('&Add to selected Service Item'),
                     self.onAddEditClick))
         QtCore.QObject.connect(
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index a4fb4ef01..92f383c57 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -581,7 +581,7 @@ class SlideController(QtGui.QWidget):
         if force:
             self.themeButton.setChecked(True)
         if self.hideButton.isChecked():
-            self.parent.mainDisplay.hide1Display()
+            self.parent.mainDisplay.hideDisplay()
         else:
             self.parent.mainDisplay.showDisplay()
 
diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 070ba6529..f550b6e36 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -81,6 +81,7 @@ class BibleMediaItem(MediaManagerItem):
         self.hasNewIcon = False
         self.hasEditIcon = False
         self.hasDeleteIcon = False
+        self.addToServiceItem = True
 
     def addEndHeaderBar(self):
         self.SearchTabWidget = QtGui.QTabWidget(self)
diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py
index c3f2ce699..73c61df40 100644
--- a/openlp/plugins/images/lib/mediaitem.py
+++ b/openlp/plugins/images/lib/mediaitem.py
@@ -27,7 +27,8 @@ import logging
 import os
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import MediaManagerItem, BaseListWithDnD, build_icon
+from openlp.core.lib import MediaManagerItem, BaseListWithDnD, build_icon, \
+contextMenuAction, contextMenuSeparator
 
 log = logging.getLogger(__name__)
 
@@ -52,7 +53,6 @@ class ImageMediaItem(MediaManagerItem):
         # be instanced by the base MediaManagerItem
         self.ListViewWithDnD_class = ImageListView
         self.servicePath = None
-        self.addToServiceItem = True
         MediaManagerItem.__init__(self, parent, icon, title)
 
     def initPluginNameVisible(self):
@@ -68,6 +68,7 @@ class ImageMediaItem(MediaManagerItem):
         self.hasFileIcon = True
         self.hasNewIcon = False
         self.hasEditIcon = False
+        self.addToServiceItem = True
 
     def initialise(self):
         log.debug(u'initialise')
@@ -81,6 +82,15 @@ class ImageMediaItem(MediaManagerItem):
             os.mkdir(self.servicePath)
         self.loadList(self.parent.config.load_list(self.ConfigSection))
 
+    def addListViewToToolBar(self):
+        MediaManagerItem.addListViewToToolBar(self)
+        self.ListView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu)
+        self.ListView.addAction(
+            contextMenuAction(
+                self.ListView, u':/slides/slide_blank.png',
+                self.trUtf8('Replace Live Background'),
+                self.onReplaceClick))
+
     def addEndHeaderBar(self):
         self.ImageWidget = QtGui.QWidget(self)
         sizePolicy = QtGui.QSizePolicy(
@@ -93,7 +103,7 @@ class ImageMediaItem(MediaManagerItem):
         self.ImageWidget.setObjectName(u'ImageWidget')
         self.blankButton = self.Toolbar.addToolbarButton(
             u'Replace Background', u':/slides/slide_blank.png',
-            self.trUtf8('Replace Background'), self.onReplaceClick, False)
+            self.trUtf8('Replace Live Background'), self.onReplaceClick, False)
         # Add the song widget to the page layout
         self.PageLayout.addWidget(self.ImageWidget)
 
@@ -155,4 +165,4 @@ class ImageMediaItem(MediaManagerItem):
             self.parent.maindisplay.addImageWithText(frame)
 
     def onPreviewClick(self):
-            MediaManagerItem.onPreviewClick(self)
+        MediaManagerItem.onPreviewClick(self)