mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 22:26:32 +02:00
Code Issues Releases Wiki Activity

Merge remote branch 'origin' into phonon

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-02-27 20:20:35 +01:00
parent 1073b7e194 d315e5b92f
commit c6d3599e47
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/CMakeLists.txt
View File

@@ -141,6 +141,7 @@ INCLUDE_DIRECTORIES(
${TAGLIB_INCLUDES} ${TAGLIB_INCLUDES}
${LIBECHONEST_INCLUDE_DIR} ${LIBECHONEST_INCLUDE_DIR}
${LIBECHONEST_INCLUDE_DIR}/..
) )
SET( OS_SPECIFIC_LINK_LIBRARIES "" ) SET( OS_SPECIFIC_LINK_LIBRARIES "" )

1
src/libtomahawk/network/bufferiodevice.cpp
View File

@@ -69,6 +69,7 @@ BufferIODevice::inputComplete( const QString& errmsg )
{ {
qDebug() << Q_FUNC_INFO; qDebug() << Q_FUNC_INFO;
setErrorString( errmsg ); setErrorString( errmsg );
m_size = m_pos;
emit readChannelFinished(); emit readChannelFinished();
} }

4
src/libtomahawk/playlist/dynamic/DynamicView.cpp
View File

@@ -45,6 +45,7 @@ DynamicView::DynamicView( QWidget* parent )
{ {
setContentsMargins( 0, 0, 0, 0 ); setContentsMargins( 0, 0, 0, 0 );
setFrameShape( QFrame::NoFrame ); setFrameShape( QFrame::NoFrame );
setAttribute( Qt::WA_MacShowFocusRect, 0 );
m_fadeOutAnim.setDuration( FADE_LENGTH ); m_fadeOutAnim.setDuration( FADE_LENGTH );
m_fadeOutAnim.setCurveShape( QTimeLine::LinearCurve ); m_fadeOutAnim.setCurveShape( QTimeLine::LinearCurve );
@@ -57,7 +58,6 @@ DynamicView::DynamicView( QWidget* parent )
m_slideAnim.setDirection( QTimeLine::Forward ); m_slideAnim.setDirection( QTimeLine::Forward );
m_fadeOutAnim.setUpdateInterval( 5 ); m_fadeOutAnim.setUpdateInterval( 5 );
connect( &m_fadeOutAnim, SIGNAL( frameChanged( int ) ), viewport(), SLOT( update() ) ); connect( &m_fadeOutAnim, SIGNAL( frameChanged( int ) ), viewport(), SLOT( update() ) );
connect( &m_fadeOutAnim, SIGNAL( finished() ), this, SLOT( animFinished() ) ); connect( &m_fadeOutAnim, SIGNAL( finished() ), this, SLOT( animFinished() ) );
} }
@@ -203,7 +203,7 @@ DynamicView::collapseEntries( int startRow, int num, int numToKeep )
m_fadingPointAnchor = QPoint( 0, fadingRectViewport.topLeft().y() ); m_fadingPointAnchor = QPoint( 0, fadingRectViewport.topLeft().y() );
// get the background // get the background
m_bg = backgroundBetween( m_fadingIndexes.rect(), startRow ); m_bg = backgroundBetween( m_fadingIndexes.rect(), startRow );
m_fadeOutAnim.start(); m_fadeOutAnim.start();

8
src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
View File

@@ -82,16 +82,14 @@ DynamicWidget::DynamicWidget( const Tomahawk::dynplaylist_ptr& playlist, QWidget
m_layout->setSpacing( 0 ); m_layout->setSpacing( 0 );
setLayout( m_layout ); setLayout( m_layout );
connect( m_setup, SIGNAL( generatePressed( int ) ), this, SLOT( generate( int ) ) ); connect( m_setup, SIGNAL( generatePressed( int ) ), this, SLOT( generate( int ) ) );
connect( m_setup, SIGNAL( typeChanged( QString ) ), this, SLOT( playlistTypeChanged( QString ) ) ); connect( m_setup, SIGNAL( typeChanged( QString ) ), this, SLOT( playlistTypeChanged( QString ) ) );
layoutFloatingWidgets(); layoutFloatingWidgets();
connect( m_controls, SIGNAL( controlChanged( Tomahawk::dyncontrol_ptr ) ), this, SLOT( controlChanged( Tomahawk::dyncontrol_ptr ) ), Qt::QueuedConnection ); 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( m_controls, SIGNAL( controlsChanged() ), this, SLOT( controlsChanged() ), Qt::QueuedConnection );
connect( PlaylistManager::instance(), SIGNAL( playClicked() ), this, SLOT( playPressed() ) ); connect( PlaylistManager::instance(), SIGNAL( playClicked() ), this, SLOT( playPressed() ) );
connect( PlaylistManager::instance(), SIGNAL( pauseClicked() ), this, SLOT( pausePressed() ) ); connect( PlaylistManager::instance(), SIGNAL( pauseClicked() ), this, SLOT( pausePressed() ) );
} }

10
src/sourcetree/sourcetreeview.cpp
View File

@@ -492,9 +492,13 @@ SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co
o.palette.setColor( QPalette::Text, o.palette.color( QPalette::HighlightedText ) ); 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 ) if ( index.data( SourceTreeItem::Type ) == SourcesModel::CollectionSource )
{ {
painter->save(); painter->save();