From fbaa48187bc2cdb45d12dfa408fcbb6e34488540 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 27 Feb 2011 16:57:05 +0100 Subject: [PATCH 1/5] * Fixed showing a focus frame around DynamicView. --- src/libtomahawk/playlist/dynamic/DynamicView.cpp | 2 +- .../playlist/dynamic/widgets/DynamicWidget.cpp | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/libtomahawk/playlist/dynamic/DynamicView.cpp b/src/libtomahawk/playlist/dynamic/DynamicView.cpp index ecd2d10a1..84928150c 100644 --- a/src/libtomahawk/playlist/dynamic/DynamicView.cpp +++ b/src/libtomahawk/playlist/dynamic/DynamicView.cpp @@ -45,6 +45,7 @@ DynamicView::DynamicView( QWidget* parent ) { setContentsMargins( 0, 0, 0, 0 ); setFrameShape( QFrame::NoFrame ); + setAttribute( Qt::WA_MacShowFocusRect, 0 ); m_fadeOutAnim.setDuration( FADE_LENGTH ); m_fadeOutAnim.setCurveShape( QTimeLine::LinearCurve ); @@ -57,7 +58,6 @@ DynamicView::DynamicView( QWidget* parent ) m_slideAnim.setDirection( QTimeLine::Forward ); m_fadeOutAnim.setUpdateInterval( 5 ); - connect( &m_fadeOutAnim, SIGNAL( frameChanged( int ) ), viewport(), SLOT( update() ) ); connect( &m_fadeOutAnim, SIGNAL( finished() ), this, SLOT( animFinished() ) ); } diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp index 20ec27727..dea9b46ad 100644 --- a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp +++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp @@ -82,16 +82,14 @@ DynamicWidget::DynamicWidget( const Tomahawk::dynplaylist_ptr& playlist, QWidget m_layout->setSpacing( 0 ); setLayout( m_layout ); - connect( m_setup, SIGNAL( generatePressed( int ) ), this, SLOT( generate( int ) ) ); connect( m_setup, SIGNAL( typeChanged( QString ) ), this, SLOT( playlistTypeChanged( QString ) ) ); - + layoutFloatingWidgets(); - + connect( m_controls, SIGNAL( controlChanged( Tomahawk::dyncontrol_ptr ) ), this, SLOT( controlChanged( Tomahawk::dyncontrol_ptr ) ), Qt::QueuedConnection ); connect( m_controls, SIGNAL( controlsChanged() ), this, SLOT( controlsChanged() ), Qt::QueuedConnection ); - - + connect( PlaylistManager::instance(), SIGNAL( playClicked() ), this, SLOT( playPressed() ) ); connect( PlaylistManager::instance(), SIGNAL( pauseClicked() ), this, SLOT( pausePressed() ) ); } From 113985eea98af657702ce28057e63a14fb7ad0af Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Sat, 26 Feb 2011 17:55:37 -0500 Subject: [PATCH 2/5] Draw row bgs properly, expanding for playlists --- src/sourcetree/sourcetreeview.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/sourcetree/sourcetreeview.cpp b/src/sourcetree/sourcetreeview.cpp index 177482a61..173a6a957 100644 --- a/src/sourcetree/sourcetreeview.cpp +++ b/src/sourcetree/sourcetreeview.cpp @@ -492,9 +492,13 @@ SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co o.palette.setColor( QPalette::Text, o.palette.color( QPalette::HighlightedText ) ); } } - - QStyledItemDelegate::paint( painter, o2, QModelIndex() ); - + + QStyleOptionViewItemV4 o3 = option; + if ( index.data( SourceTreeItem::Type ) != SourcesModel::CollectionSource ) + o3.rect.setX( 0 ); + + QApplication::style()->drawControl( QStyle::CE_ItemViewItem, &o3, painter ); + if ( index.data( SourceTreeItem::Type ) == SourcesModel::CollectionSource ) { painter->save(); From aa8bb1531015d90283584bfe8d8067a87bc3d3fb Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Sun, 27 Feb 2011 14:15:39 -0500 Subject: [PATCH 3/5] Allow echonest/Foo includes --- src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f1b5d62d9..69c48ee90 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -143,6 +143,7 @@ INCLUDE_DIRECTORIES( ${TAGLIB_INCLUDES} ${LIBECHONEST_INCLUDE_DIR} + ${LIBECHONEST_INCLUDE_DIR}/.. ) SET( OS_SPECIFIC_LINK_LIBRARIES "" ) From c0777198d17fe146a461c01d0cd6141cfeb4ed1a Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 27 Feb 2011 20:18:07 +0100 Subject: [PATCH 4/5] * Should fix atEnd() implementation of BufferIODevice. --- src/libtomahawk/network/bufferiodevice.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libtomahawk/network/bufferiodevice.cpp b/src/libtomahawk/network/bufferiodevice.cpp index 836f4f6fc..bb964038f 100644 --- a/src/libtomahawk/network/bufferiodevice.cpp +++ b/src/libtomahawk/network/bufferiodevice.cpp @@ -69,6 +69,7 @@ BufferIODevice::inputComplete( const QString& errmsg ) { qDebug() << Q_FUNC_INFO; setErrorString( errmsg ); + m_size = m_pos; emit readChannelFinished(); } From d315e5b92fdc41f1df7a4f24e12d53794deba8ca Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 27 Feb 2011 20:18:33 +0100 Subject: [PATCH 5/5] * Stupid whitespace fix. --- src/libtomahawk/playlist/dynamic/DynamicView.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libtomahawk/playlist/dynamic/DynamicView.cpp b/src/libtomahawk/playlist/dynamic/DynamicView.cpp index 84928150c..c1da332f0 100644 --- a/src/libtomahawk/playlist/dynamic/DynamicView.cpp +++ b/src/libtomahawk/playlist/dynamic/DynamicView.cpp @@ -203,7 +203,7 @@ DynamicView::collapseEntries( int startRow, int num, int numToKeep ) m_fadingPointAnchor = QPoint( 0, fadingRectViewport.topLeft().y() ); // get the background - m_bg = backgroundBetween( m_fadingIndexes.rect(), startRow ); + m_bg = backgroundBetween( m_fadingIndexes.rect(), startRow ); m_fadeOutAnim.start();