Imported Upstream version 2.0

[minitube] / src / sidebarwidget.cpp

diff --git a/src/sidebarwidget.cpp b/src/sidebarwidget.cpp
index ceae1503a2c06b0cdaf571fac3aa048129c4201e..5a5647fe2f83c00cc98053e9109c4a7539e1ed49 100644 (file)
--- a/src/sidebarwidget.cpp
+++ b/src/sidebarwidget.cpp
@@ -1,12 +1,13 @@
 #include "sidebarwidget.h"
 #include "refinesearchbutton.h"
 #include "refinesearchwidget.h"
+#include "sidebarheader.h"
 #ifndef Q_WS_X11
 #include "extra.h"
 #endif
 
 namespace The {
-QMap<QString, QAction*>* globalActions();
+QHash<QString, QAction*>* globalActions();
 }
 
 SidebarWidget::SidebarWidget(QWidget *parent) :
@@ -14,9 +15,12 @@ SidebarWidget::SidebarWidget(QWidget *parent) :
     playlist = 0;
 
     QBoxLayout *layout = new QVBoxLayout(this);
-    layout->setSpacing(1);
+    layout->setSpacing(0);
     layout->setMargin(0);
 
+    sidebarHeader = new SidebarHeader();
+    layout->addWidget(sidebarHeader);
+
     // hidden message widget
     messageLabel = new QLabel(this);
     messageLabel->setMargin(10);
@@ -70,9 +74,11 @@ void SidebarWidget::setPlaylist(QListView *playlist) {
 void SidebarWidget::showPlaylist() {
     setup();
     stackedWidget->setCurrentWidget(playlist);
+    The::globalActions()->value("refine-search")->setChecked(false);
 }
 
 void SidebarWidget::showRefineSearchWidget() {
+    if (!refineSearchWidget->isEnabled()) return;
     refineSearchWidget->setDirty(false);
     stackedWidget->setCurrentWidget(refineSearchWidget);
     refineSearchWidget->setFocus();
@@ -131,6 +137,7 @@ void SidebarWidget::handleMouseMove() {
 }
 
 void SidebarWidget::showRefineSearchButton() {
+    if (!refineSearchWidget->isEnabled()) return;
     refineSearchButton->move(
                 playlist->viewport()->width() - refineSearchButton->minimumWidth(),
                 height() - refineSearchButton->minimumHeight());