From 43ae900852f98e22ee981e50bcad83fcb02e6598 Mon Sep 17 00:00:00 2001
From: David Sansome <davidsansome@gmail.com>
Date: Fri, 18 Jun 2010 15:07:21 +0000
Subject: [PATCH] Move the clear playlist button down to the bottom again.

---
 src/playlist/playlistcontainer.cpp |  4 +---
 src/playlist/playlistcontainer.h   |  2 +-
 src/playlist/playlistcontainer.ui  | 13 -------------
 src/ui/mainwindow.cpp              |  3 ++-
 src/ui/mainwindow.ui               | 20 ++++++++++++++++++++
 5 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/playlist/playlistcontainer.cpp b/src/playlist/playlistcontainer.cpp
index 354908670..a5bdeb87f 100644
--- a/src/playlist/playlistcontainer.cpp
+++ b/src/playlist/playlistcontainer.cpp
@@ -91,12 +91,10 @@ PlaylistView* PlaylistContainer::view() const {
 }
 
 void PlaylistContainer::SetActions(
-    QAction* new_playlist, QAction* save_playlist, QAction* load_playlist,
-    QAction* clear_playlist) {
+    QAction* new_playlist, QAction* save_playlist, QAction* load_playlist) {
   ui_->create_new->setDefaultAction(new_playlist);
   ui_->save->setDefaultAction(save_playlist);
   ui_->load->setDefaultAction(load_playlist);
-  ui_->clear_playlist->setDefaultAction(clear_playlist);
 
   ui_->tab_bar->SetActions(new_playlist, load_playlist);
 
diff --git a/src/playlist/playlistcontainer.h b/src/playlist/playlistcontainer.h
index 9fbeaa062..3a2deedbd 100644
--- a/src/playlist/playlistcontainer.h
+++ b/src/playlist/playlistcontainer.h
@@ -39,7 +39,7 @@ public:
   static const char* kSettingsGroup;
 
   void SetActions(QAction* new_playlist, QAction* save_playlist,
-                  QAction* load_playlist, QAction* clear_playlist);
+                  QAction* load_playlist);
   void SetManager(PlaylistManager* manager);
 
   PlaylistView* view() const;
diff --git a/src/playlist/playlistcontainer.ui b/src/playlist/playlistcontainer.ui
index d4b335567..2b4655039 100644
--- a/src/playlist/playlistcontainer.ui
+++ b/src/playlist/playlistcontainer.ui
@@ -39,19 +39,6 @@
       <property name="margin">
        <number>0</number>
       </property>
-      <item>
-       <widget class="QToolButton" name="clear_playlist">
-        <property name="iconSize">
-         <size>
-          <width>16</width>
-          <height>16</height>
-         </size>
-        </property>
-        <property name="autoRaise">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
       <item>
        <widget class="QToolButton" name="create_new">
         <property name="iconSize">
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 4b5b8d05c..6da6fdb8e 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -260,8 +260,9 @@ MainWindow::MainWindow(NetworkAccessManager* network, Engine::Type engine, QWidg
   ui_->stop_button->setDefaultAction(ui_->action_stop);
   ui_->love_button->setDefaultAction(ui_->action_love);
   ui_->ban_button->setDefaultAction(ui_->action_ban);
+  ui_->clear_playlist_button->setDefaultAction(ui_->action_clear_playlist);
   ui_->playlist->SetActions(ui_->action_new_playlist, ui_->action_save_playlist,
-                            ui_->action_load_playlist, ui_->action_clear_playlist);
+                            ui_->action_load_playlist);
 
 #ifdef ENABLE_VISUALISATIONS
   visualisation_->SetActions(ui_->action_previous_track, ui_->action_play_pause,
diff --git a/src/ui/mainwindow.ui b/src/ui/mainwindow.ui
index 6be7fe59f..f4a19df3b 100644
--- a/src/ui/mainwindow.ui
+++ b/src/ui/mainwindow.ui
@@ -183,6 +183,26 @@
                 <property name="margin">
                  <number>0</number>
                 </property>
+                <item>
+                 <widget class="QToolButton" name="clear_playlist_button">
+                  <property name="iconSize">
+                   <size>
+                    <width>22</width>
+                    <height>22</height>
+                   </size>
+                  </property>
+                  <property name="autoRaise">
+                   <bool>true</bool>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="Line" name="line_3">
+                  <property name="orientation">
+                   <enum>Qt::Vertical</enum>
+                  </property>
+                 </widget>
+                </item>
                 <item>
                  <widget class="QToolButton" name="back_button">
                   <property name="iconSize">