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

* Fixed queue not allowing to remove items from it.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-08-14 03:14:39 +02:00
parent 7d8e29a932
commit 989243914c
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/audiocontrols.cpp
View File

@@ -517,6 +517,7 @@ AudioControls::onTrackClicked()
ViewManager::instance()->showCurrentTrack(); ViewManager::instance()->showCurrentTrack();
} }
void void
AudioControls::dragEnterEvent( QDragEnterEvent* e ) AudioControls::dragEnterEvent( QDragEnterEvent* e )
{ {
@@ -524,13 +525,15 @@ AudioControls::dragEnterEvent( QDragEnterEvent* e )
e->acceptProposedAction(); e->acceptProposedAction();
} }
void void
AudioControls::dragMoveEvent( QDragMoveEvent* e ) AudioControls::dragMoveEvent( QDragMoveEvent* /* e */ )
{ {
// if ( GlobalActionManager::instance()->acceptsMimeData( e->mimeData() ) ) // if ( GlobalActionManager::instance()->acceptsMimeData( e->mimeData() ) )
// e->acceptProposedAction(); // e->acceptProposedAction();
} }
void void
AudioControls::dropEvent( QDropEvent* e ) AudioControls::dropEvent( QDropEvent* e )
{ {
@@ -544,6 +547,7 @@ AudioControls::dropEvent( QDropEvent* e )
} }
} }
void void
AudioControls::droppedTracks( QList< query_ptr > tracks ) AudioControls::droppedTracks( QList< query_ptr > tracks )
{ {

1
src/libtomahawk/playlist/playlistmodel.h
View File

@@ -74,6 +74,7 @@ public:
virtual void removeIndex( const QModelIndex& index, bool moreToCome = false ); virtual void removeIndex( const QModelIndex& index, bool moreToCome = false );
bool isTemporary() const; bool isTemporary() const;
signals: signals:
void repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode mode ); void repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode mode );
void shuffleModeChanged( bool enabled ); void shuffleModeChanged( bool enabled );

4
src/libtomahawk/playlist/trackmodel.h
View File

@@ -62,6 +62,7 @@ public:
virtual QModelIndex parent( const QModelIndex& child ) const; virtual QModelIndex parent( const QModelIndex& child ) const;
virtual bool isReadOnly() const { return m_readOnly; } virtual bool isReadOnly() const { return m_readOnly; }
virtual void setReadOnly( bool b ) { m_readOnly = b; }
virtual QString title() const { return m_title; } virtual QString title() const { return m_title; }
virtual void setTitle( const QString& title ) { m_title = title; } virtual void setTitle( const QString& title ) { m_title = title; }
@@ -114,9 +115,6 @@ public slots:
virtual void setRepeatMode( Tomahawk::PlaylistInterface::RepeatMode /*mode*/ ) {} virtual void setRepeatMode( Tomahawk::PlaylistInterface::RepeatMode /*mode*/ ) {}
virtual void setShuffled( bool /*shuffled*/ ) {} virtual void setShuffled( bool /*shuffled*/ ) {}
protected:
virtual void setReadOnly( bool b ) { m_readOnly = b; }
private slots: private slots:
void onPlaybackFinished( const Tomahawk::result_ptr& result ); void onPlaybackFinished( const Tomahawk::result_ptr& result );
void onPlaybackStopped(); void onPlaybackStopped();

1
src/libtomahawk/viewmanager.cpp
View File

@@ -89,6 +89,7 @@ ViewManager::ViewManager( QObject* parent )
m_queueView = new QueueView( m_splitter ); m_queueView = new QueueView( m_splitter );
m_queueModel = new PlaylistModel( m_queueView ); m_queueModel = new PlaylistModel( m_queueView );
m_queueView->queue()->setPlaylistModel( m_queueModel ); m_queueView->queue()->setPlaylistModel( m_queueModel );
m_queueView->queue()->playlistModel()->setReadOnly( false );
AudioEngine::instance()->setQueue( m_queueView->queue()->proxyModel() ); AudioEngine::instance()->setQueue( m_queueView->queue()->proxyModel() );
m_splitter->addWidget( m_queueView ); m_splitter->addWidget( m_queueView );