From 298d0a08a039b2a149b71dbfde412c21f684c1b5 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Sun, 12 Jun 2011 11:05:13 -0400 Subject: [PATCH 01/61] Try harder to fix audiocontrol flickering --- src/audiocontrols.cpp | 28 ++++++++++------------------ src/audiocontrols.ui | 35 +++++++++++++++++++++-------------- 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/src/audiocontrols.cpp b/src/audiocontrols.cpp index 7b060b327..56b9d2f7a 100644 --- a/src/audiocontrols.cpp +++ b/src/audiocontrols.cpp @@ -39,7 +39,12 @@ AudioControls::AudioControls( QWidget* parent ) { ui->setupUi( this ); - ui->buttonAreaLayout->setSpacing( 2 ); + ui->buttonAreaLayout->setSpacing( 0 ); + ui->stackedLayout->setSpacing( 0 ); + ui->stackedLayout->setContentsMargins( 0, 0, 0, 0 ); + ui->stackedLayout->setMargin( 0 ); + ui->playPauseButton->setContentsMargins( 0, 0, 0, 0 ); + ui->pauseButton->setContentsMargins( 0, 0, 0, 0 ); QFont font( ui->artistTrackLabel->font() ); font.setPixelSize( 12 ); @@ -288,10 +293,7 @@ AudioControls::onPlaybackLoading( const Tomahawk::result_ptr& result ) /* m_playAction->setEnabled( false ); m_pauseAction->setEnabled( true ); */ - ui->pauseButton->setEnabled( true ); - ui->pauseButton->setVisible( true ); - ui->playPauseButton->setVisible( false ); - ui->playPauseButton->setEnabled( false ); + ui->stackedLayout->setCurrentWidget( ui->pauseButton ); } @@ -301,23 +303,16 @@ AudioControls::onPlaybackPaused() /* m_pauseAction->setEnabled( false ); m_playAction->setEnabled( true ); */ - ui->pauseButton->setVisible( false ); - ui->pauseButton->setEnabled( false ); - ui->playPauseButton->setEnabled( true ); - ui->playPauseButton->setVisible( true ); + ui->stackedLayout->setCurrentWidget( ui->playPauseButton ); } - void AudioControls::onPlaybackResumed() { /* m_playAction->setEnabled( false ); m_pauseAction->setEnabled( true ); */ - ui->playPauseButton->setVisible( false ); - ui->playPauseButton->setEnabled( false ); - ui->pauseButton->setVisible( true ); - ui->pauseButton->setEnabled( true ); + ui->stackedLayout->setCurrentWidget( ui->pauseButton ); } @@ -334,10 +329,7 @@ AudioControls::onPlaybackStopped() ui->coverImage->setPixmap( QPixmap() ); ui->seekSlider->setVisible( false ); - ui->pauseButton->setVisible( false ); - ui->pauseButton->setEnabled( false ); - ui->playPauseButton->setEnabled( true ); - ui->playPauseButton->setVisible( true ); + ui->stackedLayout->setCurrentWidget( ui->playPauseButton ); /* m_pauseAction->setEnabled( false ); m_playAction->setEnabled( true ); */ diff --git a/src/audiocontrols.ui b/src/audiocontrols.ui index 31ac8f656..4ad1d807d 100644 --- a/src/audiocontrols.ui +++ b/src/audiocontrols.ui @@ -6,7 +6,7 @@ 0 0 - 939 + 929 80 @@ -60,7 +60,7 @@ - + Qt::Horizontal @@ -80,18 +80,25 @@ - - - Play + + + 2 - - - - - - Pause - - + + + + Play + + + + + + + Pause + + + + @@ -101,7 +108,7 @@ - + Qt::Horizontal From 09be5a1a600306aeb2eba709f607359be5a6a0fb Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Sun, 12 Jun 2011 12:13:27 -0400 Subject: [PATCH 02/61] pita wip --- src/audiocontrols.cpp | 16 +++++++++------- src/audiocontrols.ui | 2 +- src/libtomahawk/playlist/albumview.h | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/audiocontrols.cpp b/src/audiocontrols.cpp index 56b9d2f7a..0169d7d54 100644 --- a/src/audiocontrols.cpp +++ b/src/audiocontrols.cpp @@ -39,13 +39,6 @@ AudioControls::AudioControls( QWidget* parent ) { ui->setupUi( this ); - ui->buttonAreaLayout->setSpacing( 0 ); - ui->stackedLayout->setSpacing( 0 ); - ui->stackedLayout->setContentsMargins( 0, 0, 0, 0 ); - ui->stackedLayout->setMargin( 0 ); - ui->playPauseButton->setContentsMargins( 0, 0, 0, 0 ); - ui->pauseButton->setContentsMargins( 0, 0, 0, 0 ); - QFont font( ui->artistTrackLabel->font() ); font.setPixelSize( 12 ); @@ -171,6 +164,15 @@ AudioControls::AudioControls( QWidget* parent ) connect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( finished( QString ) ), SLOT( infoSystemFinished( QString ) ) ); + + ui->buttonAreaLayout->setSpacing( 0 ); + ui->stackedLayout->setSpacing( 0 ); + ui->stackedLayout->setContentsMargins( 0, 0, 0, 0 ); + ui->stackedLayout->setMargin( 0 ); + ui->playPauseButton->setContentsMargins( 0, 0, 0, 0 ); + ui->pauseButton->setContentsMargins( 0, 0, 0, 0 ); + ui->stackedLayout->setSizeConstraint( QLayout::SetFixedSize ); + onPlaybackStopped(); // initial state } diff --git a/src/audiocontrols.ui b/src/audiocontrols.ui index 4ad1d807d..d97d9e7f4 100644 --- a/src/audiocontrols.ui +++ b/src/audiocontrols.ui @@ -82,7 +82,7 @@ - 2 + 0 diff --git a/src/libtomahawk/playlist/albumview.h b/src/libtomahawk/playlist/albumview.h index 194eab8d7..98e41101c 100644 --- a/src/libtomahawk/playlist/albumview.h +++ b/src/libtomahawk/playlist/albumview.h @@ -1,5 +1,5 @@ /* === This file is part of Tomahawk Player - === - * + * * Copyright 2010-2011, Christian Muehlhaeuser * * Tomahawk is free software: you can redistribute it and/or modify From d3ab32d06a58f3303072c293e3eefeeab95dca70 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 10 Aug 2011 12:33:37 +0200 Subject: [PATCH 03/61] changed color of score bars to match the rest of the color palette BUG-252 --- src/libtomahawk/playlist/playlistitemdelegate.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/libtomahawk/playlist/playlistitemdelegate.cpp b/src/libtomahawk/playlist/playlistitemdelegate.cpp index 0a51adc9d..53788be0d 100644 --- a/src/libtomahawk/playlist/playlistitemdelegate.cpp +++ b/src/libtomahawk/playlist/playlistitemdelegate.cpp @@ -261,11 +261,7 @@ PlaylistItemDelegate::paintDetailed( QPainter* painter, const QStyleOptionViewIt if ( index.column() == TrackModel::Score ) { -#ifdef Q_OS_MAC // On Mac, highlight color is very bright and stands out a lot QColor barColor( 167, 183, 211 ); // This matches the sidebar (sourcetreeview.cpp:672) -#else - QColor barColor = opt.palette.highlight().color(); -#endif if ( opt.state & QStyle::State_Selected ) painter->setPen( opt.palette.brightText().color() ); else From bc3662a997701450cc7b4a8fee9d33bc1056d1cb Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 10 Aug 2011 17:19:00 +0200 Subject: [PATCH 04/61] added the avatar frame also to the Collection and SuperCollection icons BUG: TWK-337 --- src/libtomahawk/source.cpp | 3 +-- src/sourcetree/items/collectionitem.cpp | 8 +++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/libtomahawk/source.cpp b/src/libtomahawk/source.cpp index 191906833..4845b78ab 100644 --- a/src/libtomahawk/source.cpp +++ b/src/libtomahawk/source.cpp @@ -30,7 +30,6 @@ #include #include "utils/logger.h" -#include "utils/tomahawkutils.h" using namespace Tomahawk; @@ -130,7 +129,7 @@ QPixmap Source::avatar() const { if( !m_avatar.isNull() ) - return TomahawkUtils::createAvatarFrame( m_avatar ); + return m_avatar; else return QPixmap(); } diff --git a/src/sourcetree/items/collectionitem.cpp b/src/sourcetree/items/collectionitem.cpp index 84abafbcd..d3ec1660b 100644 --- a/src/sourcetree/items/collectionitem.cpp +++ b/src/sourcetree/items/collectionitem.cpp @@ -159,15 +159,17 @@ CollectionItem::activate() QIcon CollectionItem::icon() const { + QPixmap pixmap; if( m_source.isNull() ) - return QIcon( RESPATH "images/supercollection.png" ); + pixmap = QPixmap( RESPATH "images/supercollection.png" ); else { if( m_source->avatar().isNull() ) - return QIcon( RESPATH "images/user-avatar.png" ); + pixmap = QPixmap( RESPATH "images/user-avatar.png" ); else - return QIcon( m_source->avatar() ); + pixmap = m_source->avatar(); } + return QIcon( TomahawkUtils::createAvatarFrame( pixmap ) ); } From c1f043d2d13f6ec1646adbeb085e3f1eb8cbf090 Mon Sep 17 00:00:00 2001 From: Jason Herskowitz Date: Wed, 10 Aug 2011 16:20:50 -0400 Subject: [PATCH 05/61] Mo' better avatar frame --- data/images/avatar_frame.png | Bin 7434 -> 7434 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/data/images/avatar_frame.png b/data/images/avatar_frame.png index 999ba0cae539f8a62766e43adccbfe541a132b4c..120fe88940227bdd570f25b94d30f78b04a73da4 100644 GIT binary patch delta 1728 zcmY*aO=}cE5Zy^;lbJA+?b(^^tnP>jtQZkQJxM^4XhZ}*2zXFX%qeFP!Gkw%=Ad*6 zgbfMg=1p?&u2((z2SmlQXaasSWFC>vIn- z*J|qImAToQw?c1RefsY8dc9J-#(7bVQ+hoK{2F9&adFQ#QeRnFsSWHo#^kPw{2IL0 zH#va><{2>z?u8b?0lA;IWhaSbI?eTZAa6Q>%oM(?9gckvl`^l|dNr8zO340XK6?;a zhWH38x>bzPxgShisdXmzk_coh61rqhz9ebP45Ng~m&S4Y&ife$(yI{?>T;=-CQLHK zuq<4YMqc=AP0knN6}<|{!C)za$+TC>teUK9wHh zLM=CgkV#yMn%qx2@-B5xfx!xq^1|!5^EoL2iE|6!wf+FS#{0H zXg*Pu@18Jq!Q-}qm?3Bmj$OEa;&}_Yt@UKJ6h}Bj7cN2#B`jy%f!T!p1zV@ee38rZ zG|;`cDp$;vh$GY&=F>slh5qI;0K*oj2rS9FPZ*2460~7VGoKt&7#=tn^^{}(=H$- zIfq~!mpLEgfREarE8z;yFhW6O8zzSShO#P|%&eG;B?f58Lb2AK&`>^i{EIHeIIwQl zcrboIN8lqryCWBCuuJ0p;GLZEqj8M8D0hnJ8vJG};5V)Foy1&h3b&07vQcxgEQ#3& z=1{E9{N1Ya5u9PfRCXW-q@@o@JFqOo?mgMak8%m{uYKR_+Q0Q6P+Av;jVFd^r>x*~ z|5_LyuM=}Sm@SYOt!$WGl6^EULKG$pcfe+x%Yt9GZ7(5iseEp|V;nmx>Zr=So(8KWg-+FU%Gf$F48DmsY6iQn8(iFu#nl>-f#vq`6 z+Q9vg3J z3Z8kMtGvjy@B7O0JZ0EWFjpz0;Wm}eQbsTD7A!I!vT&f#AZuG-NmpXKW0TUWe{+7A3!zuf(=xLe*t>%10%BHD}OBdZuX)7|9 zt7OntG_y(VwQAiaHBBpSRr^_NAxgh_XWu?Kx$vqX}=UzEA66 zb5*iR`l>R-$5U0RnRc>Pi&tfrgjNgdA@t6#$4wb1nJOUWwq8Iv%*5L zZdev?3vIY?D+?(Zv#GSFSsubQs5hjb%Mct(C6BsWCg3I~i}876rAVB<*^o)*m)N5K~euCmc+nfJZl zvPcO;zlB5IGgpw1vB0rgxf2X-9$e3ecYJ)TPESwe@|C?LM{|fHnu+m^{0>uR76<^p zMx#;Se}RD`U(bp!QDMWuP}R9?XqW{=)(;L2l-b+cllz^G$iR!eo#LMUPnSBt kZy-1Rut?mUogMYZy Date: Wed, 10 Aug 2011 16:56:02 -0400 Subject: [PATCH 06/61] Add track placeholder image for artist pages (Top Hits) and New Additions pages (Latest Additions). --- data/images/track-placeholder.png | Bin 0 -> 1054090 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 data/images/track-placeholder.png diff --git a/data/images/track-placeholder.png b/data/images/track-placeholder.png new file mode 100644 index 0000000000000000000000000000000000000000..de732180df804da0090e010d906a35f913e6db77 GIT binary patch literal 1054090 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%0Aav6Yi2?K z0R#|0Ko|i6fH19~5CjlF009J?6CeOMXU$9qAbTn!q+67va=2=Za@5&;AdKmY+<1PB1SbeeS{fB*srAdpXh0FV!Zmk1z$00Ic; zB0vDprPHhv0R&tW_@MveMz&0c8UKPXP)yn|BaE009Jo7f}5^qHF*NzQr7g00IcuDe&Ww z;aThjuv6IXu~iQO0Y9a~fDR3``yT?vM*sl?5KvP<=>QOD86iN;3zt ze_Th~0B{_DAaGoQUlBk60eu8?zVRRLvi1SsI7I$m2?hBzc#Qx8;Ry_SXU`G;pSxb4 w+P&+L@J4X*ERW&!{psX{ZqCKszi9ohUOQ{e6+g9H68JQ=NB`~{x{aRu|1FX}G5`Po literal 0 HcmV?d00001 From 3fa64c76eed00fb9fa828b216636df3b21bbfffd Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 11 Aug 2011 00:14:20 +0200 Subject: [PATCH 07/61] make use of the avatar frame in recently played --- src/libtomahawk/playlist/playlistitemdelegate.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libtomahawk/playlist/playlistitemdelegate.cpp b/src/libtomahawk/playlist/playlistitemdelegate.cpp index 53788be0d..c0e965077 100644 --- a/src/libtomahawk/playlist/playlistitemdelegate.cpp +++ b/src/libtomahawk/playlist/playlistitemdelegate.cpp @@ -190,6 +190,8 @@ PlaylistItemDelegate::paintShort( QPainter* painter, const QStyleOptionViewItem& if ( pixmap.isNull() ) pixmap = QPixmap( RESPATH "images/user-avatar.png" ); + pixmap = TomahawkUtils::createAvatarFrame( pixmap ); + painter->save(); { QRect r = opt.rect.adjusted( 3, 6, 0, -6 ); From a065480f75b0ad89cbb3e5dcf3de0d2b9362efca Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 11 Aug 2011 00:57:13 +0200 Subject: [PATCH 08/61] * Let headless users trigger a rescan with --filescan. --- src/tomahawkapp.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp index 3fade3256..612fa3d08 100644 --- a/src/tomahawkapp.cpp +++ b/src/tomahawkapp.cpp @@ -241,6 +241,11 @@ TomahawkApp::init() tDebug() << "Init Scrobbler."; m_scrobbler = new Scrobbler( this ); #endif + + if ( arguments().contains( "--filescan" ) ) + { + m_scanManager.data()->runScan( true ); + } } From 291035db9c63b5f2880b06e1cea8beaa4eff5577 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 11 Aug 2011 01:30:09 +0200 Subject: [PATCH 09/61] * Fixed TWK-343, wording in SourceInfoWidget. --- src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui b/src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui index bde48ccbc..42edd0331 100644 --- a/src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui +++ b/src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui @@ -51,7 +51,7 @@ - Latest Additions to their Collection + Latest Additions @@ -65,7 +65,7 @@ - Recently played Tracks + Recently Played Tracks From 9e901dba2d1a8d73886a36fe380c3a5dc0df92df Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 11 Aug 2011 01:51:25 +0200 Subject: [PATCH 10/61] * Disable horizontal scrollbars in TransferView. --- src/transferview.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/transferview.cpp b/src/transferview.cpp index 688bdc928..a1fd35d14 100644 --- a/src/transferview.cpp +++ b/src/transferview.cpp @@ -47,6 +47,7 @@ TransferView::TransferView( AnimatedSplitter* parent ) headers << tr( "Peer" ) << tr( "Rate" ) << tr( "Track" ); m_tree->setHeaderLabels( headers ); + m_tree->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); m_tree->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Ignored ); m_tree->setColumnCount( 3 ); m_tree->setColumnWidth( 0, 80 ); From caef0ccdbd705d3168bc20ff1d068f7146c9bcee Mon Sep 17 00:00:00 2001 From: Stefan Derkits Date: Thu, 11 Aug 2011 02:54:32 +0300 Subject: [PATCH 11/61] Corrected the Path for Jreen --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3312aefad..2018a40ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,7 +111,7 @@ IF( INTERNAL_JREEN ) ELSE( INTERNAL_JREEN ) macro_optional_find_package(Jreen) ENDIF( INTERNAL_JREEN ) -macro_log_feature(LIBJREEN_FOUND "Jreen" "Qt XMPP Library" "http://gitorious.org/jreen/jreen" FALSE "" "Jreen is needed for the Jabber SIP plugin. \n\n Use -DINTERNAL_JREEN=ON to build the git submodule inside Tomahawk \n Be aware this installs a full jreen with headers and everything!\n") +macro_log_feature(LIBJREEN_FOUND "Jreen" "Qt XMPP Library" "https://github.com/euroelessar/jreen" FALSE "" "Jreen is needed for the Jabber SIP plugin. \n\n Use -DINTERNAL_JREEN=ON to build the git submodule inside Tomahawk \n Be aware this installs a full jreen with headers and everything!\n") # this installs headers and such and should really be handled in a separate package by packagers IF( INTERNAL_QTWEETLIB ) From 503de73c7f0a357b930d0931ccfe0b6ba27f9c46 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 11 Aug 2011 02:40:01 +0200 Subject: [PATCH 12/61] * Use smaller fonts for PipelineStatus- & TransferView. --- src/PipelineStatusView.cpp | 12 ++++++++++++ src/transferview.cpp | 11 +++++++++++ 2 files changed, 23 insertions(+) diff --git a/src/PipelineStatusView.cpp b/src/PipelineStatusView.cpp index c6206a076..6d4fb28d0 100644 --- a/src/PipelineStatusView.cpp +++ b/src/PipelineStatusView.cpp @@ -43,6 +43,7 @@ PipelineStatusView::PipelineStatusView( AnimatedSplitter* parent ) headers << tr( "Searching For" ) << tr( "Pending" ); m_tree->setHeaderLabels( headers ); + m_tree->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); m_tree->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Ignored ); m_tree->setColumnCount( 2 ); m_tree->setColumnWidth( 0, 200 ); @@ -59,6 +60,17 @@ PipelineStatusView::PipelineStatusView( AnimatedSplitter* parent ) connect( Pipeline::instance(), SIGNAL( resolving( Tomahawk::query_ptr ) ), SLOT( onPipelineUpdate( Tomahawk::query_ptr ) ) ); connect( Pipeline::instance(), SIGNAL( idle() ), SLOT( onPipelineUpdate() ) ); +#ifndef Q_WS_WIN + QFont f = font(); + f.setPointSize( f.pointSize() - 1 ); + setFont( f ); +#endif + +#ifdef Q_WS_MAC + f.setPointSize( f.pointSize() - 2 ); + setFont( f ); +#endif + onPipelineUpdate(); } diff --git a/src/transferview.cpp b/src/transferview.cpp index a1fd35d14..77a886d63 100644 --- a/src/transferview.cpp +++ b/src/transferview.cpp @@ -59,6 +59,17 @@ TransferView::TransferView( AnimatedSplitter* parent ) m_tree->setFrameShape( QFrame::NoFrame ); m_tree->setAttribute( Qt::WA_MacShowFocusRect, 0 ); + +#ifndef Q_WS_WIN + QFont f = font(); + f.setPointSize( f.pointSize() - 1 ); + setFont( f ); +#endif + +#ifdef Q_WS_MAC + f.setPointSize( f.pointSize() - 2 ); + setFont( f ); +#endif } From 0dd29ffa3d4d794888591c601db71ad5709cf750 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 11 Aug 2011 02:48:28 +0200 Subject: [PATCH 13/61] * Use track-placeholder.png in the PlaylistItemDelegate. --- resources.qrc | 1 + src/libtomahawk/playlist/playlistitemdelegate.cpp | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/resources.qrc b/resources.qrc index 2360b353b..56f3e53c0 100644 --- a/resources.qrc +++ b/resources.qrc @@ -10,6 +10,7 @@ data/images/not-loved.png data/images/no-album-art-placeholder.png data/images/no-artist-image-placeholder.png + data/images/track-placeholder.png data/images/now-playing-panel.png data/images/now-playing-speaker.png data/images/pause-pressed.png diff --git a/src/libtomahawk/playlist/playlistitemdelegate.cpp b/src/libtomahawk/playlist/playlistitemdelegate.cpp index c0e965077..3b0a653f5 100644 --- a/src/libtomahawk/playlist/playlistitemdelegate.cpp +++ b/src/libtomahawk/playlist/playlistitemdelegate.cpp @@ -184,13 +184,11 @@ PlaylistItemDelegate::paintShort( QPainter* painter, const QStyleOptionViewItem& else lowerText = QString( "played %1 ago by %2" ).arg( playtime ).arg( source->friendlyName() ); - pixmap = source->avatar(); +// pixmap = source->avatar(); } if ( pixmap.isNull() ) - pixmap = QPixmap( RESPATH "images/user-avatar.png" ); - - pixmap = TomahawkUtils::createAvatarFrame( pixmap ); + pixmap = QPixmap( RESPATH "images/track-placeholder.png" ); painter->save(); { From 3a890ee929f5d19e5c6051565cb300480cbf3b9d Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Wed, 10 Aug 2011 22:52:50 -0400 Subject: [PATCH 14/61] Use QStackedLayout instead of show/hide for play/pause widget. Fixes flicker. Extra 2px of spacing i can't get rid of... will work harder. TWK-128 --- src/libtomahawk/globalactionmanager.cpp | 10 ++++++++++ src/libtomahawk/globalactionmanager.h | 3 +++ src/tomahawkapp.cpp | 2 ++ 3 files changed, 15 insertions(+) diff --git a/src/libtomahawk/globalactionmanager.cpp b/src/libtomahawk/globalactionmanager.cpp index a60a01918..5b79b9c3a 100644 --- a/src/libtomahawk/globalactionmanager.cpp +++ b/src/libtomahawk/globalactionmanager.cpp @@ -909,3 +909,13 @@ GlobalActionManager::openSpotifyLink( const QString& link ) return true; } + +bool +GlobalActionManager::openRdioLink( const QString& link ) +{ +// RdioParser* rdio = new RdioParser( link, this ); +// connect( spot, SIGNAL( track( Tomahawk::query_ptr ) ), this, SLOT( handleOpenTrack( Tomahawk::query_ptr ) ) ); + + return true; +} + diff --git a/src/libtomahawk/globalactionmanager.h b/src/libtomahawk/globalactionmanager.h index 725e8c959..c06561b3f 100644 --- a/src/libtomahawk/globalactionmanager.h +++ b/src/libtomahawk/globalactionmanager.h @@ -44,6 +44,9 @@ public: /// Takes a spotify link and performs the default open action on it bool openSpotifyLink( const QString& link ); + /// Takes a spotify link and performs the default open action on it + bool openRdioLink( const QString& link ); + void copyToClipboard( const Tomahawk::query_ptr& query ) const; QString copyPlaylistToClipboard( const Tomahawk::dynplaylist_ptr& playlist ); void savePlaylistToFile( const Tomahawk::playlist_ptr& playlist, const QString& filename ); diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp index 612fa3d08..6fd9af544 100644 --- a/src/tomahawkapp.cpp +++ b/src/tomahawkapp.cpp @@ -525,6 +525,8 @@ TomahawkApp::loadUrl( const QString& url ) return GlobalActionManager::instance()->parseTomahawkLink( url ); else if ( url.contains( "open.spotify.com" ) || url.contains( "spotify:track" ) ) return GlobalActionManager::instance()->openSpotifyLink( url ); + else if ( url.contains( "www.rdio.com" ) ) + return GlobalActionManager::instance()->openRdioLink( url ); else { QFile f( url ); From ca65bb2ccc410de957cb0424031afc5ddfaf9d0c Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Wed, 10 Aug 2011 23:17:32 -0400 Subject: [PATCH 15/61] Don't disable play/pause ever now that we have a stacked layout --- src/audiocontrols.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/audiocontrols.cpp b/src/audiocontrols.cpp index 14b46c3f6..947ba5f0c 100644 --- a/src/audiocontrols.cpp +++ b/src/audiocontrols.cpp @@ -310,10 +310,6 @@ AudioControls::onPlaybackLoading( const Tomahawk::result_ptr& result ) ui->stackedLayout->setCurrentWidget( ui->pauseButton ); - ui->pauseButton->setEnabled( true ); - ui->pauseButton->setVisible( true ); - ui->playPauseButton->setVisible( false ); - ui->playPauseButton->setEnabled( false ); ui->loveButton->setEnabled( true ); ui->loveButton->setVisible( true ); From e0b406e7ef32f253990a7fb8a319267946d68d0b Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 11 Aug 2011 13:58:15 +0200 Subject: [PATCH 16/61] * Fixed TWK-325: Show a spinner animation while searching for tracks. --- src/libtomahawk/playlist/trackview.h | 1 + src/libtomahawk/query.cpp | 5 ++++- src/libtomahawk/widgets/searchwidget.cpp | 10 ++++++++++ src/libtomahawk/widgets/searchwidget.h | 1 + 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/libtomahawk/playlist/trackview.h b/src/libtomahawk/playlist/trackview.h index b151a251c..d2eec8344 100644 --- a/src/libtomahawk/playlist/trackview.h +++ b/src/libtomahawk/playlist/trackview.h @@ -56,6 +56,7 @@ explicit TrackView( QWidget* parent = 0 ); TrackHeader* header() const { return m_header; } OverlayWidget* overlay() const { return m_overlay; } Tomahawk::ContextMenu* contextMenu() const { return m_contextMenu; } + LoadingSpinner* loadingSpinner() const { return m_loadingSpinner; } QModelIndex hoveredIndex() const { return m_hoveredIndex; } QModelIndex contextMenuIndex() const { return m_contextMenuIndex; } diff --git a/src/libtomahawk/query.cpp b/src/libtomahawk/query.cpp index eda3ae385..cbab0dfb2 100644 --- a/src/libtomahawk/query.cpp +++ b/src/libtomahawk/query.cpp @@ -38,9 +38,12 @@ using namespace Tomahawk; query_ptr Query::get( const QString& artist, const QString& track, const QString& album, const QID& qid, bool autoResolve ) { + if ( qid.isEmpty() ) + autoResolve = false; + query_ptr q = query_ptr( new Query( artist, track, album, qid, autoResolve ) ); - if ( autoResolve && !qid.isEmpty() ) + if ( autoResolve ) Pipeline::instance()->resolve( q ); return q; } diff --git a/src/libtomahawk/widgets/searchwidget.cpp b/src/libtomahawk/widgets/searchwidget.cpp index 58b81a7f9..8373be998 100644 --- a/src/libtomahawk/widgets/searchwidget.cpp +++ b/src/libtomahawk/widgets/searchwidget.cpp @@ -24,6 +24,7 @@ #include "sourcelist.h" #include "viewmanager.h" +#include "dynamic/widgets/LoadingSpinner.h" #include "playlist/playlistmodel.h" #include "widgets/overlaywidget.h" @@ -48,11 +49,13 @@ SearchWidget::SearchWidget( const QString& search, QWidget* parent ) ui->resultsView->setFrameShape( QFrame::NoFrame ); ui->resultsView->setAttribute( Qt::WA_MacShowFocusRect, 0 ); + ui->resultsView->loadingSpinner()->fadeIn(); m_queries << Tomahawk::Query::get( search, uuid() ); foreach ( const Tomahawk::query_ptr& query, m_queries ) { connect( query.data(), SIGNAL( resultsAdded( QList ) ), SLOT( onResultsFound( QList ) ) ); + connect( query.data(), SIGNAL( resolvingFinished( bool ) ), SLOT( onQueryFinished() ) ); } } @@ -97,3 +100,10 @@ SearchWidget::onResultsFound( const QList& results ) m_resultsModel->append( q ); } } + + +void +SearchWidget::onQueryFinished() +{ + ui->resultsView->loadingSpinner()->fadeOut(); +} diff --git a/src/libtomahawk/widgets/searchwidget.h b/src/libtomahawk/widgets/searchwidget.h index f7d7ec021..136be7f11 100644 --- a/src/libtomahawk/widgets/searchwidget.h +++ b/src/libtomahawk/widgets/searchwidget.h @@ -63,6 +63,7 @@ signals: private slots: void onResultsFound( const QList& results ); + void onQueryFinished(); private: Ui::SearchWidget *ui; From f36cf0e5fa2718e1799d5ab03a65d55ea9cf4654 Mon Sep 17 00:00:00 2001 From: Jason Herskowitz Date: Thu, 11 Aug 2011 08:19:49 -0400 Subject: [PATCH 17/61] Make light gray on track placeholder icon match the gray used on album placeholder image. --- data/images/track-placeholder.png | Bin 1054090 -> 1054090 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/data/images/track-placeholder.png b/data/images/track-placeholder.png index de732180df804da0090e010d906a35f913e6db77..fbc5781242d1d37610d4a67831cbe992d103dc88 100644 GIT binary patch delta 7197 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 XTlbz$t=xfcfhoxo$L}3C{q_F>WTKwX delta 7103 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 Date: Thu, 11 Aug 2011 09:15:07 -0400 Subject: [PATCH 18/61] Add album art drop shadow. Take 1. --- data/images/album-shadow.png | Bin 0 -> 209071 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 data/images/album-shadow.png diff --git a/data/images/album-shadow.png b/data/images/album-shadow.png new file mode 100644 index 0000000000000000000000000000000000000000..a053655e215ca04fca4528d8b4ddb0c2d7b5774a GIT binary patch literal 209071 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 V*tbMg`8*v}NKog%4Q&Qa{6GE-@Ld1^ literal 0 HcmV?d00001 From 6d82ae0c4d412f27ac85b47d3f2e5bc2d58f4d26 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 11 Aug 2011 15:48:21 +0200 Subject: [PATCH 19/61] * Don't try to resolve search queries when appending them to the SearchWidget's TrackModel. --- src/libtomahawk/widgets/searchwidget.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libtomahawk/widgets/searchwidget.cpp b/src/libtomahawk/widgets/searchwidget.cpp index 8373be998..5b253c83a 100644 --- a/src/libtomahawk/widgets/searchwidget.cpp +++ b/src/libtomahawk/widgets/searchwidget.cpp @@ -94,6 +94,7 @@ SearchWidget::onResultsFound( const QList& results ) rl << result; Tomahawk::query_ptr q = result->toQuery(); + q->setResolveFinished( true ); q->addResults( rl ); qDebug() << result->toString(); From d7100c0e8e26053fd296820f28c12594ff362a21 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 11 Aug 2011 18:10:06 +0200 Subject: [PATCH 20/61] * Generally prioritize resolving newer queries to make the GUI feel more responsive. --- src/libtomahawk/pipeline.h | 6 +++--- src/libtomahawk/playlist/playlistmodel.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libtomahawk/pipeline.h b/src/libtomahawk/pipeline.h index 599817572..df0c32c19 100644 --- a/src/libtomahawk/pipeline.h +++ b/src/libtomahawk/pipeline.h @@ -66,9 +66,9 @@ public: } public slots: - void resolve( const query_ptr& q, bool prioritized = false, bool temporaryQuery = false ); - void resolve( const QList& qlist, bool prioritized = false, bool temporaryQuery = false ); - void resolve( QID qid, bool prioritized = false, bool temporaryQuery = false ); + void resolve( const query_ptr& q, bool prioritized = true, bool temporaryQuery = false ); + void resolve( const QList& qlist, bool prioritized = true, bool temporaryQuery = false ); + void resolve( QID qid, bool prioritized = true, bool temporaryQuery = false ); void start(); void stop(); diff --git a/src/libtomahawk/playlist/playlistmodel.cpp b/src/libtomahawk/playlist/playlistmodel.cpp index 43cd42b00..4cbe80019 100644 --- a/src/libtomahawk/playlist/playlistmodel.cpp +++ b/src/libtomahawk/playlist/playlistmodel.cpp @@ -116,7 +116,7 @@ PlaylistModel::loadPlaylist( const Tomahawk::playlist_ptr& playlist, bool loadEn m_waitingForResolved.clear(); foreach( const plentry_ptr& entry, entries ) { - qDebug() << entry->query()->toString(); +// qDebug() << entry->query()->toString(); plitem = new TrackModelItem( entry, m_rootItem ); plitem->index = createIndex( m_rootItem->children.count() - 1, 0, plitem ); From b0d01ec0fb06d71d3ba6207e0440b8636d4411d6 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Sun, 12 Jun 2011 00:13:50 -0400 Subject: [PATCH 21/61] Add a new macdeploy.py script that intelligently handles osx bundling Add sip plugins and spotify Remove old scripts and update build-release-osx.sh to use new macdeploy Remove old files --- admin/mac/add-Qt-to-bundle.sh | 64 ---- admin/mac/add-spotify.sh | 16 - admin/mac/build-release-osx.sh | 62 +--- admin/mac/deposx.sh | 169 ----------- admin/mac/macdeploy.py | 517 +++++++++++++++++++++++++++++++++ admin/mac/qt.conf | 2 +- src/CMakeLists.osx.txt | 6 + 7 files changed, 535 insertions(+), 301 deletions(-) delete mode 100755 admin/mac/add-Qt-to-bundle.sh delete mode 100755 admin/mac/add-spotify.sh delete mode 100755 admin/mac/deposx.sh create mode 100755 admin/mac/macdeploy.py diff --git a/admin/mac/add-Qt-to-bundle.sh b/admin/mac/add-Qt-to-bundle.sh deleted file mode 100755 index 8720e3f8d..000000000 --- a/admin/mac/add-Qt-to-bundle.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# author: max@last.fm -# usage: Run from inside the bundle root directory, eg. Last.fm.app -# The first parameter should be the QtFrameworks to copy. -# Remaining parameters are plugins to copy, directories and files are -# valid. -# eg: add-Qt-to-bundle.sh 'QtCore QtGui QtXml' \ -# imageformats \ -# sqldrivers/libsqlite.dylib -################################################################################ - -QT_FRAMEWORKS_DIR="$QTDIR/lib" -QT_PLUGINS_DIR="$QTDIR/plugins" - -if [[ ! -d "$QTDIR/lib/QtCore.framework" ]] -then - # this dir is the location of install for the official Trolltech dmg - if [[ -d /Library/Frameworks/QtCore.framework ]] - then - QT_FRAMEWORKS_DIR=/Library/Frameworks - QT_PLUGINS_DIR=/Developer/Applications/Qt/plugins - fi -fi - -echo "Plugins go to: $QT_PLUGINS_DIR" - -if [ -z $QTDIR ] -then - echo QTDIR must be set, or install the official Qt dmg - exit 1 -fi -################################################################################ - - -#first frameworks -mkdir -p Contents/Frameworks -for x in $1 -do - echo "C $x" - cp -R $QT_FRAMEWORKS_DIR/$x.framework Contents/Frameworks/ - chmod -R u+rw Contents/Frameworks/ -done - -#plugins -shift -mkdir -p Contents/MacOS -mkdir -p Contents/MacOS/sqldrivers -mkdir -p Contents/MacOS/imageformats -mkdir -p Contents/MacOS/phonon_backend -mkdir -p Contents/MacOS/crypto - -cp -R $QT_PLUGINS_DIR/sqldrivers/libqsqlite.dylib Contents/MacOS/sqldrivers/ -cp -R $QT_PLUGINS_DIR/imageformats/libqgif.dylib Contents/MacOS/imageformats/ -cp -R $QT_PLUGINS_DIR/imageformats/libqjpeg.dylib Contents/MacOS/imageformats/ -cp -R $QT_PLUGINS_DIR/imageformats/libqico.dylib Contents/MacOS/imageformats/ -cp -R $QT_PLUGINS_DIR/imageformats/libqmng.dylib Contents/MacOS/imageformats/ -#cp -R $QT_PLUGINS_DIR/imageformats/libqsvg.dylib Contents/MacOS/imageformats/ -#cp -R $QT_PLUGINS_DIR/imageformats/libqtiff.dylib Contents/MacOS/imageformats/ -cp -R $QT_PLUGINS_DIR/crypto/libqca-ossl.dylib Contents/MacOS/crypto/ -cp -R $QT_PLUGINS_DIR/phonon_backend/phonon_vlc.so Contents/MacOS/phonon_backend/ - -#cleanup -find Contents/Frameworks -name Headers -o -name \*.prl -o -name \*_debug | xargs rm -rf -find Contents -name \*_debug -o -name \*_debug.dylib | xargs rm diff --git a/admin/mac/add-spotify.sh b/admin/mac/add-spotify.sh deleted file mode 100755 index 170c67e18..000000000 --- a/admin/mac/add-spotify.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# author: lfranchi@kde.org -# usage: Run from inside the bundle root directory, eg. Tomahawk.app -# The first parameter should be the spotify resolver binary to copy. -# eg: add-spotify.sh /path/to/spotify_tomahawkresolver -################################################################################ - -mkdir -p Contents/Frameworks -cp -R /Library/Frameworks/libspotify.framework Contents/Frameworks - -install_name_tool -change /usr/local/Cellar/qt/4.7.3/lib/QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore $1 -install_name_tool -change /usr/local/Cellar/qt/4.7.3/lib/QtNetwork.framework/Versions/4/QtNetwork @executable_path/../Frameworks/QtNetwork.framework/Versions/4/QtNetwork $1 -install_name_tool -change libqjson.0.dylib @executable_path/libqjson.0.7.1.dylib $1 -install_name_tool -change /usr/local/Cellar/qjson/0.7.1/lib/libqjson.0.7.1.dylib @executable_path/libqjson.0.7.1.dylib $1 -mkdir -p Contents/MacOS -cp $1 Contents/MacOS/ diff --git a/admin/mac/build-release-osx.sh b/admin/mac/build-release-osx.sh index bd0153ff5..3f8116d3f 100755 --- a/admin/mac/build-release-osx.sh +++ b/admin/mac/build-release-osx.sh @@ -23,65 +23,25 @@ then fi ROOT=`pwd` - -QTDIR=`which qmake` -LINKDIR=`readlink $QTDIR` -QTDIR=`dirname $QTDIR` -QTDIR=$QTDIR/`dirname $LINKDIR` -QTDIR=`dirname $QTDIR` -test -L "$QTDIR" && QTDIR=`readlink $QTDIR` - -echo "Goes here: $QTDIR" - -export QMAKESPEC='macx-g++' -export QTDIR -export VERSION -export QTVERSION='4.7.3' -################################################################################ - - -CLEAN='1' -BUILD='1' -NOTQUICK='1' -CREATEDMG='1' VERSION=$1 - header "Adding Qt to app bundle" - cd tomahawk.app - $ROOT/../admin/mac/add-Qt-to-bundle.sh \ - 'QtCore QtGui QtXml QtNetwork QtSql QtXmlPatterns QtWebKit phonon' -# 'QtCore QtGui QtXml QtNetwork QtSql QtXmlPatterns QtWebKit QtDbus phonon' +################################################################################ - header "Renaming files" + mv tomahawk.app Tomahawk.app + mv Tomahawk.app/Contents/MacOS/tomahawk Tomahawk.app/Contents/MacOS/Tomahawk + + header "Fixing and copying libraries" + $ROOT/../admin/mac/macdeploy.py Tomahawk.app quiet + + cd Tomahawk.app + + header "Renaming icon" mv Contents/Resources/tomahawkSources.icns Contents/Resources/Tomahawk.icns - mv Contents/MacOS/tomahawk Contents/MacOS/Tomahawk -# cp $ROOT/../admin/mac/Info.plist Contents/Info.plist - header "Copying VLC plugins into bundle" - mkdir -p Contents/plugins - cp -R /usr/local/Cellar/vlc-git/HEAD/lib/vlc/plugins/ Contents/plugins - rm -rf Contents/plugins/video_* Contents/plugins/gui Contents/plugins/*/libold* Contents/plugins/*/libvcd* Contents/plugins/*/libdvd* \ - Contents/plugins/*/liblibass* Contents/plugins/*/libx264* Contents/plugins/*/libschroe* Contents/plugins/*/liblibmpeg2* \ - Contents/plugins/*/libstream_out_* Contents/plugins/*/libmjpeg_plugin* Contents/plugins/*/libh264_plugin* Contents/plugins/*/libzvbi_plugin* Contents/plugins/*/lib*sub* - - header "Running install_name_tool" - $ROOT/../admin/mac/deposx.sh - - header "Copying Sparkle pubkey & framework, and qt.conf" - cp $ROOT/../admin/mac/sparkle_pub.pem Contents/Resources - cp -R /Library/Frameworks/Sparkle.framework Contents/Frameworks - cp $ROOT/../admin/mac/qt.conf Contents/Resources - - header "Adding spotify resolver to bundle if spotify_tomahawkresolver found in $ROOT" - if [ -e $ROOT/spotify_tomahawkresolver ] - then - header "Found, so adding spotify resolver."ac - $ROOT/../admin/mac/add-spotify.sh $ROOT/spotify_tomahawkresolver - fi header "Creating DMG" cd .. - mv tomahawk.app Tomahawk.app + $ROOT/../admin/mac/create-dmg.sh Tomahawk.app mv Tomahawk.dmg Tomahawk-$VERSION.dmg diff --git a/admin/mac/deposx.sh b/admin/mac/deposx.sh deleted file mode 100755 index 131cfea37..000000000 --- a/admin/mac/deposx.sh +++ /dev/null @@ -1,169 +0,0 @@ -#!/bin/sh -# author: max@last.fm, chris@last.fm -################################################################################ - - -if [ -z $QTDIR ] -then - echo QTDIR must be set - exit 1 -fi - -if [ -z $QTVERSION ] -then - echo QTVERSION must be set - exit 1 -fi - -cd .. -ORIGROOT=`pwd` -cd - - -cd Contents - -QTLIBS=`ls Frameworks | cut -d. -f1` -LIBS=`cd MacOS && ls -fR1 | grep dylib` -PLUGINFOLDERS=`ls plugins | cut -d. -f1` - -################################################################################ - - -function import_lib -{ - echo "L \`$1'" - cp -R -L $1 MacOS/`basename $1` - chmod u+rw MacOS/`basename $1` - deplib_change MacOS/`basename $1` - deposx_change MacOS/`basename $1` -} - -function deposx_change -{ - echo "D \`$1'" - echo $QTDIR - - for y in $QTLIBS - do - install_name_tool -change $QTDIR/lib/$y.framework/Versions/4/$y \ - @executable_path/../Frameworks/$y.framework/Versions/4/$y \ - "$1" - - install_name_tool -change /usr/local/Cellar/qt/$QTVERSION/lib/$y.framework/Versions/4/$y \ - @executable_path/../Frameworks/$y.framework/Versions/4/$y \ - "$1" - - install_name_tool -change /usr/X11/lib/libpng12.0.dylib \ - @executable_path/libpng12.0.dylib \ - "$1" - done - - for y in $LIBS - do - install_name_tool -change $y \ - @executable_path/$y \ - "$1" - done -} - -function deplib_change -{ - install_name_tool -change /usr/local/Cellar/qjson/0.7.1/lib/libqjson.0.7.1.dylib @executable_path/libqjson.0.7.1.dylib $1 - install_name_tool -change /usr/local/lib/libechonest.1.1.dylib @executable_path/libechonest.1.1.dylib $1 - install_name_tool -change /usr/local/lib/libclucene-core.1.dylib @executable_path/libclucene-core.1.dylib $1 - install_name_tool -change /usr/local/lib/libclucene-shared.1.dylib @executable_path/libclucene-shared.1.dylib $1 - install_name_tool -change /usr/local/Cellar/taglib/1.7/lib/libtag.1.7.0.dylib @executable_path/libtag.1.7.0.dylib $1 -# install_name_tool -change /usr/local/Cellar/gloox/1.0/lib/libgloox.8.dylib @executable_path/libgloox.8.dylib $1 -# install_name_tool -change /usr/local/Cellar/libogg/1.2.0/lib/libogg.0.dylib @executable_path/libogg.0.dylib $1 -# install_name_tool -change /usr/local/Cellar/libvorbis/1.3.1/lib/libvorbis.0.dylib @executable_path/libvorbis.0.dylib $1 -# install_name_tool -change /usr/local/Cellar/libvorbis/1.3.1/lib/libvorbisfile.3.dylib @executable_path/libvorbisfile.3.dylib $1 -# install_name_tool -change /usr/local/Cellar/mad/0.15.1b/lib/libmad.0.dylib @executable_path/libmad.0.dylib $1 -# install_name_tool -change /usr/local/Cellar/flac/1.2.1/lib/libFLAC++.6.dylib @executable_path/libFLAC++.6.dylib $1 -# install_name_tool -change /usr/local/Cellar/flac/1.2.1/lib/libFLAC.8.dylib @executable_path/libFLAC.8.dylib $1 - install_name_tool -change /usr/local/Cellar/kde-phonon/4.5.0/lib/libphonon.4.dylib @executable_path/libphonon.4.dylib $1 - install_name_tool -change /usr/local/Cellar/kde-phonon/4.5.0/lib/libphonon.4.5.0.dylib @executable_path/libphonon.4.dylib $1 - - install_name_tool -change $ORIGROOT/libtomahawklib.dylib @executable_path/libtomahawklib.dylib $1 - install_name_tool -change $ORIGROOT/libtomahawk_sipjabber.dylib @executable_path/libtomahawk_sipjabber.dylib $1 - install_name_tool -change $ORIGROOT/libtomahawk_sipgoogle.dylib @executable_path/libtomahawk_sipgoogle.dylib $1 - install_name_tool -change $ORIGROOT/libtomahawk_siptwitter.dylib @executable_path/libtomahawk_siptwitter.dylib $1 - install_name_tool -change $ORIGROOT/libtomahawk_sipzeroconf.dylib @executable_path/libtomahawk_sipzeroconf.dylib $1 - install_name_tool -change $ORIGROOT/libtomahawk_qtweetlib.dylib @executable_path/libtomahawk_qtweetlib.dylib $1 - install_name_tool -change $ORIGROOT/libtomahawk_portfwd.dylib @executable_path/libtomahawk_portfwd.dylib $1 - install_name_tool -change $ORIGROOT/libjreen.dylib @executable_path/libjreen.dylib $1 - install_name_tool -change /usr/local/Cellar/jreen/HEAD/lib/libjreen.dylib @executable_path/libjreen.dylib $1 - install_name_tool -change /usr/local/Cellar/qca/2.0.2/lib/qca.framework/Versions/2/qca @executable_path/../Frameworks/qca.framework/Versions/2/qca $1 - install_name_tool -change /usr/local/Cellar/gettext/0.18.1.1/lib/libintl.8.dylib @executable_path/libintl.8.dylib $1 - install_name_tool -change /usr/local/Cellar/vlc-git/HEAD/lib/libvlc.5.dylib @executable_path/libvlc.5.dylib $1 - install_name_tool -change /usr/local/Cellar/vlc-git/HEAD/lib/libvlccore.4.dylib @executable_path/libvlccore.4.dylib $1 - - install_name_tool -change libqjson.0.dylib @executable_path/libqjson.0.7.1.dylib $1 - install_name_tool -change libechonest.1.1.dylib @executable_path/libechonest.1.1.dylib $1 - install_name_tool -change libclucene-core.1.dylib @executable_path/libclucene-core.1.dylib $1 - install_name_tool -change libclucene-shared.1.dylib @executable_path/libclucene-shared.1.dylib $1 -} - -################################################################################ - - -# first all libraries and executables -find MacOS -type f -a -perm -100 | while read x -do - echo $x - y=$(file "$x" | grep 'Mach-O') - deposx_change "$x" - deplib_change "$x" -done - -import_lib /usr/local/Cellar/qjson/0.7.1/lib/libqjson.0.7.1.dylib -import_lib /usr/local/Cellar/taglib/1.7/lib/libtag.1.7.0.dylib -#import_lib /usr/local/Cellar/gloox/1.0/lib/libgloox.8.dylib -#import_lib /usr/local/Cellar/libogg/1.2.0/lib/libogg.0.dylib -#import_lib /usr/local/Cellar/libvorbis/1.3.1/lib/libvorbis.0.dylib -#import_lib /usr/local/Cellar/libvorbis/1.3.1/lib/libvorbisfile.3.dylib -#import_lib /usr/local/Cellar/mad/0.15.1b/lib/libmad.0.dylib -#import_lib /usr/local/Cellar/flac/1.2.1/lib/libFLAC++.6.dylib -#import_lib /usr/local/Cellar/flac/1.2.1/lib/libFLAC.8.dylib -import_lib /usr/local/lib/libechonest.1.1.dylib -import_lib /usr/local/lib/libclucene-core.1.dylib -import_lib /usr/local/lib/libclucene-shared.1.dylib -import_lib /usr/local/Cellar/kde-phonon/4.5.0/lib/libphonon.4.dylib -import_lib /usr/local/Cellar/vlc-git/HEAD/lib/libvlc.5.dylib -import_lib /usr/local/Cellar/vlc-git/HEAD/lib/libvlccore.4.dylib -import_lib /usr/local/Cellar/gettext/0.18.1.1/lib/libintl.8.dylib -import_lib /usr/X11/lib/libpng12.0.dylib - -import_lib $ORIGROOT/libjreen.dylib -import_lib $ORIGROOT/libtomahawklib.dylib -import_lib $ORIGROOT/libtomahawk_sipjabber.dylib -import_lib $ORIGROOT/libtomahawk_sipgoogle.dylib -import_lib $ORIGROOT/libtomahawk_siptwitter.dylib -import_lib $ORIGROOT/libtomahawk_sipzeroconf.dylib -import_lib $ORIGROOT/libtomahawk_qtweetlib.dylib -import_lib $ORIGROOT/libtomahawk_portfwd.dylib - -cp -R /usr/local/Cellar/qca/2.0.2/lib/qca.framework Frameworks/ -chmod 644 Frameworks/qca.framework/Versions/2/qca -deplib_change Frameworks/qca.framework/Versions/2/qca -deposx_change Frameworks/qca.framework/Versions/2/qca - -# now Qt -for x in $QTLIBS -do - echo `pwd` -# ls -l Frameworks/$x.framework/Versions/4/$x - deposx_change Frameworks/$x.framework/Versions/4/$x - install_name_tool -id @executable_path/../Frameworks/$x.framework/Versions/4/$x \ - Frameworks/$x.framework/Versions/4/$x - deplib_change "Frameworks/$x.framework/Versions/4/$x" -done - -# now VLC plugins -for x in plugins/$PLUGINFOLDERS -do - for plugin in `ls plugins/$x | cut -f1` - do - echo "Fixing VLC plugin: $plugin" - chmod 644 plugins/$x/$plugin - deplib_change plugins/$x/$plugin - done -done diff --git a/admin/mac/macdeploy.py b/admin/mac/macdeploy.py new file mode 100755 index 000000000..0461c7bb8 --- /dev/null +++ b/admin/mac/macdeploy.py @@ -0,0 +1,517 @@ +#!/usr/bin/python + +# This file is part of Clementine. +# +# Clementine 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. +# +# Clementine 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 Clementine. If not, see . + +import os +import re +import subprocess +import sys + +FRAMEWORK_SEARCH_PATH=[ + '/Library/Frameworks', + os.path.join(os.environ['HOME'], 'Library/Frameworks') +] + +LIBRARY_SEARCH_PATH=['/usr/local/lib', '/usr/local/Cellar/gettext/0.18.1.1/lib', '.'] + + +VLC_PLUGINS=[ + 'access/libaccess_attachment_plugin.dylib', + #'access/libaccess_avio_plugin.dylib', + 'access/libaccess_fake_plugin.dylib', + 'access/libaccess_ftp_plugin.dylib', + 'access/libaccess_http_plugin.dylib', + 'access/libaccess_imem_plugin.dylib', + 'access/libaccess_mmap_plugin.dylib', + 'access/libaccess_mms_plugin.dylib', + 'access/libaccess_realrtsp_plugin.dylib', + 'access/libaccess_tcp_plugin.dylib', + 'access/libaccess_udp_plugin.dylib', + 'access/libcdda_plugin.dylib', + 'access/libfilesystem_plugin.dylib', + 'access/libqtcapture_plugin.dylib', + 'access/librtp_plugin.dylib', + 'access/libzip_plugin.dylib', + 'access_output/libaccess_output_dummy_plugin.dylib', + 'access_output/libaccess_output_file_plugin.dylib', + 'access_output/libaccess_output_http_plugin.dylib', + 'access_output/libaccess_output_shout_plugin.dylib', + 'access_output/libaccess_output_udp_plugin.dylib', + 'audio_filter/liba52tofloat32_plugin.dylib', + 'audio_filter/liba52tospdif_plugin.dylib', + 'audio_filter/libaudio_format_plugin.dylib', + 'audio_filter/libaudiobargraph_a_plugin.dylib', + 'audio_filter/libchorus_flanger_plugin.dylib', + 'audio_filter/libconverter_fixed_plugin.dylib', + 'audio_filter/libdolby_surround_decoder_plugin.dylib', + 'audio_filter/libdtstofloat32_plugin.dylib', + 'audio_filter/libdtstospdif_plugin.dylib', + 'audio_filter/libequalizer_plugin.dylib', + 'audio_filter/libheadphone_channel_mixer_plugin.dylib', + 'audio_filter/libmono_plugin.dylib', + 'audio_filter/libmpgatofixed32_plugin.dylib', + 'audio_filter/libnormvol_plugin.dylib', + 'audio_filter/libparam_eq_plugin.dylib', + 'audio_filter/libscaletempo_plugin.dylib', + 'audio_filter/libsimple_channel_mixer_plugin.dylib', + 'audio_filter/libspatializer_plugin.dylib', + 'audio_filter/libtrivial_channel_mixer_plugin.dylib', + 'audio_filter/libugly_resampler_plugin.dylib', + 'audio_mixer/libfloat32_mixer_plugin.dylib', + 'audio_mixer/libspdif_mixer_plugin.dylib', + 'audio_mixer/libtrivial_mixer_plugin.dylib', + 'audio_output/libaout_file_plugin.dylib', + 'audio_output/libauhal_plugin.dylib', + 'codec/liba52_plugin.dylib', + 'codec/libadpcm_plugin.dylib', + 'codec/libaes3_plugin.dylib', + 'codec/libaraw_plugin.dylib', + 'codec/libavcodec_plugin.dylib', + 'codec/libcc_plugin.dylib', + 'codec/libcdg_plugin.dylib', + 'codec/libdts_plugin.dylib', + 'codec/libfaad_plugin.dylib', + 'codec/libfake_plugin.dylib', + 'codec/libflac_plugin.dylib', + 'codec/libfluidsynth_plugin.dylib', + 'codec/libinvmem_plugin.dylib', + 'codec/liblpcm_plugin.dylib', + 'codec/libmpeg_audio_plugin.dylib', + 'codec/libpng_plugin.dylib', + 'codec/librawvideo_plugin.dylib', + 'codec/libspeex_plugin.dylib', + 'codec/libspudec_plugin.dylib', + 'codec/libtheora_plugin.dylib', + 'codec/libtwolame_plugin.dylib', + 'codec/libvorbis_plugin.dylib', + 'control/libgestures_plugin.dylib', + 'control/libhotkeys_plugin.dylib', + 'control/libmotion_plugin.dylib', + 'control/libnetsync_plugin.dylib', + 'control/libsignals_plugin.dylib', + 'demux/libaiff_plugin.dylib', + 'demux/libasf_plugin.dylib', + 'demux/libau_plugin.dylib', + #'demux/libavformat_plugin.dylib', + 'demux/libavi_plugin.dylib', + 'demux/libdemux_cdg_plugin.dylib', + 'demux/libdemuxdump_plugin.dylib', + 'demux/libdirac_plugin.dylib', + 'demux/libes_plugin.dylib', + 'demux/libflacsys_plugin.dylib', + 'demux/liblive555_plugin.dylib', + 'demux/libmkv_plugin.dylib', + 'demux/libmod_plugin.dylib', + 'demux/libmp4_plugin.dylib', + 'demux/libmpc_plugin.dylib', + 'demux/libmpgv_plugin.dylib', + 'demux/libnsc_plugin.dylib', + 'demux/libnsv_plugin.dylib', + 'demux/libnuv_plugin.dylib', + 'demux/libogg_plugin.dylib', + 'demux/libplaylist_plugin.dylib', + 'demux/libps_plugin.dylib', + 'demux/libpva_plugin.dylib', + 'demux/librawaud_plugin.dylib', + 'demux/librawdv_plugin.dylib', + 'demux/librawvid_plugin.dylib', + 'demux/libreal_plugin.dylib', + 'demux/libsmf_plugin.dylib', + 'demux/libts_plugin.dylib', + 'demux/libtta_plugin.dylib', + 'demux/libty_plugin.dylib', + 'demux/libvc1_plugin.dylib', + 'demux/libvoc_plugin.dylib', + 'demux/libwav_plugin.dylib', + 'demux/libxa_plugin.dylib', + 'meta_engine/libfolder_plugin.dylib', + 'meta_engine/libtaglib_plugin.dylib', + 'misc/libaudioscrobbler_plugin.dylib', + 'misc/libdummy_plugin.dylib', + 'misc/libexport_plugin.dylib', + 'misc/libfreetype_plugin.dylib', + 'misc/libgnutls_plugin.dylib', + 'misc/liblogger_plugin.dylib', + 'misc/liblua_plugin.dylib', + 'misc/libosd_parser_plugin.dylib', + 'misc/libquartztext_plugin.dylib', + 'misc/libstats_plugin.dylib', + 'misc/libvod_rtsp_plugin.dylib', + 'misc/libxml_plugin.dylib', + 'misc/libxtag_plugin.dylib', + 'mmx/libi420_rgb_mmx_plugin.dylib', + 'mmx/libi420_yuy2_mmx_plugin.dylib', + 'mmx/libi422_yuy2_mmx_plugin.dylib', + 'mmx/libmemcpymmx_plugin.dylib', + 'mmxext/libmemcpymmxext_plugin.dylib', + 'mux/libmux_asf_plugin.dylib', + 'mux/libmux_avi_plugin.dylib', + 'mux/libmux_dummy_plugin.dylib', + 'mux/libmux_mp4_plugin.dylib', + 'mux/libmux_mpjpeg_plugin.dylib', + 'mux/libmux_ogg_plugin.dylib', + 'mux/libmux_ps_plugin.dylib', + 'mux/libmux_ts_plugin.dylib', + 'mux/libmux_wav_plugin.dylib', + 'packetizer/libpacketizer_copy_plugin.dylib', + 'packetizer/libpacketizer_dirac_plugin.dylib', + 'packetizer/libpacketizer_flac_plugin.dylib', + 'packetizer/libpacketizer_h264_plugin.dylib', + 'packetizer/libpacketizer_mlp_plugin.dylib', + 'packetizer/libpacketizer_mpeg4audio_plugin.dylib', + 'packetizer/libpacketizer_mpeg4video_plugin.dylib', + 'packetizer/libpacketizer_mpegvideo_plugin.dylib', + 'packetizer/libpacketizer_vc1_plugin.dylib', + 'sse2/libi420_rgb_sse2_plugin.dylib', + 'sse2/libi420_yuy2_sse2_plugin.dylib', + 'sse2/libi422_yuy2_sse2_plugin.dylib', + 'stream_filter/libdecomp_plugin.dylib', + 'stream_filter/libstream_filter_rar_plugin.dylib', + 'stream_filter/libstream_filter_record_plugin.dylib', + 'visualization/libvisual_plugin.dylib', +] + +VLC_SEARCH_PATH=[ + '/usr/local/lib/vlc/plugins/', +] + +QT_PLUGINS = [ + 'crypto/libqca-ossl.dylib', + 'phonon_backend/phonon_vlc.so', + 'sqldrivers/libqsqlite.dylib', + 'imageformats/libqgif.dylib', + 'imageformats/libqico.dylib', + 'imageformats/libqjpeg.dylib', + 'imageformats/libqmng.dylib', +] + +TOMAHAWK_PLUGINS = [ + 'libtomahawk_sipjabber.dylib', + 'libtomahawk_sipgoogle.dylib', + 'libtomahawk_siptwitter.dylib', + 'libtomahawk_sipzeroconf.dylib', + 'libtomahawk_qtweetlib.dylib', +] + +QT_PLUGINS_SEARCH_PATH=[ + '/usr/local/Cellar/qt/4.7.3/plugins', +] + + +class Error(Exception): + pass + + +class CouldNotFindQtPluginErrorFindFrameworkError(Error): + pass + + +class InstallNameToolError(Error): + pass + + +class CouldNotFindQtPluginError(Error): + pass + + +class CouldNotFindVLCPluginError(Error): + pass + + +class CouldNotFindScriptPluginError(Error): + pass + + + +if len(sys.argv) < 2: + print 'Usage: %s ' % sys.argv[0] + +bundle_dir = sys.argv[1] + +bundle_name = os.path.basename(bundle_dir).split('.')[0] + +commands = [] + +binary_dir = os.path.join(bundle_dir, 'Contents', 'MacOS') +frameworks_dir = os.path.join(bundle_dir, 'Contents', 'Frameworks') +commands.append(['mkdir', '-p', frameworks_dir]) +resources_dir = os.path.join(bundle_dir, 'Contents', 'Resources') +commands.append(['mkdir', '-p', resources_dir]) +plugins_dir = os.path.join(bundle_dir, 'Contents', 'PlugIns') +binary = os.path.join(bundle_dir, 'Contents', 'MacOS', bundle_name) + +fixed_libraries = [] +fixed_frameworks = [] + +def GetBrokenLibraries(binary): + #print "Checking libs for binary: %s" % binary + output = subprocess.Popen(['otool', '-L', binary], stdout=subprocess.PIPE).communicate()[0] + broken_libs = { + 'frameworks': [], + 'libs': []} + for line in [x.split(' ')[0].lstrip() for x in output.split('\n')[1:]]: + #print "Checking line: %s" % line + if not line: # skip empty lines + continue + if os.path.basename(binary) == os.path.basename(line): + #print "mnope %s-%s" % (os.path.basename(binary), os.path.basename(line)) + continue + if re.match(r'^\s*/System/', line): + continue # System framework + elif re.match(r'^\s*/usr/lib/', line): + #print "unix style system lib" + continue # unix style system library + elif re.match(r'Breakpad', line): + continue # Manually added by cmake. + elif re.match(r'^\s*@executable_path', line) or re.match(r'^\s*@loader_path', line): + # Potentially already fixed library + if '.framework' in line: + relative_path = os.path.join(*line.split('/')[3:]) + if not os.path.exists(os.path.join(frameworks_dir, relative_path)): + broken_libs['frameworks'].append(relative_path) + else: + relative_path = os.path.join(*line.split('/')[1:]) + #print "RELPATH %s %s" % (relative_path, os.path.join(binary_dir, relative_path)) + if not os.path.exists(os.path.join(binary_dir, relative_path)): + broken_libs['libs'].append(relative_path) + elif re.search(r'\w+\.framework', line): + broken_libs['frameworks'].append(line) + else: + broken_libs['libs'].append(line) + + return broken_libs + +def FindFramework(path): + for search_path in FRAMEWORK_SEARCH_PATH: + abs_path = os.path.join(search_path, path) + if os.path.exists(abs_path): + return abs_path + + raise CouldNotFindFrameworkError(path) + +def FindLibrary(path): + if os.path.exists(path): + return path + for search_path in LIBRARY_SEARCH_PATH: + abs_path = os.path.join(search_path, path) + if os.path.exists(abs_path): + return abs_path + else: # try harder---look for lib name in library folders + newpath = os.path.join(search_path,os.path.basename(path)) + if os.path.exists(newpath): + return newpath + + return "" + #raise CouldNotFindFrameworkError(path) + +def FixAllLibraries(broken_libs): + for framework in broken_libs['frameworks']: + FixFramework(framework) + for lib in broken_libs['libs']: + FixLibrary(lib) + +def FixFramework(path): + if path in fixed_libraries: + return + else: + fixed_libraries.append(path) + abs_path = FindFramework(path) + broken_libs = GetBrokenLibraries(abs_path) + FixAllLibraries(broken_libs) + + new_path = CopyFramework(abs_path) + id = os.sep.join(new_path.split(os.sep)[3:]) + FixFrameworkId(new_path, id) + for framework in broken_libs['frameworks']: + FixFrameworkInstallPath(framework, new_path) + for library in broken_libs['libs']: + FixLibraryInstallPath(library, new_path) + +def FixLibrary(path): + if path in fixed_libraries or FindSystemLibrary(os.path.basename(path)) is not None: + return + else: + fixed_libraries.append(path) + abs_path = FindLibrary(path) + if abs_path == "": + print "Could not resolve %s, not fixing!" % path + return + broken_libs = GetBrokenLibraries(abs_path) + FixAllLibraries(broken_libs) + + new_path = CopyLibrary(abs_path) + FixLibraryId(new_path) + for framework in broken_libs['frameworks']: + FixFrameworkInstallPath(framework, new_path) + for library in broken_libs['libs']: + FixLibraryInstallPath(library, new_path) + +def FixVLCPlugin(abs_path, subdir): + broken_libs = GetBrokenLibraries(abs_path) + FixAllLibraries(broken_libs) + + #print "Copying plugin....%s %s %s" % (plugins_dir, subdir, os.path.join(abs_path.split('/')[-2:])) + plugindir = abs_path.split('/')[-2] + new_path = os.path.join(plugins_dir, subdir, plugindir, os.path.basename(abs_path)) + args = ['mkdir', '-p', os.path.dirname(new_path)] + commands.append(args) + args = ['ditto', '--arch=i386', '--arch=x86_64', abs_path, new_path] + commands.append(args) + args = ['chmod', 'u+w', new_path] + commands.append(args) + for framework in broken_libs['frameworks']: + FixFrameworkInstallPath(framework, new_path) + for library in broken_libs['libs']: + FixLibraryInstallPath(library, new_path) + +def FixPlugin(abs_path, subdir): + broken_libs = GetBrokenLibraries(abs_path) + FixAllLibraries(broken_libs) + + new_path = CopyPlugin(abs_path, subdir) + for framework in broken_libs['frameworks']: + FixFrameworkInstallPath(framework, new_path) + for library in broken_libs['libs']: + FixLibraryInstallPath(library, new_path) + +def FixBinary(path): + broken_libs = GetBrokenLibraries(path) + FixAllLibraries(broken_libs) + for framework in broken_libs['frameworks']: + FixFrameworkInstallPath(framework, path) + for library in broken_libs['libs']: + FixLibraryInstallPath(library, path) + +def CopyLibrary(path): + new_path = os.path.join(frameworks_dir, os.path.basename(path)) + args = ['ditto', '--arch=i386', '--arch=x86_64', path, new_path] + commands.append(args) + args = ['chmod', 'u+w', new_path] + commands.append(args) + return new_path + +def CopyPlugin(path, subdir): + new_path = os.path.join(plugins_dir, subdir, os.path.basename(path)) + args = ['mkdir', '-p', os.path.dirname(new_path)] + commands.append(args) + args = ['ditto', '--arch=i386', '--arch=x86_64', path, new_path] + commands.append(args) + args = ['chmod', 'u+w', new_path] + commands.append(args) + return new_path + +def CopyFramework(path): + parts = path.split(os.sep) + for i, part in enumerate(parts): + if re.match(r'\w+\.framework', part): + full_path = os.path.join(frameworks_dir, *parts[i:-1]) + break + args = ['mkdir', '-p', full_path] + commands.append(args) + args = ['ditto', '--arch=i386', '--arch=x86_64', path, full_path] + commands.append(args) + args = ['chmod', 'u+w', os.path.join(full_path, parts[-1])] + commands.append(args) + + menu_nib = os.path.join(os.path.split(path)[0], 'Resources', 'qt_menu.nib') + if os.path.exists(menu_nib): + args = ['cp', '-r', menu_nib, resources_dir] + commands.append(args) + + return os.path.join(full_path, parts[-1]) + +def FixId(path, library_name): + id = '@executable_path/../Frameworks/%s' % library_name + args = ['install_name_tool', '-id', id, path] + commands.append(args) + +def FixLibraryId(path): + library_name = os.path.basename(path) + FixId(path, library_name) + +def FixFrameworkId(path, id): + FixId(path, id) + +def FixInstallPath(library_path, library, new_path): + args = ['install_name_tool', '-change', library_path, new_path, library] + commands.append(args) + +def FindSystemLibrary(library_name): + for path in ['/lib', '/usr/lib']: + full_path = os.path.join(path, library_name) + if os.path.exists(full_path): + return full_path + return None + +def FixLibraryInstallPath(library_path, library): + system_library = FindSystemLibrary(os.path.basename(library_path)) + if system_library is None: + new_path = '@executable_path/../Frameworks/%s' % os.path.basename(library_path) + FixInstallPath(library_path, library, new_path) + else: + FixInstallPath(library_path, library, system_library) + +def FixFrameworkInstallPath(library_path, library): + parts = library_path.split(os.sep) + for i, part in enumerate(parts): + if re.match(r'\w+\.framework', part): + full_path = os.path.join(*parts[i:]) + break + new_path = '@executable_path/../Frameworks/%s' % full_path + FixInstallPath(library_path, library, new_path) + +def FindQtPlugin(name): + for path in QT_PLUGINS_SEARCH_PATH: + if os.path.exists(path): + if os.path.exists(os.path.join(path, name)): + return os.path.join(path, name) + raise CouldNotFindQtPluginError(name) + + +def FindVLCPlugin(name): + for path in VLC_SEARCH_PATH: + if os.path.exists(path): + if os.path.exists(os.path.join(path, name)): + return os.path.join(path, name) + raise CouldNotFindVLCPluginError(name) + +FixBinary(binary) + +for plugin in VLC_PLUGINS: + FixVLCPlugin(FindVLCPlugin(plugin), '.') + +for plugin in TOMAHAWK_PLUGINS: + FixPlugin(plugin, '../MacOS') + +try: + FixPlugin('spotify_tomahawkresolver', '../MacOS') +except: + print 'Failed to find spotify resolver' + +for plugin in QT_PLUGINS: + FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin)) + +if len(sys.argv) <= 2: + print 'Would run %d commands:' % len(commands) + for command in commands: + print ' '.join(command) + + print 'OK?' + raw_input() + +for command in commands: + p = subprocess.Popen(command) + os.waitpid(p.pid, 0) diff --git a/admin/mac/qt.conf b/admin/mac/qt.conf index 1c7b73536..64d729736 100644 --- a/admin/mac/qt.conf +++ b/admin/mac/qt.conf @@ -1,2 +1,2 @@ [Paths] -Plugins = plugins +Plugins = PlugIns diff --git a/src/CMakeLists.osx.txt b/src/CMakeLists.osx.txt index f88939b80..067bf6985 100644 --- a/src/CMakeLists.osx.txt +++ b/src/CMakeLists.osx.txt @@ -49,4 +49,10 @@ if (APPLE) ) ENDIF() FILE( WRITE ${CMAKE_BINARY_DIR}/Info.plist "${edited_plist}" ) + + FILE(COPY ${CMAKE_SOURCE_DIR}/admin/mac/qt.conf + DESTINATION "${CMAKE_BINARY_DIR}/tomahawk.app/Contents/Resources") + FILE(COPY ${CMAKE_SOURCE_DIR}/admin/mac/sparkle_pub.pem + DESTINATION "${CMAKE_BINARY_DIR}/tomahawk.app/Contents/Resources") + endif (APPLE) From 206c21276792bdaa9a34ea261c8e62ef7b399066 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Thu, 11 Aug 2011 16:07:12 -0400 Subject: [PATCH 22/61] Don't install Info.plist at cmake time, as it is only valid for releases --- admin/mac/build-release-osx.sh | 1 + src/CMakeLists.osx.txt | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/admin/mac/build-release-osx.sh b/admin/mac/build-release-osx.sh index 3f8116d3f..7ab75162c 100755 --- a/admin/mac/build-release-osx.sh +++ b/admin/mac/build-release-osx.sh @@ -37,6 +37,7 @@ VERSION=$1 header "Renaming icon" mv Contents/Resources/tomahawkSources.icns Contents/Resources/Tomahawk.icns + cp $ROOT/../admin/mac/Info.plist Contents/Info.plist header "Creating DMG" diff --git a/src/CMakeLists.osx.txt b/src/CMakeLists.osx.txt index 067bf6985..27edb81b8 100644 --- a/src/CMakeLists.osx.txt +++ b/src/CMakeLists.osx.txt @@ -50,8 +50,6 @@ if (APPLE) ENDIF() FILE( WRITE ${CMAKE_BINARY_DIR}/Info.plist "${edited_plist}" ) - FILE(COPY ${CMAKE_SOURCE_DIR}/admin/mac/qt.conf - DESTINATION "${CMAKE_BINARY_DIR}/tomahawk.app/Contents/Resources") FILE(COPY ${CMAKE_SOURCE_DIR}/admin/mac/sparkle_pub.pem DESTINATION "${CMAKE_BINARY_DIR}/tomahawk.app/Contents/Resources") From c8ba2ee1711fc563632962eabfe8c77f24beb97d Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 11 Aug 2011 21:29:16 +0200 Subject: [PATCH 23/61] Revert "Use 512x512 icon on osx as lion has bigger icon previews" This reverts commit b7649a32817056b89ea2f2d97d8cf3a89c09645a. --- CMakeModules/AddAppIconMacro.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeModules/AddAppIconMacro.cmake b/CMakeModules/AddAppIconMacro.cmake index ea65edaa5..37ea17174 100644 --- a/CMakeModules/AddAppIconMacro.cmake +++ b/CMakeModules/AddAppIconMacro.cmake @@ -76,9 +76,9 @@ macro (KDE4_ADD_APP_ICON appsources pattern) file(GLOB_RECURSE files "${pattern}") # we can only test for the 128-icon like that - we don't use patterns anymore foreach (it ${files}) - if (it MATCHES ".*512.*" ) + if (it MATCHES ".*128.*" ) set (_icon ${it}) - endif (it MATCHES ".*512.*") + endif (it MATCHES ".*128.*") endforeach (it) if (_icon) @@ -101,8 +101,8 @@ macro (KDE4_ADD_APP_ICON appsources pattern) set_source_files_properties(${_outfilename}.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources) else(_icon) - # TODO - try to scale a non-512 icon...? Try to convert an SVG on the fly? - message(STATUS "Unable to find an 512x512 icon that matches pattern ${pattern} for variable ${appsources} - application will not have an application icon!") + # TODO - try to scale a non-128 icon...? Try to convert an SVG on the fly? + message(STATUS "Unable to find an 128x128 icon that matches pattern ${pattern} for variable ${appsources} - application will not have an application icon!") endif(_icon) else(SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE) From 0e6c79b92199013748aa3a5f083eddfe89670322 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 10 Aug 2011 21:09:47 +0200 Subject: [PATCH 24/61] auto-expand the local collections on startup --- src/sourcetree/items/collectionitem.cpp | 10 ++++++++++ src/sourcetree/items/collectionitem.h | 2 ++ src/sourcetree/items/sourcetreeitem.cpp | 1 + src/sourcetree/items/sourcetreeitem.h | 1 + src/sourcetree/sourcesmodel.cpp | 7 +++++++ src/sourcetree/sourcesmodel.h | 3 +++ src/sourcetree/sourcesproxymodel.cpp | 12 ++++++++++-- src/sourcetree/sourcesproxymodel.h | 2 ++ src/sourcetree/sourcetreeview.cpp | 8 ++++++++ src/sourcetree/sourcetreeview.h | 2 ++ 10 files changed, 46 insertions(+), 2 deletions(-) diff --git a/src/sourcetree/items/collectionitem.cpp b/src/sourcetree/items/collectionitem.cpp index d3ec1660b..c91c39771 100644 --- a/src/sourcetree/items/collectionitem.cpp +++ b/src/sourcetree/items/collectionitem.cpp @@ -114,6 +114,9 @@ CollectionItem::CollectionItem( SourcesModel* mdl, SourceTreeItem* parent, cons SLOT( onAutoPlaylistsAdded( QList ) ), Qt::QueuedConnection ); connect( source->collection().data(), SIGNAL( stationsAdded( QList ) ), SLOT( onStationsAdded( QList ) ), Qt::QueuedConnection ); + + if ( m_source->isLocal() ) + QTimer::singleShot(0, this, SLOT(requestExpanding())); } @@ -343,6 +346,13 @@ CollectionItem::onStationDeleted( const dynplaylist_ptr& station ) } +void +CollectionItem::requestExpanding() +{ + emit expandRequest(this); +} + + void CollectionItem::tempPageActivated( Tomahawk::ViewPage* v ) { diff --git a/src/sourcetree/items/collectionitem.h b/src/sourcetree/items/collectionitem.h index b92a75e47..5a8b5fb23 100644 --- a/src/sourcetree/items/collectionitem.h +++ b/src/sourcetree/items/collectionitem.h @@ -51,6 +51,8 @@ private slots: void onStationsAdded( const QList& stations ); void onStationDeleted( const Tomahawk::dynplaylist_ptr& stations ); + void requestExpanding(); + void tempPageActivated( Tomahawk::ViewPage* ); Tomahawk::ViewPage* tempItemClicked(); Tomahawk::ViewPage* getTempPage() const; diff --git a/src/sourcetree/items/sourcetreeitem.cpp b/src/sourcetree/items/sourcetreeitem.cpp index c15c33047..5cc9e3f7d 100644 --- a/src/sourcetree/items/sourcetreeitem.cpp +++ b/src/sourcetree/items/sourcetreeitem.cpp @@ -33,6 +33,7 @@ SourceTreeItem::SourceTreeItem( SourcesModel* model, SourceTreeItem* parent, Sou connect( this, SIGNAL( childRowsRemoved() ), m_model, SLOT( onItemRowsRemovedDone() ) ); connect( this, SIGNAL( updated() ), m_model, SLOT( itemUpdated() ) ); connect( this, SIGNAL( selectRequest( SourceTreeItem* ) ), m_model, SLOT( itemSelectRequest( SourceTreeItem* ) ) ); + connect( this, SIGNAL( expandRequest( SourceTreeItem* ) ), m_model, SLOT( itemExpandRequest( SourceTreeItem* ) ) ); if( !m_parent ) return; diff --git a/src/sourcetree/items/sourcetreeitem.h b/src/sourcetree/items/sourcetreeitem.h index 57553988e..bfab5e1b1 100644 --- a/src/sourcetree/items/sourcetreeitem.h +++ b/src/sourcetree/items/sourcetreeitem.h @@ -63,6 +63,7 @@ public: signals: void updated(); void selectRequest( SourceTreeItem* ); + void expandRequest( SourceTreeItem* ); void beginChildRowsAdded( int fromRow, int toRow ); void childRowsAdded(); diff --git a/src/sourcetree/sourcesmodel.cpp b/src/sourcetree/sourcesmodel.cpp index 7330c53c1..8c99f5702 100644 --- a/src/sourcetree/sourcesmodel.cpp +++ b/src/sourcetree/sourcesmodel.cpp @@ -493,3 +493,10 @@ SourcesModel::itemSelectRequest( SourceTreeItem* item ) { emit selectRequest( indexFromItem( item ) ); } + +void +SourcesModel::itemExpandRequest( SourceTreeItem *item ) +{ + qDebug() << "expanding source" << indexFromItem( item ) << item; + emit expandRequest( indexFromItem( item ) ); +} diff --git a/src/sourcetree/sourcesmodel.h b/src/sourcetree/sourcesmodel.h index 94ca4008c..cfcb62776 100644 --- a/src/sourcetree/sourcesmodel.h +++ b/src/sourcetree/sourcesmodel.h @@ -102,8 +102,11 @@ public slots: void viewPageActivated( Tomahawk::ViewPage* ); void itemSelectRequest( SourceTreeItem* item ); + void itemExpandRequest( SourceTreeItem* item ); + signals: void selectRequest( const QModelIndex& idx ); + void expandRequest( const QModelIndex& idx ); private slots: void onSourcesAdded( const QList& sources ); diff --git a/src/sourcetree/sourcesproxymodel.cpp b/src/sourcetree/sourcesproxymodel.cpp index 6fe6c3bcb..93ec73b64 100644 --- a/src/sourcetree/sourcesproxymodel.cpp +++ b/src/sourcetree/sourcesproxymodel.cpp @@ -37,8 +37,8 @@ SourcesProxyModel::SourcesProxyModel( SourcesModel* model, QObject* parent ) setSourceModel( model ); - if ( model && model->metaObject()->indexOfSignal( "trackCountChanged(QModelIndex)" ) > -1 ) - connect( model, SIGNAL( askForExpand( QModelIndex ) ), this, SLOT( askedToExpand( QModelIndex ) ) ); + if ( model && model->metaObject()->indexOfSignal( "expandRequest(QModelIndex)" ) > -1 ) + connect( model, SIGNAL( expandRequest( QModelIndex ) ), this, SLOT( expandRequested( QModelIndex ) ) ); if ( model && model->metaObject()->indexOfSignal( "selectRequest(QModelIndex)" ) > -1 ) connect( model, SIGNAL( selectRequest( QModelIndex ) ), this, SLOT( selectRequested( QModelIndex ) ) ); } @@ -73,6 +73,14 @@ SourcesProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex& sourcePar void SourcesProxyModel::selectRequested( const QModelIndex& idx ) { + qDebug() << "selectRequested for idx" << idx << idx.data(Qt::DisplayRole).toString() << mapFromSource( idx ); emit selectRequest( mapFromSource( idx ) ); } +void +SourcesProxyModel::expandRequested( const QModelIndex& idx ) +{ + qDebug() << "emitting expand for idx" << idx << idx.data(Qt::DisplayRole).toString() << mapFromSource( idx ); + emit expandRequest( mapFromSource( idx ) ); +} + diff --git a/src/sourcetree/sourcesproxymodel.h b/src/sourcetree/sourcesproxymodel.h index 4599d8c5c..65e3198d8 100644 --- a/src/sourcetree/sourcesproxymodel.h +++ b/src/sourcetree/sourcesproxymodel.h @@ -34,9 +34,11 @@ public slots: void showOfflineSources( bool offlineSourcesShown ); void selectRequested( const QModelIndex& ); + void expandRequested( const QModelIndex& ); signals: void selectRequest( const QModelIndex& idx ); + void expandRequest( const QModelIndex& idx ); protected: bool filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent ) const; diff --git a/src/sourcetree/sourcetreeview.cpp b/src/sourcetree/sourcetreeview.cpp index b7f4226d9..4acbf7f56 100644 --- a/src/sourcetree/sourcetreeview.cpp +++ b/src/sourcetree/sourcetreeview.cpp @@ -108,6 +108,7 @@ SourceTreeView::SourceTreeView( QWidget* parent ) m_model = new SourcesModel( this ); m_proxyModel = new SourcesProxyModel( m_model, this ); connect( m_proxyModel, SIGNAL( selectRequest( QModelIndex ) ), this, SLOT( selectRequest( QModelIndex ) ), Qt::QueuedConnection ); + connect( m_proxyModel, SIGNAL( expandRequest( QModelIndex ) ), this, SLOT( expandRequest( QModelIndex ) ), Qt::QueuedConnection ); setModel( m_proxyModel ); @@ -246,6 +247,13 @@ SourceTreeView::selectRequest( const QModelIndex& idx ) } } +void +SourceTreeView::expandRequest( const QModelIndex &idx ) +{ + qDebug() << "Expanding idx" << idx; + expand( idx ); +} + void SourceTreeView::loadPlaylist() diff --git a/src/sourcetree/sourcetreeview.h b/src/sourcetree/sourcetreeview.h index 0e62deab6..3566895ff 100644 --- a/src/sourcetree/sourcetreeview.h +++ b/src/sourcetree/sourcetreeview.h @@ -49,6 +49,7 @@ private slots: void onItemExpanded( const QModelIndex& idx ); void onItemActivated( const QModelIndex& index ); void selectRequest( const QModelIndex& idx ); + void expandRequest( const QModelIndex& idx ); void loadPlaylist(); void deletePlaylist( const QModelIndex& = QModelIndex() ); @@ -73,6 +74,7 @@ protected: private: void setupMenus(); + int totalSize(const QModelIndex &parentIndex); template< typename T > T* itemFromIndex( const QModelIndex& index ) const; From eda589301256b4c33939ebc5380dc30accf571e2 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 11 Aug 2011 23:59:11 +0200 Subject: [PATCH 25/61] removed unused function --- src/sourcetree/sourcetreeview.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/sourcetree/sourcetreeview.h b/src/sourcetree/sourcetreeview.h index 3566895ff..15c8276f9 100644 --- a/src/sourcetree/sourcetreeview.h +++ b/src/sourcetree/sourcetreeview.h @@ -74,7 +74,6 @@ protected: private: void setupMenus(); - int totalSize(const QModelIndex &parentIndex); template< typename T > T* itemFromIndex( const QModelIndex& index ) const; From c99fff2b16afad932b1c7ef52ce3318df7aa5014 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Thu, 11 Aug 2011 18:05:58 -0400 Subject: [PATCH 26/61] Polish up the playlist widget a whole bunch. TWK-348 --- .../playlist/dynamic/DynamicPlaylist.h | 2 ++ .../dynamic/widgets/DynamicWidget.cpp | 11 ++++++++ .../playlist/dynamic/widgets/DynamicWidget.h | 2 +- .../widgets/welcomeplaylistmodel.cpp | 26 ++++++++++++++++++- .../widgets/welcomeplaylistmodel.h | 4 ++- src/libtomahawk/widgets/welcomewidget.cpp | 25 ++++++++++++++++-- src/libtomahawk/widgets/welcomewidget.h | 4 ++- src/sourcetree/items/collectionitem.cpp | 2 ++ src/sourcetree/items/collectionitem.h | 2 ++ src/sourcetree/items/genericpageitems.cpp | 2 ++ src/sourcetree/items/genericpageitems.h | 2 ++ src/sourcetree/items/playlistitems.cpp | 3 +++ src/sourcetree/items/playlistitems.h | 2 ++ src/sourcetree/items/sourcetreeitem.cpp | 2 ++ src/sourcetree/items/sourcetreeitem.h | 2 ++ src/sourcetree/sourcesproxymodel.cpp | 2 +- src/sourcetree/sourcesproxymodel.h | 2 +- 17 files changed, 87 insertions(+), 8 deletions(-) diff --git a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.h b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.h index 63e29e9fe..35ed57ed9 100644 --- a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.h +++ b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.h @@ -219,4 +219,6 @@ private: }; // namespace +Q_DECLARE_METATYPE( QSharedPointer< Tomahawk::DynamicPlaylist > ) + #endif diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp index 9fa4d0e24..23cfa14a9 100644 --- a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp +++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp @@ -427,6 +427,17 @@ DynamicWidget::paintRoundedFilledRect( QPainter& p, QPalette& pal, QRect& r, qre p.drawRoundedRect( r, 10, 10 ); } +QPixmap +DynamicWidget::pixmap() const +{ + if ( m_playlist->mode() == OnDemand ) + return QPixmap( RESPATH "images/station.png" ); + else if ( m_playlist->mode() == Static ) + return QPixmap( RESPATH "images/automatic-playlist.png" ); + else + return QPixmap(); +} + bool DynamicWidget::jumpToCurrentTrack() diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.h b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.h index 31f1040a3..26f61baae 100644 --- a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.h +++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.h @@ -77,7 +77,7 @@ public: virtual QString title() const { return m_model->title(); } virtual QString description() const { return m_model->description(); } - virtual QPixmap pixmap() const { return QPixmap( RESPATH "images/playlist-icon.png" ); } + virtual QPixmap pixmap() const; virtual bool jumpToCurrentTrack(); diff --git a/src/libtomahawk/widgets/welcomeplaylistmodel.cpp b/src/libtomahawk/widgets/welcomeplaylistmodel.cpp index fe855885c..e2946fc27 100644 --- a/src/libtomahawk/widgets/welcomeplaylistmodel.cpp +++ b/src/libtomahawk/widgets/welcomeplaylistmodel.cpp @@ -110,8 +110,32 @@ WelcomePlaylistModel::data( const QModelIndex& index, int role ) const return m_artists[pl]; } + case PlaylistTypeRole: + { + if ( !pl.dynamicCast< Tomahawk::DynamicPlaylist >().isNull() ) + { + dynplaylist_ptr dynp = pl.dynamicCast< Tomahawk::DynamicPlaylist >(); + if ( dynp->mode() == Static ) + return AutoPlaylist; + else if ( dynp->mode() == OnDemand ) + return Station; + } else + { + return StaticPlaylist; + } + } + case DynamicPlaylistRole: + { + dynplaylist_ptr dynp = pl.dynamicCast< Tomahawk::DynamicPlaylist >(); + return QVariant::fromValue< Tomahawk::dynplaylist_ptr >( dynp ); + } case TrackCountRole: - return pl->entries().count(); + { + if ( !pl.dynamicCast< Tomahawk::DynamicPlaylist >().isNull() ) + return QString( QChar( 0x221E ) ); + else + return pl->entries().count(); + } default: return QVariant(); } diff --git a/src/libtomahawk/widgets/welcomeplaylistmodel.h b/src/libtomahawk/widgets/welcomeplaylistmodel.h index b979dfc95..ef075510b 100644 --- a/src/libtomahawk/widgets/welcomeplaylistmodel.h +++ b/src/libtomahawk/widgets/welcomeplaylistmodel.h @@ -30,7 +30,9 @@ class WelcomePlaylistModel : public QAbstractListModel Q_OBJECT public: enum ItemRoles - { ArtistRole = Qt::UserRole, TrackCountRole, PlaylistRole }; + { ArtistRole = Qt::UserRole, TrackCountRole, PlaylistRole, PlaylistTypeRole, DynamicPlaylistRole }; + enum PlaylistTypes + { StaticPlaylist, AutoPlaylist, Station }; explicit WelcomePlaylistModel( QObject* parent = 0 ); diff --git a/src/libtomahawk/widgets/welcomewidget.cpp b/src/libtomahawk/widgets/welcomewidget.cpp index 5bf94cb74..51db3b8f8 100644 --- a/src/libtomahawk/widgets/welcomewidget.cpp +++ b/src/libtomahawk/widgets/welcomewidget.cpp @@ -32,6 +32,7 @@ #include "widgets/overlaywidget.h" #include "utils/tomahawkutils.h" #include "utils/logger.h" +#include #define HISTORY_TRACK_ITEMS 25 #define HISTORY_PLAYLIST_ITEMS 5 @@ -222,9 +223,29 @@ PlaylistDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, QFont italicFont = opt.font; italicFont.setItalic( true ); - painter->drawPixmap( option.rect.adjusted( 10, 13, -option.rect.width() + 48, -13 ), m_playlistIcon ); + QPixmap icon; + WelcomePlaylistModel::PlaylistTypes type = (WelcomePlaylistModel::PlaylistTypes)index.data( WelcomePlaylistModel::PlaylistTypeRole ).toInt(); + if( type == WelcomePlaylistModel::StaticPlaylist ) + icon = m_playlistIcon; + else if( type == WelcomePlaylistModel::AutoPlaylist ) + icon = m_autoIcon; + else if( type == WelcomePlaylistModel::Station ) + icon = m_stationIcon; - painter->drawText( option.rect.adjusted( 56, 26, -100, -8 ), index.data( WelcomePlaylistModel::ArtistRole ).toString() ); + QRect pixmapRect = option.rect.adjusted( 10, 13, -option.rect.width() + 48, -13 ); + icon = icon.scaled( pixmapRect.size(), Qt::KeepAspectRatio, Qt::SmoothTransformation ); + + painter->drawPixmap( pixmapRect, icon ); + + QString descText; + if ( type == WelcomePlaylistModel::Station ) + { + descText = index.data( WelcomePlaylistModel::DynamicPlaylistRole ).value< Tomahawk::dynplaylist_ptr >()->generator()->sentenceSummary(); + } else + { + descText = index.data( WelcomePlaylistModel::ArtistRole ).toString(); + } + painter->drawText( option.rect.adjusted( 56, 26, -100, -8 ), descText ); QString trackCount = tr( "%1 tracks" ).arg( index.data( WelcomePlaylistModel::TrackCountRole ).toString() ); painter->drawText( option.rect.adjusted( option.rect.width() - 96, 12, 0, -2 - opt.rect.height() / 2 ), trackCount, to ); diff --git a/src/libtomahawk/widgets/welcomewidget.h b/src/libtomahawk/widgets/welcomewidget.h index 8889cc76a..0f4de5c69 100644 --- a/src/libtomahawk/widgets/welcomewidget.h +++ b/src/libtomahawk/widgets/welcomewidget.h @@ -50,6 +50,8 @@ public: PlaylistDelegate() { m_playlistIcon = QPixmap( RESPATH "images/playlist-icon.png" ); + m_autoIcon = QPixmap( RESPATH "images/automatic-playlist.png" ); + m_stationIcon = QPixmap( RESPATH "images/station.png" ); } protected: @@ -57,7 +59,7 @@ protected: QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const; private: - QPixmap m_playlistIcon; + QPixmap m_playlistIcon, m_autoIcon, m_stationIcon; }; class DLLEXPORT PlaylistWidget : public QListView diff --git a/src/sourcetree/items/collectionitem.cpp b/src/sourcetree/items/collectionitem.cpp index c91c39771..44e57ddfd 100644 --- a/src/sourcetree/items/collectionitem.cpp +++ b/src/sourcetree/items/collectionitem.cpp @@ -1,4 +1,6 @@ /* + * Copyright 2010-2011, Leo Franchi + * * 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 * the Free Software Foundation; either version 2 of the License, or diff --git a/src/sourcetree/items/collectionitem.h b/src/sourcetree/items/collectionitem.h index 5a8b5fb23..15fae1456 100644 --- a/src/sourcetree/items/collectionitem.h +++ b/src/sourcetree/items/collectionitem.h @@ -1,4 +1,6 @@ /* + * Copyright 2010-2011, Leo Franchi + * * 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 * the Free Software Foundation; either version 2 of the License, or diff --git a/src/sourcetree/items/genericpageitems.cpp b/src/sourcetree/items/genericpageitems.cpp index c37a6aa67..86211dea7 100644 --- a/src/sourcetree/items/genericpageitems.cpp +++ b/src/sourcetree/items/genericpageitems.cpp @@ -1,4 +1,6 @@ /* + * Copyright 2010-2011, Leo Franchi + * * 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 * the Free Software Foundation; either version 2 of the License, or diff --git a/src/sourcetree/items/genericpageitems.h b/src/sourcetree/items/genericpageitems.h index 378224bb1..2b2609ea9 100644 --- a/src/sourcetree/items/genericpageitems.h +++ b/src/sourcetree/items/genericpageitems.h @@ -1,4 +1,6 @@ /* + * Copyright 2010-2011, Leo Franchi + * * 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 * the Free Software Foundation; either version 2 of the License, or diff --git a/src/sourcetree/items/playlistitems.cpp b/src/sourcetree/items/playlistitems.cpp index 2146c9f37..ee7976892 100644 --- a/src/sourcetree/items/playlistitems.cpp +++ b/src/sourcetree/items/playlistitems.cpp @@ -1,4 +1,7 @@ /* + * + * Copyright 2010-2011, Leo Franchi + * * 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 * the Free Software Foundation; either version 2 of the License, or diff --git a/src/sourcetree/items/playlistitems.h b/src/sourcetree/items/playlistitems.h index 1c3e9d463..7ae0d8a96 100644 --- a/src/sourcetree/items/playlistitems.h +++ b/src/sourcetree/items/playlistitems.h @@ -1,4 +1,6 @@ /* + * Copyright 2010-2011, Leo Franchi + * * 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 * the Free Software Foundation; either version 2 of the License, or diff --git a/src/sourcetree/items/sourcetreeitem.cpp b/src/sourcetree/items/sourcetreeitem.cpp index 5cc9e3f7d..5f82833c3 100644 --- a/src/sourcetree/items/sourcetreeitem.cpp +++ b/src/sourcetree/items/sourcetreeitem.cpp @@ -1,4 +1,6 @@ /* + Copyright 2010-2011, Leo Franchi + 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 the Free Software Foundation; either version 2 of the License, or diff --git a/src/sourcetree/items/sourcetreeitem.h b/src/sourcetree/items/sourcetreeitem.h index bfab5e1b1..b8b971172 100644 --- a/src/sourcetree/items/sourcetreeitem.h +++ b/src/sourcetree/items/sourcetreeitem.h @@ -1,4 +1,6 @@ /* + Copyright 2010-2011, Leo Franchi + 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 the Free Software Foundation; either version 2 of the License, or diff --git a/src/sourcetree/sourcesproxymodel.cpp b/src/sourcetree/sourcesproxymodel.cpp index 93ec73b64..b449455cc 100644 --- a/src/sourcetree/sourcesproxymodel.cpp +++ b/src/sourcetree/sourcesproxymodel.cpp @@ -1,6 +1,6 @@ /* === This file is part of Tomahawk Player - === * - * Copyright 2010-2011, Christian Muehlhaeuser + * Copyright 2010-2011, Leo Franchi * * Tomahawk is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/sourcetree/sourcesproxymodel.h b/src/sourcetree/sourcesproxymodel.h index 65e3198d8..57917d815 100644 --- a/src/sourcetree/sourcesproxymodel.h +++ b/src/sourcetree/sourcesproxymodel.h @@ -1,6 +1,6 @@ /* === This file is part of Tomahawk Player - === * - * Copyright 2010-2011, Christian Muehlhaeuser + * Copyright 2010-2011, Leo Franchi * * Tomahawk is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by From a9c0d5f8208033df99a6b98af79e61c9d997cff0 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Thu, 11 Aug 2011 18:10:55 -0400 Subject: [PATCH 27/61] only show infinity icon for stations, not auto playlists --- src/libtomahawk/widgets/welcomeplaylistmodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libtomahawk/widgets/welcomeplaylistmodel.cpp b/src/libtomahawk/widgets/welcomeplaylistmodel.cpp index e2946fc27..478d85550 100644 --- a/src/libtomahawk/widgets/welcomeplaylistmodel.cpp +++ b/src/libtomahawk/widgets/welcomeplaylistmodel.cpp @@ -131,7 +131,7 @@ WelcomePlaylistModel::data( const QModelIndex& index, int role ) const } case TrackCountRole: { - if ( !pl.dynamicCast< Tomahawk::DynamicPlaylist >().isNull() ) + if ( !pl.dynamicCast< Tomahawk::DynamicPlaylist >().isNull() && pl.dynamicCast< Tomahawk::DynamicPlaylist >()->mode() == OnDemand ) return QString( QChar( 0x221E ) ); else return pl->entries().count(); From 11f7f4a25e03cf8a3f45fb6818deea7c718890fc Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Thu, 11 Aug 2011 18:24:39 -0400 Subject: [PATCH 28/61] re-enable avatars in recently played tracks list, as per TWK-346 --- src/libtomahawk/playlist/playlistitemdelegate.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libtomahawk/playlist/playlistitemdelegate.cpp b/src/libtomahawk/playlist/playlistitemdelegate.cpp index 3b0a653f5..88056189b 100644 --- a/src/libtomahawk/playlist/playlistitemdelegate.cpp +++ b/src/libtomahawk/playlist/playlistitemdelegate.cpp @@ -184,7 +184,7 @@ PlaylistItemDelegate::paintShort( QPainter* painter, const QStyleOptionViewItem& else lowerText = QString( "played %1 ago by %2" ).arg( playtime ).arg( source->friendlyName() ); -// pixmap = source->avatar(); + pixmap = source->avatar(); } if ( pixmap.isNull() ) From 2a061b5bf18382e2b4f81595e3b6264eb640652d Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Thu, 11 Aug 2011 18:37:31 -0400 Subject: [PATCH 29/61] change Recently Played for super collection to Dashboard --- resources.qrc | 1 + src/sourcetree/items/collectionitem.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/resources.qrc b/resources.qrc index 56f3e53c0..977d1dfff 100644 --- a/resources.qrc +++ b/resources.qrc @@ -86,6 +86,7 @@ data/images/station.png data/images/new-additions.png data/images/loved_playlist.png + data/images/dashboard.png data/stylesheets/topbar-radiobuttons.css data/icons/tomahawk-icon-16x16.png data/icons/tomahawk-icon-32x32.png diff --git a/src/sourcetree/items/collectionitem.cpp b/src/sourcetree/items/collectionitem.cpp index 44e57ddfd..12f2a976c 100644 --- a/src/sourcetree/items/collectionitem.cpp +++ b/src/sourcetree/items/collectionitem.cpp @@ -58,7 +58,7 @@ CollectionItem::CollectionItem( SourcesModel* mdl, SourceTreeItem* parent, cons connect( ViewManager::instance(), SIGNAL( tempPageActivated( Tomahawk::ViewPage*) ), this, SLOT( tempPageActivated( Tomahawk::ViewPage* ) ) ); // add misc children of root node - GenericPageItem* recent = new GenericPageItem( model(), this, tr( "Recently Played" ), QIcon( RESPATH "images/recently-played.png" ), + GenericPageItem* recent = new GenericPageItem( model(), this, tr( "Dashboard" ), QIcon( RESPATH "images/dashboard.png" ), boost::bind( &ViewManager::showWelcomePage, ViewManager::instance() ), boost::bind( &ViewManager::welcomeWidget, ViewManager::instance() ) ); From 78d867b16f52ae311c900fc2996decc203906796 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Thu, 11 Aug 2011 20:37:17 -0400 Subject: [PATCH 30/61] add rdio link parsing --- src/libtomahawk/CMakeLists.txt | 2 + src/libtomahawk/globalactionmanager.cpp | 21 ++++- src/libtomahawk/utils/rdioparser.cpp | 101 ++++++++++++++++++++++ src/libtomahawk/utils/rdioparser.h | 62 +++++++++++++ src/libtomahawk/widgets/welcomewidget.cpp | 3 +- 5 files changed, 185 insertions(+), 4 deletions(-) create mode 100644 src/libtomahawk/utils/rdioparser.cpp create mode 100644 src/libtomahawk/utils/rdioparser.h diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index 574c29ad5..b9b740b97 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -173,6 +173,7 @@ set( libSources utils/xspfgenerator.cpp utils/jspfloader.cpp utils/spotifyparser.cpp + utils/rdioparser.cpp utils/shortenedlinkparser.cpp widgets/newplaylistwidget.cpp @@ -352,6 +353,7 @@ set( libHeaders utils/xspfgenerator.h utils/jspfloader.h utils/spotifyparser.h + utils/rdioparser.h utils/shortenedlinkparser.h widgets/newplaylistwidget.h diff --git a/src/libtomahawk/globalactionmanager.cpp b/src/libtomahawk/globalactionmanager.cpp index 5b79b9c3a..ffd7fd253 100644 --- a/src/libtomahawk/globalactionmanager.cpp +++ b/src/libtomahawk/globalactionmanager.cpp @@ -46,6 +46,7 @@ #include "utils/jspfloader.h" #include "utils/spotifyparser.h" #include "utils/shortenedlinkparser.h" +#include "utils/rdioparser.h" GlobalActionManager* GlobalActionManager::s_instance = 0; @@ -791,9 +792,14 @@ GlobalActionManager::acceptsMimeData( const QMimeData* data, bool tracksOnly ) // crude check for spotify tracks if ( data->hasFormat( "text/plain" ) && data->data( "text/plain" ).contains( "spotify" ) && - ( tracksOnly ? data->data( "text/plain" ).contains( "track" ) : true ) ) + ( tracksOnly ? data->data( "text/plain" ).contains( "track" ) : true ) ) return true; + // crude check for rdio tracks + if ( data->hasFormat( "text/plain" ) && data->data( "text/plain" ).contains( "rdio.com" ) && + ( tracksOnly ? data->data( "text/plain" ).contains( "track" ) : true ) ) + return true; + // We whitelist t.co and bit.ly (and j.mp) since they do some link checking. Often playable (e.g. spotify..) links hide behind them, // so we do an extra level of lookup if ( ( data->hasFormat( "text/plain" ) && data->data( "text/plain" ).contains( "bit.ly" ) ) || @@ -831,6 +837,14 @@ GlobalActionManager::handleTrackUrls( const QString& urls ) tDebug() << "Got a list of spotify urls!" << tracks; SpotifyParser* spot = new SpotifyParser( tracks, this ); connect( spot, SIGNAL( tracks( QList ) ), this, SIGNAL( tracks( QList ) ) ); + } else if ( urls.contains( "rdio.com" ) ) + { + QStringList tracks = urls.split( "\n" ); + + tDebug() << "Got a list of rdio urls!" << tracks; + RdioParser* rdio = new RdioParser( this ); + connect( rdio, SIGNAL( tracks( QList ) ), this, SIGNAL( tracks( QList ) ) ); + rdio->parse( tracks ); } else if ( urls.contains( "bit.ly" ) || urls.contains( "j.mp" ) || urls.contains( "t.co" ) ) @@ -913,8 +927,9 @@ GlobalActionManager::openSpotifyLink( const QString& link ) bool GlobalActionManager::openRdioLink( const QString& link ) { -// RdioParser* rdio = new RdioParser( link, this ); -// connect( spot, SIGNAL( track( Tomahawk::query_ptr ) ), this, SLOT( handleOpenTrack( Tomahawk::query_ptr ) ) ); + RdioParser* rdio = new RdioParser( this ); + connect( rdio, SIGNAL( track( Tomahawk::query_ptr ) ), this, SLOT( handleOpenTrack( Tomahawk::query_ptr ) ) ); + rdio->parse( link ); return true; } diff --git a/src/libtomahawk/utils/rdioparser.cpp b/src/libtomahawk/utils/rdioparser.cpp new file mode 100644 index 000000000..a10ab2462 --- /dev/null +++ b/src/libtomahawk/utils/rdioparser.cpp @@ -0,0 +1,101 @@ +/* === This file is part of Tomahawk Player - === + * + * Copyright 2010-2011, Leo Franchi + * + * 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 "rdioparser.h" + +#include +#include + +using namespace Tomahawk; + +RdioParser::RdioParser( QObject* parent ) + : QObject( parent ) + , m_count( 0 ) +{ +} + +RdioParser::~RdioParser() +{ +} + +void +RdioParser::parse( const QString& url ) +{ + m_multi = false; + m_total = 1; + parseUrl( url ); +} + +void +RdioParser::parse( const QStringList& urls ) +{ + m_multi = true; + m_total = urls.count(); + + foreach( const QString& url, urls ) + parseUrl( url ); +} + + +void +RdioParser::parseUrl( const QString& url ) +{ + query_ptr query; + m_count++; + + if ( url.contains( "artist" ) && url.contains( "album" ) ) + { + // this is a "full" url, no redirection needed + QString realUrl = QUrl::fromUserInput( url ).toString().replace( "_", " " ); + + QString artist, trk, album; + QString matchStr = "/%1/([^/]*)/"; + QRegExp r( QString( matchStr ).arg( "artist" ) ); + + int loc = r.indexIn( realUrl ); + if ( loc >= 0 ) + artist = r.cap( 1 ); + + r = QRegExp( QString( matchStr ).arg( "album" ) ); + loc = r.indexIn( realUrl ); + if ( loc >= 0 ) + album = r.cap( 1 ); + + r = QRegExp( QString( matchStr ).arg( "track" ) ); + loc = r.indexIn( realUrl ); + if ( loc >= 0 ) + trk = r.cap( 1 ); + + if ( !trk.isEmpty() && !artist.isEmpty() ) + { + query = Query::get( artist, trk, album, uuid(), true ); + } + } + + if ( m_multi ) + { + if ( !query.isNull() ) + m_queries << query; + + if ( m_count == m_total ) + emit tracks( m_queries ); + } + if ( !m_multi && !query.isNull() ) + emit track( query ); +} + diff --git a/src/libtomahawk/utils/rdioparser.h b/src/libtomahawk/utils/rdioparser.h new file mode 100644 index 000000000..8d2cece5b --- /dev/null +++ b/src/libtomahawk/utils/rdioparser.h @@ -0,0 +1,62 @@ +/* === This file is part of Tomahawk Player - === + * + * Copyright 2010-2011, Leo Franchi + * + * 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 RDIOPARSER_H +#define RDIOPARSER_H + +#include +#include + +#include "query.h" +#include "source.h" + +class QNetworkReply; +namespace Tomahawk +{ + +/** + * Small class to parse spotify links into query_ptrs + * + * Connect to the signals to get the results + */ + +class RdioParser : public QObject +{ + Q_OBJECT +public: + explicit RdioParser( QObject* parent = 0 ); + virtual ~RdioParser(); + + void parse( const QString& url ); + void parse( const QStringList& urls ); + +signals: + void track( const Tomahawk::query_ptr& track ); + void tracks( const QList< Tomahawk::query_ptr > tracks ); + +private: + void parseUrl( const QString& url ); + + bool m_multi; + int m_count, m_total; + QList< query_ptr > m_queries; +}; + +} + +#endif // RDIOPARSER_H diff --git a/src/libtomahawk/widgets/welcomewidget.cpp b/src/libtomahawk/widgets/welcomewidget.cpp index 51db3b8f8..44757c076 100644 --- a/src/libtomahawk/widgets/welcomewidget.cpp +++ b/src/libtomahawk/widgets/welcomewidget.cpp @@ -245,7 +245,8 @@ PlaylistDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, { descText = index.data( WelcomePlaylistModel::ArtistRole ).toString(); } - painter->drawText( option.rect.adjusted( 56, 26, -100, -8 ), descText ); + painter->setFont( italicFont ); + painter->drawText( option.rect.adjusted( 66, 26, -100, -8 ), descText ); QString trackCount = tr( "%1 tracks" ).arg( index.data( WelcomePlaylistModel::TrackCountRole ).toString() ); painter->drawText( option.rect.adjusted( option.rect.width() - 96, 12, 0, -2 - opt.rect.height() / 2 ), trackCount, to ); From 595d0cf9879349d64bb13d7682d5ebd31a8875cb Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Thu, 11 Aug 2011 21:11:59 -0400 Subject: [PATCH 31/61] Update playlists when revision info comes in --- .../widgets/welcomeplaylistmodel.cpp | 22 +++++++++++++++++++ .../widgets/welcomeplaylistmodel.h | 1 + 2 files changed, 23 insertions(+) diff --git a/src/libtomahawk/widgets/welcomeplaylistmodel.cpp b/src/libtomahawk/widgets/welcomeplaylistmodel.cpp index 478d85550..fbb8fcacf 100644 --- a/src/libtomahawk/widgets/welcomeplaylistmodel.cpp +++ b/src/libtomahawk/widgets/welcomeplaylistmodel.cpp @@ -70,7 +70,13 @@ WelcomePlaylistModel::loadFromSettings() m_recplaylists << pl; if( !m_cached.contains( playlist_guids[i] ) ) + { + if ( pl.dynamicCast< DynamicPlaylist >().isNull() ) + connect( pl.data(), SIGNAL(revisionLoaded(Tomahawk::PlaylistRevision)), this, SLOT(playlistRevisionLoaded()) ); + else + connect( pl.data(), SIGNAL(dynamicRevisionLoaded(Tomahawk::DynamicPlaylistRevision)), this, SLOT(playlistRevisionLoaded()) ); m_cached[playlist_guids[i]] = pl; + } } else m_waitingForSome = true; } @@ -141,6 +147,22 @@ WelcomePlaylistModel::data( const QModelIndex& index, int role ) const } } +void +WelcomePlaylistModel::playlistRevisionLoaded() +{ + Playlist* p = qobject_cast< Playlist* >( sender() ); + Q_ASSERT( p ); + + for ( int i = 0; i < m_recplaylists.size(); i++ ) + { + if ( m_recplaylists[ i ]->guid() == p->guid() ) + { + QModelIndex idx = index( i, 0, QModelIndex() ); + emit dataChanged( idx, idx ); + } + } +} + void WelcomePlaylistModel::onSourceAdded( const Tomahawk::source_ptr& source ) diff --git a/src/libtomahawk/widgets/welcomeplaylistmodel.h b/src/libtomahawk/widgets/welcomeplaylistmodel.h index ef075510b..08d8ffcc6 100644 --- a/src/libtomahawk/widgets/welcomeplaylistmodel.h +++ b/src/libtomahawk/widgets/welcomeplaylistmodel.h @@ -51,6 +51,7 @@ private slots: void loadFromSettings(); void plAdded( const Tomahawk::playlist_ptr& ); + void playlistRevisionLoaded(); private: QList< Tomahawk::playlist_ptr > m_recplaylists; From 91525bf5d90c4a798d9b713850b3f04a7fed8124 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Thu, 11 Aug 2011 21:19:57 -0400 Subject: [PATCH 32/61] reload top loved tracks playlist with love by local source as well --- src/libtomahawk/playlist/customplaylistview.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libtomahawk/playlist/customplaylistview.cpp b/src/libtomahawk/playlist/customplaylistview.cpp index 7c262d8af..d2306f4dd 100644 --- a/src/libtomahawk/playlist/customplaylistview.cpp +++ b/src/libtomahawk/playlist/customplaylistview.cpp @@ -43,6 +43,7 @@ CustomPlaylistView::CustomPlaylistView( CustomPlaylistView::PlaylistType type, c connect( m_source.data(), SIGNAL( socialAttributesChanged() ), this, SLOT( reload() ) ); else if ( m_type == AllLovedTracks ) { + connect( SourceList::instance()->getLocal().data(), SIGNAL( socialAttributesChanged() ), this, SLOT( reload() ) ); foreach ( const source_ptr& s, SourceList::instance()->sources( true ) ) connect( s.data(), SIGNAL( socialAttributesChanged() ), this, SLOT( reload() ) ); From 53f812ed42ca2252fc891e4befb193aa4de01dd7 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 11 Aug 2011 23:41:05 +0200 Subject: [PATCH 33/61] * Used tLog() instead of qDebug() for jabber errors. --- src/sip/jabber/jabber.cpp | 6 ++++++ src/sip/jabber/jabber.h | 5 +---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/sip/jabber/jabber.cpp b/src/sip/jabber/jabber.cpp index 6cc138aa2..9434dc1b4 100644 --- a/src/sip/jabber/jabber.cpp +++ b/src/sip/jabber/jabber.cpp @@ -325,6 +325,12 @@ JabberPlugin::onDisconnect( Jreen::Client::DisconnectReason reason ) } } +void +JabberPlugin::onError( const Jreen::Connection::SocketError& e ) +{ + tLog() << "JABBER error:" << e; +} + QString JabberPlugin::errorMessage( Jreen::Client::DisconnectReason reason ) { diff --git a/src/sip/jabber/jabber.h b/src/sip/jabber/jabber.h index 1d12bb7de..101ac5c15 100644 --- a/src/sip/jabber/jabber.h +++ b/src/sip/jabber/jabber.h @@ -111,10 +111,7 @@ private slots: void onSubscriptionRequestConfirmed( int result ); void onNewMessage( const Jreen::Message& message ); - void onError( const Jreen::Connection::SocketError& e ) - { - qDebug() << e; - } + void onError( const Jreen::Connection::SocketError& e ); void onNewIq( const Jreen::IQ &iq ); void onNewAvatar( const QString &jid ); void onCheckJidExists( QString jid ); From 744f31bb45dd0b24653b51ab157b1307d59c6a94 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Fri, 12 Aug 2011 03:17:36 +0200 Subject: [PATCH 34/61] Added almost-finished AlbumInfoWidget. --- src/libtomahawk/CMakeLists.txt | 3 + src/libtomahawk/viewmanager.cpp | 21 +-- src/libtomahawk/viewmanager.h | 3 +- .../widgets/infowidgets/AlbumInfoWidget.cpp | 171 ++++++++++++++++++ .../widgets/infowidgets/AlbumInfoWidget.h | 108 +++++++++++ .../widgets/infowidgets/AlbumInfoWidget.ui | 55 ++++++ .../widgets/infowidgets/ArtistInfoWidget.cpp | 15 +- .../widgets/infowidgets/ArtistInfoWidget.h | 3 +- src/libtomahawk/widgets/welcomewidget.cpp | 1 + 9 files changed, 351 insertions(+), 29 deletions(-) create mode 100644 src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp create mode 100644 src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h create mode 100644 src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index b9b740b97..907be5b56 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -186,6 +186,7 @@ set( libSources widgets/SocialPlaylistWidget.cpp widgets/infowidgets/sourceinfowidget.cpp widgets/infowidgets/ArtistInfoWidget.cpp + widgets/infowidgets/AlbumInfoWidget.cpp kdsingleapplicationguard/kdsingleapplicationguard.cpp kdsingleapplicationguard/kdsharedmemorylocker.cpp @@ -366,6 +367,7 @@ set( libHeaders widgets/SocialPlaylistWidget.h widgets/infowidgets/sourceinfowidget.h widgets/infowidgets/ArtistInfoWidget.h + widgets/infowidgets/AlbumInfoWidget.h kdsingleapplicationguard/kdsingleapplicationguard.h ) @@ -389,6 +391,7 @@ set( libUI ${libUI} widgets/SocialPlaylistWidget.ui widgets/infowidgets/sourceinfowidget.ui widgets/infowidgets/ArtistInfoWidget.ui + widgets/infowidgets/AlbumInfoWidget.ui playlist/topbar/topbar.ui playlist/infobar/infobar.ui ) diff --git a/src/libtomahawk/viewmanager.cpp b/src/libtomahawk/viewmanager.cpp index 54fdd54ce..b50a6ada9 100644 --- a/src/libtomahawk/viewmanager.cpp +++ b/src/libtomahawk/viewmanager.cpp @@ -46,6 +46,7 @@ #include "widgets/welcomewidget.h" #include "widgets/infowidgets/sourceinfowidget.h" #include "widgets/infowidgets/ArtistInfoWidget.h" +#include "widgets/infowidgets/AlbumInfoWidget.h" #include "widgets/newplaylistwidget.h" #include "utils/logger.h" @@ -237,27 +238,19 @@ ViewManager::show( const Tomahawk::artist_ptr& artist ) Tomahawk::ViewPage* ViewManager::show( const Tomahawk::album_ptr& album ) { - PlaylistView* view; + AlbumInfoWidget* swidget; if ( !m_albumViews.contains( album ) ) { - view = new PlaylistView(); - PlaylistModel* model = new PlaylistModel(); - model->append( album ); - view->setPlaylistModel( model ); - view->setFrameShape( QFrame::NoFrame ); - view->setAttribute( Qt::WA_MacShowFocusRect, 0 ); - - m_albumViews.insert( album, view ); + swidget = new AlbumInfoWidget( album ); + m_albumViews.insert( album, swidget ); } else { - view = m_albumViews.value( album ); + swidget = m_albumViews.value( album ); } - setPage( view ); - emit numSourcesChanged( 1 ); - - return view; + setPage( swidget ); + return swidget; } diff --git a/src/libtomahawk/viewmanager.h b/src/libtomahawk/viewmanager.h index 2321265cb..8d597d610 100644 --- a/src/libtomahawk/viewmanager.h +++ b/src/libtomahawk/viewmanager.h @@ -33,6 +33,7 @@ class AnimatedSplitter; class AlbumModel; class AlbumView; +class AlbumInfoWidget; class ArtistInfoWidget; class ArtistView; class CollectionModel; @@ -188,7 +189,7 @@ private: QHash< Tomahawk::collection_ptr, ArtistView* > m_treeViews; QHash< Tomahawk::collection_ptr, AlbumView* > m_collectionAlbumViews; QHash< Tomahawk::artist_ptr, ArtistInfoWidget* > m_artistViews; - QHash< Tomahawk::album_ptr, PlaylistView* > m_albumViews; + QHash< Tomahawk::album_ptr, AlbumInfoWidget* > m_albumViews; QHash< Tomahawk::playlist_ptr, PlaylistView* > m_playlistViews; QHash< Tomahawk::source_ptr, SourceInfoWidget* > m_sourceViews; diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp new file mode 100644 index 000000000..3454e47b2 --- /dev/null +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp @@ -0,0 +1,171 @@ +/* === 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 "AlbumInfoWidget.h" +#include "ui_AlbumInfoWidget.h" + +#include "viewmanager.h" +#include "playlist/treemodel.h" +#include "playlist/albummodel.h" + +#include "database/databasecommand_alltracks.h" +#include "database/databasecommand_allalbums.h" + +#include "utils/tomahawkutils.h" +#include "utils/logger.h" + +#include "widgets/overlaywidget.h" + +static QString s_aiInfoIdentifier = QString( "AlbumInfoWidget" ); + +using namespace Tomahawk; + + +AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* parent ) + : QWidget( parent ) + , ui( new Ui::AlbumInfoWidget ) + , m_album( album ) +{ + ui->setupUi( this ); + + ui->albumsView->setFrameShape( QFrame::NoFrame ); + ui->albumsView->setAttribute( Qt::WA_MacShowFocusRect, 0 ); + ui->tracksView->setFrameShape( QFrame::NoFrame ); + ui->tracksView->setAttribute( Qt::WA_MacShowFocusRect, 0 ); + + TomahawkUtils::unmarginLayout( layout() ); + + m_albumsModel = new AlbumModel( ui->albumsView ); + ui->albumsView->setAlbumModel( m_albumsModel ); + + m_tracksModel = new TreeModel( ui->tracksView ); + ui->tracksView->setTreeModel( m_tracksModel ); + + m_pixmap = QPixmap( RESPATH "images/no-album-art-placeholder.png" ).scaledToWidth( 48, Qt::SmoothTransformation ); + + 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 ) ) ); + + // Apparently headers can only be removed when it's already visible / layed-out + QTimer::singleShot( 0, this, SLOT( removeHeaders() ) ); + + load( album ); +} + + +AlbumInfoWidget::~AlbumInfoWidget() +{ + delete ui; +} + + +void +AlbumInfoWidget::load( const album_ptr& album ) +{ + m_title = album->name(); + m_description = album->artist()->name(); + m_tracksModel->addTracks( album, QModelIndex() ); + + QList al; + al << album; + m_albumsModel->addAlbums( al ); + + Tomahawk::InfoSystem::InfoCriteriaHash trackInfo; + trackInfo["artist"] = album->artist()->name(); + trackInfo["album"] = album->name(); + + Tomahawk::InfoSystem::InfoRequestData requestData; + requestData.caller = s_aiInfoIdentifier; + requestData.type = Tomahawk::InfoSystem::InfoAlbumCoverArt; + requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoCriteriaHash >( trackInfo ); + requestData.customData = QVariantMap(); + + Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData ); +} + + +void +AlbumInfoWidget::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output ) +{ + if ( requestData.caller != s_aiInfoIdentifier ) + { + return; + } + + InfoSystem::InfoCriteriaHash trackInfo; + trackInfo = requestData.input.value< InfoSystem::InfoCriteriaHash >(); + + if ( output.canConvert< QVariantMap >() ) + { + if ( trackInfo["album"] != m_album->name() ) + { + qDebug() << "Returned info was for:" << trackInfo["album"] << "- was looking for:" << m_album->name(); + return; + } + } + + QVariantMap returnedData = output.value< QVariantMap >(); + switch ( requestData.type ) + { + case Tomahawk::InfoSystem::InfoAlbumCoverArt: + { + QVariantMap returnedData = output.value< QVariantMap >(); + const QByteArray ba = returnedData["imgbytes"].toByteArray(); + if ( ba.length() ) + { + m_pixmap.loadFromData( ba ); + emit pixmapChanged( m_pixmap ); + } + } + + default: + return; + } +} + + +void +AlbumInfoWidget::infoSystemFinished( QString target ) +{ + Q_UNUSED( target ); +} + + +void +AlbumInfoWidget::changeEvent( QEvent* e ) +{ + QWidget::changeEvent( e ); + switch ( e->type() ) + { + case QEvent::LanguageChange: + ui->retranslateUi( this ); + break; + + default: + break; + } +} + + +void +AlbumInfoWidget::removeHeaders() +{ +} diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h new file mode 100644 index 000000000..e88ec852a --- /dev/null +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h @@ -0,0 +1,108 @@ +/* === 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 . + */ + +/** + * \class AlbumInfoWidget + * \brief ViewPage, which displays an album for an artist and recommends others. + * + * This Tomahawk ViewPage displays the tracks of any given album + * It is our default ViewPage when showing an artist via ViewManager. + * + */ + +#ifndef ALBUMINFOWIDGET_H +#define ALBUMINFOWIDGET_H + +#include + +#include "artist.h" +#include "result.h" +#include "playlistinterface.h" +#include "viewpage.h" +#include "infosystem/infosystem.h" + +#include "dllmacro.h" + +class AlbumModel; +class TreeModel; + +namespace Ui +{ + class AlbumInfoWidget; +} + +class DLLEXPORT AlbumInfoWidget : public QWidget, public Tomahawk::ViewPage +{ +Q_OBJECT + +public: + AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* parent = 0 ); + ~AlbumInfoWidget(); + + /** \brief Loads information for a given album. + * \param album The album that you want to load information for. + * + * Calling this method will make AlbumInfoWidget load information about + * an album, and related other albums. This method will be automatically + * called by the constructor, but you can use it to load another album's + * information at any point. + */ + void load( const Tomahawk::album_ptr& album ); + + virtual QWidget* widget() { return this; } + virtual Tomahawk::PlaylistInterface* playlistInterface() const { return 0; } + + virtual QString title() const { return m_title; } + virtual QString description() const { return m_description; } + virtual QString longDescription() const { return m_longDescription; } + virtual QPixmap pixmap() const { if ( m_pixmap.isNull() ) return Tomahawk::ViewPage::pixmap(); else return m_pixmap; } + + virtual bool isTemporaryPage() const { return true; } + virtual bool showStatsBar() const { return false; } + + virtual bool jumpToCurrentTrack() { return false; } + +signals: + void longDescriptionChanged( const QString& description ); + void descriptionChanged( const QString& description ); + void pixmapChanged( const QPixmap& pixmap ); + +protected: + void changeEvent( QEvent* e ); + +private slots: + void infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output ); + void infoSystemFinished( QString target ); + + void removeHeaders(); + +private: + Ui::AlbumInfoWidget *ui; + + Tomahawk::album_ptr m_album; + + AlbumModel* m_albumsModel; + TreeModel* m_tracksModel; + + QString m_title; + QString m_description; + QString m_longDescription; + QPixmap m_pixmap; +}; + +#endif // ALBUMINFOWIDGET_H diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui new file mode 100644 index 000000000..c06d89099 --- /dev/null +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui @@ -0,0 +1,55 @@ + + + AlbumInfoWidget + + + + 0 + 0 + 902 + 696 + + + + Form + + + + + + + + + + + Other Albums by Artist + + + + + + + + + + + + + HeaderLabel + QLabel +
widgets/HeaderLabel.h
+ + + ArtistView + QTreeView +
artistview.h
+ + + AlbumView + QListView +
playlist/albumview.h
+ + + + + diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp index 39e41710c..e911033e6 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp @@ -59,6 +59,8 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget* m_relatedModel = new TreeModel( ui->relatedArtists ); ui->relatedArtists->setTreeModel( m_relatedModel ); + ui->relatedArtists->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); + ui->relatedArtists->header()->setVisible( false ); m_topHitsModel = new PlaylistModel( ui->topHits ); m_topHitsModel->setStyle( TrackModel::Short ); @@ -72,12 +74,10 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget* connect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( finished( QString ) ), SLOT( infoSystemFinished( QString ) ) ); - // Apparently headers can only be removed when it's already visible / layed-out - QTimer::singleShot( 0, this ,SLOT( removeHeaders() ) ); - load( artist ); } + ArtistInfoWidget::~ArtistInfoWidget() { delete ui; @@ -125,7 +125,6 @@ ArtistInfoWidget::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestD // qDebug() << "Info of wrong type or not with our identifier"; return; } - qDebug() << Q_FUNC_INFO << requestData.caller << requestData.type << s_aiInfoIdentifier; InfoSystem::InfoCriteriaHash trackInfo; trackInfo = requestData.input.value< InfoSystem::InfoCriteriaHash >(); @@ -207,7 +206,6 @@ void ArtistInfoWidget::infoSystemFinished( QString target ) { Q_UNUSED( target ); - qDebug() << Q_FUNC_INFO; } @@ -225,10 +223,3 @@ ArtistInfoWidget::changeEvent( QEvent* e ) break; } } - -void -ArtistInfoWidget::removeHeaders() -{ - for ( int i = 1; i < ui->relatedArtists->header()->count(); i++ ) - ui->relatedArtists->header()->hideSection( ui->relatedArtists->header()->logicalIndex( i ) ); -} diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h index 176adae95..155a3f2f7 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h @@ -90,7 +90,6 @@ private slots: void infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output ); void infoSystemFinished( QString target ); - void removeHeaders(); private: Ui::ArtistInfoWidget *ui; @@ -106,4 +105,4 @@ private: QPixmap m_pixmap; }; -#endif // SOURCEINFOWIDGET_H +#endif // ARTISTINFOWIDGET_H diff --git a/src/libtomahawk/widgets/welcomewidget.cpp b/src/libtomahawk/widgets/welcomewidget.cpp index 44757c076..9f1af850a 100644 --- a/src/libtomahawk/widgets/welcomewidget.cpp +++ b/src/libtomahawk/widgets/welcomewidget.cpp @@ -190,6 +190,7 @@ WelcomeWidget::changeEvent( QEvent* e ) } } + QSize PlaylistDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const { From 7a4a2f5b707fc8d49d506be94944549277c07014 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Thu, 11 Aug 2011 21:25:44 -0400 Subject: [PATCH 35/61] didn't mean to commit that change, doing a partial update of the playlist delegate isn't great --- src/libtomahawk/widgets/welcomewidget.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libtomahawk/widgets/welcomewidget.cpp b/src/libtomahawk/widgets/welcomewidget.cpp index 9f1af850a..c408e7fed 100644 --- a/src/libtomahawk/widgets/welcomewidget.cpp +++ b/src/libtomahawk/widgets/welcomewidget.cpp @@ -246,8 +246,7 @@ PlaylistDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, { descText = index.data( WelcomePlaylistModel::ArtistRole ).toString(); } - painter->setFont( italicFont ); - painter->drawText( option.rect.adjusted( 66, 26, -100, -8 ), descText ); + painter->drawText( option.rect.adjusted( 56, 26, -100, -8 ), descText ); QString trackCount = tr( "%1 tracks" ).arg( index.data( WelcomePlaylistModel::TrackCountRole ).toString() ); painter->drawText( option.rect.adjusted( option.rect.width() - 96, 12, 0, -2 - opt.rect.height() / 2 ), trackCount, to ); From 4da0b72dedac47d8bd4ab5dcd5bc42881e3f4a18 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Fri, 12 Aug 2011 03:56:30 +0200 Subject: [PATCH 36/61] cmake: check for boost --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2018a40ca..2715217c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,6 +93,11 @@ macro_log_feature(TAGLIB_FOUND "TagLib" "Audio Meta-Data Library" "http://develo include( CheckTagLibFileName ) check_taglib_filename( COMPLEX_TAGLIB_FILENAME ) +macro_optional_find_package(Boost) +macro_log_feature(Boost_FOUND "Boost" "Provides free peer-reviewed portable C++ source libraries" "http://www.boost.org" TRUE "" "") #FIXME: give useful explaination + + + # required #While we distribute our own liblastfm2, don't need to look for it #macro_optional_find_package(LibLastFm 0.3.3) From 7169aa352e7347fc3dcd1e94f125e568f1895fea Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Fri, 12 Aug 2011 04:01:39 +0200 Subject: [PATCH 37/61] cmake: check for QtWebkit --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2715217c6..8831b3ddd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,11 +67,11 @@ IF( NOT BUILD_GUI ) 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") + LIST(APPEND NEEDED_QT4_COMPONENTS "QtGui" "QtWebkit" ) ENDIF() 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_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI framework" "http://qt.nokia.com" TRUE "" "If you see this, although libqt4-devel is installed, check whether \n the qtwebkit-devel package is installed as well") macro_optional_find_package(Phonon 4.5.0) macro_log_feature(PHONON_FOUND "Phonon" "The Phonon multimedia library" "http://phonon.kde.org" TRUE "" "") From fe15fcd1f5c3f5d115a4f775cd8ac3b1e35da39b Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Fri, 12 Aug 2011 04:18:41 +0200 Subject: [PATCH 38/61] * Remove obsolete method. --- src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp | 9 --------- src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h | 2 -- 2 files changed, 11 deletions(-) diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp index 3454e47b2..6e9dc8374 100644 --- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp @@ -64,9 +64,6 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par connect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( finished( QString ) ), SLOT( infoSystemFinished( QString ) ) ); - // Apparently headers can only be removed when it's already visible / layed-out - QTimer::singleShot( 0, this, SLOT( removeHeaders() ) ); - load( album ); } @@ -163,9 +160,3 @@ AlbumInfoWidget::changeEvent( QEvent* e ) break; } } - - -void -AlbumInfoWidget::removeHeaders() -{ -} diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h index e88ec852a..9975ff522 100644 --- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h @@ -89,8 +89,6 @@ private slots: void infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output ); void infoSystemFinished( QString target ); - void removeHeaders(); - private: Ui::AlbumInfoWidget *ui; From 1fa1ed42e9ecc7aa247c2cec498b41b2b5213285 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Fri, 12 Aug 2011 00:10:02 -0400 Subject: [PATCH 39/61] Paint a nicer playlist delegate, and number count backdrop --- data/images/supercollection.png | Bin 1530 -> 3161 bytes data/images/user-avatar.png | Bin 1477 -> 3144 bytes src/libtomahawk/utils/tomahawkutils.cpp | 36 +++++++++++++++ src/libtomahawk/utils/tomahawkutils.h | 4 ++ .../widgets/welcomeplaylistmodel.cpp | 17 +++++++ .../widgets/welcomeplaylistmodel.h | 2 + src/libtomahawk/widgets/welcomewidget.cpp | 42 +++++++++++++----- src/libtomahawk/widgets/welcomewidget.h | 3 +- src/sourcetree/sourcetreeview.cpp | 24 ++-------- 9 files changed, 96 insertions(+), 32 deletions(-) diff --git a/data/images/supercollection.png b/data/images/supercollection.png index e965f88e4fbe8e2432eccdcfe73bcf81a2871cff..6c6f192d958940f7ba81464462eb88428c972d55 100644 GIT binary patch delta 3136 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 diff --git a/src/libtomahawk/utils/tomahawkutils.cpp b/src/libtomahawk/utils/tomahawkutils.cpp index 9b37b9c8d..fdef729be 100644 --- a/src/libtomahawk/utils/tomahawkutils.cpp +++ b/src/libtomahawk/utils/tomahawkutils.cpp @@ -349,6 +349,42 @@ createDragPixmap( int itemCount ) return dragPixmap; } +void +drawBackgroundAndNumbers( QPainter* painter, const QString& text, const QRect& figRectIn ) +{ + QRect figRect = figRectIn; + if ( text.length() == 1 ) + figRect.adjust( -painter->fontMetrics().averageCharWidth(), 0, 0, 0 ); + + QPen origpen = painter->pen(); + QPen pen = origpen; + pen.setWidth( 1.0 ); + painter->setPen( pen ); + painter->drawRect( figRect ); + + // circles look bad. make it an oval. (thanks, apple) + const int bulgeWidth = 8; + const int offset = 0; // number of pixels to begin, counting inwards from figRect.x() and figRect.width(). 0 means start at each end, negative means start inside the rect. + + QPainterPath ppath; + ppath.moveTo( QPoint( figRect.x() + offset, figRect.y() + figRect.height() / 2 ) ); + QRect leftArcRect( figRect.x() + offset - bulgeWidth, figRect.y(), 2*bulgeWidth, figRect.height() ); + ppath.arcTo( leftArcRect, 90, 180 ); + painter->drawPath( ppath ); + + ppath = QPainterPath(); + ppath.moveTo( figRect.x() + figRect.width() - offset, figRect.y() + figRect.height() / 2 ); + leftArcRect = QRect( figRect.x() + figRect.width() - offset - bulgeWidth, figRect.y(), 2*bulgeWidth, figRect.height() ); + ppath.arcTo( leftArcRect, 270, 180 ); + painter->drawPath( ppath ); + + painter->setPen( origpen ); + + QTextOption to( Qt::AlignCenter ); + painter->setPen( Qt::white ); + painter->drawText( figRect.adjusted( -5, 0, 6, 0 ), text, to ); +} + void unmarginLayout( QLayout* layout ) diff --git a/src/libtomahawk/utils/tomahawkutils.h b/src/libtomahawk/utils/tomahawkutils.h index d72fcd015..238e63143 100644 --- a/src/libtomahawk/utils/tomahawkutils.h +++ b/src/libtomahawk/utils/tomahawkutils.h @@ -25,9 +25,11 @@ #include #include #include +#include #define RESPATH ":/data/" +class QPainter; class QColor; class QDir; class QDateTime; @@ -74,6 +76,8 @@ namespace TomahawkUtils DLLEXPORT QColor alphaBlend( const QColor& colorFrom, const QColor& colorTo, float opacity ); DLLEXPORT QPixmap createDragPixmap( int itemCount = 1 ); + DLLEXPORT void drawBackgroundAndNumbers( QPainter* p, const QString& text, const QRect& rect ); + DLLEXPORT void unmarginLayout( QLayout* layout ); DLLEXPORT NetworkProxyFactory* proxyFactory(); diff --git a/src/libtomahawk/widgets/welcomeplaylistmodel.cpp b/src/libtomahawk/widgets/welcomeplaylistmodel.cpp index fbb8fcacf..618354562 100644 --- a/src/libtomahawk/widgets/welcomeplaylistmodel.cpp +++ b/src/libtomahawk/widgets/welcomeplaylistmodel.cpp @@ -167,10 +167,27 @@ WelcomePlaylistModel::playlistRevisionLoaded() void WelcomePlaylistModel::onSourceAdded( const Tomahawk::source_ptr& source ) { + connect( source.data(), SIGNAL( online() ), this, SLOT( sourceOnline() ) ); connect( source->collection().data(), SIGNAL( playlistsAdded( QList ) ), SLOT( loadFromSettings() ) ); connect( source->collection().data(), SIGNAL( playlistsDeleted( QList ) ), SLOT( onPlaylistsRemoved( QList ) ) ); } +void +WelcomePlaylistModel::sourceOnline() +{ + Source* s = qobject_cast< Source* >( sender() ); + Q_ASSERT( s ); + + for ( int i = 0; i < m_recplaylists.size(); i++ ) + { + if ( m_recplaylists[ i ]->author().data() == s ) + { + QModelIndex idx = index( i, 0, QModelIndex() ); + emit dataChanged( idx, idx ); + } + } +} + void WelcomePlaylistModel::onPlaylistsRemoved( QList< playlist_ptr > playlists ) diff --git a/src/libtomahawk/widgets/welcomeplaylistmodel.h b/src/libtomahawk/widgets/welcomeplaylistmodel.h index 08d8ffcc6..c30d83ea0 100644 --- a/src/libtomahawk/widgets/welcomeplaylistmodel.h +++ b/src/libtomahawk/widgets/welcomeplaylistmodel.h @@ -60,6 +60,8 @@ private: unsigned int m_maxPlaylists; bool m_waitingForSome; + public slots: + void sourceOnline(); }; #endif // WELCOMEPLAYLISTMODEL_H diff --git a/src/libtomahawk/widgets/welcomewidget.cpp b/src/libtomahawk/widgets/welcomewidget.cpp index c408e7fed..8c423d6ad 100644 --- a/src/libtomahawk/widgets/welcomewidget.cpp +++ b/src/libtomahawk/widgets/welcomewidget.cpp @@ -221,8 +221,6 @@ 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 ); QPixmap icon; WelcomePlaylistModel::PlaylistTypes type = (WelcomePlaylistModel::PlaylistTypes)index.data( WelcomePlaylistModel::PlaylistTypeRole ).toInt(); @@ -246,16 +244,40 @@ PlaylistDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, { descText = index.data( WelcomePlaylistModel::ArtistRole ).toString(); } - painter->drawText( option.rect.adjusted( 56, 26, -100, -8 ), descText ); + QColor c = painter->pen().color(); + painter->setPen( QColor( Qt::gray ).darker() ); + painter->drawText( option.rect.adjusted( 66, 19, -100, -8 ), descText ); + painter->setPen( c ); - QString trackCount = tr( "%1 tracks" ).arg( index.data( WelcomePlaylistModel::TrackCountRole ).toString() ); - painter->drawText( option.rect.adjusted( option.rect.width() - 96, 12, 0, -2 - opt.rect.height() / 2 ), trackCount, to ); + if ( type != WelcomePlaylistModel::Station ) + { + painter->save(); + QString tracks = index.data( WelcomePlaylistModel::TrackCountRole ).toString(); + int width = painter->fontMetrics().width( tracks ); +// int bottomEdge = pixmapRect + // right edge 10px past right edge of pixmapRect + // bottom edge flush with bottom of pixmap + QRect rect( pixmapRect.right() - width, 0, width - 8, 0 ); + rect.adjust( 0, 0, -1, 0 ); + rect.setTop( pixmapRect.bottom() - painter->fontMetrics().height() - 1 ); + rect.setBottom( pixmapRect.bottom() + 1 ); - 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 ); + QColor figColor( 191, 191, 191 ); + painter->setPen( figColor ); + painter->setBrush( figColor ); + painter->setFont( boldFont ); + + TomahawkUtils::drawBackgroundAndNumbers( painter, tracks, rect ); + painter->restore(); + } + + + QPixmap avatar = index.data( WelcomePlaylistModel::PlaylistRole ).value< Tomahawk::playlist_ptr >()->author()->avatar(); + if ( avatar.isNull() ) + avatar = m_defaultAvatar; + avatar = TomahawkUtils::createAvatarFrame( avatar ); + QRect r( option.rect.width() - avatar.width() - 10, option.rect.top() + option.rect.height()/2 - avatar.height()/2, avatar.width(), avatar.height() ); + painter->drawPixmap( r, avatar ); painter->setFont( boldFont ); painter->drawText( option.rect.adjusted( 56, 6, -100, -option.rect.height() + 20 ), index.data().toString() ); diff --git a/src/libtomahawk/widgets/welcomewidget.h b/src/libtomahawk/widgets/welcomewidget.h index 0f4de5c69..dcbd7837a 100644 --- a/src/libtomahawk/widgets/welcomewidget.h +++ b/src/libtomahawk/widgets/welcomewidget.h @@ -52,6 +52,7 @@ public: m_playlistIcon = QPixmap( RESPATH "images/playlist-icon.png" ); m_autoIcon = QPixmap( RESPATH "images/automatic-playlist.png" ); m_stationIcon = QPixmap( RESPATH "images/station.png" ); + m_defaultAvatar = QPixmap( RESPATH "images/user-avatar.png" ); } protected: @@ -59,7 +60,7 @@ protected: QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const; private: - QPixmap m_playlistIcon, m_autoIcon, m_stationIcon; + QPixmap m_playlistIcon, m_autoIcon, m_stationIcon, m_defaultAvatar; }; class DLLEXPORT PlaylistWidget : public QListView diff --git a/src/sourcetree/sourcetreeview.cpp b/src/sourcetree/sourcetreeview.cpp index 4acbf7f56..3f169dc36 100644 --- a/src/sourcetree/sourcetreeview.cpp +++ b/src/sourcetree/sourcetreeview.cpp @@ -673,34 +673,16 @@ SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co { painter->setRenderHint( QPainter::Antialiasing ); - QRect figRect = o.rect.adjusted( o.rect.width() - figWidth - 18, 0, -10, -o.rect.height() + 16 ); + QRect figRect = o.rect.adjusted( o.rect.width() - figWidth - 6, 0, -15, -o.rect.height() + 16 ); int hd = ( option.rect.height() - figRect.height() ) / 2; figRect.adjust( 0, hd, 0, hd ); + painter->setFont( bold ); QColor figColor( 167, 183, 211 ); painter->setPen( figColor ); painter->setBrush( figColor ); - QPen origpen = painter->pen(); - QPen pen = origpen; - pen.setWidth( 1.0 ); - painter->setPen( pen ); - painter->drawRect( figRect ); - - QPainterPath ppath; - ppath.moveTo( QPoint( figRect.x(), figRect.y() ) ); - ppath.quadTo( QPoint( figRect.x() - 8, figRect.y() + figRect.height() / 2 ), QPoint( figRect.x(), figRect.y() + figRect.height() ) ); - painter->drawPath( ppath ); - ppath.moveTo( QPoint( figRect.x() + figRect.width(), figRect.y() ) ); - ppath.quadTo( QPoint( figRect.x() + figRect.width() + 8, figRect.y() + figRect.height() / 2 ), QPoint( figRect.x() + figRect.width(), figRect.y() + figRect.height() ) ); - painter->drawPath( ppath ); - - painter->setPen( origpen ); - - QTextOption to( Qt::AlignCenter ); - painter->setFont( bold ); - painter->setPen( Qt::white ); - painter->drawText( figRect, tracks, to ); + TomahawkUtils::drawBackgroundAndNumbers( painter, tracks, figRect ); } painter->restore(); From bb1a06a63621bff02edb46c177236030d0dc9085 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Fri, 12 Aug 2011 00:18:38 -0400 Subject: [PATCH 40/61] mac-specific tweaks --- src/libtomahawk/utils/tomahawkutils.cpp | 4 ++++ src/libtomahawk/widgets/welcomewidget.cpp | 23 +++++++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/utils/tomahawkutils.cpp b/src/libtomahawk/utils/tomahawkutils.cpp index fdef729be..950e76ebe 100644 --- a/src/libtomahawk/utils/tomahawkutils.cpp +++ b/src/libtomahawk/utils/tomahawkutils.cpp @@ -380,6 +380,10 @@ drawBackgroundAndNumbers( QPainter* painter, const QString& text, const QRect& f painter->setPen( origpen ); +#ifdef Q_OS_MAC + figRect.adjust( -1, 0, 0, 0 ); +#endif + QTextOption to( Qt::AlignCenter ); painter->setPen( Qt::white ); painter->drawText( figRect.adjusted( -5, 0, 6, 0 ), text, to ); diff --git a/src/libtomahawk/widgets/welcomewidget.cpp b/src/libtomahawk/widgets/welcomewidget.cpp index 8c423d6ad..21ffe2005 100644 --- a/src/libtomahawk/widgets/welcomewidget.cpp +++ b/src/libtomahawk/widgets/welcomewidget.cpp @@ -71,6 +71,9 @@ WelcomeWidget::WelcomeWidget( QWidget* parent ) ui->playlistWidget->setItemDelegate( new PlaylistDelegate() ); ui->playlistWidget->setModel( model ); ui->playlistWidget->overlay()->resize( 380, 86 ); +#ifdef Q_OS_MAC + ui->playlistWidget->setVerticalScrollMode( QAbstractItemView::ScrollPerPixel ); +#endif connect( model, SIGNAL( emptinessChanged( bool) ), this, SLOT( updatePlaylists() ) ); @@ -219,7 +222,11 @@ PlaylistDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, QTextOption to; to.setAlignment( Qt::AlignCenter ); QFont font = opt.font; - QFont boldFont = opt.font; +#ifdef Q_OS_MAC + font.setPointSize( font.pointSize() - 2 ); +#endif + + QFont boldFont = font; boldFont.setBold( true ); QPixmap icon; @@ -246,8 +253,20 @@ PlaylistDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, } QColor c = painter->pen().color(); painter->setPen( QColor( Qt::gray ).darker() ); - painter->drawText( option.rect.adjusted( 66, 19, -100, -8 ), descText ); + QFont font2 = font; +#ifdef Q_OS_MAC + font2.setPointSize( font2.pointSize() - 1 ); +#endif + painter->setFont( font2 ); + + QRect rectText = option.rect.adjusted( 66, 20, -100, -8 ); +#ifdef Q_OS_MAC + rectText.adjust( 0, 1, 0, 0 ); +#endif + + painter->drawText( rectText, descText ); painter->setPen( c ); + painter->setFont( font ); if ( type != WelcomePlaylistModel::Station ) { From dc3426244509249e4d048108d895d5e8a55ca46d Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Fri, 12 Aug 2011 13:59:43 +0200 Subject: [PATCH 41/61] Hopefully fix AddAppIconMacro inclusion problems for everyone --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1eaf2afb1..6bda3e7d3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,7 +14,7 @@ SET( QT_USE_QTXML TRUE ) SET( QT_USE_QTWEBKIT TRUE ) INCLUDE( ${QT_USE_FILE} ) -INCLUDE( ${CMAKE_MODULE_PATH}/AddAppIconMacro.cmake ) +INCLUDE( ${CMAKE_SOURCE_DIR}/CMakeModules/AddAppIconMacro.cmake ) #SET( CMAKE_BUILD_TYPE "Release" ) SET( CMAKE_VERBOSE_MAKEFILE ON ) From 6be91dd558e118ae506146363d3b13cce1313c7b Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Fri, 12 Aug 2011 14:05:22 +0200 Subject: [PATCH 42/61] Fix cross-compilation in cmake 2.8.5 --- CMakeModules/AddAppIconMacro.cmake | 2 ++ admin/win/Toolchain-mingw32-openSUSE.cmake | 17 ++++++++++++----- src/libtomahawk/CMakeLists.txt | 1 + 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/CMakeModules/AddAppIconMacro.cmake b/CMakeModules/AddAppIconMacro.cmake index 37ea17174..64f8f3210 100644 --- a/CMakeModules/AddAppIconMacro.cmake +++ b/CMakeModules/AddAppIconMacro.cmake @@ -1,3 +1,5 @@ +SET(WINDRES_EXECUTABLE ${CMAKE_RC_COMPILER}) + # This macro is taken from kdelibs/cmake/modules/KDE4Macros.cmake. # # Copyright (c) 2006-2009 Alexander Neundorf, diff --git a/admin/win/Toolchain-mingw32-openSUSE.cmake b/admin/win/Toolchain-mingw32-openSUSE.cmake index afcddedd7..0be73a183 100644 --- a/admin/win/Toolchain-mingw32-openSUSE.cmake +++ b/admin/win/Toolchain-mingw32-openSUSE.cmake @@ -1,20 +1,27 @@ +SET(MINGW_PREFIX "i686-w64-mingw32") + # this one is important SET(CMAKE_SYSTEM_NAME Windows) # specify the cross compiler -SET(CMAKE_C_COMPILER ccache i686-w64-mingw32-gcc) -SET(CMAKE_CXX_COMPILER ccache i686-w64-mingw32-g++) +SET(CMAKE_C_COMPILER ccache ${MINGW_PREFIX}-gcc) +SET(CMAKE_CXX_COMPILER ccache ${MINGW_PREFIX}-g++) +SET(CMAKE_RC_COMPILER /usr/bin/${MINGW_PREFIX}-windres) # where is the target environment containing libraries -SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32/sys-root/mingw) +SET(CMAKE_FIND_ROOT_PATH /usr/${MINGW_PREFIX}/sys-root/mingw) SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -# windres executable for application icon support -SET(WINDRES_EXECUTABLE /usr/bin/i686-w64-mingw32-windres) + # libs with broken find modules SET(TAGLIB_FOUND true) SET(TAGLIB_LIBRARIES ${CMAKE_FIND_ROOT_PATH}/lib/libtag.dll.a) SET(TAGLIB_INCLUDES ${CMAKE_FIND_ROOT_PATH}/include/taglib) + +SET(QT_PLUGINS_DIR ${CMAKE_FIND_ROOT_PATH}/lib/qt4/plugins/) +SET(QT_QTUITOOLS_LIBRARY_RELEASE ${CMAKE_FIND_ROOT_PATH}/lib/libQtUiTools.a) +SET(QT_QTUITOOLS_LIBRARY_DEBUG ${CMAKE_FIND_ROOT_PATH}/lib/libQtUiToolsd.a) +SET(QT_QTUITOOLS_LIBRARY ${QT_QTUITOOLS_LIBRARY_RELEASE}) \ No newline at end of file diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index 907be5b56..4dbf3080c 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -482,6 +482,7 @@ target_link_libraries( tomahawklib ${LIBPORTFWD_LIBRARIES} # External deps + ${QT_QTUITOOLS_LIBRARY} ${QJSON_LIBRARIES} ${PHONON_LIBS} ${TAGLIB_LIBRARIES} From 1d6697f11d1bbcd628e6e33eb76c2e49df13abe7 Mon Sep 17 00:00:00 2001 From: Harald Sitter Date: Fri, 12 Aug 2011 14:25:42 +0200 Subject: [PATCH 43/61] use cmake_module_path for includes of cmakemodules --- CMakeLists.txt | 8 ++++---- src/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8831b3ddd..cea9dd3c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ PROJECT( tomahawk ) CMAKE_MINIMUM_REQUIRED( VERSION 2.8 ) -SET( CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_SOURCE_DIR}/CMakeModules" ) +SET( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" ) IF( ${CMAKE_VERSION} VERSION_GREATER 2.8.3 ) CMAKE_POLICY(SET CMP0017 NEW) @@ -28,9 +28,9 @@ 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 ) + INCLUDE( CMakeDateStamp ) SET( TOMAHAWK_VERSION_TWEAK "${CMAKE_DATESTAMP_YEAR}${CMAKE_DATESTAMP_MONTH}${CMAKE_DATESTAMP_DAY}" ) - INCLUDE( ${CMAKE_MODULE_PATH}/CMakeVersionSource.cmake ) + INCLUDE( CMakeVersionSource ) ENDIF() SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION_MAJOR}.${TOMAHAWK_VERSION_MINOR}.${TOMAHAWK_VERSION_PATCH} ) @@ -54,7 +54,7 @@ SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) # installer creation -INCLUDE( CPack.cmake ) +INCLUDE( CPack ) #deps INCLUDE( MacroOptionalFindPackage ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6bda3e7d3..2a1cc320b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,7 +14,7 @@ SET( QT_USE_QTXML TRUE ) SET( QT_USE_QTWEBKIT TRUE ) INCLUDE( ${QT_USE_FILE} ) -INCLUDE( ${CMAKE_SOURCE_DIR}/CMakeModules/AddAppIconMacro.cmake ) +INCLUDE( AddAppIconMacro ) #SET( CMAKE_BUILD_TYPE "Release" ) SET( CMAKE_VERBOSE_MAKEFILE ON ) From a72ef2bf6e673e4f5dbe635d840bba0210f3e9b3 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Fri, 12 Aug 2011 09:06:53 -0400 Subject: [PATCH 44/61] qt.conf, not info.plist --- admin/mac/build-release-osx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/mac/build-release-osx.sh b/admin/mac/build-release-osx.sh index 7ab75162c..083f2bb20 100755 --- a/admin/mac/build-release-osx.sh +++ b/admin/mac/build-release-osx.sh @@ -37,7 +37,7 @@ VERSION=$1 header "Renaming icon" mv Contents/Resources/tomahawkSources.icns Contents/Resources/Tomahawk.icns - cp $ROOT/../admin/mac/Info.plist Contents/Info.plist + cp $ROOT/../admin/mac/qt.conf Contents/Resources/Info.plist header "Creating DMG" From 4bef594b5390d755132150ff22095326bfe523ec Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Fri, 12 Aug 2011 09:11:05 -0400 Subject: [PATCH 45/61] actually fix things :) --- admin/mac/build-release-osx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/mac/build-release-osx.sh b/admin/mac/build-release-osx.sh index 083f2bb20..c3dcbcd83 100755 --- a/admin/mac/build-release-osx.sh +++ b/admin/mac/build-release-osx.sh @@ -37,7 +37,7 @@ VERSION=$1 header "Renaming icon" mv Contents/Resources/tomahawkSources.icns Contents/Resources/Tomahawk.icns - cp $ROOT/../admin/mac/qt.conf Contents/Resources/Info.plist + cp $ROOT/../admin/mac/qt.conf Contents/Resources/qt.conf header "Creating DMG" From eda6f8ff8fc943faaa751266d7cc7cdad0bfd68f Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Fri, 12 Aug 2011 15:07:48 +0200 Subject: [PATCH 46/61] * We're officially 0.2.0 (rc1) now. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cea9dd3c8..3a1c02513 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,10 +15,10 @@ SET( TOMAHAWK_APPLICATION_NAME "Tomahawk" ) SET( TOMAHAWK_DESCRIPTION_SUMMARY "The social media player" ) SET( TOMAHAWK_VERSION_MAJOR 0 ) -SET( TOMAHAWK_VERSION_MINOR 1 ) +SET( TOMAHAWK_VERSION_MINOR 2 ) SET( TOMAHAWK_VERSION_PATCH 0 ) -# SET( TOMAHAWK_VERSION_RC 0 ) +SET( TOMAHAWK_VERSION_RC 1 ) # build options From 1245ae7ac21ee78ecb06c15ec3333471dfbd3e50 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Fri, 12 Aug 2011 15:21:29 +0200 Subject: [PATCH 47/61] Fix linking against QtUiTools on windows --- src/libtomahawk/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index 4dbf3080c..1add45b16 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -482,13 +482,14 @@ target_link_libraries( tomahawklib ${LIBPORTFWD_LIBRARIES} # External deps - ${QT_QTUITOOLS_LIBRARY} ${QJSON_LIBRARIES} ${PHONON_LIBS} ${TAGLIB_LIBRARIES} ${CLUCENE_LIBRARIES} ${LIBECHONEST_LIBRARY} + ${QT_QTUITOOLS_LIBRARY} ${QT_LIBRARIES} + ${QT_QTUITOOLS_LIBRARY} # We really need to link twice against it for windows, maybe QTBUG-20498 is related ${OS_SPECIFIC_LINK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${LINK_LIBRARIES} From 70b0203acdb1f5137620b1c7f564a94c2de6f833 Mon Sep 17 00:00:00 2001 From: Jason Herskowitz Date: Fri, 12 Aug 2011 09:27:33 -0400 Subject: [PATCH 48/61] More changelogging. --- ChangeLog | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index 9cf4b39ad..7001a7807 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,18 @@ Version 0.2.0: + * Created new Album page (that shows other albums from that artist available in your Super Collection) + * Updated playlists when revision info is recieved + * Added support for "playing" Rdio track URLs and ability to drag/drop them into Tomahawk + * Change "Recently Played" page to "Dashboard" + * Prioritize resolving newer queries to make GUI more responsive + * Display spinner animation while searching for tracks + * Fix for occasionally flashing play control buttons + * Remove horizontal scrollbars when they aren't needed + * Let headless users trigger a rescan with --filescan + * Removed "test login" button from Last.fm settings + * Fix font and image sizes from being too big/small on some OSes + * Include Stations and Automatic Playlists in News Stations and Playlists widget + * When click through to station or playlist ensure that sidebar navigation reflects it + * Even more design tweaks, new placeholder icons (and use them in right places) * Show search and artist page temporary navigation in sidebar when on those pages * Fixed bug where drop indicator wouldn't show under last track if that was drop zone * Fixed cross-wiring of Previous and Next song in "Music Player" menu (OS X) From b9f7bf2656729513011b688287cc1feb16470f06 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Fri, 12 Aug 2011 12:29:42 -0400 Subject: [PATCH 49/61] misc avatar and welcome widget work --- .../playlist/playlistitemdelegate.cpp | 18 +++++++++++++----- .../playlist/playlistitemdelegate.h | 4 ++-- src/libtomahawk/playlist/trackmodel.h | 2 +- src/libtomahawk/source.cpp | 12 ++++++++++-- src/libtomahawk/source.h | 5 ++++- src/libtomahawk/widgets/welcomewidget.cpp | 15 ++++++++------- src/libtomahawk/widgets/welcomewidget.h | 2 +- src/sourcetree/items/collectionitem.cpp | 11 ++++++----- src/sourcetree/items/collectionitem.h | 1 + src/sourcetree/sourcetreeview.cpp | 5 ++++- 10 files changed, 50 insertions(+), 25 deletions(-) diff --git a/src/libtomahawk/playlist/playlistitemdelegate.cpp b/src/libtomahawk/playlist/playlistitemdelegate.cpp index 88056189b..6c3f9931b 100644 --- a/src/libtomahawk/playlist/playlistitemdelegate.cpp +++ b/src/libtomahawk/playlist/playlistitemdelegate.cpp @@ -57,6 +57,8 @@ PlaylistItemDelegate::PlaylistItemDelegate( TrackView* parent, TrackProxyModel* m_centerOption = QTextOption( Qt::AlignVCenter ); m_centerOption.setWrapMode( QTextOption::NoWrap ); + + m_defaultAvatar = TomahawkUtils::createAvatarFrame( QPixmap( RESPATH "images/user-avatar.png" ) ); } @@ -75,7 +77,7 @@ PlaylistItemDelegate::sizeHint( const QStyleOptionViewItem& option, const QModel if ( index.isValid() ) { int style = index.data( TrackModel::StyleRole ).toInt(); - if ( style == TrackModel::Short ) + if ( style == TrackModel::Short || style == TrackModel::ShortWithAvatars ) size.setHeight( 44 ); } @@ -135,12 +137,14 @@ PlaylistItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& opti case TrackModel::Short: paintShort( painter, option, index ); break; + case TrackModel::ShortWithAvatars: + paintShort( painter, option, index, true ); } } void -PlaylistItemDelegate::paintShort( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const +PlaylistItemDelegate::paintShort( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index, bool useAvatars ) const { TrackModelItem* item = m_model->itemFromIndex( m_model->mapToSource( index ) ); Q_ASSERT( item ); @@ -184,11 +188,14 @@ PlaylistItemDelegate::paintShort( QPainter* painter, const QStyleOptionViewItem& else lowerText = QString( "played %1 ago by %2" ).arg( playtime ).arg( source->friendlyName() ); - pixmap = source->avatar(); + if ( useAvatars ) + pixmap = source->avatar( Source::FancyStyle ); } - if ( pixmap.isNull() ) + if ( pixmap.isNull() && !useAvatars ) pixmap = QPixmap( RESPATH "images/track-placeholder.png" ); + else if ( pixmap.isNull() && useAvatars ) + pixmap = m_defaultAvatar; painter->save(); { @@ -227,7 +234,8 @@ PlaylistItemDelegate::paintShort( QPainter* painter, const QStyleOptionViewItem& QString text = painter->fontMetrics().elidedText( upperText, Qt::ElideRight, r.width() ); painter->drawText( r.adjusted( 0, 1, 0, 0 ), text, m_topOption ); - painter->setFont( opt.font ); + + painter->setFont( opt.font); text = painter->fontMetrics().elidedText( lowerText, Qt::ElideRight, r.width() ); painter->drawText( r.adjusted( 0, 1, 0, 0 ), text, m_bottomOption ); } diff --git a/src/libtomahawk/playlist/playlistitemdelegate.h b/src/libtomahawk/playlist/playlistitemdelegate.h index 6d9bcae7c..98fc25674 100644 --- a/src/libtomahawk/playlist/playlistitemdelegate.h +++ b/src/libtomahawk/playlist/playlistitemdelegate.h @@ -50,12 +50,12 @@ private: void prepareStyleOption( QStyleOptionViewItemV4* option, const QModelIndex& index, TrackModelItem* item ) const; void paintDetailed( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const; - void paintShort( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const; + void paintShort( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index, bool useAvatars = false ) const; unsigned int m_removalProgress; mutable QHash< qint64, QPixmap > m_cache; - QPixmap m_nowPlayingIcon; + QPixmap m_nowPlayingIcon, m_defaultAvatar; mutable QPixmap m_arrowIcon; QTextOption m_topOption; diff --git a/src/libtomahawk/playlist/trackmodel.h b/src/libtomahawk/playlist/trackmodel.h index a95c88b80..db456f00e 100644 --- a/src/libtomahawk/playlist/trackmodel.h +++ b/src/libtomahawk/playlist/trackmodel.h @@ -34,7 +34,7 @@ Q_OBJECT public: enum TrackItemStyle - { Detailed = 0, Short = 1 }; + { Detailed = 0, Short = 1, ShortWithAvatars = 2 }; enum TrackModelRole { StyleRole = Qt::UserRole + 1 }; diff --git a/src/libtomahawk/source.cpp b/src/libtomahawk/source.cpp index 4845b78ab..24e7aaa37 100644 --- a/src/libtomahawk/source.cpp +++ b/src/libtomahawk/source.cpp @@ -30,6 +30,7 @@ #include #include "utils/logger.h" +#include "utils/tomahawkutils.h" using namespace Tomahawk; @@ -126,10 +127,17 @@ Source::setAvatar( const QPixmap& avatar ) QPixmap -Source::avatar() const +Source::avatar( AvatarStyle style ) const { - if( !m_avatar.isNull() ) + if ( style == FancyStyle && + !m_avatar.isNull() && + m_fancyAvatar.isNull() ) + m_fancyAvatar = TomahawkUtils::createAvatarFrame( m_avatar ); + + if ( style == Original && !m_avatar.isNull() ) return m_avatar; + else if ( style == FancyStyle && !m_fancyAvatar.isNull() ) + return m_fancyAvatar; else return QPixmap(); } diff --git a/src/libtomahawk/source.h b/src/libtomahawk/source.h index b18dbe407..d368db784 100644 --- a/src/libtomahawk/source.h +++ b/src/libtomahawk/source.h @@ -45,6 +45,8 @@ friend class ::DBSyncConnection; friend class ::DatabaseCommand_SocialAction; public: + enum AvatarStyle { Original, FancyStyle }; + explicit Source( int id, const QString& username = QString() ); virtual ~Source(); @@ -58,7 +60,7 @@ public: void setFriendlyName( const QString& fname ); void setAvatar( const QPixmap& avatar ); - QPixmap avatar() const; + QPixmap avatar( AvatarStyle style = Original ) const; collection_ptr collection() const; void addCollection( const Tomahawk::collection_ptr& c ); @@ -132,6 +134,7 @@ private: ControlConnection* m_cc; QPixmap m_avatar; + mutable QPixmap m_fancyAvatar; Tomahawk::playlistinterface_ptr m_playlistInterface; }; diff --git a/src/libtomahawk/widgets/welcomewidget.cpp b/src/libtomahawk/widgets/welcomewidget.cpp index 21ffe2005..49e664d19 100644 --- a/src/libtomahawk/widgets/welcomewidget.cpp +++ b/src/libtomahawk/widgets/welcomewidget.cpp @@ -35,7 +35,7 @@ #include #define HISTORY_TRACK_ITEMS 25 -#define HISTORY_PLAYLIST_ITEMS 5 +#define HISTORY_PLAYLIST_ITEMS 10 #define HISTORY_RESOLVING_TIMEOUT 2500 using namespace Tomahawk; @@ -78,7 +78,7 @@ WelcomeWidget::WelcomeWidget( QWidget* parent ) connect( model, SIGNAL( emptinessChanged( bool) ), this, SLOT( updatePlaylists() ) ); m_tracksModel = new PlaylistModel( ui->tracksView ); - m_tracksModel->setStyle( TrackModel::Short ); + m_tracksModel->setStyle( TrackModel::ShortWithAvatars ); ui->tracksView->overlay()->setEnabled( false ); ui->tracksView->setPlaylistModel( m_tracksModel ); @@ -262,6 +262,8 @@ PlaylistDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, QRect rectText = option.rect.adjusted( 66, 20, -100, -8 ); #ifdef Q_OS_MAC rectText.adjust( 0, 1, 0, 0 ); +#elif Q_OS_WIN + rectText.adjust( 0, 2, 0, 0 ); #endif painter->drawText( rectText, descText ); @@ -276,12 +278,12 @@ PlaylistDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, // int bottomEdge = pixmapRect // right edge 10px past right edge of pixmapRect // bottom edge flush with bottom of pixmap - QRect rect( pixmapRect.right() - width, 0, width - 8, 0 ); - rect.adjust( 0, 0, -1, 0 ); + QRect rect( pixmapRect.right() - width , 0, width - 8, 0 ); + rect.adjust( -1, 0, 0, 0 ); rect.setTop( pixmapRect.bottom() - painter->fontMetrics().height() - 1 ); rect.setBottom( pixmapRect.bottom() + 1 ); - QColor figColor( 191, 191, 191 ); + QColor figColor( 153, 153, 153 ); painter->setPen( figColor ); painter->setBrush( figColor ); painter->setFont( boldFont ); @@ -291,10 +293,9 @@ PlaylistDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, } - QPixmap avatar = index.data( WelcomePlaylistModel::PlaylistRole ).value< Tomahawk::playlist_ptr >()->author()->avatar(); + QPixmap avatar = index.data( WelcomePlaylistModel::PlaylistRole ).value< Tomahawk::playlist_ptr >()->author()->avatar( Source::FancyStyle ); if ( avatar.isNull() ) avatar = m_defaultAvatar; - avatar = TomahawkUtils::createAvatarFrame( avatar ); QRect r( option.rect.width() - avatar.width() - 10, option.rect.top() + option.rect.height()/2 - avatar.height()/2, avatar.width(), avatar.height() ); painter->drawPixmap( r, avatar ); diff --git a/src/libtomahawk/widgets/welcomewidget.h b/src/libtomahawk/widgets/welcomewidget.h index dcbd7837a..6df35c045 100644 --- a/src/libtomahawk/widgets/welcomewidget.h +++ b/src/libtomahawk/widgets/welcomewidget.h @@ -52,7 +52,7 @@ public: m_playlistIcon = QPixmap( RESPATH "images/playlist-icon.png" ); m_autoIcon = QPixmap( RESPATH "images/automatic-playlist.png" ); m_stationIcon = QPixmap( RESPATH "images/station.png" ); - m_defaultAvatar = QPixmap( RESPATH "images/user-avatar.png" ); + m_defaultAvatar = TomahawkUtils::createAvatarFrame( QPixmap( RESPATH "images/user-avatar.png" ) ); } protected: diff --git a/src/sourcetree/items/collectionitem.cpp b/src/sourcetree/items/collectionitem.cpp index 12f2a976c..644498940 100644 --- a/src/sourcetree/items/collectionitem.cpp +++ b/src/sourcetree/items/collectionitem.cpp @@ -71,6 +71,7 @@ CollectionItem::CollectionItem( SourcesModel* mdl, SourceTreeItem* parent, cons // ); // m_coolPlaylistsItem->setSortValue( 200 ); + m_superCol = TomahawkUtils::createAvatarFrame( QPixmap( RESPATH "images/supercollection.png" ) ); return; } @@ -101,6 +102,8 @@ CollectionItem::CollectionItem( SourcesModel* mdl, SourceTreeItem* parent, cons if( ViewManager::instance()->pageForCollection( source->collection() ) ) model()->linkSourceItemToPage( this, ViewManager::instance()->pageForCollection( source->collection() ) ); + m_defaultAvatar = TomahawkUtils::createAvatarFrame( QPixmap( RESPATH "images/user-avatar.png" ) ); + // load auto playlists and stations! connect( source.data(), SIGNAL( stats( QVariantMap ) ), this, SIGNAL( updated() ) ); @@ -164,17 +167,15 @@ CollectionItem::activate() QIcon CollectionItem::icon() const { - QPixmap pixmap; if( m_source.isNull() ) - pixmap = QPixmap( RESPATH "images/supercollection.png" ); + return m_superCol; else { if( m_source->avatar().isNull() ) - pixmap = QPixmap( RESPATH "images/user-avatar.png" ); + return m_defaultAvatar; else - pixmap = m_source->avatar(); + return m_source->avatar( Source::FancyStyle ); } - return QIcon( TomahawkUtils::createAvatarFrame( pixmap ) ); } diff --git a/src/sourcetree/items/collectionitem.h b/src/sourcetree/items/collectionitem.h index 15fae1456..5b1f0341e 100644 --- a/src/sourcetree/items/collectionitem.h +++ b/src/sourcetree/items/collectionitem.h @@ -74,6 +74,7 @@ private: void playlistDeletedInternal( SourceTreeItem* parent, const T& playlists ); Tomahawk::source_ptr m_source; + QPixmap m_superCol, m_defaultAvatar; CategoryItem* m_playlists; CategoryItem* m_stations; diff --git a/src/sourcetree/sourcetreeview.cpp b/src/sourcetree/sourcetreeview.cpp index 3f169dc36..0652da1fd 100644 --- a/src/sourcetree/sourcetreeview.cpp +++ b/src/sourcetree/sourcetreeview.cpp @@ -673,9 +673,12 @@ SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co { painter->setRenderHint( QPainter::Antialiasing ); - QRect figRect = o.rect.adjusted( o.rect.width() - figWidth - 6, 0, -15, -o.rect.height() + 16 ); + QRect figRect = o.rect.adjusted( o.rect.width() - figWidth - 8, 0, -13, -o.rect.height() + 16 ); int hd = ( option.rect.height() - figRect.height() ) / 2; figRect.adjust( 0, hd, 0, hd ); +#ifdef Q_OS_WIN + figRect.adjust( -3, 0, 3, 0 ); +#endif painter->setFont( bold ); QColor figColor( 167, 183, 211 ); From 01c501202887e3dca3938ed5fe480da9ab935c96 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Fri, 12 Aug 2011 12:50:49 -0400 Subject: [PATCH 50/61] use artist-description radio instead of song-radio when no artist/song elements are present. fixes TWK-355 --- .../playlist/dynamic/echonest/EchonestGenerator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp index dea04b55e..22dafb554 100644 --- a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp +++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp @@ -401,8 +401,8 @@ EchonestGenerator::appendRadioType( Echonest::DynamicPlaylist::PlaylistParams& p params.append( Echonest::DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Type, Echonest::DynamicPlaylist::ArtistRadioType ) ); else if( onlyThisArtistType( Echonest::DynamicPlaylist::SongRadioType ) ) params.append( Echonest::DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Type, Echonest::DynamicPlaylist::SongRadioType ) ); - else // no artist or song or description types. default to song-radio - params.append( Echonest::DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Type, Echonest::DynamicPlaylist::SongRadioType ) ); + else // no artist or song or description types. default to artist-description + params.append( Echonest::DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Type, Echonest::DynamicPlaylist::ArtistDescriptionType ) ); return static_cast< Echonest::DynamicPlaylist::ArtistTypeEnum >( params.last().second.toInt() ); } From bb0e7e76314b82e8de7086488ff7794c478064ec Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Fri, 12 Aug 2011 12:52:13 -0400 Subject: [PATCH 51/61] changelog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 7001a7807..2cb645b39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ Version 0.2.0: + * Fix inability to create Echonest playlists based solely on style or mood. * Created new Album page (that shows other albums from that artist available in your Super Collection) * Updated playlists when revision info is recieved * Added support for "playing" Rdio track URLs and ability to drag/drop them into Tomahawk From 7d90bc74262ac770828216cedd70bca3de7c057d Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Fri, 12 Aug 2011 13:04:12 -0400 Subject: [PATCH 52/61] support rd.io shortened links too --- src/libtomahawk/globalactionmanager.cpp | 12 +++++++----- src/libtomahawk/utils/shortenedlinkparser.cpp | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/libtomahawk/globalactionmanager.cpp b/src/libtomahawk/globalactionmanager.cpp index ffd7fd253..1a797ee3a 100644 --- a/src/libtomahawk/globalactionmanager.cpp +++ b/src/libtomahawk/globalactionmanager.cpp @@ -796,15 +796,16 @@ GlobalActionManager::acceptsMimeData( const QMimeData* data, bool tracksOnly ) return true; // crude check for rdio tracks - if ( data->hasFormat( "text/plain" ) && data->data( "text/plain" ).contains( "rdio.com" ) && - ( tracksOnly ? data->data( "text/plain" ).contains( "track" ) : true ) ) - return true; + if ( data->hasFormat( "text/plain" ) && data->data( "text/plain" ).contains( "rdio.com" ) && + ( tracksOnly ? data->data( "text/plain" ).contains( "track" ) : true ) ) + return true; // We whitelist t.co and bit.ly (and j.mp) since they do some link checking. Often playable (e.g. spotify..) links hide behind them, // so we do an extra level of lookup if ( ( data->hasFormat( "text/plain" ) && data->data( "text/plain" ).contains( "bit.ly" ) ) || ( data->hasFormat( "text/plain" ) && data->data( "text/plain" ).contains( "j.mp" ) ) || - ( data->hasFormat( "text/plain" ) && data->data( "text/plain" ).contains( "t.co" ) ) ) + ( data->hasFormat( "text/plain" ) && data->data( "text/plain" ).contains( "t.co" ) ) || + ( data->hasFormat( "text/plain" ) && data->data( "text/plain" ).contains( "rd.io" ) ) ) return true; return false; @@ -847,7 +848,8 @@ GlobalActionManager::handleTrackUrls( const QString& urls ) rdio->parse( tracks ); } else if ( urls.contains( "bit.ly" ) || urls.contains( "j.mp" ) || - urls.contains( "t.co" ) ) + urls.contains( "t.co" ) || + urls.contains( "rd.io" ) ) { QStringList tracks = urls.split( "\n" ); diff --git a/src/libtomahawk/utils/shortenedlinkparser.cpp b/src/libtomahawk/utils/shortenedlinkparser.cpp index 6b1cade6c..6e2d04847 100644 --- a/src/libtomahawk/utils/shortenedlinkparser.cpp +++ b/src/libtomahawk/utils/shortenedlinkparser.cpp @@ -44,7 +44,8 @@ ShortenedLinkParser::lengthenUrl( const QString& url ) // Whitelisted links if ( !( url.contains( "t.co" ) || url.contains( "bit.ly" ) || - url.contains( "j.mp" ) ) ) + url.contains( "j.mp" ) || + url.contains( "rd.io" ) ) ) return; tDebug() << "Looking up..." << url; From 009be45dc396c7241fbbd93edef345d456ef8bb6 Mon Sep 17 00:00:00 2001 From: Jason Herskowitz Date: Fri, 12 Aug 2011 14:50:51 -0400 Subject: [PATCH 53/61] Cha-cha-cha-changelog --- ChangeLog | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2cb645b39..0c96ba8e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,15 +1,16 @@ Version 0.2.0: * Fix inability to create Echonest playlists based solely on style or mood. * Created new Album page (that shows other albums from that artist available in your Super Collection) - * Updated playlists when revision info is recieved + * Update playlists in dashboard to keep them in sync * Added support for "playing" Rdio track URLs and ability to drag/drop them into Tomahawk * Change "Recently Played" page to "Dashboard" * Prioritize resolving newer queries to make GUI more responsive + * Automatically expand local collection node in sidebar on launch * Display spinner animation while searching for tracks * Fix for occasionally flashing play control buttons * Remove horizontal scrollbars when they aren't needed - * Let headless users trigger a rescan with --filescan - * Removed "test login" button from Last.fm settings + * Let headless-Tomahawk users trigger a rescan with --filescan + * Removed "test login" button from Last.fm settings (OS X only) * Fix font and image sizes from being too big/small on some OSes * Include Stations and Automatic Playlists in News Stations and Playlists widget * When click through to station or playlist ensure that sidebar navigation reflects it @@ -34,8 +35,7 @@ Version 0.2.0: * Fixed a few crashes that could occur when fetching data from Last.fm. * Made Twitter dialog more readable/understandable. * Added Artist pages (and links to them from now playing metadata and from collection track list views) - with artist bio snippet, related artists, top tracks and view of all tracks/albums from that - artist in user's Super Collection + with artist bio snippet, related artists, top tracks and view of all tracks/albums from that artist in user's Super Collection * Fixed streaming from https:// links * Desktop notifications for now playing (Linux only) * Implement new javascript resolver API and ability to present configuration options for resolvers @@ -62,11 +62,11 @@ Version 0.2.0: * Don't require @foo.com domains for jabber and google * Added global search function that searches all available sources (super collection and all enabled resolvers) * Cleaned up Preference Window and styling - * Collection scanner now can now run automatically, watching files and + * Collection scanner now can run automatically, watching files and directories for changes. On by default. * Added Pipeline view window * Allow seeking in songs - if possible - * Added ability to make a copy of a sources' playlists and add to your own playlists + * Added ability to make a copy of a peer's playlists and add to your own playlists * Added MediaKey support on OS X * Shuffle and Repeat settings are stored on a playlist by playlist basis From 809d1139d4a73a8445eb006b941d910bba26b23d Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Fri, 12 Aug 2011 15:12:39 -0400 Subject: [PATCH 54/61] Never sh ow horiz scrollbar in welcomewidget trackview --- src/libtomahawk/widgets/welcomewidget.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libtomahawk/widgets/welcomewidget.cpp b/src/libtomahawk/widgets/welcomewidget.cpp index 49e664d19..f2c47e757 100644 --- a/src/libtomahawk/widgets/welcomewidget.cpp +++ b/src/libtomahawk/widgets/welcomewidget.cpp @@ -81,6 +81,7 @@ WelcomeWidget::WelcomeWidget( QWidget* parent ) m_tracksModel->setStyle( TrackModel::ShortWithAvatars ); ui->tracksView->overlay()->setEnabled( false ); ui->tracksView->setPlaylistModel( m_tracksModel ); + ui->tracksView->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); m_recentAlbumsModel = new AlbumModel( ui->additionsView ); ui->additionsView->setAlbumModel( m_recentAlbumsModel ); From b43fe66409f9793d4a676a4b05bcbff01d60b771 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Fri, 12 Aug 2011 15:34:21 -0400 Subject: [PATCH 55/61] Hide header for track list in welcome widget --- src/libtomahawk/widgets/welcomewidget.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libtomahawk/widgets/welcomewidget.cpp b/src/libtomahawk/widgets/welcomewidget.cpp index f2c47e757..1316069d2 100644 --- a/src/libtomahawk/widgets/welcomewidget.cpp +++ b/src/libtomahawk/widgets/welcomewidget.cpp @@ -81,6 +81,7 @@ WelcomeWidget::WelcomeWidget( QWidget* parent ) 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_recentAlbumsModel = new AlbumModel( ui->additionsView ); From 7baf43e3d7ed3dada2c20c0bf01b71492c79a791 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Fri, 12 Aug 2011 22:36:39 +0200 Subject: [PATCH 56/61] shrink font in newplaylistwidget und allow wordwrap for the text --- src/libtomahawk/widgets/newplaylistwidget.ui | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/src/libtomahawk/widgets/newplaylistwidget.ui b/src/libtomahawk/widgets/newplaylistwidget.ui index 0e9215b2f..74a6d7956 100644 --- a/src/libtomahawk/widgets/newplaylistwidget.ui +++ b/src/libtomahawk/widgets/newplaylistwidget.ui @@ -6,7 +6,7 @@ 0 0 - 985 + 729 460 @@ -16,11 +16,6 @@ - - - 13 - - Enter a title for the new playlist: @@ -38,11 +33,6 @@ - - - 13 - - Tomahawk offers a variety of ways to help you create playlists and find music you enjoy! @@ -53,14 +43,12 @@ - - - 13 - - Just enter a genre or tag name and Tomahawk will suggest a few songs to get you started with your new playlist: + + true + From aff075f2adb16296bbdbaa3c9fbb25e0a843afb6 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Fri, 12 Aug 2011 21:35:51 +0200 Subject: [PATCH 57/61] added --help command line option --- src/tomahawkapp.cpp | 18 ++++++++++++++++++ src/tomahawkapp.h | 2 ++ 2 files changed, 20 insertions(+) diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp index 6fd9af544..3533a792c 100644 --- a/src/tomahawkapp.cpp +++ b/src/tomahawkapp.cpp @@ -124,6 +124,12 @@ TomahawkApp::TomahawkApp( int& argc, char *argv[] ) void TomahawkApp::init() { + if ( arguments().contains( "--help" ) || arguments().contains( "-h" ) ) + { + printHelp(); + ::exit(0); + } + Logger::setupLogfile(); qsrand( QTime( 0, 0, 0 ).secsTo( QTime::currentTime() ) ); @@ -297,6 +303,18 @@ TomahawkApp::instance() return (TomahawkApp*)TOMAHAWK_APPLICATION::instance(); } +void +TomahawkApp::printHelp() +{ + std::cout << QString( "usage: " + arguments().at( 0 ) + " [options]" ).toAscii().data(); + std::cout << QString( "options are:" ).toAscii().data(); + std::cout << QString( " --help Show this help" ).toAscii().data(); + std::cout << QString( " --http Initialize HTTP server" ).toAscii().data(); + std::cout << QString( " --filescan Scan for files on startup" ).toAscii().data(); + std::cout << QString( " --testdb Use a test database instead of real collection" ).toAscii().data(); + std::cout << QString( " --noupnp Disable UPNP" ).toAscii().data(); + std::cout << QString( " --nosip Disable SIP" ).toAscii().data(); +} #ifndef TOMAHAWK_HEADLESS AudioControls* diff --git a/src/tomahawkapp.h b/src/tomahawkapp.h index ea13702e7..9e36f802b 100644 --- a/src/tomahawkapp.h +++ b/src/tomahawkapp.h @@ -108,6 +108,8 @@ private slots: private: void registerMetaTypes(); + void printHelp(); + // Start-up order: database, collection, pipeline, servent, http void initDatabase(); void initLocalCollection(); From 5e6751dc64670c140df2485f100b600649bc5066 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sat, 13 Aug 2011 04:07:29 +0200 Subject: [PATCH 58/61] merge lfranchi's commit --- src/tomahawkapp.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp index 3533a792c..be2a680eb 100644 --- a/src/tomahawkapp.cpp +++ b/src/tomahawkapp.cpp @@ -306,14 +306,16 @@ TomahawkApp::instance() void TomahawkApp::printHelp() { - std::cout << QString( "usage: " + arguments().at( 0 ) + " [options]" ).toAscii().data(); - std::cout << QString( "options are:" ).toAscii().data(); - std::cout << QString( " --help Show this help" ).toAscii().data(); - std::cout << QString( " --http Initialize HTTP server" ).toAscii().data(); - std::cout << QString( " --filescan Scan for files on startup" ).toAscii().data(); - std::cout << QString( " --testdb Use a test database instead of real collection" ).toAscii().data(); - std::cout << QString( " --noupnp Disable UPNP" ).toAscii().data(); - std::cout << QString( " --nosip Disable SIP" ).toAscii().data(); + std::cout << QString( "usage: " + arguments().at( 0 ) + " [options] [url]\n" ).toAscii().data(); + std::cout << QString( "options are:\n" ).toAscii().data(); + std::cout << QString( " --help Show this help\n" ).toAscii().data(); + std::cout << QString( " --http Initialize HTTP server\n" ).toAscii().data(); + std::cout << QString( " --filescan Scan for files on startup\n" ).toAscii().data(); + std::cout << QString( " --testdb Use a test database instead of real collection\n" ).toAscii().data(); + std::cout << QString( " --noupnp Disable UPNP\n" ).toAscii().data(); + std::cout << QString( " --nosip Disable SIP\n" ).toAscii().data(); + std::cout << QString( "\nurl is a tomahawk:// command or alternatively a url that Tomahawk can recognize.\n" ).toAscii().data(); + std::cout << QString( "For more documentation, see http://wiki.tomahawk-player.org/mediawiki/index.php/Tomahawk://_Links\n" ).toAscii().data(); } #ifndef TOMAHAWK_HEADLESS From aa68229ac69d4aa64c774e11aacb5d17fc789afa Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 13 Aug 2011 04:15:58 +0200 Subject: [PATCH 59/61] * Fixed TWK-107: paint dividers between toolbar, central widget and status bar. --- src/libtomahawk/utils/proxystyle.cpp | 5 ++++ src/libtomahawk/viewmanager.cpp | 6 ----- src/tomahawkwindow.cpp | 11 +++++++++ src/tomahawkwindow.ui | 34 +++++++++++++++++++++++++++- 4 files changed, 49 insertions(+), 7 deletions(-) diff --git a/src/libtomahawk/utils/proxystyle.cpp b/src/libtomahawk/utils/proxystyle.cpp index 1e906f0f6..cba2b80ac 100644 --- a/src/libtomahawk/utils/proxystyle.cpp +++ b/src/libtomahawk/utils/proxystyle.cpp @@ -80,6 +80,11 @@ ProxyStyle::drawControl( ControlElement ce, const QStyleOption* opt, QPainter* p p->setPen( QColor( 0x8c, 0x8c, 0x8c ) ); p->drawLine( opt->rect.topLeft(), opt->rect.bottomRight() ); } + else + { + p->setPen( QColor( 0xff, 0xff, 0xff ) ); + p->drawLine( opt->rect.topLeft(), opt->rect.bottomRight() ); + } } else QProxyStyle::drawControl( ce, opt, p, w ); diff --git a/src/libtomahawk/viewmanager.cpp b/src/libtomahawk/viewmanager.cpp index b50a6ada9..6d990ebf3 100644 --- a/src/libtomahawk/viewmanager.cpp +++ b/src/libtomahawk/viewmanager.cpp @@ -80,11 +80,6 @@ ViewManager::ViewManager( QObject* parent ) m_infobar = new InfoBar(); m_stack = new QStackedWidget(); - QFrame* line = new QFrame(); - line->setFrameStyle( QFrame::HLine ); - line->setStyleSheet( "border: 1px solid gray;" ); - line->setMaximumHeight( 1 ); - m_splitter = new AnimatedSplitter(); m_splitter->setOrientation( Qt::Vertical ); m_splitter->setChildrenCollapsible( false ); @@ -101,7 +96,6 @@ ViewManager::ViewManager( QObject* parent ) m_widget->layout()->addWidget( m_infobar ); m_widget->layout()->addWidget( m_topbar ); - m_widget->layout()->addWidget( line ); m_widget->layout()->addWidget( m_splitter ); m_superCollectionView = new ArtistView(); diff --git a/src/tomahawkwindow.cpp b/src/tomahawkwindow.cpp index c6e7fcc7b..13dba067d 100644 --- a/src/tomahawkwindow.cpp +++ b/src/tomahawkwindow.cpp @@ -93,6 +93,7 @@ TomahawkWindow::TomahawkWindow( QWidget* parent ) ui->centralWidget->setContentsMargins( 0, 0, 0, 0 ); ui->centralWidget->layout()->setContentsMargins( 0, 0, 0, 0 ); ui->centralWidget->layout()->setMargin( 0 ); + ui->centralWidget->layout()->setSpacing( 0 ); setupSideBar(); setupToolBar(); @@ -174,6 +175,16 @@ TomahawkWindow::applyPlatformTweaks() #ifdef Q_WS_MAC setUnifiedTitleAndToolBarOnMac( true ); #endif + +#ifdef Q_OS_MAC + ui->hline1->setMaximumHeight( 0 ); + ui->hline2->setMaximumHeight( 0 ); + ui->hline1->hide(); + ui->hline2->hide(); +#else + ui->hline1->setStyleSheet( "border: 1px solid gray;" ); + ui->hline2->setStyleSheet( "border: 1px solid gray;" ); +#endif } diff --git a/src/tomahawkwindow.ui b/src/tomahawkwindow.ui index dad448a42..c9fde85c0 100644 --- a/src/tomahawkwindow.ui +++ b/src/tomahawkwindow.ui @@ -15,6 +15,22 @@ + + + + + 16777215 + 1 + + + + QFrame::HLine + + + QFrame::Raised + + + @@ -27,6 +43,22 @@ + + + + + 16777215 + 1 + + + + QFrame::HLine + + + QFrame::Raised + + + @@ -35,7 +67,7 @@ 0 0 1000 - 22 + 20 From f15dd8153fd0f6536ea790d79bd09146534c32cf Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 13 Aug 2011 04:23:37 +0200 Subject: [PATCH 60/61] * Try to fix OS X painting glitch. --- src/libtomahawk/utils/proxystyle.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libtomahawk/utils/proxystyle.cpp b/src/libtomahawk/utils/proxystyle.cpp index cba2b80ac..0c1bf1dc0 100644 --- a/src/libtomahawk/utils/proxystyle.cpp +++ b/src/libtomahawk/utils/proxystyle.cpp @@ -80,11 +80,13 @@ ProxyStyle::drawControl( ControlElement ce, const QStyleOption* opt, QPainter* p p->setPen( QColor( 0x8c, 0x8c, 0x8c ) ); p->drawLine( opt->rect.topLeft(), opt->rect.bottomRight() ); } +#ifndef Q_WS_MAC else { p->setPen( QColor( 0xff, 0xff, 0xff ) ); p->drawLine( opt->rect.topLeft(), opt->rect.bottomRight() ); } +#endif } else QProxyStyle::drawControl( ce, opt, p, w ); From 637ec28ab1eb0e5f4d9cb11424082649295ef407 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 13 Aug 2011 04:38:08 +0200 Subject: [PATCH 61/61] * Try to fix ViewManager, too. --- src/libtomahawk/viewmanager.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/libtomahawk/viewmanager.cpp b/src/libtomahawk/viewmanager.cpp index 6d990ebf3..1be1c6a1e 100644 --- a/src/libtomahawk/viewmanager.cpp +++ b/src/libtomahawk/viewmanager.cpp @@ -80,6 +80,13 @@ ViewManager::ViewManager( QObject* parent ) m_infobar = new InfoBar(); m_stack = new QStackedWidget(); +#ifdef Q_OS_MAC + QFrame* line = new QFrame(); + line->setFrameStyle( QFrame::HLine ); + line->setStyleSheet( "border: 1px solid gray;" ); + line->setMaximumHeight( 1 ); +#endif + m_splitter = new AnimatedSplitter(); m_splitter->setOrientation( Qt::Vertical ); m_splitter->setChildrenCollapsible( false ); @@ -96,6 +103,9 @@ ViewManager::ViewManager( QObject* parent ) m_widget->layout()->addWidget( m_infobar ); m_widget->layout()->addWidget( m_topbar ); +#ifdef Q_OS_MAC + m_widget->layout()->addWidget( line ); +#endif m_widget->layout()->addWidget( m_splitter ); m_superCollectionView = new ArtistView();