Show artist and track in TomahawkTouchWindow title too

src/tomahawkapp.cpp

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

src/tomahawkdesktopwindow.cpp

@@ -257,8 +257,6 @@ TomahawkDesktopWindow::setupSignals()
              m_audioControls,           SLOT( onShuffleModeChanged( bool ) ) );
 
     // <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( resumed()), SLOT( audioStarted() ) );
     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
 TomahawkDesktopWindow::onSipConnected()
 {

src/tomahawkdesktopwindow.h

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

src/tomahawkwindow.cpp

@@ -25,6 +25,7 @@
 #include "tomahawkapp.h"
 #include "sourcetree/sourcesmodel.h"
 #include "viewmanager.h"
+#include "audio/audioengine.h"
 
 #include <QCloseEvent>
 
@@ -43,6 +44,8 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
 
     if( !s_sourcesModel )
         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
 TomahawkWindow::retranslateUi()
 {
 
 }
+
+
+void
+TomahawkWindow::setupSignals()
+{
+    // <From AudioEngine>
+    connect( AudioEngine::instance(), SIGNAL( loading( const Tomahawk::result_ptr& ) ),
+             SLOT( onPlaybackLoading( const Tomahawk::result_ptr& ) ) );
+}

src/tomahawkwindow.h

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