From ad697e419a3f6a1bec9da533b9bb1157df9ff222 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Sun, 13 Feb 2011 08:46:40 +0100
Subject: [PATCH] * Fix elided texts fo now-playing row in
 PlaylistItemDelegate. * Fixed blue now-playing frame around the entire row.

---
 src/libtomahawk/network/servent.cpp              |  1 -
 .../playlist/playlistitemdelegate.cpp            | 11 ++++++-----
 src/tomahawkapp.cpp                              | 16 +++++++++++++++-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/libtomahawk/network/servent.cpp b/src/libtomahawk/network/servent.cpp
index ddcaa5839..5921a8346 100644
--- a/src/libtomahawk/network/servent.cpp
+++ b/src/libtomahawk/network/servent.cpp
@@ -349,7 +349,6 @@ Servent::createParallelConnection( Connection* orig_conn, Connection* new_conn,
 }
 
 
-/// for outbound connections. DRY out the socket handover code from readyread too?
 void
 Servent::socketConnected()
 {
diff --git a/src/libtomahawk/playlist/playlistitemdelegate.cpp b/src/libtomahawk/playlist/playlistitemdelegate.cpp
index 8aed62255..74ae72f17 100644
--- a/src/libtomahawk/playlist/playlistitemdelegate.cpp
+++ b/src/libtomahawk/playlist/playlistitemdelegate.cpp
@@ -62,7 +62,7 @@ PlaylistItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& opti
     if ( item->isPlaying() )
     {
         painter->save();
-        painter->setRenderHint( QPainter::Antialiasing );
+//        painter->setRenderHint( QPainter::Antialiasing );
 
         {
             QRect r = option.rect.adjusted( 3, 0, 0, 0 );
@@ -73,13 +73,14 @@ PlaylistItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& opti
                 r.adjust( 22, 0, 0, 3 );
             }
 
-            QTextOption to( Qt::AlignVCenter );
-
             painter->setPen( option.palette.text().color() );
-            painter->drawText( r.adjusted( 0, 1, 0, 0 ), index.data().toString(), to );
+
+            QTextOption to( Qt::AlignVCenter );
+            QString text = painter->fontMetrics().elidedText( index.data().toString(), Qt::ElideRight, r.width() - 3 );
+            painter->drawText( r.adjusted( 0, 1, 0, 0 ), text, to );
         }
 
-        if ( m_view->header()->visualIndex( index.column() ) == m_view->header()->visibleSectionCount() - 1 )
+//        if ( m_view->header()->visualIndex( index.column() ) == m_view->header()->visibleSectionCount() - 1 )
         {
             QRect r = QRect( 3, option.rect.y() + 1, m_view->viewport()->width() - 6, option.rect.height() - 2 );
             painter->setPen( option.palette.highlight().color() );
diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp
index f6b01fa19..1064d988b 100644
--- a/src/tomahawkapp.cpp
+++ b/src/tomahawkapp.cpp
@@ -135,12 +135,16 @@ TomahawkApp::TomahawkApp( int& argc, char *argv[] )
     m_servent = new Servent( this );
     connect( m_servent, SIGNAL( ready() ), SLOT( setupSIP() ) );
 
+    qDebug() << "Init Database.";
     setupDatabase();
     
+    qDebug() << "Init Echonest Factory.";
     GeneratorFactory::registerFactory( "echonest", new EchonestFactory );
     
 #ifndef NO_LIBLASTFM
+        qDebug() << "Init Scrobbler.";
         m_scrobbler = new Scrobbler( this );
+        qDebug() << "Setting NAM.";
         TomahawkUtils::setNam( new lastfm::NetworkAccessManager( this ) );
 
         connect( m_audioEngine, SIGNAL( started( const Tomahawk::result_ptr& ) ),
@@ -155,6 +159,7 @@ TomahawkApp::TomahawkApp( int& argc, char *argv[] )
         connect( m_audioEngine, SIGNAL( stopped() ),
                  m_scrobbler,     SLOT( trackStopped() ), Qt::QueuedConnection );
 #else
+        qDebug() << "Setting NAM.";
         TomahawkUtils::setNam( new QNetworkAccessManager );
 #endif
 
@@ -173,12 +178,15 @@ TomahawkApp::TomahawkApp( int& argc, char *argv[] )
 
     QNetworkProxy::setApplicationProxy( *TomahawkUtils::proxy() );
 
+    qDebug() << "Init SIP system.";
     m_sipHandler = new SipHandler( this );
+    qDebug() << "Init InfoSystem.";
     m_infoSystem = new Tomahawk::InfoSystem::InfoSystem( this );
 
-#ifndef TOMAHAWK_HEADLESS
+    #ifndef TOMAHAWK_HEADLESS
     if ( !m_headless )
     {
+        qDebug() << "Init MainWindow.";
         m_mainwindow = new TomahawkWindow();
         m_mainwindow->setWindowTitle( "Tomahawk" );
         m_mainwindow->show();
@@ -186,13 +194,19 @@ TomahawkApp::TomahawkApp( int& argc, char *argv[] )
     }
 #endif
 
+    qDebug() << "Init Pipeline.";
     setupPipeline();
+    qDebug() << "Init Local Collection.";
     initLocalCollection();
+    qDebug() << "Init Servent.";
     startServent();
     //loadPlugins();
 
     if( arguments().contains( "--http" ) || TomahawkSettings::instance()->value( "network/http", true ).toBool() )
+    {
+        qDebug() << "Init HTTP Server.";
         startHTTP();
+    }
 
 #ifndef TOMAHAWK_HEADLESS
     if ( !TomahawkSettings::instance()->hasScannerPath() )