diff --git a/src/libtomahawk/playlist/playlistview.cpp b/src/libtomahawk/playlist/playlistview.cpp index f389ed423..36a964420 100644 --- a/src/libtomahawk/playlist/playlistview.cpp +++ b/src/libtomahawk/playlist/playlistview.cpp @@ -80,110 +80,7 @@ PlaylistView::setPlaylistModel( PlaylistModel* model ) } -/** Drop **/ - -void -PlaylistView::dragEnterEvent( QDragEnterEvent* event ) -{ - qDebug() << Q_FUNC_INFO; - QTreeView::dragEnterEvent( event ); - - if ( DropJob::acceptsMimeData( event->mimeData() ) ) - { - m_dragging = true; - m_dropRect = QRect(); - - qDebug() << Q_FUNC_INFO << "Accepting Drag Event"; - event->acceptProposedAction(); - } -} - - -void -PlaylistView::dragMoveEvent( QDragMoveEvent* event ) -{ - QTreeView::dragMoveEvent( event ); - - if ( model()->isReadOnly() ) - { - qDebug() << Q_FUNC_INFO << "Ignoring DragMove Event"; - event->ignore(); - return; - } - - if ( DropJob::acceptsMimeData( event->mimeData() ) ) - { - qDebug() << Q_FUNC_INFO << "Accepting DragMove Event"; - } - - setDirtyRegion( m_dropRect ); -} - - -void -PlaylistView::dropEvent( QDropEvent* event ) -{ - QTreeView::dropEvent( event ); - - if ( event->isAccepted() ) - { - qDebug() << Q_FUNC_INFO << "Ignoring accepted event!"; - } - else - { - if ( DropJob::acceptsMimeData( event->mimeData()) ) - { - const QPoint pos = event->pos(); - const QModelIndex index = indexAt( pos ); - - qDebug() << Q_FUNC_INFO << "Drop Event accepted at row:" << index.row(); - event->acceptProposedAction(); - - if ( !model()->isReadOnly() ) - { - model()->dropMimeData( event->mimeData(), event->proposedAction(), index.row(), 0, index.parent() ); - } - } - } - - m_dragging = false; -} - - -void -PlaylistView::paintEvent( QPaintEvent* event ) -{ - QTreeView::paintEvent( event ); - QPainter painter( viewport() ); - - if ( m_dragging ) - { - // draw drop indicator - { - // draw indicator for inserting items - QBrush blendedBrush = viewOptions().palette.brush( QPalette::Normal, QPalette::Highlight ); - QColor color = blendedBrush.color(); - - const int y = ( m_dropRect.top() + m_dropRect.bottom() ) / 2; - const int thickness = m_dropRect.height() / 2; - - int alpha = 255; - const int alphaDec = alpha / ( thickness + 1 ); - for ( int i = 0; i < thickness; i++ ) - { - color.setAlpha( alpha ); - alpha -= alphaDec; - painter.setPen( color ); - painter.drawLine( 0, y - i, width(), y - i ); - painter.drawLine( 0, y + i, width(), y + i ); - } - } - } -} - - -/** Drop **/ void PlaylistView::keyPressEvent( QKeyEvent* event ) { diff --git a/src/libtomahawk/playlist/playlistview.h b/src/libtomahawk/playlist/playlistview.h index 26fe829c0..237cfe249 100644 --- a/src/libtomahawk/playlist/playlistview.h +++ b/src/libtomahawk/playlist/playlistview.h @@ -56,11 +56,7 @@ signals: protected: void keyPressEvent( QKeyEvent* event ); - virtual void dragEnterEvent( QDragEnterEvent* event ); - virtual void dragLeaveEvent( QDragLeaveEvent* /*event*/ ) { m_dragging = false; setDirtyRegion( m_dropRect ); } - virtual void dragMoveEvent( QDragMoveEvent* event ); - virtual void dropEvent( QDropEvent* event ); - void paintEvent( QPaintEvent* event ); + private slots: void onTrackCountChanged( unsigned int tracks ); diff --git a/src/libtomahawk/resolvers/scriptresolver.h b/src/libtomahawk/resolvers/scriptresolver.h index fb01b9f8b..8cf904e49 100644 --- a/src/libtomahawk/resolvers/scriptresolver.h +++ b/src/libtomahawk/resolvers/scriptresolver.h @@ -59,7 +59,6 @@ signals: public slots: virtual void stop(); virtual void resolve( const Tomahawk::query_ptr& query ); - virtual void start(); private slots: diff --git a/src/sourcetree/sourcetreeview.cpp b/src/sourcetree/sourcetreeview.cpp index dacdf1b39..5d4865ca3 100644 --- a/src/sourcetree/sourcetreeview.cpp +++ b/src/sourcetree/sourcetreeview.cpp @@ -267,7 +267,7 @@ SourceTreeView::addToSpotify( ) PlaylistItem* item = itemFromIndex< PlaylistItem >( idx ); playlist_ptr playlist = item->playlist(); qDebug() << Q_FUNC_INFO << "Static playlist" << playlist->title(); - qDebug() << Q_FUNC_INFO << playlist->tracks().first()->artist(); + // Do something with playlist -> spotify } else if( type == SourcesModel::AutomaticPlaylist || type == SourcesModel::Station ) {