From 86771b1291771246be1b362d11acccb9a0a91d31 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Sun, 13 Feb 2011 10:41:15 +0100
Subject: [PATCH] * Readded the status button.

---
 src/libtomahawk/playlist/playlistmanager.cpp |  5 ++-
 src/tomahawkwindow.cpp                       | 35 +++++++++++++-------
 src/tomahawkwindow.h                         |  2 ++
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/libtomahawk/playlist/playlistmanager.cpp b/src/libtomahawk/playlist/playlistmanager.cpp
index c2902fda7..a4f5b330b 100644
--- a/src/libtomahawk/playlist/playlistmanager.cpp
+++ b/src/libtomahawk/playlist/playlistmanager.cpp
@@ -75,8 +75,6 @@ PlaylistManager::PlaylistManager( QObject* parent )
     m_splitter->addWidget( m_queueView );
     m_splitter->hide( 1, false );
 
-    m_widget->layout()->setMargin( 0 );
-    m_widget->layout()->setSpacing( 0 );
     m_widget->layout()->addWidget( m_infobar );
     m_widget->layout()->addWidget( m_topbar );
     m_widget->layout()->addWidget( line );
@@ -101,7 +99,8 @@ PlaylistManager::PlaylistManager( QObject* parent )
     m_widget->setContentsMargins( 0, 0, 0, 0 );
     m_widget->layout()->setContentsMargins( 0, 0, 0, 0 );
     m_widget->layout()->setMargin( 0 );
-
+    m_widget->layout()->setSpacing( 0 );
+    
     connect( &m_filterTimer, SIGNAL( timeout() ), SLOT( applyFilter() ) );
 
     connect( m_topbar, SIGNAL( filterTextChanged( QString ) ),
diff --git a/src/tomahawkwindow.cpp b/src/tomahawkwindow.cpp
index 7c21c4898..9d1aaec99 100644
--- a/src/tomahawkwindow.cpp
+++ b/src/tomahawkwindow.cpp
@@ -57,10 +57,10 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
 #endif
 
     PlaylistManager* pm = new PlaylistManager( this );
-    
+
     connect( m_audioControls, SIGNAL( playPressed() ), pm, SLOT( onPlayClicked() ) );
     connect( m_audioControls, SIGNAL( pausePressed() ), pm, SLOT( onPauseClicked() ) );
-    
+
     ui->setupUi( this );
 
     delete ui->sidebarWidget;
@@ -69,24 +69,35 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
     ui->centralWidget->setContentsMargins( 0, 0, 0, 0 );
     ui->centralWidget->layout()->setContentsMargins( 0, 0, 0, 0 );
     ui->centralWidget->layout()->setMargin( 0 );
-    
-    AnimatedSplitter* sidebar = new AnimatedSplitter( this );
+
+    QWidget* sidebarWidget = new QWidget();
+    sidebarWidget->setLayout( new QVBoxLayout() );
+    sidebarWidget->setContentsMargins( 0, 0, 0, 0 );
+    sidebarWidget->layout()->setContentsMargins( 0, 0, 0, 0 );
+    sidebarWidget->layout()->setMargin( 0 );
+    sidebarWidget->layout()->setSpacing( 0 );
+
+    AnimatedSplitter* sidebar = new AnimatedSplitter();
     sidebar->setOrientation( Qt::Vertical );
     sidebar->setChildrenCollapsible( false );
     sidebar->setGreedyWidget( 0 );
     sidebar->setStretchFactor( 0, 3 );
     sidebar->setStretchFactor( 1, 1 );
-    
+
     SourceTreeView* stv = new SourceTreeView();
     TransferView* transferView = new TransferView();
-    
+
     sidebar->addWidget( stv );
     sidebar->addWidget( transferView );
     sidebar->hide( 1, false );
-    
-    ui->splitter->addWidget( sidebar );
-    
+
+    m_statusButton = new QPushButton();
+    sidebarWidget->layout()->addWidget( sidebar );
+    sidebarWidget->layout()->addWidget( m_statusButton );
+
+    ui->splitter->addWidget( sidebarWidget );
     ui->splitter->addWidget( PlaylistManager::instance()->widget() );
+
     ui->splitter->setStretchFactor( 0, 1 );
     ui->splitter->setStretchFactor( 1, 3 );
     ui->splitter->setCollapsible( 1, false );
@@ -161,7 +172,7 @@ TomahawkWindow::setupSignals()
     connect( ui->actionCreate_New_Station, SIGNAL( triggered() ), SLOT( createStation() ));
     connect( ui->actionAboutTomahawk, SIGNAL( triggered() ), SLOT( showAboutTomahawk() ) );
     connect( ui->actionExit, SIGNAL( triggered() ), APP, SLOT( quit() ) );
-//    connect( ui->statusButton, SIGNAL( clicked() ), APP->sipHandler(), SLOT( toggleConnect() ) );
+    connect( m_statusButton, SIGNAL( clicked() ), APP->sipHandler(), SLOT( toggleConnect() ) );
 
     // <SipHandler>
     connect( APP->sipHandler(), SIGNAL( connected() ), SLOT( onSipConnected() ) );
@@ -372,14 +383,14 @@ TomahawkWindow::onPlaybackLoading( const Tomahawk::result_ptr& result )
 void
 TomahawkWindow::onSipConnected()
 {
-//    ui->statusButton->setText( tr( "Online" ) );
+    m_statusButton->setText( tr( "Online" ) );
 }
 
 
 void
 TomahawkWindow::onSipDisconnected()
 {
-//    ui->statusButton->setText( tr( "Offline" ) );
+    m_statusButton->setText( tr( "Offline" ) );
 }
 
 
diff --git a/src/tomahawkwindow.h b/src/tomahawkwindow.h
index 087f377ec..078868e6d 100644
--- a/src/tomahawkwindow.h
+++ b/src/tomahawkwindow.h
@@ -4,6 +4,7 @@
 #include <QMainWindow>
 #include <QVariantMap>
 #include <QNetworkAccessManager>
+#include <QPushButton>
 #include <QString>
 #include <QStackedWidget>
 
@@ -70,6 +71,7 @@ private:
     AudioControls* m_audioControls;
     TomahawkTrayIcon* m_trayIcon;
     QNetworkAccessManager m_nam;
+    QPushButton* m_statusButton;
 
     Tomahawk::result_ptr m_currentTrack;
     QString m_windowTitle;