From f3dc1a08009ba87668a98c58367f99476535e42e Mon Sep 17 00:00:00 2001
From: Jason Herskowitz <jherskowitz@globallistic.com>
Date: Sun, 7 Aug 2011 16:44:57 -0400
Subject: [PATCH 01/22] Trying some new matching icons for the drag indictors
 for songs

---
 data/icons/audio-x-generic-16x16.png | Bin 643 -> 4346 bytes
 data/icons/audio-x-generic-32x32.png | Bin 1485 -> 7434 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/icons/audio-x-generic-16x16.png b/data/icons/audio-x-generic-16x16.png
index 017b00da90f5f743e448303e13a74aed5f27494f..b5715ad5876437ae4e9299600da4387831c6de85 100644
GIT binary patch
literal 4346
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
V^Qh&DhaXCC%=Me-Tj3MG{6CBJ%*Fr!

delta 619
zcmV-x0+jvwA%g{wBYyw{b3#c}2nYxWd<bNS00009a7bBm0005I0005I0XppC;s5{u
z8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10su)wK~#9!jZ@ES6G0UI
zX0zI4SESaYNJ36-$R!~cD?JtbBkDgQf(rc$yhyOcLmLl*UVjw4OHa0_mzL5<ixMMf
zezYXSHVI)j$xi1zHp3?E!3Q7j?Y#Nk``*l~kWxYjkpMst_&<{hr;6J$gN3{2-R|ya
zG!n`XhOS6);3I}1v)Swl09^p%@!0TvpGk%S3<H{|$?Q2&%{VY7^@+q##4wUCZezQ;
z&2c2OJ~16}mwzxhD7H9%6Hh-qfiy5xSSgU<0!$tbhxlEsPHnWz7*=zuD1F~TrBZ?G
zy4-Ab1fK2q=m@D)3a;mA$+l@>?ZFz(yfe;~%Vj8|W|tMT+ih5ug?g=~=QPE2_Q@Mb
z*tU&Ut3?W~K7)8X&Jxq<v|j7DUG~nrgTY{cL?XdCx_|OZBjodW)a!M`Vlg5G1$yk4
z?ku6ElobjE`qm?uVFl4>6q!s0pSvIN>i9W+d^<t=@SJmVkvTYyL+^!D>RT`|^V0tK
z2YB}LAvOzN@YZ_`^Y2&6^7%BIO>{c{VB3~Y=Qyn(@U~dM{l$AI{(6jS;uhXKddFQG
zjRtbL9AxOVmP%Xi0qiqDN>;M0WJ%BSB+W+h6p5h-vfuB^ot<6IZEUQ6pnk+7=mM0y
zg3RdkdU9`Xe_VW7TxVhklixW-S51`}+NR>Z+Ixr@y8u>P6SCqpiBbRn002ovPDHLk
FV1iefAo&0Q

diff --git a/data/icons/audio-x-generic-32x32.png b/data/icons/audio-x-generic-32x32.png
index 8a30401bfaaab7512dfdfc799c9c1c4db9d554d7..5a2c069d3f92a2b7224d1f48bcdcfba534014987 100644
GIT binary patch
literal 7434
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

literal 1485
zcmbu<2~*QY7zf~m6uAt+60s305jmnF0*Y4DLShi8$R%Z>(pD^Dff10~1B=vZyo!WI
zIYd!G$`Py+5JAX6FdPO$Kmw6)21tMehzCK=E`L8lpV|HG?9R^4?Cd*x&DYx<ZLrn=
z0D$)NAp64+zufguFv<DX`EWqRk~{<S^z^z1eEQ*3KicC+EL=@k?pnzmsRFo&i*uvI
z9gYf(OAL-V2@(?%?ZP4>Vt);eK4}*fb1G+I?^*z~pZa<QxGgO$!TtXq8UfG2;c!eQ
zv%I_<W<^ECmwbVkn3zzj)gTIhXn^_=rAJwTjs%!6-Bs5xU;k}vau#5(0#mvvE)8v#
zZn};JzRd>sM_^+<u*x*GrmrWY61L=+*=Jih<l-G_fg=;^C<0DdIHv-qT@S2x7w&eB
z+qvid);&dL-#@Z-skCxsn-YtOq&qflkDc7|x4TynysC(Y3Z1<N*ZACX^<mlhHrx7*
zuBYUajtHEORUA8^B!s>UJ=H-vGvIe&I4C(e`FB=qdgDzR#G%pY^uofzBB-;dxVX4P
zQc_x4$`F(>%a^bDd?xROw79yuy0*5K#bUA9oMl{YU0ofI$E&Zee+8*u@cH}(sE5}e
zYiMk0dj0yf0BUIw3Wcq$ts<zcO*96ht!<#Cy}kV{)PYcRh{fVgs0%UF)url^NF?u|
z?qyP_r$;(2l}>c^^z`)hA=Hw7XaF%eFgPe1lp%%?!-x_2@cZErNG>0dE98(uAy<ql
zpwUsq=-4PUHa0poJ_e0{p&VDjrcy#Gm2wJ(N(EmRnw*@NQBFcr2=&wyd~)bL;sfF%
z;uB&Tq0vmwOlzPS#OImM(ER7w+1a_dx%v6|g@uL1#YI@F7QQ<pVUbzK`FkG*TH2_u
zR_N;K8yKREu<P*FgiW^F9G&;>-RJ85>Xk$ylZ`7E7j0)-j9{_<>`5jDB)vPGaVWyX
z4|_$}kb5nR!Fc$Qmmms1BMKEo2H^q%jHQa+KkanlCw+{u<9tTHd2|8(I<<>_;^4Eq
zz<Pf96VD<~o9!7*g4)jRh<CXB$xFBqmhk*{8V(*9bGiNo93bT-<vl%#Cj#pHhZPPR
z9Z}g9CQN;eSA#Yo8_g9M*>AAGQE%SjyV|F$s;b$70y!j^M7D617nn+!YOxW7G+XC&
zYe{rMEkekN4ow>}n-g3+`>pK~{^(9SeV^*j8CGm@$e@?8Lbx^SZg}a=(n{+2J8qso
zw~(8c#7s;-48%)b7yikxy7#iO^FB>8NM>9KyV~4J>dV);d{FMgX!BSqQLpxx9Q)L1
zQyOKnsbkd*x~MNxyXBeqj712~GQ~>AzG}Oa6Nho7{+3KN#`pb1avpO16rEL?rq$n|
z#fj+?A2;ati&D<Hm|ND3Thz&$RHBv9F|vE?uw*586U1YT6qqx!aQt0?+pr$uK(Sqd
zaT&mtT{PRIz;dcO^poZe+|3bMX6Es^&877#Z$EhK?sDqrX%~LIRsk((vpQxDcv@4Y
z=bYnB_ZxZO;%SsRbP@XBUE$L1&6xEOL&8+r!^-ySCaa&D7*f&+$>F!xRtE)a{&@Ey
z(MNdUn;*bVuf=Lps%<R!&4GAIdC9@bC*c?ryFHhC!hYYa6uqP8(zoRpVl3DU%^ID+
zX-0;n(O)%e^RvO#x`qh_bQ*D~w$*S)h*skc{or1V*F{Wgo8RRW@mqp)Pr5nT`4F{t
o|H>m)Dtl4ZoyPg4U$(ZVv1@93j&%?<yO%#wPd9IJ8R>ZHf9NR*tpET3


From 58c18acd01cab9add75ea44e559896e86f8b7179 Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Sun, 7 Aug 2011 17:08:35 -0400
Subject: [PATCH 02/22] Load automatic playlists and stations in Newest
 Stations and Playlists list...

---
 .../playlist/dynamic/DynamicPlaylist.cpp       | 18 ++++++++++++++++++
 .../playlist/dynamic/DynamicPlaylist.h         |  2 ++
 .../widgets/welcomeplaylistmodel.cpp           | 12 +++++++-----
 src/libtomahawk/widgets/welcomeplaylistmodel.h |  3 +--
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp
index 80e566fcc..04e6d9e03 100644
--- a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp
+++ b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp
@@ -121,6 +121,24 @@ DynamicPlaylist::setMode( int mode )
     m_generator->setMode( (GeneratorMode)mode );
 }
 
+dynplaylist_ptr
+DynamicPlaylist::load( const QString& guid )
+{
+    dynplaylist_ptr p;
+
+    foreach( const Tomahawk::source_ptr& source, SourceList::instance()->sources() )
+    {
+        p = source->collection()->autoPlaylist( guid );
+        if ( p.isNull() )
+            p = source->collection()->station( guid );
+
+        if( !p.isNull() )
+            return p;
+    }
+
+    return p;
+}
+
 
 dynplaylist_ptr
 DynamicPlaylist::create( const Tomahawk::source_ptr& author,
diff --git a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.h b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.h
index 22268ee7c..63e29e9fe 100644
--- a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.h
+++ b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.h
@@ -91,6 +91,8 @@ class DLLEXPORT DynamicPlaylist : public Playlist
 public:
     virtual ~DynamicPlaylist();
 
+    static Tomahawk::dynplaylist_ptr load( const QString& guid );
+
     /// Generate an empty dynamic playlist with default generator
     static Tomahawk::dynplaylist_ptr create( const source_ptr& author,
                                              const QString& guid,
diff --git a/src/libtomahawk/widgets/welcomeplaylistmodel.cpp b/src/libtomahawk/widgets/welcomeplaylistmodel.cpp
index 8c19b2e66..fe855885c 100644
--- a/src/libtomahawk/widgets/welcomeplaylistmodel.cpp
+++ b/src/libtomahawk/widgets/welcomeplaylistmodel.cpp
@@ -1,6 +1,5 @@
 /*
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2011  Leo Franchi <leo.franchi@kdab.com>
+    Copyright (C) 2011  Leo Franchi <lfranchi@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,10 +19,11 @@
 
 #include "welcomeplaylistmodel.h"
 
-#include <tomahawksettings.h>
-#include <audio/audioengine.h>
-#include <sourcelist.h>
+#include "tomahawksettings.h"
+#include "audio/audioengine.h"
+#include "sourcelist.h"
 #include "utils/logger.h"
+#include "dynamic/DynamicPlaylist.h"
 
 using namespace Tomahawk;
 
@@ -63,6 +63,8 @@ WelcomePlaylistModel::loadFromSettings()
         playlist_ptr pl = m_cached.value( playlist_guids[i], playlist_ptr() );
         if( pl.isNull() )
             pl = Tomahawk::Playlist::load( playlist_guids[i] );
+        if( pl.isNull() )
+            pl = Tomahawk::DynamicPlaylist::load( playlist_guids[i] );
 
         if ( !pl.isNull() ) {
             m_recplaylists << pl;
diff --git a/src/libtomahawk/widgets/welcomeplaylistmodel.h b/src/libtomahawk/widgets/welcomeplaylistmodel.h
index b4defabed..b979dfc95 100644
--- a/src/libtomahawk/widgets/welcomeplaylistmodel.h
+++ b/src/libtomahawk/widgets/welcomeplaylistmodel.h
@@ -1,6 +1,5 @@
 /*
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2011  Leo Franchi <leo.franchi@kdab.com>
+    Copyright (C) 2011  Leo Franchi <lfranchi@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

From 086574173300c22d9e3084f14ddaeeb48c26c7cf Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Sun, 7 Aug 2011 17:08:54 -0400
Subject: [PATCH 03/22] Don't draw white text on light background

---
 src/libtomahawk/widgets/welcomewidget.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/libtomahawk/widgets/welcomewidget.cpp b/src/libtomahawk/widgets/welcomewidget.cpp
index 10ee83747..5bf94cb74 100644
--- a/src/libtomahawk/widgets/welcomewidget.cpp
+++ b/src/libtomahawk/widgets/welcomewidget.cpp
@@ -205,7 +205,7 @@ PlaylistDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
     initStyleOption( &opt, QModelIndex() );
     qApp->style()->drawControl( QStyle::CE_ItemViewItem, &opt, painter );
 
-    if ( option.state & QStyle::State_Selected )
+    if ( option.state & QStyle::State_Selected && option.state & QStyle::State_Active )
     {
         opt.palette.setColor( QPalette::Text, opt.palette.color( QPalette::HighlightedText ) );
     }
@@ -219,13 +219,21 @@ PlaylistDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
     QFont font = opt.font;
     QFont boldFont = opt.font;
     boldFont.setBold( true );
+    QFont italicFont = opt.font;
+    italicFont.setItalic( true );
 
     painter->drawPixmap( option.rect.adjusted( 10, 13, -option.rect.width() + 48, -13 ), m_playlistIcon );
 
     painter->drawText( option.rect.adjusted( 56, 26, -100, -8 ), index.data( WelcomePlaylistModel::ArtistRole ).toString() );
 
     QString trackCount = tr( "%1 tracks" ).arg( index.data( WelcomePlaylistModel::TrackCountRole ).toString() );
-    painter->drawText( option.rect.adjusted( option.rect.width() - 96, 2, 0, -2 ), trackCount, to );
+    painter->drawText( option.rect.adjusted( option.rect.width() - 96, 12, 0, -2 - opt.rect.height() / 2 ), trackCount, to );
+
+    QString author = index.data( WelcomePlaylistModel::PlaylistRole ).value< Tomahawk::playlist_ptr >()->author()->friendlyName();
+    QRect r = option.rect.adjusted( option.rect.width() - 96, 2 + opt.rect.height() / 2, 0, -12);
+    painter->setFont( italicFont );
+    author = painter->fontMetrics().elidedText( author, Qt::ElideRight, r.width() );
+    painter->drawText( r, author, to );
 
     painter->setFont( boldFont );
     painter->drawText( option.rect.adjusted( 56, 6, -100, -option.rect.height() + 20 ), index.data().toString() );

From dcf1ebb70fe215266e4ec82ad535aac2f88da6db Mon Sep 17 00:00:00 2001
From: Jason Herskowitz <jherskowitz@globallistic.com>
Date: Sun, 7 Aug 2011 17:36:59 -0400
Subject: [PATCH 04/22] Don't forget one of the drag indicator icon sizes
 (22x22)

---
 data/icons/audio-x-generic-22x22.png | Bin 856 -> 5264 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/icons/audio-x-generic-22x22.png b/data/icons/audio-x-generic-22x22.png
index e2c40f1da4e84d06414be0afb722f02f3b85cf0d..84d6becf635d1cde0ae044b67d32904169ebd436 100644
GIT binary patch
literal 5264
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

literal 856
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H3?x5i&EW)6%*9TgAsieWw;%dH0CG7CJR*yM
zqGce=SbMeU3{X(A#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDFz0{<^Z1%
z*Z=?j1Jy%-ii(PsmKKC<VPR}(Y3btPa^S#$<HwJmKY#ARh4U9LUbuAWB3~^xe<h!I
z6{mEExLl`*QkRlSkCa-Wx>}E%_5=mPiRwm^)J!IsSe2VuZIG~Cst~%^DQas}^m)~U
zONQmQLdzcn)jsi?^`dIgl|{>L&02YF<=VAt*R5Z_;n>=Z8#iv+v}yCj%{%Y!-2H0J
z-cJh;JUnpt=^>y4jz2qk5(u6iIraF&X&`uh?9B5MXMx}x7`!-n{`~n17cO3WdFB!j
zygG9k2wq*ja^=cZAh>qz=FOXT?%cWi?(Tgccz5r~`zKGIJ%9e<#q$?0U%q<v>h<f_
zZ{ECl3kL7rz5Vv~9T2>K|L*;V_dxLB!}}kvKY+l;4<8}m)5lMrK7N1u2?#!e!51+2
z3I^XG;QP1lVDJMBe*XCJ69j(!`t=(K{`~&)=g;52fB*ga7k=I9H89WxOM?7@8D!*?
z3{5R8t!>?(Jp2Cr*RQZl9%W!$X?eOhhE&|jy|~}o*-(J}!~0mhZ4s+=ON)eJuee5)
zyngfG#r=o%N<SXoFAQ;aELid2g6khvSuMMq$$O^H*z(@eL!UFo?oMo5LSeui@Be4m
zI2QODyZUG{uw|v28TM|Pxhd(<iR_jm7d}b_dR~b<JV$krh9r;KZx@BoO-f6*Oj1x*
zToz($AGlTQ=(DKfJzC!muk^@y;eX<;c&O>#Ew`R|o4mg^Z`y1AkdGCiw&q*-w<J}*
z7VbQ)9y$4=2H$}%;ddoh*K)tE=+E5I*i~NVv)K3EWwWQ-rbh@}um1J-TADY@ign);
z&m}CAj(pCPFTZo@Zl%H?g_idh4!u@9)T(*v=8}RdQ{H*bQ;e|;Kj(MRQmtubo42{+
u(NGDy^57{lEs`SQv-;KIzf3<j{iJ^E%&6<{-F56i>DbfN&t;ucLK6UNRMxft


From 44aa85b51e0576caee0fa57701932145661bff38 Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Sun, 7 Aug 2011 17:43:27 -0400
Subject: [PATCH 05/22] support spotifyURL and spotifyURI in track/open,
 track/queue, and track/play links

---
 src/libtomahawk/globalactionmanager.cpp | 52 +++++++++++++++++++++++++
 src/libtomahawk/globalactionmanager.h   |  5 +++
 2 files changed, 57 insertions(+)

diff --git a/src/libtomahawk/globalactionmanager.cpp b/src/libtomahawk/globalactionmanager.cpp
index 3b7477168..a60a01918 100644
--- a/src/libtomahawk/globalactionmanager.cpp
+++ b/src/libtomahawk/globalactionmanager.cpp
@@ -346,6 +346,10 @@ bool
 GlobalActionManager::doQueueAdd( const QStringList& parts, const QList< QPair< QString, QString > >& queryItems )
 {
     if( parts.size() && parts[ 0 ] == "track" ) {
+
+        if( queueSpotify( parts, queryItems ) )
+            return true;
+
         QPair< QString, QString > pair;
 
         QString title, artist, album, urlStr;
@@ -394,6 +398,28 @@ GlobalActionManager::doQueueAdd( const QStringList& parts, const QList< QPair< Q
     return false;
 }
 
+bool
+GlobalActionManager::queueSpotify( const QStringList& , const QList< QPair< QString, QString > >& queryItems )
+{
+    QString url;
+
+    QPair< QString, QString > pair;
+    foreach( pair, queryItems ) {
+        if( pair.first == "spotifyURL" )
+            url = pair.second;
+        else if( pair.first == "spotifyURI" )
+            url = pair.second;
+    }
+
+    if( url.isEmpty() )
+        return false;
+
+    openSpotifyLink( url );
+
+    return true;
+}
+
+
 bool
 GlobalActionManager::handleSearchCommand( const QUrl& url )
 {
@@ -581,6 +607,9 @@ GlobalActionManager::handlePlayCommand( const QUrl& url )
     }
 
     if( parts[ 0 ] == "track" ) {
+        if( playSpotify( url ) )
+            return true;
+
         QPair< QString, QString > pair;
         QString title, artist, album, urlStr;
         foreach( pair, url.queryItems() ) {
@@ -607,6 +636,29 @@ GlobalActionManager::handlePlayCommand( const QUrl& url )
     return false;
 }
 
+bool
+GlobalActionManager::playSpotify( const QUrl& url )
+{
+    if( !url.hasQueryItem( "spotifyURI" ) && !url.hasQueryItem( "spotifyURL" ) )
+        return false;
+
+    QString spotifyUrl = url.hasQueryItem( "spotifyURI" ) ? url.queryItemValue( "spotifyURI" ) : url.queryItemValue( "spotifyURL" );
+    SpotifyParser* p = new SpotifyParser( spotifyUrl, this );
+    connect( p, SIGNAL( track( Tomahawk::query_ptr ) ), this, SLOT( spotifyToPlay( Tomahawk::query_ptr ) ) );
+
+    return true;
+}
+
+void
+GlobalActionManager::spotifyToPlay( const query_ptr& q )
+{
+    Pipeline::instance()->resolve( q, true );
+
+    m_waitingToPlay = q;
+    connect( q.data(), SIGNAL( resolvingFinished( bool ) ), this, SLOT( waitingForResolved( bool ) ) );
+}
+
+
 bool GlobalActionManager::handleBookmarkCommand(const QUrl& url)
 {
     QStringList parts = url.path().split( "/" ).mid( 1 ); // get the rest of the command
diff --git a/src/libtomahawk/globalactionmanager.h b/src/libtomahawk/globalactionmanager.h
index c8dd48a1f..725e8c959 100644
--- a/src/libtomahawk/globalactionmanager.h
+++ b/src/libtomahawk/globalactionmanager.h
@@ -77,6 +77,8 @@ private slots:
 
     void xspfCreated( const QByteArray& xspf );
     void expandedUrls( QStringList );
+
+    void spotifyToPlay( const Tomahawk::query_ptr& );
 private:
     explicit GlobalActionManager( QObject* parent = 0 );
     void doBookmark( const Tomahawk::playlist_ptr& pl, const Tomahawk::query_ptr& q );
@@ -93,6 +95,9 @@ private:
     bool handleOpenCommand(const QUrl& url );
     bool doQueueAdd( const QStringList& parts, const QList< QPair< QString, QString > >& queryItems );
 
+    bool playSpotify( const QUrl& url );
+    bool queueSpotify( const QStringList& parts, const QList< QPair< QString, QString > >& queryItems );
+
     /// handle parsing mime data
     void handleTrackUrls( const QString& urls );
     QList< Tomahawk::query_ptr > tracksFromQueryList( const QMimeData* d );

From 8e07eb5c551d02797789e6d69654be0439465d8d Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Mon, 8 Aug 2011 14:05:51 +0200
Subject: [PATCH 06/22] Use macro_optional_find_package everywhere. FindPhonon
 needs to be fixed to respect the version number.

---
 CMakeLists.txt | 77 +++++++++++++++++++++++++++++---------------------
 1 file changed, 45 insertions(+), 32 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d219e04f2..f6859f824 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,12 @@ SET( TOMAHAWK_VERSION_PATCH 0 )
 
 # SET( TOMAHAWK_VERSION_RC 0 )
 
+
+# build options
+option(BUILD_GUI "Build Tomahawk with GUI" ON)
+
+
+# generate version string
 IF( NOT CMAKE_BUILD_TYPE STREQUAL "Release" )
   # Use the date as the tweak level.
   INCLUDE( ${CMAKE_MODULE_PATH}/CMakeDateStamp.cmake )
@@ -50,31 +56,27 @@ SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
 # installer creation
 INCLUDE( CPack.cmake )
 
-# Check if we need qtgui:
-IF( "${gui}" STREQUAL "no" )
-    ADD_DEFINITIONS( -DENABLE_HEADLESS )
-    MESSAGE( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} in HEADLESS mode ***" )
-	FIND_PACKAGE( Qt4 4.7.0 COMPONENTS QtCore QtXml QtNetwork REQUIRED )
-ELSE()
-    MESSAGE( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} full GUI version ***" )
-	FIND_PACKAGE( Qt4 4.7.0 COMPONENTS QtGui QtCore QtXml QtNetwork REQUIRED )
-ENDIF()
-
 #deps
 INCLUDE( MacroOptionalFindPackage )
 INCLUDE( MacroLogFeature )
 
-# required
-#While we distribute our own liblastfm2, don't need to look for it
-#macro_optional_find_package(LibLastFm 0.3.3)
-#macro_log_feature(LIBLASTFM_FOUND "LastFm" "Qt library for the Last.fm webservices" "https://github.com/mxcl/liblastfm" FALSE "" "liblastfm is needed for scrobbling tracks to Last.fm and fetching cover artwork")
-set(LIBLASTFM_FOUND true)
+# Check if we need qtgui:
+SET(NEEDED_QT4_COMPONENTS QtCore QtXml QtNetwork )
+IF( NOT BUILD_GUI )
+    ADD_DEFINITIONS( -DENABLE_HEADLESS )
+    MESSAGE( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} in HEADLESS mode ***" )
+ELSE()
+    MESSAGE( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} full GUI version ***" )
+    LIST(APPEND NEEDED_QT4_COMPONENTS "QtGui")
+ENDIF()
 
-find_package(Phonon REQUIRED)
-if(PHONON_VERSION STRLESS "4.5.0")
-	message(FATAL_ERROR "Phonon version 4.5.0 or higher is required, you have version ${PHONON_VERSION}")
-else()
-	message(STATUS "Phonon found; ensure that phonon-vlc is at least 0.4")
+macro_optional_find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS} )
+macro_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI framework" "http://qt.nokia.com" TRUE "" "")
+
+macro_optional_find_package(Phonon 4.5.0)
+macro_log_feature(PHONON_FOUND "Phonon" "The Phonon multimedia library" "http://phonon.kde.org" TRUE "" "")
+if(PHONON_FOUND)
+    message(STATUS "Phonon found; ensure that phonon-vlc is at least 0.4")
 endif()
 
 macro_optional_find_package(LibEchonest 1.1.7)
@@ -88,6 +90,15 @@ macro_log_feature(QJSON_FOUND "QJson" "Qt library that maps JSON data to QVarian
 
 macro_optional_find_package(Taglib 1.6.0)
 macro_log_feature(TAGLIB_FOUND "TagLib" "Audio Meta-Data Library" "http://developer.kde.org/~wheeler/taglib.html" TRUE "" "taglib is needed for reading meta data from audio files")
+include( CheckTagLibFileName )
+check_taglib_filename( COMPLEX_TAGLIB_FILENAME )
+
+# required
+#While we distribute our own liblastfm2, don't need to look for it
+#macro_optional_find_package(LibLastFm 0.3.3)
+#macro_log_feature(LIBLASTFM_FOUND "LastFm" "Qt library for the Last.fm webservices" "https://github.com/mxcl/liblastfm" FALSE "" "liblastfm is needed for scrobbling tracks to Last.fm and fetching cover artwork")
+set(LIBLASTFM_FOUND true)
+
 
 # this installs headers and such and should really be handled in a separate package by packagers
 IF( INTERNAL_JREEN )
@@ -124,20 +135,22 @@ SET( LIBPORTFWD_LIBRARIES ${LIBPORTFWD_LIBRARY} )
 ADD_SUBDIRECTORY( ${THIRDPARTY_DIR}/libportfwd )
 
 # we need pthreads too
-find_package(Threads)
+macro_optional_find_package(Threads)
+macro_log_feature(THREADS_FOUND "Threads" "Threading Library" "" TRUE "" "Platform specific library for threading")
 
-find_package(KDE4Installed)
-find_package(KDE4)
-IF(KDE4_FOUND)
-    #KDE4 adds and removes some compiler flags that we don't like
-    STRING( REPLACE "-std=iso9899:1990" "" CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
-    SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions" )
-ELSE()
-    SET( CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
-ENDIF()
+macro_optional_find_package(KDE4Installed)
 
-include( CheckTagLibFileName )
-check_taglib_filename( COMPLEX_TAGLIB_FILENAME )
+# this was used before we had FindKDE4Installed, just leaving it here to keep the flags
+# for future kde integration
+
+# macro_optional_find_package(KDE4)
+# IF(KDE4_FOUND)
+#     #KDE4 adds and removes some compiler flags that we don't like
+#     STRING( REPLACE "-std=iso9899:1990" "" CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
+#     SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions" )
+# ELSE()
+#     SET( CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
+# ENDIF()
 
 IF( WIN32 )
   find_library(QTSPARKLE_LIBRARIES qtsparkle)

From 7dc1e94ae6967bfcd4c2fef45be3a673dc8331f5 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Mon, 8 Aug 2011 14:53:35 +0200
Subject: [PATCH 07/22] Fix FindCLucene.cmake to respect find_version

---
 CMakeModules/FindCLucene.cmake | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/CMakeModules/FindCLucene.cmake b/CMakeModules/FindCLucene.cmake
index 52116d01f..eb0eafc3e 100644
--- a/CMakeModules/FindCLucene.cmake
+++ b/CMakeModules/FindCLucene.cmake
@@ -12,9 +12,12 @@
 INCLUDE(CheckSymbolExists)
 INCLUDE(FindLibraryWithDebug)
 
-if(NOT CLUCENE_MIN_VERSION)
-  set(CLUCENE_MIN_VERSION "0.9.23")
-endif(NOT CLUCENE_MIN_VERSION)
+
+IF(CLucene_FIND_VERSION)
+  SET(CLUCENE_MIN_VERSION ${CLucene_FIND_VERSION})
+ELSEIF()
+  SET(CLUCENE_MIN_VERSION "0.9.23")
+ENDIF(CLucene_FIND_VERSION)
 
 IF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
   INCLUDE(${PROJECT_CMAKE}/CLuceneConfig.cmake)

From f05c58150e1ca3e4416fa05b8f6ad931457fdd32 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Mon, 8 Aug 2011 14:54:54 +0200
Subject: [PATCH 08/22] Fix FindPhonon.cmake to respect find_version

---
 CMakeModules/FindPhonon.cmake | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeModules/FindPhonon.cmake b/CMakeModules/FindPhonon.cmake
index 77dda657b..466fc3c62 100644
--- a/CMakeModules/FindPhonon.cmake
+++ b/CMakeModules/FindPhonon.cmake
@@ -38,14 +38,14 @@ else(PHONON_FOUND)
    find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ${QT_LIBRARY_DIR})
    find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h)
 
-   if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
+   _phonon_find_version()
+   if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY AND NOT PHONON_VERSION VERSION_LESS ${Phonon_FIND_VERSION})
       set(PHONON_LIBS ${phonon_LIB_DEPENDS} ${PHONON_LIBRARY})
       set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR})
       set(PHONON_FOUND TRUE)
-      _phonon_find_version()
-   else(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
+   else(PHONON_INCLUDE_DIR AND PHONON_LIBRARY AND NOT PHONON_VERSION VERSION_LESS ${Phonon_FIND_VERSION})
       set(PHONON_FOUND FALSE)
-   endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
+   endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY AND NOT PHONON_VERSION VERSION_LESS ${Phonon_FIND_VERSION})
 
    if(PHONON_FOUND)
       if(NOT PHONON_FIND_QUIETLY)

From 72add01e66910633b1c354eeb40c41a2fc202ea9 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Mon, 8 Aug 2011 21:32:54 +0200
Subject: [PATCH 09/22] * Prevent multiple resolvingFinished() signals being
 emitted from Query.

---
 src/libtomahawk/query.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/libtomahawk/query.cpp b/src/libtomahawk/query.cpp
index 93ac8540e..2e675a389 100644
--- a/src/libtomahawk/query.cpp
+++ b/src/libtomahawk/query.cpp
@@ -169,9 +169,11 @@ Query::removeResult( const Tomahawk::result_ptr& result )
 void
 Query::onResolvingFinished()
 {
-//    qDebug() << Q_FUNC_INFO << "Finished resolving." << toString();
-    m_resolveFinished = true;
-    emit resolvingFinished( m_solved );
+    if ( !m_resolveFinished )
+    {
+        m_resolveFinished = true;
+        emit resolvingFinished( m_solved );
+    }
 }
 
 

From d9a4b718ed38ba32af40a895572bb14663f2eb2e Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Mon, 8 Aug 2011 21:55:39 +0200
Subject: [PATCH 10/22] * Use setPixelSize instead of setPointSize. Should fix
 HeaderLabel weirdness on some systems.

---
 src/libtomahawk/widgets/HeaderLabel.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/libtomahawk/widgets/HeaderLabel.cpp b/src/libtomahawk/widgets/HeaderLabel.cpp
index 3b98ad3e7..055f2001f 100644
--- a/src/libtomahawk/widgets/HeaderLabel.cpp
+++ b/src/libtomahawk/widgets/HeaderLabel.cpp
@@ -31,11 +31,7 @@ HeaderLabel::HeaderLabel( QWidget* parent )
 {
     QFont f( font() );
     f.setBold( true );
-    f.setPointSize( 11 );
-
-#ifdef Q_WS_MAC
-    f.setPointSize( f.pointSize() - 2 );
-#endif
+    f.setPixelSize( 12 );
 
     setFont( f );
     setFixedHeight( sizeHint().height() + 8 );

From fb9556819648bd58d2dc26a2c3605fc42607fe02 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <mzanetti@kde.org>
Date: Tue, 9 Aug 2011 00:45:37 +0200
Subject: [PATCH 11/22] Start playing on ENTER in artistview

BUG: TWK-204
---
 src/libtomahawk/playlist/artistview.cpp | 14 ++++++++++++++
 src/libtomahawk/playlist/artistview.h   |  1 +
 2 files changed, 15 insertions(+)

diff --git a/src/libtomahawk/playlist/artistview.cpp b/src/libtomahawk/playlist/artistview.cpp
index 49b1e1153..6b5cd225e 100644
--- a/src/libtomahawk/playlist/artistview.cpp
+++ b/src/libtomahawk/playlist/artistview.cpp
@@ -151,6 +151,20 @@ ArtistView::onItemActivated( const QModelIndex& index )
     }
 }
 
+void
+ArtistView::keyPressEvent( QKeyEvent* event )
+{
+    qDebug() << Q_FUNC_INFO;
+    QTreeView::keyPressEvent( event );
+
+    if ( !model() )
+        return;
+
+    if ( event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return )
+    {
+        onItemActivated( currentIndex() );
+    }
+}
 
 void
 ArtistView::paintEvent( QPaintEvent* event )
diff --git a/src/libtomahawk/playlist/artistview.h b/src/libtomahawk/playlist/artistview.h
index fe5db9c63..f4076a200 100644
--- a/src/libtomahawk/playlist/artistview.h
+++ b/src/libtomahawk/playlist/artistview.h
@@ -74,6 +74,7 @@ protected:
     virtual void resizeEvent( QResizeEvent* event );
 
     void paintEvent( QPaintEvent* event );
+    void keyPressEvent( QKeyEvent* event );
 
 private slots:
     void onFilterChanged( const QString& filter );

From 023be21950c3e7fc60e25cac36ebb829c6065fee Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Tue, 9 Aug 2011 00:54:48 +0200
Subject: [PATCH 12/22] * Fixed the preemptive onResolvingFinished() call
 triggered by the Pipeline. Fixes stations, I bet.

---
 src/libtomahawk/pipeline.cpp                      |  7 -------
 src/libtomahawk/playlist/dynamic/DynamicModel.cpp | 12 +++++++-----
 src/libtomahawk/query.cpp                         |  4 ++--
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/libtomahawk/pipeline.cpp b/src/libtomahawk/pipeline.cpp
index 57d38f919..ad1d801da 100644
--- a/src/libtomahawk/pipeline.cpp
+++ b/src/libtomahawk/pipeline.cpp
@@ -289,13 +289,6 @@ Pipeline::shunt( const query_ptr& q )
         if ( r->timeout() > 0 )
             new FuncTimeout( r->timeout(), boost::bind( &Pipeline::timeoutShunt, this, q ), this );
     }
-    else
-    {
-        qDebug() << "Reached end of pipeline for:" << q->toString();
-        setQIDState( q, 0 );
-
-        q->onResolvingFinished();
-    }
 
     shuntNext();
 }
diff --git a/src/libtomahawk/playlist/dynamic/DynamicModel.cpp b/src/libtomahawk/playlist/dynamic/DynamicModel.cpp
index 1cf9267c9..436b47e6b 100644
--- a/src/libtomahawk/playlist/dynamic/DynamicModel.cpp
+++ b/src/libtomahawk/playlist/dynamic/DynamicModel.cpp
@@ -137,12 +137,13 @@ DynamicModel::trackResolveFinished( bool success )
 
     Query* q = qobject_cast<Query*>( sender() );
 
-    qDebug() << "Got resolveFinished in DynamicModel" << q->track() << q->artist();
-    if( !m_waitingFor.contains( q ) )
+    tDebug() << "Got resolveFinished in DynamicModel" << q->track() << q->artist();
+    if ( !m_waitingFor.contains( q ) )
         return;
 
-    if( !q->playable() ) {
-        qDebug() << "Got not playable or resolved track:" << q->track() << q->artist() << m_lastResolvedRow << m_currentAttempts;
+    if ( !q->playable() )
+    {
+        tDebug() << "Got not playable or resolved track:" << q->track() << q->artist() << m_lastResolvedRow << m_currentAttempts;
         m_currentAttempts++;
 
         int curAttempts = m_startingAfterFailed ? m_currentAttempts - 20 : m_currentAttempts; // if we just failed, m_currentAttempts includes those failures
@@ -154,7 +155,8 @@ DynamicModel::trackResolveFinished( bool success )
             emit trackGenerationFailure( tr( "Could not find a playable track.\n\nPlease change the filters or try again." ) );
         }
     }
-    else {
+    else
+    {
         qDebug() << "Got successful resolved track:" << q->track() << q->artist() << m_lastResolvedRow << m_currentAttempts;
 
         if( m_currentAttempts > 0 ) {
diff --git a/src/libtomahawk/query.cpp b/src/libtomahawk/query.cpp
index 2e675a389..d31de8aed 100644
--- a/src/libtomahawk/query.cpp
+++ b/src/libtomahawk/query.cpp
@@ -127,8 +127,8 @@ Query::addResults( const QList< Tomahawk::result_ptr >& newresults )
         }
     }
 
-    emit resultsAdded( newresults );
     checkResults();
+    emit resultsAdded( newresults );
 }
 
 
@@ -326,7 +326,7 @@ Query::checkResults()
         emit solvedStateChanged( false );
     }
 
-    if( becameSolved )
+    if ( becameSolved )
         emit solvedStateChanged( true );
 }
 

From ba0c21e111962106b52a6d3abb4a4391dfb0181a Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Tue, 9 Aug 2011 01:47:59 +0200
Subject: [PATCH 13/22] Show tomahawk version in the diagnostics dialog

---
 src/diagnosticsdialog.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/diagnosticsdialog.cpp b/src/diagnosticsdialog.cpp
index 0d46ced6f..565032f8c 100644
--- a/src/diagnosticsdialog.cpp
+++ b/src/diagnosticsdialog.cpp
@@ -19,6 +19,8 @@
 #include "diagnosticsdialog.h"
 #include "ui_diagnosticsdialog.h"
 
+#include "config.h"
+
 #include <sip/SipHandler.h>
 #include <network/servent.h>
 #include <sourcelist.h>
@@ -54,6 +56,11 @@ void DiagnosticsDialog::updateLogView()
             .arg( QDateTime::currentDateTime().toString() )
     );
 
+    // network
+    log.append(
+        "TOMAHAWK-VERSION: " TOMAHAWK_VERSION "\n\n\n"
+    );
+
     // network
     log.append(
         "NETWORK:\n"

From 304981c28bd05bff370bca7d100d6468dc83f035 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Tue, 9 Aug 2011 01:59:57 +0200
Subject: [PATCH 14/22] * We should still remove the query from the pending
 list in Pipeline.

---
 src/PipelineStatusView.cpp   | 2 +-
 src/libtomahawk/pipeline.cpp | 4 ++++
 src/libtomahawk/query.cpp    | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/PipelineStatusView.cpp b/src/PipelineStatusView.cpp
index c9efda9a6..c6206a076 100644
--- a/src/PipelineStatusView.cpp
+++ b/src/PipelineStatusView.cpp
@@ -66,7 +66,7 @@ PipelineStatusView::PipelineStatusView( AnimatedSplitter* parent )
 void
 PipelineStatusView::onPipelineUpdate( const query_ptr& query )
 {
-    qDebug() << Q_FUNC_INFO;
+    tDebug() << Q_FUNC_INFO << query.isNull();
 
     QTreeWidgetItem* ti = m_tree->invisibleRootItem()->child( 0 );
 
diff --git a/src/libtomahawk/pipeline.cpp b/src/libtomahawk/pipeline.cpp
index ad1d801da..3e055d512 100644
--- a/src/libtomahawk/pipeline.cpp
+++ b/src/libtomahawk/pipeline.cpp
@@ -289,6 +289,10 @@ Pipeline::shunt( const query_ptr& q )
         if ( r->timeout() > 0 )
             new FuncTimeout( r->timeout(), boost::bind( &Pipeline::timeoutShunt, this, q ), this );
     }
+    else
+    {
+        setQIDState( q, 0 );
+    }
 
     shuntNext();
 }
diff --git a/src/libtomahawk/query.cpp b/src/libtomahawk/query.cpp
index d31de8aed..eda3ae385 100644
--- a/src/libtomahawk/query.cpp
+++ b/src/libtomahawk/query.cpp
@@ -169,6 +169,7 @@ Query::removeResult( const Tomahawk::result_ptr& result )
 void
 Query::onResolvingFinished()
 {
+    tDebug() << "Finished resolving:" << toString();
     if ( !m_resolveFinished )
     {
         m_resolveFinished = true;

From 6b622657089de461b47a0c60e3f44223c9239069 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Tue, 9 Aug 2011 02:51:34 +0200
Subject: [PATCH 15/22] Show what you've actually searched for in the sidebar

---
 src/libtomahawk/widgets/searchwidget.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libtomahawk/widgets/searchwidget.h b/src/libtomahawk/widgets/searchwidget.h
index 83308e482..f7d7ec021 100644
--- a/src/libtomahawk/widgets/searchwidget.h
+++ b/src/libtomahawk/widgets/searchwidget.h
@@ -48,7 +48,7 @@ public:
     virtual Tomahawk::PlaylistInterface* playlistInterface() const { return 0; }
     virtual bool isTemporaryPage() const { return true; }
 
-    virtual QString title() const { return tr( "Search" ); }
+    virtual QString title() const { return QString( tr( "Search: %1" ) ).arg( m_search ); }
     virtual QString description() const { return tr( "Results for '%1'" ).arg( m_search ); }
 
     virtual bool showStatsBar() const { return false; }

From d7dd3292ffa36868280b71718efd1489e91822eb Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Mon, 8 Aug 2011 21:07:23 -0400
Subject: [PATCH 16/22] be safer and don't crash. TWK-333

---
 src/sourcetree/sourcesmodel.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/sourcetree/sourcesmodel.cpp b/src/sourcetree/sourcesmodel.cpp
index f97d3cb71..8b9858625 100644
--- a/src/sourcetree/sourcesmodel.cpp
+++ b/src/sourcetree/sourcesmodel.cpp
@@ -328,7 +328,8 @@ SourcesModel::itemUpdated()
         return;
 
     QModelIndex idx = indexFromItem( item );
-    emit dataChanged( idx, idx );
+    if( idx.isValid() )
+        emit dataChanged( idx, idx );
 }
 
 
@@ -429,7 +430,11 @@ SourcesModel::indexFromItem( SourceTreeItem* item ) const
     QList< int > childIndexList;
     SourceTreeItem* curItem = item;
     while( curItem != m_rootItem ) {
-        childIndexList << rowForItem( curItem );
+        int row  = rowForItem( curItem );
+        if( row < 0 ) // something went wrong, bail
+            return QModelIndex();
+
+        childIndexList << row;
 
         curItem = curItem->parent();
     }
@@ -448,6 +453,9 @@ SourcesModel::indexFromItem( SourceTreeItem* item ) const
 int
 SourcesModel::rowForItem( SourceTreeItem* item ) const
 {
+    if( !item || !item->parent() || !item->parent()->children().contains( item ) )
+        return -1;
+
     return item->parent()->children().indexOf( item );
 }
 

From a46aadd84357b9bbfc8bbc33e2ce77bd2be557ba Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Tue, 9 Aug 2011 03:20:40 +0200
Subject: [PATCH 17/22] Use filter.png for the filter in the topbar

---
 resources.qrc                              | 1 +
 src/libtomahawk/playlist/topbar/topbar.cpp | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/resources.qrc b/resources.qrc
index 0b79cbc41..9b18f86cc 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -5,6 +5,7 @@
     <file>./data/images/back-pressed.png</file>
     <file>./data/images/back-rest.png</file>
     <file>./data/images/cover-shadow.png</file>
+    <file>./data/images/filter.png</file>
     <file>./data/images/loved.png</file>
     <file>./data/images/not-loved.png</file>
     <file>./data/images/no-album-art-placeholder.png</file>
diff --git a/src/libtomahawk/playlist/topbar/topbar.cpp b/src/libtomahawk/playlist/topbar/topbar.cpp
index 8849c5953..caf855bec 100644
--- a/src/libtomahawk/playlist/topbar/topbar.cpp
+++ b/src/libtomahawk/playlist/topbar/topbar.cpp
@@ -19,6 +19,8 @@
 #include "topbar.h"
 #include "ui_topbar.h"
 
+#include "searchbutton.h"
+
 #include <QPropertyAnimation>
 #include <QRadioButton>
 #include <QFile>
@@ -53,6 +55,8 @@ TopBar::TopBar( QWidget* parent )
 #endif
     ui->filterEdit->setInactiveText( tr( "Filter" ) );
 
+    ui->filterEdit->searchButton()->setImage( QImage( RESPATH "images/filter.png" ) );
+
     // initialise dudes
     for( int i = 0; i < MAXDUDES; ++i )
     {

From 6cba708640a8ebb0a1ff191eecc34533c18d90df Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Tue, 9 Aug 2011 03:21:49 +0200
Subject: [PATCH 18/22] * BUG: TWK-312 - Fixed AnimatedSplitter cutting off
 child widgets.

---
 src/libtomahawk/playlist/topbar/topbar.cpp    | 2 +-
 src/libtomahawk/utils/animatedsplitter.cpp    | 5 +++++
 src/libtomahawk/viewmanager.cpp               | 2 ++
 src/libtomahawk/widgets/newplaylistwidget.cpp | 2 ++
 src/libtomahawk/widgets/newplaylistwidget.ui  | 3 ---
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/libtomahawk/playlist/topbar/topbar.cpp b/src/libtomahawk/playlist/topbar/topbar.cpp
index caf855bec..200974db1 100644
--- a/src/libtomahawk/playlist/topbar/topbar.cpp
+++ b/src/libtomahawk/playlist/topbar/topbar.cpp
@@ -50,10 +50,10 @@ TopBar::TopBar( QWidget* parent )
     connect( ui->filterEdit, SIGNAL( textChanged( QString ) ), SIGNAL( filterTextChanged( QString ) ) );
 
     ui->filterEdit->setStyleSheet( "QLineEdit { border: 1px solid gray; border-radius: 6px; margin-right: 2px; }" );
+    ui->filterEdit->setInactiveText( tr( "Filter" ) );
 #ifdef Q_WS_MAC
     ui->filterEdit->setAttribute( Qt::WA_MacShowFocusRect, 0 );
 #endif
-    ui->filterEdit->setInactiveText( tr( "Filter" ) );
 
     ui->filterEdit->searchButton()->setImage( QImage( RESPATH "images/filter.png" ) );
 
diff --git a/src/libtomahawk/utils/animatedsplitter.cpp b/src/libtomahawk/utils/animatedsplitter.cpp
index bd733034a..50ae3b72f 100644
--- a/src/libtomahawk/utils/animatedsplitter.cpp
+++ b/src/libtomahawk/utils/animatedsplitter.cpp
@@ -104,6 +104,11 @@ AnimatedSplitter::onSizeChanged( const QSize& size )
         if ( i == m_greedyIndex )
         {
             j = height() - size.height();
+            for ( int x = 0; x < count(); x++ )
+            {
+                if ( x != i && x != wi )
+                    j -= widget( x )->height();
+            }
         }
         else if ( i == wi )
         {
diff --git a/src/libtomahawk/viewmanager.cpp b/src/libtomahawk/viewmanager.cpp
index 5454b5f3b..54fdd54ce 100644
--- a/src/libtomahawk/viewmanager.cpp
+++ b/src/libtomahawk/viewmanager.cpp
@@ -621,6 +621,8 @@ ViewManager::setPage( ViewPage* page, bool trackHistory )
     }
 
     m_stack->setCurrentWidget( page->widget() );
+    page->widget()->setFocus();
+
     updateView();
 }
 
diff --git a/src/libtomahawk/widgets/newplaylistwidget.cpp b/src/libtomahawk/widgets/newplaylistwidget.cpp
index 81d1d4a10..201a7b015 100644
--- a/src/libtomahawk/widgets/newplaylistwidget.cpp
+++ b/src/libtomahawk/widgets/newplaylistwidget.cpp
@@ -56,6 +56,8 @@ NewPlaylistWidget::NewPlaylistWidget( QWidget* parent )
     ui->suggestionsView->overlay()->setEnabled( false );
 
     connect( &m_filterTimer, SIGNAL( timeout() ), SLOT( updateSuggestions() ) );
+
+    ui->titleEdit->setFocus();
 }
 
 
diff --git a/src/libtomahawk/widgets/newplaylistwidget.ui b/src/libtomahawk/widgets/newplaylistwidget.ui
index e3a145050..0e9215b2f 100644
--- a/src/libtomahawk/widgets/newplaylistwidget.ui
+++ b/src/libtomahawk/widgets/newplaylistwidget.ui
@@ -34,9 +34,6 @@
        <height>26</height>
       </size>
      </property>
-     <property name="focusPolicy">
-      <enum>Qt::StrongFocus</enum>
-     </property>
     </widget>
    </item>
    <item>

From 4b2c6e8d890cd876bbf966639b4c63dc74ff9932 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Tue, 9 Aug 2011 03:36:16 +0200
Subject: [PATCH 19/22] * 50 fps is enough for our AnimatedSplitter animation.

---
 src/libtomahawk/utils/animatedsplitter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libtomahawk/utils/animatedsplitter.cpp b/src/libtomahawk/utils/animatedsplitter.cpp
index 50ae3b72f..0a34e32af 100644
--- a/src/libtomahawk/utils/animatedsplitter.cpp
+++ b/src/libtomahawk/utils/animatedsplitter.cpp
@@ -150,7 +150,7 @@ AnimatedWidget::AnimatedWidget( AnimatedSplitter* parent )
     , m_isHidden( false )
 {
     m_timeLine = new QTimeLine( ANIMATION_TIME, this );
-    m_timeLine->setUpdateInterval( 5 );
+    m_timeLine->setUpdateInterval( 20 );
     m_timeLine->setEasingCurve( QEasingCurve::OutBack );
 
     connect( m_timeLine, SIGNAL( frameChanged( int ) ), SLOT( onAnimationStep( int ) ) );

From fc43a6a851dc218c5da8927107a302d92f0f5236 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Tue, 9 Aug 2011 03:41:06 +0200
Subject: [PATCH 20/22] * Hide the last.fm test button on OS X - for the 0.2
 release.

---
 src/settingsdialog.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 808b263bc..2ea04216e 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -159,6 +159,10 @@ SettingsDialog::SettingsDialog( QWidget *parent )
     ui->lineEditLastfmPassword->setText(s->lastFmPassword() );
     connect( ui->pushButtonTestLastfmLogin, SIGNAL( clicked( bool) ), this, SLOT( testLastFmLogin() ) );
 
+#ifdef Q_WS_MAC // FIXME
+    ui->pushButtonTestLastfmLogin->setVisible( false );
+#endif
+
     // SCRIPT RESOLVER
     ui->removeScript->setEnabled( false );
     ResolverConfigDelegate* del = new ResolverConfigDelegate( this );

From 339710c86ac4da118bf0d832a891ac599ee4d9f9 Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Mon, 8 Aug 2011 23:23:52 -0400
Subject: [PATCH 21/22] Find playlist/dynplaylist item to activate if opened
 from non-sidebar. TWK-300. Ugh.

---
 .../playlist/dynamic/widgets/DynamicWidget.h  |  1 +
 src/sourcetree/items/playlistitems.cpp        | 29 +++++++++++++++++
 src/sourcetree/items/playlistitems.h          |  3 ++
 src/sourcetree/sourcesmodel.cpp               | 31 ++++++++++++++++++-
 src/sourcetree/sourcesmodel.h                 |  1 +
 5 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.h b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.h
index 4b6e7a5b3..31f1040a3 100644
--- a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.h
+++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.h
@@ -63,6 +63,7 @@ public:
     virtual ~DynamicWidget();
 
     void loadDynamicPlaylist( const dynplaylist_ptr& playlist );
+    dynplaylist_ptr playlist() { return m_playlist; }
 
     virtual PlaylistInterface* playlistInterface() const;
 
diff --git a/src/sourcetree/items/playlistitems.cpp b/src/sourcetree/items/playlistitems.cpp
index 2bef4cce8..2146c9f37 100644
--- a/src/sourcetree/items/playlistitems.cpp
+++ b/src/sourcetree/items/playlistitems.cpp
@@ -180,6 +180,20 @@ PlaylistItem::setData( const QVariant& v, bool role )
     return false;
 }
 
+bool
+PlaylistItem::activateCurrent()
+{
+    if( ViewManager::instance()->pageForPlaylist( m_playlist ) == ViewManager::instance()->currentPage() )
+    {
+        model()->linkSourceItemToPage( this, ViewManager::instance()->currentPage() );
+        emit selectRequest( this );
+
+        return true;
+    }
+
+    return false;
+}
+
 
 DynamicPlaylistItem::DynamicPlaylistItem( SourcesModel* mdl, SourceTreeItem* parent, const dynplaylist_ptr& pl, int index )
     : PlaylistItem( mdl, parent, pl.staticCast< Playlist >(), index )
@@ -312,3 +326,18 @@ DynamicPlaylistItem::icon() const
         return QIcon( RESPATH "images/automatic-playlist.png" );
     }
 }
+
+bool
+DynamicPlaylistItem::activateCurrent()
+{
+    if( ViewManager::instance()->pageForDynPlaylist( m_dynplaylist ) == ViewManager::instance()->currentPage() )
+    {
+        model()->linkSourceItemToPage( this, ViewManager::instance()->currentPage() );
+        emit selectRequest( this );
+
+        return true;
+    }
+
+    return false;
+}
+
diff --git a/src/sourcetree/items/playlistitems.h b/src/sourcetree/items/playlistitems.h
index 42ce35e00..1c3e9d463 100644
--- a/src/sourcetree/items/playlistitems.h
+++ b/src/sourcetree/items/playlistitems.h
@@ -37,6 +37,8 @@ public:
     virtual bool setData(const QVariant& v, bool role);
     virtual int peerSortValue() const;
 
+    virtual bool activateCurrent();
+
 protected:
     void setLoaded( bool loaded );
 
@@ -65,6 +67,7 @@ public:
     virtual int peerSortValue() const;
     virtual QIcon icon() const;
 
+    virtual bool activateCurrent();
 private slots:
     void onDynamicPlaylistLoaded( Tomahawk::DynamicPlaylistRevision revision );
 
diff --git a/src/sourcetree/sourcesmodel.cpp b/src/sourcetree/sourcesmodel.cpp
index 8b9858625..5c5254624 100644
--- a/src/sourcetree/sourcesmodel.cpp
+++ b/src/sourcetree/sourcesmodel.cpp
@@ -33,6 +33,7 @@
 
 #include "utils/logger.h"
 #include "globalactionmanager.h"
+#include "items/playlistitems.h"
 
 using namespace Tomahawk;
 
@@ -281,10 +282,38 @@ SourcesModel::viewPageActivated( Tomahawk::ViewPage* page )
     }
     else
     {
-        m_viewPageDelayedCacheItem = page;
+        // HACK
+        // try to find it if it is a playlist. not pretty at all.... but this happens when ViewManager loads a playlist or dynplaylist NOT from the sidebar but from somewhere else
+        // we don't know which sourcetreeitem is related to it, so we have to find it. we also don't know if this page is a playlist or dynplaylist or not, but we can't check as we can't
+        // include DynamicWidget.h here (so can't dynamic_cast).
+        // this could also be fixed by keeping a master list of playlists/sourcetreeitems... but that's even uglier i think. this is only called the first time a certain viewpage is clicked from external
+        // sources.
+        if( activatePlaylistPage( page, m_rootItem ) )
+            m_viewPageDelayedCacheItem = page;
     }
 }
 
+bool
+SourcesModel::activatePlaylistPage( ViewPage* p, SourceTreeItem* i )
+{
+    if( !i )
+        return false;
+
+    qDebug() << "Doing an activation check on:" << p << i;
+    if( qobject_cast< PlaylistItem* >( i ) &&
+        qobject_cast< PlaylistItem* >( i )->activateCurrent() )
+        return true;
+
+    bool ret = false;
+    for( int k = 0; k < i->children().size(); k++ )
+    {
+        if( activatePlaylistPage( p, i->children().at( k ) ) )
+            ret = true;
+    }
+
+    return ret;
+}
+
 
 void
 SourcesModel::loadSources()
diff --git a/src/sourcetree/sourcesmodel.h b/src/sourcetree/sourcesmodel.h
index c702b4b4b..94ca4008c 100644
--- a/src/sourcetree/sourcesmodel.h
+++ b/src/sourcetree/sourcesmodel.h
@@ -113,6 +113,7 @@ private slots:
 private:
     SourceTreeItem* itemFromIndex( const QModelIndex& idx ) const;
     int rowForItem( SourceTreeItem* item ) const;
+    bool activatePlaylistPage( Tomahawk::ViewPage* p, SourceTreeItem* i );
 
     SourceTreeItem* m_rootItem;
 

From 585bfcdc49e735d06a178019db507e97c44943b8 Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Tue, 9 Aug 2011 07:12:55 -0400
Subject: [PATCH 22/22] debug--

---
 src/sourcetree/sourcesmodel.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/sourcetree/sourcesmodel.cpp b/src/sourcetree/sourcesmodel.cpp
index 5c5254624..7330c53c1 100644
--- a/src/sourcetree/sourcesmodel.cpp
+++ b/src/sourcetree/sourcesmodel.cpp
@@ -299,7 +299,6 @@ SourcesModel::activatePlaylistPage( ViewPage* p, SourceTreeItem* i )
     if( !i )
         return false;
 
-    qDebug() << "Doing an activation check on:" << p << i;
     if( qobject_cast< PlaylistItem* >( i ) &&
         qobject_cast< PlaylistItem* >( i )->activateCurrent() )
         return true;