mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-20 04:41:36 +02:00
Code Issues Releases Wiki Activity

* Readded the status button.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-02-13 10:41:15 +01:00
parent cbc4252ac9
commit 86771b1291
3 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libtomahawk/playlist/playlistmanager.cpp
View File

@@ -75,8 +75,6 @@ PlaylistManager::PlaylistManager( QObject* parent )
m_splitter->addWidget( m_queueView ); m_splitter->addWidget( m_queueView );
m_splitter->hide( 1, false ); 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_infobar );
m_widget->layout()->addWidget( m_topbar ); m_widget->layout()->addWidget( m_topbar );
m_widget->layout()->addWidget( line ); m_widget->layout()->addWidget( line );
@@ -101,6 +99,7 @@ PlaylistManager::PlaylistManager( QObject* parent )
m_widget->setContentsMargins( 0, 0, 0, 0 ); m_widget->setContentsMargins( 0, 0, 0, 0 );
m_widget->layout()->setContentsMargins( 0, 0, 0, 0 ); m_widget->layout()->setContentsMargins( 0, 0, 0, 0 );
m_widget->layout()->setMargin( 0 ); m_widget->layout()->setMargin( 0 );
m_widget->layout()->setSpacing( 0 );
connect( &m_filterTimer, SIGNAL( timeout() ), SLOT( applyFilter() ) ); connect( &m_filterTimer, SIGNAL( timeout() ), SLOT( applyFilter() ) );

21
src/tomahawkwindow.cpp
View File

@@ -70,7 +70,14 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
ui->centralWidget->layout()->setContentsMargins( 0, 0, 0, 0 ); ui->centralWidget->layout()->setContentsMargins( 0, 0, 0, 0 );
ui->centralWidget->layout()->setMargin( 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->setOrientation( Qt::Vertical );
sidebar->setChildrenCollapsible( false ); sidebar->setChildrenCollapsible( false );
sidebar->setGreedyWidget( 0 ); sidebar->setGreedyWidget( 0 );
@@ -84,9 +91,13 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
sidebar->addWidget( transferView ); sidebar->addWidget( transferView );
sidebar->hide( 1, false ); 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->addWidget( PlaylistManager::instance()->widget() );
ui->splitter->setStretchFactor( 0, 1 ); ui->splitter->setStretchFactor( 0, 1 );
ui->splitter->setStretchFactor( 1, 3 ); ui->splitter->setStretchFactor( 1, 3 );
ui->splitter->setCollapsible( 1, false ); ui->splitter->setCollapsible( 1, false );
@@ -161,7 +172,7 @@ TomahawkWindow::setupSignals()
connect( ui->actionCreate_New_Station, SIGNAL( triggered() ), SLOT( createStation() )); connect( ui->actionCreate_New_Station, SIGNAL( triggered() ), SLOT( createStation() ));
connect( ui->actionAboutTomahawk, SIGNAL( triggered() ), SLOT( showAboutTomahawk() ) ); connect( ui->actionAboutTomahawk, SIGNAL( triggered() ), SLOT( showAboutTomahawk() ) );
connect( ui->actionExit, SIGNAL( triggered() ), APP, SLOT( quit() ) ); 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> // <SipHandler>
connect( APP->sipHandler(), SIGNAL( connected() ), SLOT( onSipConnected() ) ); connect( APP->sipHandler(), SIGNAL( connected() ), SLOT( onSipConnected() ) );
@@ -372,14 +383,14 @@ TomahawkWindow::onPlaybackLoading( const Tomahawk::result_ptr& result )
void void
TomahawkWindow::onSipConnected() TomahawkWindow::onSipConnected()
{ {
// ui->statusButton->setText( tr( "Online" ) ); m_statusButton->setText( tr( "Online" ) );
} }
void void
TomahawkWindow::onSipDisconnected() TomahawkWindow::onSipDisconnected()
{ {
// ui->statusButton->setText( tr( "Offline" ) ); m_statusButton->setText( tr( "Offline" ) );
} }

2
src/tomahawkwindow.h
View File

@@ -4,6 +4,7 @@
#include <QMainWindow> #include <QMainWindow>
#include <QVariantMap> #include <QVariantMap>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
#include <QPushButton>
#include <QString> #include <QString>
#include <QStackedWidget> #include <QStackedWidget>
@@ -70,6 +71,7 @@ private:
AudioControls* m_audioControls; AudioControls* m_audioControls;
TomahawkTrayIcon* m_trayIcon; TomahawkTrayIcon* m_trayIcon;
QNetworkAccessManager m_nam; QNetworkAccessManager m_nam;
QPushButton* m_statusButton;
Tomahawk::result_ptr m_currentTrack; Tomahawk::result_ptr m_currentTrack;
QString m_windowTitle; QString m_windowTitle;