From 68f8b1e45fd8a79ac4b20bf7d7071b00ce27d7fe Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul.snyman@saturnlaboratories.co.za>
Date: Sat, 17 Oct 2009 20:41:56 +0200
Subject: [PATCH] Fixed a bug where a warning was generated about layouts. Made
 the media manager items stand out a little more, and enhanced the currently
 selected one.

---
 openlp/core/ui/mainwindow.py          | 26 +++++++++++++++++---------
 openlp/plugins/songs/lib/mediaitem.py |  2 +-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index bd1cadc7a..995b53f3c 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -35,6 +35,22 @@ from openlp.core.lib import translate, RenderManager, PluginConfig, \
     buildIcon
 from openlp.core.utils import check_latest_version
 
+media_manager_style = """
+  QToolBox::tab {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 palette(midlight), stop: 1.0 palette(dark));
+    border-width: 1px;
+    border-style: outset;
+    border-color: palette(midlight);
+    border-radius: 5px;
+  }
+  QToolBox::tab:selected {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 palette(light), stop: 1.0 palette(dark));
+    border-color: palette(light);
+  }
+"""
+
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
         """
@@ -107,15 +123,7 @@ class Ui_MainWindow(object):
         self.MediaManagerDock = OpenLPDockWidget(MainWindow)
         MediaManagerIcon = buildIcon(u':/system/system_mediamanager.png')
         self.MediaManagerDock.setWindowIcon(MediaManagerIcon)
-        self.MediaManagerDock.setStyleSheet("""
- QToolBox::tab {
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                 stop: 0 palette(light), stop: 1.0 palette(dark));
-     border: none;
-     border-radius: 5px;
-     margin: 0;
- }
-        """)
+        self.MediaManagerDock.setStyleSheet(media_manager_style)
         self.MediaManagerDock.setMinimumWidth(
             self.settingsmanager.mainwindow_left)
         self.MediaManagerDock.setObjectName(u'MediaManagerDock')
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 8488766bf..ed6978628 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -93,7 +93,7 @@ class SongMediaItem(MediaManagerItem):
         self.SearchLayout.setWidget(
             1, QtGui.QFormLayout.FieldRole, self.SearchTypeComboBox)
         self.PageLayout.addLayout(self.SearchLayout)
-        self.SearchButtonLayout = QtGui.QHBoxLayout(self)
+        self.SearchButtonLayout = QtGui.QHBoxLayout()
         self.SearchButtonLayout.setMargin(0)
         self.SearchButtonLayout.setSpacing(4)
         self.SearchButtonLayout.setObjectName(u'SearchButtonLayout')