From a4a3c4fb178ad0faca1f536c1194c161136a4d9d Mon Sep 17 00:00:00 2001 From: Casey Link Date: Sun, 21 Aug 2011 12:56:41 -0500 Subject: [PATCH 01/14] Add What's Hot page with corresponding widget. --- data/images/whats-hot.png | Bin 0 -> 6395 bytes resources.qrc | 1 + src/libtomahawk/CMakeLists.txt | 3 + src/libtomahawk/viewmanager.cpp | 9 ++ src/libtomahawk/viewmanager.h | 5 + src/libtomahawk/widgets/whatshotwidget.cpp | 163 +++++++++++++++++++++ src/libtomahawk/widgets/whatshotwidget.h | 86 +++++++++++ src/libtomahawk/widgets/whatshotwidget.ui | 72 +++++++++ src/sourcetree/items/collectionitem.cpp | 8 + src/sourcetree/items/collectionitem.h | 1 + 10 files changed, 348 insertions(+) create mode 100644 data/images/whats-hot.png create mode 100644 src/libtomahawk/widgets/whatshotwidget.cpp create mode 100644 src/libtomahawk/widgets/whatshotwidget.h create mode 100644 src/libtomahawk/widgets/whatshotwidget.ui diff --git a/data/images/whats-hot.png b/data/images/whats-hot.png new file mode 100644 index 0000000000000000000000000000000000000000..3b7ef64d068a643ca107af3224c195dbca51d866 GIT binary patch literal 6395 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

-$+Tr z;F1~8xWLjB$U`tn!@pMHTQ5^JS?7ACaM(vdp4kW;wr!-W;-TcTkN_O@hAbKVCIg9| z6S0_$5c@IjrMuX_qygLF!wNzINI+9@Tmd*{QN(*63nmWF7SRrq{eTzCl5atz(Mo{B zh(5c{UKtW1!5!rtv8V``SH#*sl7T@#--~1_QG6&7z`WVlD`LDEPj+hL;I9u;L+-7v zr2^fIz%w9%UN)+WE!d5?3d#{4ilJUSHfjb~^g^CK5n>KmNr|*0FEZ%g%7k&Cv5S$Vr1sicJ?4SfSBl}6nLotHt|0YBQ z%uF(w5W9K!(2LIBkJcJMKL5$?++p&>uo^i zh%RxnFk>pZy;ltjvCm@3+5Y{!g6#5o=@hx z4|CbPMu2#;ZJqwN9b&Zq9@q+iV{aoM4+t1VdPnvl&^a@p>W?aQ{vj8gvFpmhLjq;d zj$jOkpB}l;CDZI8m>Jl=;AVz zqhWFBwa2^?%pt+d@*yX;AUzDK=2|Vb+0fzDkY;|%yk=|#gr)BDUyF`s30Qj!XV4fS z>&~MvT%+k_qGV{NqI?hpc+tYyN=qAGVL;E=iwr#ska_}znfmGoO<*(fWjEIZ(fVfn zp6Lvfq{7l|D4qiEVK$qZ6oFJ(5t1N1tV}?CuEiFAgrESR88A&o@2({4SYaA9vqbFXLRn{G z$rZFG8IBN9A^;OEPnLwt-e7q+;ee=&1Y;nWm8gIJpsp7*WOLzp?QRCN1k55<-!-wF zIJ@XhVYEhO7`x^=4sr;ngK`lQiXrn++mI&e&b4U9P*u($S#&C()F;8>RC&su&r)>50OjJz3`XjR=-10nVyOMhT(L zp#O>WopWgND-LxHX0JFAeo0CQRc4D2AYyZdev~W*7@x>Bb*x2#g$O(`RP{wAU(s$+ z&R;>rN+=Rk--jsNJEe3h#To=tl}tfH*ueAm1cq{7q(y}QDt01wrckQWMtnn27g=xeI9v>0EWVhN&*2SDKQnLDXj7lIrvZw1~lYH=o$ z6Ep$_)@T=1PWomXL=lm4m1B0!}^Yr&&6m=OIUrGW|&>-vG z3P&7fCO)*C1l-TnofvFuxO@EVR8DJ)P1qQkQq7FE$%M*27q0TyRIlw3?@cqd8Rt$v z>{uSJxCBlIq4dQA=8*xTb%jWX8W9NrzJ zoqHgv9DEY+$XB3-UbUfX1^86rX*J*)Kr+Qe*?-^ODIakQ32?c7rEnuoH6+Fv=1|Iq~@XSh}mm(Vl_YPwf zMRinrxO`tC$Plq-QaH95PGooAy1F!7WPXkruyb(vu0$|4#zrO3)FU#y7lE-g^-}jL zI9NacjpeaRXt~HiDl>?PZnw8ptl7Kdc(X1_bI7+udwv1CA`uzKLBUhMgB>xRJs5L%;!c**avK7P8O`@k!`+7f3`=@Kgdsx_mmrT#v?Knbp^{ zDbvv-#Iv(wLwVKQjeO+J-&D{5HKPMr?6l~q#WfJo=S{Cy^SE4q~=sYyb5()Udk)?dL3s;AYzHa@{uj#I X5~su0s#!jO{data/images/automatic-playlist.png data/images/station.png data/images/new-additions.png + data/images/whats-hot.png data/images/loved_playlist.png data/images/dashboard.png data/stylesheets/topbar-radiobuttons.css diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index a2b7823e1..869e03226 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -181,6 +181,7 @@ set( libSources widgets/playlisttypeselectordlg.cpp widgets/welcomewidget.cpp widgets/welcomeplaylistmodel.cpp + widgets/whatshotwidget.cpp widgets/overlaywidget.cpp widgets/HeaderLabel.cpp widgets/SocialPlaylistWidget.cpp @@ -360,6 +361,7 @@ set( libHeaders widgets/SeekSlider.h widgets/playlisttypeselectordlg.h widgets/welcomewidget.h + widgets/whatshotwidget.h widgets/welcomeplaylistmodel.h widgets/overlaywidget.h widgets/HeaderLabel.h @@ -387,6 +389,7 @@ set( libUI ${libUI} widgets/newplaylistwidget.ui widgets/searchwidget.ui widgets/welcomewidget.ui + widgets/whatshotwidget.ui widgets/SocialPlaylistWidget.ui widgets/infowidgets/sourceinfowidget.ui widgets/infowidgets/ArtistInfoWidget.ui diff --git a/src/libtomahawk/viewmanager.cpp b/src/libtomahawk/viewmanager.cpp index 90c324245..de59744a0 100644 --- a/src/libtomahawk/viewmanager.cpp +++ b/src/libtomahawk/viewmanager.cpp @@ -44,6 +44,7 @@ #include "dynamic/widgets/DynamicWidget.h" #include "widgets/welcomewidget.h" +#include "widgets/whatshotwidget.h" #include "widgets/infowidgets/sourceinfowidget.h" #include "widgets/infowidgets/ArtistInfoWidget.h" #include "widgets/infowidgets/AlbumInfoWidget.h" @@ -69,6 +70,7 @@ ViewManager::ViewManager( QObject* parent ) : QObject( parent ) , m_widget( new QWidget() ) , m_welcomeWidget( new WelcomeWidget() ) + , m_whatsHotWidget( new WhatsHotWidget() ) , m_currentMode( PlaylistInterface::Tree ) { s_instance = this; @@ -426,6 +428,13 @@ ViewManager::showWelcomePage() return show( m_welcomeWidget ); } +Tomahawk::ViewPage* +ViewManager::showWhatsHotPage() +{ + return show( m_whatsHotWidget ); +} + + void ViewManager::setTableMode() diff --git a/src/libtomahawk/viewmanager.h b/src/libtomahawk/viewmanager.h index 34ed0431f..d1ab325b4 100644 --- a/src/libtomahawk/viewmanager.h +++ b/src/libtomahawk/viewmanager.h @@ -27,6 +27,7 @@ #include "playlistinterface.h" #include "viewpage.h" #include "widgets/welcomewidget.h" +#include "widgets/whatshotwidget.h" #include "dllmacro.h" @@ -51,6 +52,7 @@ class SourceInfoWidget; class InfoBar; class TopBar; class WelcomeWidget; +class WhatsHotWidget; class QPushButton; namespace Tomahawk @@ -83,6 +85,7 @@ public: Tomahawk::ViewPage* show( Tomahawk::ViewPage* page ); Tomahawk::ViewPage* welcomeWidget() const { return m_welcomeWidget; } + Tomahawk::ViewPage* whatsHotWidget() const { return m_whatsHotWidget; } ArtistView* superCollectionView() const { return m_superCollectionView; } /// Get the view page for the given item. Not pretty... @@ -120,6 +123,7 @@ signals: public slots: Tomahawk::ViewPage* showSuperCollection(); Tomahawk::ViewPage* showWelcomePage(); + Tomahawk::ViewPage* showWhatsHotPage(); void showCurrentTrack(); // Returns the shown viewpage @@ -184,6 +188,7 @@ private: TreeModel* m_superCollectionModel; ArtistView* m_superCollectionView; WelcomeWidget* m_welcomeWidget; + WhatsHotWidget* m_whatsHotWidget; QList< Tomahawk::collection_ptr > m_superCollections; diff --git a/src/libtomahawk/widgets/whatshotwidget.cpp b/src/libtomahawk/widgets/whatshotwidget.cpp new file mode 100644 index 000000000..91c06151a --- /dev/null +++ b/src/libtomahawk/widgets/whatshotwidget.cpp @@ -0,0 +1,163 @@ +/* === This file is part of Tomahawk Player - === + * + * Copyright 2010-2011, Christian Muehlhaeuser + * + * Tomahawk is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Tomahawk is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Tomahawk. If not, see . + */ + +#include "whatshotwidget.h" +#include "ui_whatshotwidget.h" + +#include + +#include "viewmanager.h" +#include "sourcelist.h" +#include "tomahawksettings.h" +#include "welcomeplaylistmodel.h" + +#include "audio/audioengine.h" +#include "playlist/playlistmodel.h" +#include "widgets/overlaywidget.h" +#include "utils/tomahawkutils.h" +#include "utils/logger.h" +#include + +#define HISTORY_TRACK_ITEMS 25 +#define HISTORY_PLAYLIST_ITEMS 10 +#define HISTORY_RESOLVING_TIMEOUT 2500 + +using namespace Tomahawk; + +static QString s_whatsHotIdentifier = QString( "WhatsHotWidget" ); + +WhatsHotWidget::WhatsHotWidget( QWidget* parent ) + : QWidget( parent ) + , ui( new Ui::WhatsHotWidget ) +{ + tDebug() << "WhatsHot: Hello world!"; + ui->setupUi( this ); + ui->tracksView->setFrameShape( QFrame::NoFrame ); + ui->tracksView->setAttribute( Qt::WA_MacShowFocusRect, 0 ); + + TomahawkUtils::unmarginLayout( layout() ); + TomahawkUtils::unmarginLayout( ui->verticalLayout_2->layout() ); + + + m_tracksModel = new PlaylistModel( ui->tracksView ); + m_tracksModel->setStyle( TrackModel::ShortWithAvatars ); + ui->tracksView->overlay()->setEnabled( false ); + ui->tracksView->setPlaylistModel( m_tracksModel ); + ui->tracksView->setHeaderHidden( true ); + ui->tracksView->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); + + + m_artistsModel = new TreeModel( ui->artistsView); + m_artistsModel->setColumnStyle( TreeModel::TrackOnly ); + ui->artistsView->setTreeModel( m_artistsModel ); + ui->artistsView->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); + ui->artistsView->header()->setVisible( false ); + + + m_timer = new QTimer( this ); + connect( m_timer, SIGNAL( timeout() ), SLOT( checkQueries() ) ); + + + connect( Tomahawk::InfoSystem::InfoSystem::instance(), + SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ), + SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ) ); + + connect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( finished( QString ) ), SLOT( infoSystemFinished( QString ) ) ); + + + Tomahawk::InfoSystem::InfoCriteriaHash artistInfo; + + Tomahawk::InfoSystem::InfoRequestData requestData; + requestData.caller = s_whatsHotIdentifier; + requestData.customData = QVariantMap(); + requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoCriteriaHash >( artistInfo ); + + requestData.type = Tomahawk::InfoSystem::InfoChartArtists; + Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData ); + tDebug() << "WhatsHot: requested InfoChartArtists"; +} + + +WhatsHotWidget::~WhatsHotWidget() +{ + delete ui; +} + + +void +WhatsHotWidget::checkQueries() +{ + m_timer->stop(); +// m_tracksModel->ensureResolved(); +} + + +void +WhatsHotWidget::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output ) +{ + if ( requestData.caller != s_whatsHotIdentifier ) + { +// tDebug() << "Info of wrong type or not with our identifier"; + return; + } + + tDebug() << "WhatsHot: got something..."; + QVariantMap returnedData = output.value< QVariantMap >(); + switch ( requestData.type ) + { + case InfoSystem::InfoChartArtists: + { + const QStringList artists = returnedData["artists"].toStringList(); + tDebug() << "WhatsHot: got artists! " << artists.size(); + tDebug() << artists; + foreach ( const QString& artist, artists ) + { + m_artistsModel->addArtists( Artist::get( artist ) ); + } + break; + } + + default: + return; + } +} + + +void +WhatsHotWidget::infoSystemFinished( QString target ) +{ + Q_UNUSED( target ); +} + + +void +WhatsHotWidget::changeEvent( QEvent* e ) +{ + QWidget::changeEvent( e ); + switch ( e->type() ) + { + case QEvent::LanguageChange: + ui->retranslateUi( this ); + break; + + default: + break; + } +} + + diff --git a/src/libtomahawk/widgets/whatshotwidget.h b/src/libtomahawk/widgets/whatshotwidget.h new file mode 100644 index 000000000..b9e719dda --- /dev/null +++ b/src/libtomahawk/widgets/whatshotwidget.h @@ -0,0 +1,86 @@ +/* === This file is part of Tomahawk Player - === + * + * Copyright 2010-2011, Christian Muehlhaeuser + * + * Tomahawk is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Tomahawk is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Tomahawk. If not, see . + */ + +#ifndef WHATSHOTWIDGET_H +#define WHATSHOTWIDGET_H + +#include +#include +#include + +#include "playlistinterface.h" +#include "infosystem/infosystem.h" +#include "playlist.h" +#include "result.h" +#include "viewpage.h" + +#include "utils/tomahawkutils.h" + +#include "dllmacro.h" + +class TreeModel; +class PlaylistModel; +class OverlayWidget; + +namespace Ui +{ + class WhatsHotWidget; +} + +class DLLEXPORT WhatsHotWidget : public QWidget, public Tomahawk::ViewPage +{ +Q_OBJECT + +public: + WhatsHotWidget( QWidget* parent = 0 ); + ~WhatsHotWidget(); + + virtual QWidget* widget() { return this; } + virtual Tomahawk::PlaylistInterface* playlistInterface() const { return 0; } + + virtual QString title() const { return tr( "What's Hot" ); } + virtual QString description() const { return QString(); } + + virtual bool showStatsBar() const { return false; } + virtual bool showInfoBar() const { return false; } + + virtual bool jumpToCurrentTrack() { return false; } + +protected: + void changeEvent( QEvent* e ); + +signals: + void destroyed( QWidget* widget ); + +public slots: + +private slots: + void checkQueries(); + void infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output ); + void infoSystemFinished( QString target ); + +private: + Ui::WhatsHotWidget *ui; + + PlaylistModel* m_tracksModel; + TreeModel* m_artistsModel; + + QTimer* m_timer; +}; + +#endif // WHATSHOTWIDGET_H diff --git a/src/libtomahawk/widgets/whatshotwidget.ui b/src/libtomahawk/widgets/whatshotwidget.ui new file mode 100644 index 000000000..5259550ca --- /dev/null +++ b/src/libtomahawk/widgets/whatshotwidget.ui @@ -0,0 +1,72 @@ + + + WhatsHotWidget + + + + 0 + 0 + 875 + 513 + + + + + + + + + Top Tracks + + + + + + + + 320 + 0 + + + + + + + + + + + + Top Artists + + + + + + + + 320 + 0 + + + + + + + + + + + HeaderLabel + QLabel +

widgets/HeaderLabel.h
+ + + PlaylistView + QTreeView +
playlist/playlistview.h
+ + + + + diff --git a/src/sourcetree/items/collectionitem.cpp b/src/sourcetree/items/collectionitem.cpp index 3d2c2a6b5..9bca2be3d 100644 --- a/src/sourcetree/items/collectionitem.cpp +++ b/src/sourcetree/items/collectionitem.cpp @@ -44,6 +44,7 @@ CollectionItem::CollectionItem( SourcesModel* mdl, SourceTreeItem* parent, cons , m_sourceInfoPage( 0 ) , m_coolPlaylistsPage( 0 ) , m_lovedTracksPage( 0 ) + , m_whatsHotPage( 0 ) { m_lovedTracksItem = new GenericPageItem( model(), this, ( m_source.isNull() ? tr( "Top Loved Tracks" ) : tr( "Loved Tracks" ) ), QIcon( RESPATH "images/loved_playlist.png" ), boost::bind( &CollectionItem::lovedTracksClicked, this ), @@ -62,6 +63,13 @@ CollectionItem::CollectionItem( SourcesModel* mdl, SourceTreeItem* parent, cons ); recent->setSortValue( -300 ); + GenericPageItem* hot = new GenericPageItem( model(), this, tr( "What's Hot" ), QIcon( RESPATH "images/whats-hot.png" ), + boost::bind( &ViewManager::showWhatsHotPage, ViewManager::instance() ), + boost::bind( &ViewManager::whatsHotWidget, ViewManager::instance() ) + ); + hot->setSortValue( -300 ); + + // TODO finish implementing and making pretty // m_coolPlaylistsItem = new GenericPageItem( model(), this, tr( "Cool Stuff" ), QIcon( RESPATH "images/new-additions.png" ), // boost::bind( &CollectionItem::coolPlaylistsClicked, this ), diff --git a/src/sourcetree/items/collectionitem.h b/src/sourcetree/items/collectionitem.h index 76c639355..838099d93 100644 --- a/src/sourcetree/items/collectionitem.h +++ b/src/sourcetree/items/collectionitem.h @@ -86,6 +86,7 @@ private: Tomahawk::ViewPage* m_sourceInfoPage; Tomahawk::ViewPage* m_coolPlaylistsPage; Tomahawk::ViewPage* m_lovedTracksPage; + Tomahawk::ViewPage* m_whatsHotPage; }; From 228699863f22a4e8e07cb5a6617c88e4b58a019e Mon Sep 17 00:00:00 2001 From: Casey Link Date: Sun, 21 Aug 2011 12:58:21 -0500 Subject: [PATCH 02/14] Add new Chart InfoTypes for retrieving charts --- src/libtomahawk/infosystem/infosystem.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/libtomahawk/infosystem/infosystem.h b/src/libtomahawk/infosystem/infosystem.h index c918970cb..b04394356 100644 --- a/src/libtomahawk/infosystem/infosystem.h +++ b/src/libtomahawk/infosystem/infosystem.h @@ -92,6 +92,10 @@ enum InfoType { // as items are saved in cache, mark them here to not change the InfoAlbumComposer = 48, InfoAlbumSongs = 49, + InfoChartArtists = 50, + InfoChartAlbums = 51, + InfoChartTracks = 52, + InfoMiscTopHotttness = 60, InfoMiscTopTerms = 61, From 68d3783b26d974fa5010c91916d3ec8ec29e19c1 Mon Sep 17 00:00:00 2001 From: Casey Link Date: Sun, 21 Aug 2011 12:57:53 -0500 Subject: [PATCH 03/14] Implement chart.TopArtists in the lastfm plugin --- .../infoplugins/generic/lastfmplugin.cpp | 73 ++++++++++++++++++- .../infoplugins/generic/lastfmplugin.h | 2 + 2 files changed, 74 insertions(+), 1 deletion(-) diff --git a/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.cpp b/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.cpp index e1e832856..1162e9ec5 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.cpp +++ b/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.cpp @@ -47,7 +47,7 @@ LastFmPlugin::LastFmPlugin() : InfoPlugin() , m_scrobbler( 0 ) { - m_supportedGetTypes << InfoAlbumCoverArt << InfoArtistImages << InfoArtistSimilars << InfoArtistSongs; + m_supportedGetTypes << InfoAlbumCoverArt << InfoArtistImages << InfoArtistSimilars << InfoArtistSongs << InfoChartArtists; m_supportedPushTypes << InfoSubmitScrobble << InfoSubmitNowPlaying << InfoLove << InfoUnLove; /* @@ -147,6 +147,10 @@ LastFmPlugin::getInfo( uint requestId, Tomahawk::InfoSystem::InfoRequestData req fetchTopTracks( requestId, requestData ); break; + case InfoChartArtists: + fetchChartArtists( requestId, requestData ); + break; + default: dataError( requestId, requestData ); } @@ -298,6 +302,24 @@ LastFmPlugin::fetchTopTracks( uint requestId, Tomahawk::InfoSystem::InfoRequestD emit getCachedInfo( requestId, criteria, 2419200000, requestData ); } +void +LastFmPlugin::fetchChartArtists( uint requestId, Tomahawk::InfoSystem::InfoRequestData requestData ) +{ + if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoCriteriaHash >() ) + { + dataError( requestId, requestData ); + return; + } + InfoCriteriaHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoCriteriaHash >(); + Tomahawk::InfoSystem::InfoCriteriaHash criteria; + if ( hash.contains( "country" ) ) + { + criteria["country"] = hash["country"]; + } + + emit getCachedInfo( requestId, criteria, 2419200000, requestData ); +} + void LastFmPlugin::fetchCoverArt( uint requestId, Tomahawk::InfoSystem::InfoRequestData requestData ) @@ -356,6 +378,25 @@ LastFmPlugin::notInCacheSlot( uint requestId, QHash criteria, switch ( requestData.type ) { + case InfoChartArtists: + { + tDebug() << "LastfmPlugin: InfoChartArtists notin cache, fetching"; + QMap args; + if( criteria.contains( "country" ) ) { + args["method"] = "geo.getTopArtists"; + args["country"] = criteria["country"]; + } else { + args["method"] = "chart.getTopArtists"; + } + args["limit"] = "100"; + QNetworkReply* reply = lastfm::ws::get(args); + reply->setProperty( "requestId", requestId ); + reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) ); + + connect( reply, SIGNAL( finished() ), SLOT( chartTopArtistsReturned() ) ); + return; + } + case InfoArtistSimilars: { lastfm::Artist a( criteria["artist"] ); @@ -447,6 +488,36 @@ LastFmPlugin::similarArtistsReturned() emit updateCache( criteria, 2419200000, requestData.type, returnedData ); } +void +LastFmPlugin::chartTopArtistsReturned() +{ + tDebug() << "LastfmPlugin: InfoChartArtists data returned!"; + QNetworkReply* reply = qobject_cast( sender() ); + QList list = lastfm::Artist::list( reply ); + QStringList al; + + tDebug() << "\tgot " << list.size() << " artists"; + + foreach ( const lastfm::Artist& a, list ) + al << a.toString(); + + QVariantMap returnedData; + returnedData["artists"] = al; + + Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(); + + emit info( + reply->property( "requestId" ).toUInt(), + requestData, + returnedData + ); + + Tomahawk::InfoSystem::InfoCriteriaHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoCriteriaHash>(); + Tomahawk::InfoSystem::InfoCriteriaHash criteria; + if( origData.contains("country") ) + criteria["country"] = origData["country"]; + emit updateCache( criteria, 2419200000, requestData.type, returnedData ); +} void LastFmPlugin::topTracksReturned() diff --git a/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.h b/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.h index dcd6eae2c..59f8af6ce 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.h +++ b/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.h @@ -52,6 +52,7 @@ public slots: void artistImagesReturned(); void similarArtistsReturned(); void topTracksReturned(); + void chartTopArtistsReturned(); void namChangedSlot( QNetworkAccessManager *nam ); @@ -66,6 +67,7 @@ private: void fetchArtistImages( uint requestId, Tomahawk::InfoSystem::InfoRequestData requestData ); void fetchSimilarArtists( uint requestId, Tomahawk::InfoSystem::InfoRequestData requestData ); void fetchTopTracks( uint requestId, Tomahawk::InfoSystem::InfoRequestData requestData ); + void fetchChartArtists( uint requestId, Tomahawk::InfoSystem::InfoRequestData requestData ); void createScrobbler(); void nowPlaying( const QVariant &input ); From c6a104af93119f49d00a6a43988e2ea01f7c5e25 Mon Sep 17 00:00:00 2001 From: Casey Link Date: Sun, 21 Aug 2011 13:48:07 -0500 Subject: [PATCH 04/14] Use a proxy model that doesn't sort, so we preserve the ranking order --- src/libtomahawk/widgets/whatshotwidget.cpp | 12 +++++++++++- src/libtomahawk/widgets/whatshotwidget.h | 2 ++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/libtomahawk/widgets/whatshotwidget.cpp b/src/libtomahawk/widgets/whatshotwidget.cpp index 91c06151a..83badbaa3 100644 --- a/src/libtomahawk/widgets/whatshotwidget.cpp +++ b/src/libtomahawk/widgets/whatshotwidget.cpp @@ -28,6 +28,7 @@ #include "audio/audioengine.h" #include "playlist/playlistmodel.h" +#include "playlist/treeproxymodel.h" #include "widgets/overlaywidget.h" #include "utils/tomahawkutils.h" #include "utils/logger.h" @@ -62,9 +63,18 @@ WhatsHotWidget::WhatsHotWidget( QWidget* parent ) ui->tracksView->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); - m_artistsModel = new TreeModel( ui->artistsView); + m_artistsModel = new TreeModel( ui->artistsView ); m_artistsModel->setColumnStyle( TreeModel::TrackOnly ); + + m_artistsProxy = new TreeProxyModel( ui->artistsView ); + m_artistsProxy->setFilterCaseSensitivity( Qt::CaseInsensitive ); + m_artistsProxy->setDynamicSortFilter( true ); + + ui->artistsView->setProxyModel( m_artistsProxy ); ui->artistsView->setTreeModel( m_artistsModel ); + + m_artistsProxy->sort( -1 ); // disable sorting, must be called after artistsView->setTreeModel + ui->artistsView->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); ui->artistsView->header()->setVisible( false ); diff --git a/src/libtomahawk/widgets/whatshotwidget.h b/src/libtomahawk/widgets/whatshotwidget.h index b9e719dda..2839c2eef 100644 --- a/src/libtomahawk/widgets/whatshotwidget.h +++ b/src/libtomahawk/widgets/whatshotwidget.h @@ -36,6 +36,7 @@ class TreeModel; class PlaylistModel; class OverlayWidget; +class TreeProxyModel; namespace Ui { @@ -79,6 +80,7 @@ private: PlaylistModel* m_tracksModel; TreeModel* m_artistsModel; + TreeProxyModel* m_artistsProxy; QTimer* m_timer; }; From a21992a99abe68477ae615c04cccde1ae7272ba2 Mon Sep 17 00:00:00 2001 From: Casey Link Date: Sun, 21 Aug 2011 18:03:21 -0500 Subject: [PATCH 05/14] Either the lastfm XML output has changed, or this library was buggy all along. This patch fixes the parsing of elements. --- thirdparty/liblastfm2/src/types/Track.cpp | 27 ++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/thirdparty/liblastfm2/src/types/Track.cpp b/thirdparty/liblastfm2/src/types/Track.cpp index 64d8288d0..35e972b81 100644 --- a/thirdparty/liblastfm2/src/types/Track.cpp +++ b/thirdparty/liblastfm2/src/types/Track.cpp @@ -51,11 +51,32 @@ lastfm::Track::Track( const QDomElement& e ) d = new TrackData; if (e.isNull()) { d->null = true; return; } - - d->artist = e.namedItem( "artist" ).toElement().text(); + + //TODO: not sure of lastfm's xml changed, but nodes have + // Artist Name.. + // as children isntead of Artist Name + // we detect both here. + QDomNode artistName = e.namedItem( "artist" ).namedItem( "name" ); + if( artistName.isNull() ) { + d->artist = e.namedItem( "artist" ).toElement().text(); + } else { + d->artist = artistName.toElement().text(); + } + d->albumArtist = e.namedItem( "albumArtist" ).toElement().text(); d->album = e.namedItem( "album" ).toElement().text(); - d->title = e.namedItem( "track" ).toElement().text(); + + + //TODO: not sure if lastfm xml's changed, or if chart.getTopTracks uses + //a different format, but the title is stored at + //Title... + //we detect both here. + QDomNode trackTitle = e.namedItem( "name" ); + if( trackTitle.isNull() ) + d->title = e.namedItem( "track" ).toElement().text(); + else + d->title = trackTitle.toElement().text(); + d->correctedArtist = e.namedItem( "correctedArtist" ).toElement().text(); d->correctedAlbumArtist = e.namedItem( "correctedAlbumArtist" ).toElement().text(); d->correctedAlbum = e.namedItem( "correctedAlbum" ).toElement().text(); From fc235ccf1b0697c7366b673853be69fa26827816 Mon Sep 17 00:00:00 2001 From: Casey Link Date: Sun, 21 Aug 2011 18:04:44 -0500 Subject: [PATCH 06/14] Implement fetching and displaying of the Top Tracks Chart. --- .../infoplugins/generic/lastfmplugin.cpp | 100 +++++++++++++++++- .../infoplugins/generic/lastfmplugin.h | 4 + src/libtomahawk/infosystem/infosystem.h | 7 ++ src/libtomahawk/widgets/whatshotwidget.cpp | 25 ++++- src/tomahawkapp.cpp | 2 + 5 files changed, 131 insertions(+), 7 deletions(-) diff --git a/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.cpp b/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.cpp index 1162e9ec5..a752a5d1b 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.cpp +++ b/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.cpp @@ -47,7 +47,7 @@ LastFmPlugin::LastFmPlugin() : InfoPlugin() , m_scrobbler( 0 ) { - m_supportedGetTypes << InfoAlbumCoverArt << InfoArtistImages << InfoArtistSimilars << InfoArtistSongs << InfoChartArtists; + m_supportedGetTypes << InfoAlbumCoverArt << InfoArtistImages << InfoArtistSimilars << InfoArtistSongs << InfoChartArtists << InfoChartTracks; m_supportedPushTypes << InfoSubmitScrobble << InfoSubmitNowPlaying << InfoLove << InfoUnLove; /* @@ -151,6 +151,10 @@ LastFmPlugin::getInfo( uint requestId, Tomahawk::InfoSystem::InfoRequestData req fetchChartArtists( requestId, requestData ); break; + case InfoChartTracks: + fetchChartTracks( requestId, requestData ); + break; + default: dataError( requestId, requestData ); } @@ -321,6 +325,25 @@ LastFmPlugin::fetchChartArtists( uint requestId, Tomahawk::InfoSystem::InfoReque } +void +LastFmPlugin::fetchChartTracks( uint requestId, Tomahawk::InfoSystem::InfoRequestData requestData ) +{ + if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoCriteriaHash >() ) + { + dataError( requestId, requestData ); + return; + } + InfoCriteriaHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoCriteriaHash >(); + Tomahawk::InfoSystem::InfoCriteriaHash criteria; + if ( hash.contains( "country" ) ) + { + criteria["country"] = hash["country"]; + } + + emit getCachedInfo( requestId, criteria, 2419200000, requestData ); +} + + void LastFmPlugin::fetchCoverArt( uint requestId, Tomahawk::InfoSystem::InfoRequestData requestData ) { @@ -397,6 +420,25 @@ LastFmPlugin::notInCacheSlot( uint requestId, QHash criteria, return; } + case InfoChartTracks: + { + tDebug() << "LastfmPlugin: InfoChartTracks not in cache, fetching"; + QMap args; + if( criteria.contains( "country" ) ) { + args["method"] = "geo.getTopTracks"; + args["country"] = criteria["country"]; + } else { + args["method"] = "chart.getTopTracks"; + } + args["limit"] = "100"; + QNetworkReply* reply = lastfm::ws::get(args); + reply->setProperty( "requestId", requestId ); + reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) ); + + connect( reply, SIGNAL( finished() ), SLOT( chartTopTracksReturned() ) ); + return; + } + case InfoArtistSimilars: { lastfm::Artist a( criteria["artist"] ); @@ -519,6 +561,42 @@ LastFmPlugin::chartTopArtistsReturned() emit updateCache( criteria, 2419200000, requestData.type, returnedData ); } +void +LastFmPlugin::chartTopTracksReturned() +{ + tDebug() << "LastfmPlugin: InfoChartTracks data returned!"; + QNetworkReply* reply = qobject_cast( sender() ); + QList tracks = parseTrackList( reply ); + + QList top_tracks; + + foreach( const lastfm::Track &t, tracks ) { + ArtistTrackPair pair; + pair.artist = t.artist().toString(); + pair.track = t.title(); + top_tracks << pair; + } + + tDebug() << "\tgot " << top_tracks.size() << " tracks"; + + QVariantMap returnedData; + returnedData["tracks"] = QVariant::fromValue( top_tracks ); + + Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(); + + emit info( + reply->property( "requestId" ).toUInt(), + requestData, + returnedData + ); + + Tomahawk::InfoSystem::InfoCriteriaHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoCriteriaHash>(); + Tomahawk::InfoSystem::InfoCriteriaHash criteria; + if( origData.contains("country") ) + criteria["country"] = origData["country"]; + emit updateCache( criteria, 0, requestData.type, returnedData ); +} + void LastFmPlugin::topTracksReturned() { @@ -539,7 +617,7 @@ LastFmPlugin::topTracksReturned() Tomahawk::InfoSystem::InfoCriteriaHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoCriteriaHash>(); Tomahawk::InfoSystem::InfoCriteriaHash criteria; criteria["artist"] = origData["artist"]; - emit updateCache( criteria, 2419200000, requestData.type, returnedData ); + emit updateCache( criteria, 0, requestData.type, returnedData ); } @@ -746,3 +824,21 @@ LastFmPlugin::createScrobbler() } } + +QList +LastFmPlugin::parseTrackList( QNetworkReply * reply ) +{ + QList tracks; + try { + lastfm::XmlQuery lfm = lastfm::ws::parse(reply); + foreach (lastfm::XmlQuery xq, lfm.children( "track" )) { + tracks.append( lastfm::Track( xq ) ); + } + } + catch (lastfm::ws::ParseError& e) + { + qWarning() << e.what(); + } + return tracks; +} + diff --git a/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.h b/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.h index 59f8af6ce..c8da91a73 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.h +++ b/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.h @@ -53,6 +53,7 @@ public slots: void similarArtistsReturned(); void topTracksReturned(); void chartTopArtistsReturned(); + void chartTopTracksReturned(); void namChangedSlot( QNetworkAccessManager *nam ); @@ -68,6 +69,7 @@ private: void fetchSimilarArtists( uint requestId, Tomahawk::InfoSystem::InfoRequestData requestData ); void fetchTopTracks( uint requestId, Tomahawk::InfoSystem::InfoRequestData requestData ); void fetchChartArtists( uint requestId, Tomahawk::InfoSystem::InfoRequestData requestData ); + void fetchChartTracks( uint requestId, Tomahawk::InfoSystem::InfoRequestData requestData ); void createScrobbler(); void nowPlaying( const QVariant &input ); @@ -76,6 +78,8 @@ private: void dataError( uint requestId, Tomahawk::InfoSystem::InfoRequestData requestData ); + QList parseTrackList( QNetworkReply * reply ); + lastfm::MutableTrack m_track; lastfm::Audioscrobbler* m_scrobbler; QString m_pw; diff --git a/src/libtomahawk/infosystem/infosystem.h b/src/libtomahawk/infosystem/infosystem.h index b04394356..7037da075 100644 --- a/src/libtomahawk/infosystem/infosystem.h +++ b/src/libtomahawk/infosystem/infosystem.h @@ -122,6 +122,11 @@ struct InfoRequestData { QVariantMap customData; }; +struct ArtistTrackPair { + QString artist; + QString track; +}; + typedef QMap< InfoType, QVariant > InfoTypeMap; typedef QMap< InfoType, uint > InfoTimeoutMap; typedef QMap< QString, QMap< QString, QString > > InfoGenericMap; @@ -258,5 +263,7 @@ Q_DECLARE_METATYPE( Tomahawk::InfoSystem::InfoRequestData ); Q_DECLARE_METATYPE( Tomahawk::InfoSystem::InfoGenericMap ); Q_DECLARE_METATYPE( Tomahawk::InfoSystem::InfoCriteriaHash ); Q_DECLARE_METATYPE( QWeakPointer< Tomahawk::InfoSystem::InfoSystemCache > ); +Q_DECLARE_METATYPE( Tomahawk::InfoSystem::ArtistTrackPair ); +Q_DECLARE_METATYPE( QList ); #endif // TOMAHAWK_INFOSYSTEM_H diff --git a/src/libtomahawk/widgets/whatshotwidget.cpp b/src/libtomahawk/widgets/whatshotwidget.cpp index 83badbaa3..429b1f2af 100644 --- a/src/libtomahawk/widgets/whatshotwidget.cpp +++ b/src/libtomahawk/widgets/whatshotwidget.cpp @@ -56,9 +56,10 @@ WhatsHotWidget::WhatsHotWidget( QWidget* parent ) m_tracksModel = new PlaylistModel( ui->tracksView ); - m_tracksModel->setStyle( TrackModel::ShortWithAvatars ); + m_tracksModel->setStyle( TrackModel::Short ); + ui->tracksView->overlay()->setEnabled( false ); - ui->tracksView->setPlaylistModel( m_tracksModel ); + ui->tracksView->setTrackModel( m_tracksModel ); ui->tracksView->setHeaderHidden( true ); ui->tracksView->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); @@ -99,7 +100,11 @@ WhatsHotWidget::WhatsHotWidget( QWidget* parent ) requestData.type = Tomahawk::InfoSystem::InfoChartArtists; Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData ); - tDebug() << "WhatsHot: requested InfoChartArtists"; + + requestData.type = Tomahawk::InfoSystem::InfoChartTracks; + Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData ); + + tDebug() << "WhatsHot: requested InfoChartArtists+Tracks"; } @@ -113,7 +118,7 @@ void WhatsHotWidget::checkQueries() { m_timer->stop(); -// m_tracksModel->ensureResolved(); + m_tracksModel->ensureResolved(); } @@ -141,7 +146,17 @@ WhatsHotWidget::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestDat } break; } - + case InfoSystem::InfoChartTracks: + { + const QList tracks = returnedData["tracks"].value >(); + tDebug() << "WhatsHot: got tracks! " << tracks.size(); + foreach ( const Tomahawk::InfoSystem::ArtistTrackPair& track, tracks ) + { + query_ptr query = Query::get( track.artist, track.track, QString(), uuid() ); + m_tracksModel->append( query ); + } + break; + } default: return; } diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp index bd841c2dc..55819319c 100644 --- a/src/tomahawkapp.cpp +++ b/src/tomahawkapp.cpp @@ -389,6 +389,8 @@ TomahawkApp::registerMetaTypes() qRegisterMetaType< QWeakPointer< Tomahawk::InfoSystem::InfoSystemCache > >( "QWeakPointer< Tomahawk::InfoSystem::InfoSystemCache >" ); qRegisterMetaType< DirLister::Mode >("DirLister::Mode"); + qRegisterMetaType< Tomahawk::InfoSystem::ArtistTrackPair >("Tomahawk::InfoSystem::ArtistTrackPair"); + qRegisterMetaType< QList >("QList"); } From ebb71321f6ef8f90e57f86083386374aa45eedc2 Mon Sep 17 00:00:00 2001 From: Casey Link Date: Sun, 21 Aug 2011 18:20:00 -0500 Subject: [PATCH 07/14] Add a splitter to the charts widget. --- src/libtomahawk/widgets/whatshotwidget.ui | 92 +++++++++++++---------- 1 file changed, 52 insertions(+), 40 deletions(-) diff --git a/src/libtomahawk/widgets/whatshotwidget.ui b/src/libtomahawk/widgets/whatshotwidget.ui index 5259550ca..a1a9d258b 100644 --- a/src/libtomahawk/widgets/whatshotwidget.ui +++ b/src/libtomahawk/widgets/whatshotwidget.ui @@ -12,46 +12,53 @@ - - - - - Top Tracks - - - - - - - - 320 - 0 - - - - - - - - - - - - Top Artists - - - - - - - - 320 - 0 - - - - - + + + Qt::Horizontal + + + + + + + Top Tracks + + + + + + + + 320 + 0 + + + + + + + + + + + + Top Artists + + + + + + + + 320 + 0 + + + + + + + @@ -66,6 +73,11 @@ QTreeView
playlist/playlistview.h
+ + ArtistView + QTreeView +
artistview.h
+ From 415d2e8ec784f55b474dcbda176b185316b61648 Mon Sep 17 00:00:00 2001 From: Casey Link Date: Sun, 21 Aug 2011 18:55:53 -0500 Subject: [PATCH 08/14] ignore my ctags file --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 19b945fcb..f4683f379 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ thirdparty/qtweetlib/WARNING-twitter-api-keys clang/ win/ gcc/ +tags From e43e45cd761c744454d0388638c7135636280246 Mon Sep 17 00:00:00 2001 From: Casey Link Date: Fri, 26 Aug 2011 18:43:35 -0500 Subject: [PATCH 09/14] Introduce StyleHelper, HeaderWidget and ComboBox These are customized widgets for tomahawk that make headers pretty. --- src/libtomahawk/CMakeLists.txt | 6 ++ src/libtomahawk/utils/stylehelper.cpp | 63 +++++++++++++++++++ src/libtomahawk/utils/stylehelper.h | 44 +++++++++++++ src/libtomahawk/widgets/HeaderLabel.cpp | 24 +------ src/libtomahawk/widgets/HeaderWidget.cpp | 42 +++++++++++++ src/libtomahawk/widgets/HeaderWidget.h | 45 +++++++++++++ src/libtomahawk/widgets/combobox.cpp | 80 ++++++++++++++++++++++++ src/libtomahawk/widgets/combobox.h | 44 +++++++++++++ 8 files changed, 327 insertions(+), 21 deletions(-) create mode 100644 src/libtomahawk/utils/stylehelper.cpp create mode 100644 src/libtomahawk/utils/stylehelper.h create mode 100644 src/libtomahawk/widgets/HeaderWidget.cpp create mode 100644 src/libtomahawk/widgets/HeaderWidget.h create mode 100644 src/libtomahawk/widgets/combobox.cpp create mode 100644 src/libtomahawk/widgets/combobox.h diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index 869e03226..bce5067d7 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -174,6 +174,7 @@ set( libSources utils/spotifyparser.cpp utils/rdioparser.cpp utils/shortenedlinkparser.cpp + utils/stylehelper.cpp widgets/newplaylistwidget.cpp widgets/searchwidget.cpp @@ -184,6 +185,8 @@ set( libSources widgets/whatshotwidget.cpp widgets/overlaywidget.cpp widgets/HeaderLabel.cpp + widgets/HeaderWidget.cpp + widgets/combobox.cpp widgets/SocialPlaylistWidget.cpp widgets/infowidgets/sourceinfowidget.cpp widgets/infowidgets/ArtistInfoWidget.cpp @@ -355,6 +358,7 @@ set( libHeaders utils/spotifyparser.h utils/rdioparser.h utils/shortenedlinkparser.h + utils/stylehelper.h widgets/newplaylistwidget.h widgets/searchwidget.h @@ -365,6 +369,8 @@ set( libHeaders widgets/welcomeplaylistmodel.h widgets/overlaywidget.h widgets/HeaderLabel.h + widgets/HeaderWidget.h + widgets/combobox.h widgets/SocialPlaylistWidget.h widgets/infowidgets/sourceinfowidget.h widgets/infowidgets/ArtistInfoWidget.h diff --git a/src/libtomahawk/utils/stylehelper.cpp b/src/libtomahawk/utils/stylehelper.cpp new file mode 100644 index 000000000..2681facc7 --- /dev/null +++ b/src/libtomahawk/utils/stylehelper.cpp @@ -0,0 +1,63 @@ +/* === This file is part of Tomahawk Player - === + * + * Copyright 2011, Casey Link + * + * Tomahawk is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Tomahawk is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Tomahawk. If not, see . + */ + +#include "stylehelper.h" + +#include + + +QColor StyleHelper::headerUpperColor() +{ + return QColor( 80, 80, 80 ); +} + +QColor StyleHelper::headerLowerColor() +{ + return QColor( 72, 72, 72 ); +} + +QColor StyleHelper::headerHighlightColor() +{ + return QColor( "#333" ); +} + +void StyleHelper::horizontalHeader(QPainter *painter, const QRect &r) +{ + QRect upperHalf( 0, 0, r.width(), r.height() / 2 ); + QRect lowerHalf( 0, upperHalf.height(), r.width(), r.height() ); + painter->fillRect( upperHalf, StyleHelper::headerUpperColor() ); + painter->fillRect( lowerHalf, StyleHelper::headerLowerColor() ); + + { + QColor lineColor( 100, 100, 100 ); + QLine line( 0, 0, r.width(), 0 ); + painter->setPen( lineColor ); + painter->drawLine( line ); + } + { + QColor lineColor( 30, 30, 30 ); + QLine line( 0, r.height() - 1, r.width(), r.height() - 1 ); + painter->setPen( lineColor ); + painter->drawLine( line ); + } +} + +QColor StyleHelper::headerTextColor() +{ + return Qt::white; +} diff --git a/src/libtomahawk/utils/stylehelper.h b/src/libtomahawk/utils/stylehelper.h new file mode 100644 index 000000000..7881f5974 --- /dev/null +++ b/src/libtomahawk/utils/stylehelper.h @@ -0,0 +1,44 @@ +/* === This file is part of Tomahawk Player - === + * + * Copyright 2011, Casey Link + * + * Tomahawk is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Tomahawk is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Tomahawk. If not, see . + */ + +#ifndef STYLEHELPER_H +#define STYLEHELPER_H + + +#include +#include + +class QPalette; +class QPainter; + +class StyleHelper +{ +public: + + static QColor headerUpperColor(); + static QColor headerLowerColor(); + static QColor headerTextColor(); + static QColor headerHighlightColor(); + + static void horizontalHeader(QPainter *painter, const QRect &rect); +private: + static QColor m_baseColor; + static QColor m_requestedBaseColor; +}; + +#endif // STYLEHELPER_H diff --git a/src/libtomahawk/widgets/HeaderLabel.cpp b/src/libtomahawk/widgets/HeaderLabel.cpp index 055f2001f..6b86b04e5 100644 --- a/src/libtomahawk/widgets/HeaderLabel.cpp +++ b/src/libtomahawk/widgets/HeaderLabel.cpp @@ -21,6 +21,7 @@ #include #include "utils/logger.h" +#include "utils/stylehelper.h" #define FONT_SIZE 16 @@ -55,29 +56,10 @@ HeaderLabel::paintEvent( QPaintEvent* /* event */ ) { QPainter p( this ); QRect r = contentsRect(); - -// p.setRenderHint( QPainter::Antialiasing ); - - QRect upperHalf( 0, 0, r.width(), r.height() / 2 ); - QRect lowerHalf( 0, upperHalf.height(), r.width(), r.height() ); - p.fillRect( upperHalf, QColor( 80, 80, 80 ) ); - p.fillRect( lowerHalf, QColor( 72, 72, 72 ) ); - - { - QColor lineColor( 100, 100, 100 ); - QLine line( 0, 0, r.width(), 0 ); - p.setPen( lineColor ); - p.drawLine( line ); - } - { - QColor lineColor( 30, 30, 30 ); - QLine line( 0, r.height() - 1, r.width(), r.height() - 1 ); - p.setPen( lineColor ); - p.drawLine( line ); - } + StyleHelper::horizontalHeader(&p, r); QTextOption to( Qt::AlignVCenter ); r.adjust( 8, 0, -8, 0 ); - p.setPen( Qt::white ); + p.setPen( StyleHelper::headerTextColor() ); p.drawText( r, text(), to ); } diff --git a/src/libtomahawk/widgets/HeaderWidget.cpp b/src/libtomahawk/widgets/HeaderWidget.cpp new file mode 100644 index 000000000..94dd03ca4 --- /dev/null +++ b/src/libtomahawk/widgets/HeaderWidget.cpp @@ -0,0 +1,42 @@ +/* === This file is part of Tomahawk Player - === + * + * Copyright 2011, Casey Link + * + * Tomahawk is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Tomahawk is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Tomahawk. If not, see . + */ + +#include "HeaderWidget.h" + + +#include "utils/stylehelper.h" + +#include +#include +#include + +HeaderWidget::HeaderWidget(QWidget *parent) : QWidget(parent) +{ +} + +HeaderWidget::~HeaderWidget() +{ +} + +void HeaderWidget::paintEvent(QPaintEvent *e) +{ + QStylePainter p(this); + QRect r = e->rect(); + + StyleHelper::horizontalHeader(&p, r); +} diff --git a/src/libtomahawk/widgets/HeaderWidget.h b/src/libtomahawk/widgets/HeaderWidget.h new file mode 100644 index 000000000..bdaef5060 --- /dev/null +++ b/src/libtomahawk/widgets/HeaderWidget.h @@ -0,0 +1,45 @@ + +/* === This file is part of Tomahawk Player - === + * + * Copyright 2011, Casey Link + * + * Tomahawk is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Tomahawk is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Tomahawk. If not, see . + */ + +#ifndef HEADERWIDGET_H +#define HEADERWIDGET_H + +#include +#include + +#include "dllmacro.h" + +class DLLEXPORT HeaderWidget : public QWidget +{ +Q_OBJECT + +public: + HeaderWidget(QWidget *parent = 0); + virtual ~HeaderWidget(); + + virtual void paintEvent(QPaintEvent *); + + +private: + + +}; + + +#endif diff --git a/src/libtomahawk/widgets/combobox.cpp b/src/libtomahawk/widgets/combobox.cpp new file mode 100644 index 000000000..29be3bac2 --- /dev/null +++ b/src/libtomahawk/widgets/combobox.cpp @@ -0,0 +1,80 @@ +/* === This file is part of Tomahawk Player - === + * + * Copyright 2011, Casey Link + * + * Tomahawk is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Tomahawk is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Tomahawk. If not, see . + */ + +#include "combobox.h" + + +#include "utils/stylehelper.h" + +#include +#include +#include +#include + +ComboBox::ComboBox(QWidget *parent) : QComboBox(parent) +{ +} + +ComboBox::~ComboBox() +{ +} + +void ComboBox::paintEvent(QPaintEvent *) +{ + QStylePainter p(this); + p.setPen(palette().color(QPalette::Text)); + QStyleOptionComboBox cb; + initStyleOption(&cb); + QRect r = cb.rect; + + + StyleHelper::horizontalHeader(&p, r); + + if( cb.state & QStyle::State_MouseOver ) { + QRect highlightRect(r); + QSize shrink(3,4); + QSize hS(highlightRect.size()); + hS -= shrink; + highlightRect.setSize(hS); + highlightRect.translate(0,2); + p.save(); + p.setRenderHint(QPainter::Antialiasing); + p.setBrush( StyleHelper::headerHighlightColor() ); + p.drawRoundedRect(highlightRect, 10.0, 10.0); + p.restore(); + } + + QTextOption to( Qt::AlignVCenter ); + r.adjust( 8, 0, -8, 0 ); + p.setPen( Qt::white ); + p.setBrush( StyleHelper::headerTextColor() ); + p.drawText( r, cb.currentText, to ); + + + bool reverse = cb.direction == Qt::RightToLeft; + int menuButtonWidth = 12; + int left = !reverse ? r.right() - menuButtonWidth : r.left(); + int right = !reverse ? r.right() : r.left() + menuButtonWidth; + QRect arrowRect((left + right) / 2 + (reverse ? 6 : -6), r.center().y() - 3, 9, 9); + + QStyleOption arrowOpt = cb; + arrowOpt.rect = arrowRect; + //p.drawPrimitive(QStyle::PE_IndicatorArrowDown, arrowOpt); + //Utils::StyleHelper::drawArrow(QStyle::PE_IndicatorArrowDown, &p, &arrowOpt); + +} diff --git a/src/libtomahawk/widgets/combobox.h b/src/libtomahawk/widgets/combobox.h new file mode 100644 index 000000000..df701ab95 --- /dev/null +++ b/src/libtomahawk/widgets/combobox.h @@ -0,0 +1,44 @@ +/* === This file is part of Tomahawk Player - === + * + * Copyright 2011, Casey Link + * + * Tomahawk is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Tomahawk is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Tomahawk. If not, see . + */ + +#ifndef COMBOBOX_H +#define COMBOBOX_H + +#include +#include + +#include "dllmacro.h" + +class DLLEXPORT ComboBox : public QComboBox +{ +Q_OBJECT + +public: + ComboBox(QWidget *parent = 0); + virtual ~ComboBox(); + + virtual void paintEvent(QPaintEvent *); + + +private: + + +}; + + +#endif From ccc8d3b26a398b0167b0f0197a6b1c254025fb7e Mon Sep 17 00:00:00 2001 From: Casey Link Date: Fri, 26 Aug 2011 18:44:25 -0500 Subject: [PATCH 10/14] Use the new Header and ComboBox widgets in the whatshot widget. --- src/libtomahawk/widgets/whatshotwidget.cpp | 11 +- src/libtomahawk/widgets/whatshotwidget.ui | 218 ++++++++++++++++----- 2 files changed, 173 insertions(+), 56 deletions(-) diff --git a/src/libtomahawk/widgets/whatshotwidget.cpp b/src/libtomahawk/widgets/whatshotwidget.cpp index 429b1f2af..b68649619 100644 --- a/src/libtomahawk/widgets/whatshotwidget.cpp +++ b/src/libtomahawk/widgets/whatshotwidget.cpp @@ -46,18 +46,20 @@ WhatsHotWidget::WhatsHotWidget( QWidget* parent ) : QWidget( parent ) , ui( new Ui::WhatsHotWidget ) { - tDebug() << "WhatsHot: Hello world!"; ui->setupUi( this ); - ui->tracksView->setFrameShape( QFrame::NoFrame ); - ui->tracksView->setAttribute( Qt::WA_MacShowFocusRect, 0 ); TomahawkUtils::unmarginLayout( layout() ); + TomahawkUtils::unmarginLayout( ui->verticalLayout->layout() ); TomahawkUtils::unmarginLayout( ui->verticalLayout_2->layout() ); + TomahawkUtils::unmarginLayout( ui->horizontalLayout->layout() ); + TomahawkUtils::unmarginLayout( ui->horizontalLayout_3->layout() ); m_tracksModel = new PlaylistModel( ui->tracksView ); m_tracksModel->setStyle( TrackModel::Short ); + ui->tracksView->setFrameShape( QFrame::NoFrame ); + ui->tracksView->setAttribute( Qt::WA_MacShowFocusRect, 0 ); ui->tracksView->overlay()->setEnabled( false ); ui->tracksView->setTrackModel( m_tracksModel ); ui->tracksView->setHeaderHidden( true ); @@ -73,6 +75,9 @@ WhatsHotWidget::WhatsHotWidget( QWidget* parent ) ui->artistsView->setProxyModel( m_artistsProxy ); ui->artistsView->setTreeModel( m_artistsModel ); + ui->artistsView->setFrameShape( QFrame::NoFrame ); + ui->artistsView->setAttribute( Qt::WA_MacShowFocusRect, 0 ); + m_artistsProxy->sort( -1 ); // disable sorting, must be called after artistsView->setTreeModel diff --git a/src/libtomahawk/widgets/whatshotwidget.ui b/src/libtomahawk/widgets/whatshotwidget.ui index a1a9d258b..37c35bb7f 100644 --- a/src/libtomahawk/widgets/whatshotwidget.ui +++ b/src/libtomahawk/widgets/whatshotwidget.ui @@ -10,64 +10,166 @@ 513 - + - - - Qt::Horizontal - - - - - - - Top Tracks - - - - - - - - 320 - 0 - - - - - - - - - - - - Top Artists - - - - - - - - 320 - 0 - - - - - - - + + + + + + + + QComboBox::AdjustToContentsOnFirstShow + + + + 0 + 0 + + + + + Billboard + + + + + Last.fm + + + + + iTunes + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 5 + + + + + + + + QComboBox::AdjustToContentsOnFirstShow + + + + Top 100 Tracks + + + + + + + + + + + + 320 + 0 + + + + + + + + + + + + + + + QComboBox::AdjustToContentsOnFirstShow + + + + 0 + 0 + + + + + Billboard + + + + + Last.fm + + + + + iTunes + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 5 + + + + + + + + QComboBox::AdjustToContentsOnFirstShow + + + + Top 100 Tracks + + + + + + + + + + + + 320 + 0 + + + + + - - HeaderLabel - QLabel -
widgets/HeaderLabel.h
- PlaylistView QTreeView @@ -78,6 +180,16 @@ QTreeView
artistview.h
 + + ComboBox + QComboBox +
widgets/combobox.h
+ + + HeaderWidget + QWidget +
widgets/HeaderWidget.h
+ From ec2dec4fafeeb97801f9ed3a82e5279575b9bb98 Mon Sep 17 00:00:00 2001 From: Casey Link Date: Fri, 26 Aug 2011 19:47:11 -0500 Subject: [PATCH 11/14] Handle our own Arrow Drawing. Adds AntiAliasing and uses our own colors. --- src/libtomahawk/utils/stylehelper.cpp | 90 ++++++++++++++++++++++++++- src/libtomahawk/utils/stylehelper.h | 2 + src/libtomahawk/widgets/combobox.cpp | 3 +- 3 files changed, 92 insertions(+), 3 deletions(-) diff --git a/src/libtomahawk/utils/stylehelper.cpp b/src/libtomahawk/utils/stylehelper.cpp index 2681facc7..7583c5b76 100644 --- a/src/libtomahawk/utils/stylehelper.cpp +++ b/src/libtomahawk/utils/stylehelper.cpp @@ -19,7 +19,8 @@ #include "stylehelper.h" #include - +#include +#include QColor StyleHelper::headerUpperColor() { @@ -61,3 +62,90 @@ QColor StyleHelper::headerTextColor() { return Qt::white; } + + +/* + * This implementation is from QWindowsStyle (Qt 7.2) + * + * It is licensed under the GPL 3: + * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). + * Contact: Nokia Corporation (qt-info@nokia.com) + */ +void StyleHelper::drawArrow(QStyle::PrimitiveElement element, QPainter *p, const QStyleOption *opt) +{ + + if (opt->rect.width() <= 1 || opt->rect.height() <= 1) + return; + QRect r = opt->rect; + int size = qMin(r.height(), r.width()); + QPixmap pixmap; + QString pixmapName; + pixmapName.sprintf("arrow-%s-%d-%d-%d-%lld", + "$qt_ia", + uint(opt->state), element, + size, opt->palette.cacheKey()); + if (!QPixmapCache::find(pixmapName, pixmap)) { + int border = size/5; + int sqsize = 2*(size/2); + QImage image(sqsize, sqsize, QImage::Format_ARGB32); + image.fill(0); + QPainter imagePainter(&image); + imagePainter.setRenderHint(QPainter::Antialiasing, true); + QPolygon a; + switch (element) { + case QStyle::PE_IndicatorArrowUp: + a.setPoints(3, border, sqsize/2, sqsize/2, border, sqsize - border, sqsize/2); + break; + case QStyle::PE_IndicatorArrowDown: + a.setPoints(3, border, sqsize/2, sqsize/2, sqsize - border, sqsize - border, sqsize/2); + break; + case QStyle::PE_IndicatorArrowRight: + a.setPoints(3, sqsize - border, sqsize/2, sqsize/2, border, sqsize/2, sqsize - border); + break; + case QStyle::PE_IndicatorArrowLeft: + a.setPoints(3, border, sqsize/2, sqsize/2, border, sqsize/2, sqsize - border); + break; + default: + break; + } + + int bsx = 0; + int bsy = 0; + + if (opt->state & QStyle::State_Sunken) { + bsx = qApp->style()->pixelMetric(QStyle::PM_ButtonShiftHorizontal); + bsy = qApp->style()->pixelMetric(QStyle::PM_ButtonShiftVertical); + } + + QRect bounds = a.boundingRect(); + int sx = sqsize / 2 - bounds.center().x() - 1; + int sy = sqsize / 2 - bounds.center().y() - 1; + imagePainter.translate(sx + bsx, sy + bsy); + imagePainter.setPen(opt->palette.buttonText().color()); + imagePainter.setBrush(opt->palette.buttonText()); + + if (!(opt->state & QStyle::State_Enabled)) { + QColor foreGround(150, 150, 150, 150); + imagePainter.setBrush(opt->palette.mid().color()); + imagePainter.setPen(opt->palette.mid().color()); + } else { + QColor shadow(0, 0, 0, 100); + imagePainter.translate(0, 1); + imagePainter.setPen(shadow); + imagePainter.setBrush(shadow); + QColor foreGround(255, 255, 255, 210); + imagePainter.drawPolygon(a); + imagePainter.translate(0, -1); + imagePainter.setPen(foreGround); + imagePainter.setBrush(foreGround); + } + + imagePainter.drawPolygon(a); + imagePainter.end(); + pixmap = QPixmap::fromImage(image); + QPixmapCache::insert(pixmapName, pixmap); + } + int xOffset = r.x() + (r.width() - size)/2; + int yOffset = r.y() + (r.height() - size)/2; + p->drawPixmap(xOffset, yOffset, pixmap); +} diff --git a/src/libtomahawk/utils/stylehelper.h b/src/libtomahawk/utils/stylehelper.h index 7881f5974..2fa371725 100644 --- a/src/libtomahawk/utils/stylehelper.h +++ b/src/libtomahawk/utils/stylehelper.h @@ -22,6 +22,7 @@ #include #include +#include class QPalette; class QPainter; @@ -36,6 +37,7 @@ public: static QColor headerHighlightColor(); static void horizontalHeader(QPainter *painter, const QRect &rect); + static void drawArrow(QStyle::PrimitiveElement, QPainter *painter, const QStyleOption *opt); private: static QColor m_baseColor; static QColor m_requestedBaseColor; diff --git a/src/libtomahawk/widgets/combobox.cpp b/src/libtomahawk/widgets/combobox.cpp index 29be3bac2..6a53b8fb5 100644 --- a/src/libtomahawk/widgets/combobox.cpp +++ b/src/libtomahawk/widgets/combobox.cpp @@ -74,7 +74,6 @@ void ComboBox::paintEvent(QPaintEvent *) QStyleOption arrowOpt = cb; arrowOpt.rect = arrowRect; - //p.drawPrimitive(QStyle::PE_IndicatorArrowDown, arrowOpt); - //Utils::StyleHelper::drawArrow(QStyle::PE_IndicatorArrowDown, &p, &arrowOpt); + StyleHelper::drawArrow(QStyle::PE_IndicatorArrowDown, &p, &arrowOpt); } From 6cba5c990e24cb92d8dd2b9b011de8f1e066590f Mon Sep 17 00:00:00 2001 From: Casey Link Date: Fri, 26 Aug 2011 20:12:14 -0500 Subject: [PATCH 12/14] Change display name of whatshot widget to Charts and use the charts icon --- data/images/whats-hot.png | Bin 6395 -> 0 bytes src/libtomahawk/widgets/whatshotwidget.h | 2 +- src/sourcetree/items/collectionitem.cpp | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 data/images/whats-hot.png diff --git a/data/images/whats-hot.png b/data/images/whats-hot.png deleted file mode 100644 index 3b7ef64d068a643ca107af3224c195dbca51d866..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6395 zcmZu#c{r49)IT!@V;{Q+6VWDVmoS5hN=T(?p}`xKCCZxclq_#5%9b_Sq?D<*BEkq! z%0!_o8AXz1rYvI_eE0Ca*Z2MLnaefzbKmFu&VJ54&);@7mQv!X;s7AE-D-qHKoMzN+(0;#Qe4-?En$xtm>#IT*X|u;Gwqd+xK) zGn~P}sg|jiy&1jy`e2p}CM&0V^~cQrIxab-2H#^%XV-R}WXFb$q0^bRGhFaZqozJ& z-iny^b@mQ;WPhc%j$pppo7by7Qxh3JePvn0w{?#X>nUFRP5ZmZPHR_9@C*B^TNb@Z z`X<*GzUH@P^0Zh&pcLds*)naOi$1IKWQGml@Uhag#sHv(4X?bUDsdG^?(5bB^8gac zC*r6paPU6m_IH4nKUEIjOH{UgO$6AIeQr6!OjNQ$A)hIoQK9~lsf>3P*+P|E%rqvM zi*#cP#dB1W%@*us8hs`_V+g5c%cgaao>r_jlvH9@Ry|QU^$J1D*=pT2>^8YCMq#&Bb?vF!_&oCyR~@ai|ExTvu<7z)>STOd zEqTpF{>7J;s}s*X*)8-5?@xVkPgC{c>+I7Fe(Pi$vE-W`4XRHyOt9xSa~pR4^!J0% zi&tE+hSkz;m%cb3z7)Nc{x?lkw?@gehqm4!ZoR8IZDW9<8Z*n8LtKoH#pDNwP8Ue8 zJkQ6+Thgp)7WZ@pw4cfq6ZeZnTv+{TiB`fr+ow8bIjkDsD_y?qfQfs#^D zQV}&)E=w19EC^YUt5UdNRjTz};g2b)wR;U()~KbrUzfRlavyE^*z&WASKrDd86`O+ zg(dag-@EVhK1x&YeTlsf_Q^bOatOVjjq=DZO5E^f%4C`ILiDzn;hST`q^7Obl2D2v4a6 ztO~K-V{!VvTfW;>x6B{D?{U(vAG5iezGUpEUsNwuAF@(tC1vH~<`WOy9)>;K*m|b5 ztkq@k)S%K}e=En|CzG0~mpN+WWyJFrE8bANyEwAA&7bwl^rLHkaG%)d+fnJhjt0w7 zuaR4$%D*_xoCeK}2J46$;umdbHic*xBXynzq|jx2wC$mc38(NOLQ0c>2-r-Md=7_WaNJ zZw9VxYRd4)axVMwvWK(BgVr!CHlh4)(C+|w;Qwlq5Vx#x+2|hc*3|?20r7#f0g=H?W6onb zV_st{^>+*9)SEZ^Z9aR-&;MP3r_am&+g%oOkcW^aA(e1P zbiMFp;S!NmlBSC0l44Q^G*2a*WGeqrn{Zv*?yi^Cp!k-Usd!Lr(%_x0wMMh-l_(am zlN5IH?u2#UyXV9hwxwrGk>>FQsmc?f3d@$Sxv&3g_tQOozJ5Ht=KSshQ|_f#e#hlq zda=3f#Pd@D?)fJ??LA!w(u=U7`$gx1qQ|%XPLcDIUo1BGcX!q2DwDszpT_rkrmfBB zPTQO8=lZCp{pJhhAAR+8S%Jm})*pyJYZ!T5F69ZOCxUElw@SsfC)azIy8NFD>5;Zu z%Whu2x%+Wp(GKHlKQbMX#tb_)hgwV?i?ZG3|9Y*Mt^JDNs|&8Z&>r69u%-EHKI@C` zmzA3mGZHgy*-ITye!8N?pm1rSt=ozf2~yp`KfK@aVo+MA(eWTg$`*R|={m&Kqh{ij2ELNP~zb+{+@lBogqmhFz zTos*@{@TYmk?l29*7PBYEA>$A_vIe7BVIec`sJKCF?!|w)Aw)R3$1rvKX~Zf^Zd3yIU8<` zoyiP$taF%t_@J=ti*9Rkc}HN#uylmF;^wcM#DSO3Rs`+$DBT)5>fJbWz9UZ6MXk8} zM_5OZWuR?!R$R!P5Ye%%oc%FCaKdD(BctYKy3)02*!Y)v0b3w-8taJlp= zv!042op;ZMe7F0VQ(xI$`MxtXyl|A*Zxy_v(Wu-%f8{N&Y?GW)&d*D?GS!{bEz1gL z!#JzIyZYCxkK3P>ow?NH_eA&kgzve3a9`Kca`yB$m2Em&C;WxpZo z!Xvyl!(V&j9Jw!jMznY?Z90WJADTQeu?+K>?y@R4bh7^_uWoR^@gu*HUHzLII3L3& zPcWNKw~V*wJKhK`<-8tHEA-awSXiV}JUSjQHmDpZK4jhQcqT5WfM3=+{Y!LG=2!UB zna4+&UhHu?lg_Fsg_1nH{t7w~uoE*`>ptH*yKzh^mEoOUzS_eBCf?KUrqISQQ z>A7xdE}ByjDV;6z`OMS(Z@j6|K`_Se9`8uu<=sSfdD+TuN@CxLh!*GByZHDaGSa)JQhrI#lhfHg%~iWD~}jp z^1ytg>4OKA8Nre*ngI|+Ap=xuk^t+H(R&~G|LhWh$rU94eOw3+27DY2aZ@RL4KNtT zEfH{`3lJ3`U={ zw3M`=qGvoXrvB67KO_Jgl8cVe2AwBEMr8l*28IYWqf;SS(wrCs&K0W>D2!I0r{^^h zh!FWcjyxgIq$C_c#gM6p1P=peaRdM|TH~Og=RXp}Tjk6D*ZlRH6p`v8>KG!Lqopst zGK+R#-aEp0N_<9L6dR=0K|>r0 z_S9cI4goNilCa87L|q+42|fNXF_86C*WfXuRjim2`lCgsp1K4Dy}S#_HsG59N{@h9 zWLae=R~eYuu@61cLrV{@MKH7{Q%E(H8L}WzO2ScunJ+e=e867{VGSWO=;PV~2!Wzl zPOlLnn}49i3*7I5YKl&5o_H~5*cKUqh&iSjsqh*kkV$_!jNnnYvKgN`%D;yrKRupP zYN-^G1&W3<%7CJcWJvB3aDt!vpxogCf6faO?F>*jOXJlHcb^lH3|G^}u`5K3J;<

-$+Tr z;F1~8xWLjB$U`tn!@pMHTQ5^JS?7ACaM(vdp4kW;wr!-W;-TcTkN_O@hAbKVCIg9| z6S0_$5c@IjrMuX_qygLF!wNzINI+9@Tmd*{QN(*63nmWF7SRrq{eTzCl5atz(Mo{B zh(5c{UKtW1!5!rtv8V``SH#*sl7T@#--~1_QG6&7z`WVlD`LDEPj+hL;I9u;L+-7v zr2^fIz%w9%UN)+WE!d5?3d#{4ilJUSHfjb~^g^CK5n>KmNr|*0FEZ%g%7k&Cv5S$Vr1sicJ?4SfSBl}6nLotHt|0YBQ z%uF(w5W9K!(2LIBkJcJMKL5$?++p&>uo^i zh%RxnFk>pZy;ltjvCm@3+5Y{!g6#5o=@hx z4|CbPMu2#;ZJqwN9b&Zq9@q+iV{aoM4+t1VdPnvl&^a@p>W?aQ{vj8gvFpmhLjq;d zj$jOkpB}l;CDZI8m>Jl=;AVz zqhWFBwa2^?%pt+d@*yX;AUzDK=2|Vb+0fzDkY;|%yk=|#gr)BDUyF`s30Qj!XV4fS z>&~MvT%+k_qGV{NqI?hpc+tYyN=qAGVL;E=iwr#ska_}znfmGoO<*(fWjEIZ(fVfn zp6Lvfq{7l|D4qiEVK$qZ6oFJ(5t1N1tV}?CuEiFAgrESR88A&o@2({4SYaA9vqbFXLRn{G z$rZFG8IBN9A^;OEPnLwt-e7q+;ee=&1Y;nWm8gIJpsp7*WOLzp?QRCN1k55<-!-wF zIJ@XhVYEhO7`x^=4sr;ngK`lQiXrn++mI&e&b4U9P*u($S#&C()F;8>RC&su&r)>50OjJz3`XjR=-10nVyOMhT(L zp#O>WopWgND-LxHX0JFAeo0CQRc4D2AYyZdev~W*7@x>Bb*x2#g$O(`RP{wAU(s$+ z&R;>rN+=Rk--jsNJEe3h#To=tl}tfH*ueAm1cq{7q(y}QDt01wrckQWMtnn27g=xeI9v>0EWVhN&*2SDKQnLDXj7lIrvZw1~lYH=o$ z6Ep$_)@T=1PWomXL=lm4m1B0!}^Yr&&6m=OIUrGW|&>-vG z3P&7fCO)*C1l-TnofvFuxO@EVR8DJ)P1qQkQq7FE$%M*27q0TyRIlw3?@cqd8Rt$v z>{uSJxCBlIq4dQA=8*xTb%jWX8W9NrzJ zoqHgv9DEY+$XB3-UbUfX1^86rX*J*)Kr+Qe*?-^ODIakQ32?c7rEnuoH6+Fv=1|Iq~@XSh}mm(Vl_YPwf zMRinrxO`tC$Plq-QaH95PGooAy1F!7WPXkruyb(vu0$|4#zrO3)FU#y7lE-g^-}jL zI9NacjpeaRXt~HiDl>?PZnw8ptl7Kdc(X1_bI7+udwv1CA`uzKLBUhMgB>xRJs5L%;!c**avK7P8O`@k!`+7f3`=@Kgdsx_mmrT#v?Knbp^{ zDbvv-#Iv(wLwVKQjeO+J-&D{5HKPMr?6l~q#WfJo=S{Cy^SE4q~=sYyb5()Udk)?dL3s;AYzHa@{uj#I X5~su0s#!jO{setSortValue( -300 ); - GenericPageItem* hot = new GenericPageItem( model(), this, tr( "What's Hot" ), QIcon( RESPATH "images/whats-hot.png" ), + GenericPageItem* hot = new GenericPageItem( model(), this, tr( "Charts" ), QIcon( RESPATH "images/charts.png" ), boost::bind( &ViewManager::showWhatsHotPage, ViewManager::instance() ), boost::bind( &ViewManager::whatsHotWidget, ViewManager::instance() ) ); From 2bff9e9a277aa300fc2756d3384769b03091ee7a Mon Sep 17 00:00:00 2001 From: Casey Link Date: Sat, 27 Aug 2011 01:45:39 +0000 Subject: [PATCH 13/14] fix charts image in resources --- resources.qrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources.qrc b/resources.qrc index d70b6902e..30d6bd31d 100644 --- a/resources.qrc +++ b/resources.qrc @@ -85,7 +85,7 @@ data/images/automatic-playlist.png data/images/station.png data/images/new-additions.png - data/images/whats-hot.png + data/images/charts.png data/images/loved_playlist.png data/images/dashboard.png data/images/artist-icon.png From 320e5a325286d342efca45bf0206af8bbef2d49d Mon Sep 17 00:00:00 2001 From: Casey Link Date: Mon, 29 Aug 2011 23:55:37 +0000 Subject: [PATCH 14/14] Fix oopsies leftover from the playlist model rename --- src/libtomahawk/CMakeLists.txt | 4 ---- src/libtomahawk/widgets/whatshotwidget.cpp | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index 25cbf469f..bd09f66c0 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -368,13 +368,9 @@ set( libHeaders widgets/SeekSlider.h widgets/playlisttypeselectordlg.h widgets/welcomewidget.h -<<<<<<< HEAD widgets/whatshotwidget.h - widgets/welcomeplaylistmodel.h -======= widgets/RecentlyPlayedPlaylistsModel.h widgets/RecentPlaylistsModel.h ->>>>>>> master widgets/overlaywidget.h widgets/HeaderLabel.h widgets/HeaderWidget.h diff --git a/src/libtomahawk/widgets/whatshotwidget.cpp b/src/libtomahawk/widgets/whatshotwidget.cpp index b68649619..894e8246f 100644 --- a/src/libtomahawk/widgets/whatshotwidget.cpp +++ b/src/libtomahawk/widgets/whatshotwidget.cpp @@ -24,7 +24,7 @@ #include "viewmanager.h" #include "sourcelist.h" #include "tomahawksettings.h" -#include "welcomeplaylistmodel.h" +#include "RecentPlaylistsModel.h" #include "audio/audioengine.h" #include "playlist/playlistmodel.h"