mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-13 17:43:59 +02:00
Code Issues Releases Wiki Activity

Show artist and track in TomahawkTouchWindow title too

Browse Source
This commit is contained in:
Dominik Schmidt
2011-09-07 06:02:44 +02:00
parent 58f239b3a9
commit 5ea4b28ad4
5 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/tomahawkapp.cpp
View File

@@ -231,7 +231,6 @@ TomahawkApp::init()
m_mainwindow->show(); m_mainwindow->show();
#else #else
m_declarativeWindow = new TomahawkTouchWindow(); m_declarativeWindow = new TomahawkTouchWindow();
m_declarativeWindow->setWindowTitle( "Touch-ma-hawk" );
m_declarativeWindow->show(); m_declarativeWindow->show();
#endif // TOUCHMAHAWK #endif // TOUCHMAHAWK

9
src/tomahawkdesktopwindow.cpp
View File

@@ -257,8 +257,6 @@ TomahawkDesktopWindow::setupSignals()
m_audioControls, SLOT( onShuffleModeChanged( bool ) ) ); m_audioControls, SLOT( onShuffleModeChanged( bool ) ) );
// <From AudioEngine> // <From AudioEngine>
connect( AudioEngine::instance(), SIGNAL( loading( const Tomahawk::result_ptr& ) ),
SLOT( onPlaybackLoading( const Tomahawk::result_ptr& ) ) );
connect( AudioEngine::instance(), SIGNAL( started( Tomahawk::result_ptr ) ), SLOT( audioStarted() ) ); connect( AudioEngine::instance(), SIGNAL( started( Tomahawk::result_ptr ) ), SLOT( audioStarted() ) );
connect( AudioEngine::instance(), SIGNAL( resumed()), SLOT( audioStarted() ) ); connect( AudioEngine::instance(), SIGNAL( resumed()), SLOT( audioStarted() ) );
connect( AudioEngine::instance(), SIGNAL( paused() ), SLOT( audioStopped() ) ); connect( AudioEngine::instance(), SIGNAL( paused() ), SLOT( audioStopped() ) );
@@ -497,13 +495,6 @@ TomahawkDesktopWindow::audioStopped()
} }
void
TomahawkDesktopWindow::onPlaybackLoading( const Tomahawk::result_ptr& result )
{
m_currentTrack = result;
setWindowTitle( m_windowTitle );
}
void void
TomahawkDesktopWindow::onSipConnected() TomahawkDesktopWindow::onSipConnected()
{ {

2
src/tomahawkdesktopwindow.h
View File

@@ -81,8 +81,6 @@ private slots:
void addPeerManually(); void addPeerManually();
void onPlaybackLoading( const Tomahawk::result_ptr& result );
void audioStarted(); void audioStarted();
void audioStopped(); void audioStopped();

22
src/tomahawkwindow.cpp
View File

@@ -25,6 +25,7 @@
#include "tomahawkapp.h" #include "tomahawkapp.h"
#include "sourcetree/sourcesmodel.h" #include "sourcetree/sourcesmodel.h"
#include "viewmanager.h" #include "viewmanager.h"
#include "audio/audioengine.h"
#include <QCloseEvent> #include <QCloseEvent>
@@ -43,6 +44,8 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
if( !s_sourcesModel ) if( !s_sourcesModel )
s_sourcesModel = new SourcesModel( this ); s_sourcesModel = new SourcesModel( this );
setupSignals();
} }
@@ -197,8 +200,27 @@ TomahawkWindow::maximize()
} }
void
TomahawkWindow::onPlaybackLoading( const Tomahawk::result_ptr& result )
{
m_currentTrack = result;
setWindowTitle( m_windowTitle );
}
void void
TomahawkWindow::retranslateUi() TomahawkWindow::retranslateUi()
{ {
} }
void
TomahawkWindow::setupSignals()
{
// <From AudioEngine>
connect( AudioEngine::instance(), SIGNAL( loading( const Tomahawk::result_ptr& ) ),
SLOT( onPlaybackLoading( const Tomahawk::result_ptr& ) ) );
}

6
src/tomahawkwindow.h
View File

@@ -51,6 +51,12 @@ private slots:
virtual void minimize(); virtual void minimize();
virtual void maximize(); virtual void maximize();
void onPlaybackLoading( const Tomahawk::result_ptr& result );
private:
void setupSignals();
protected: protected:
static SourcesModel* s_sourcesModel; static SourcesModel* s_sourcesModel;