1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00

* Moved and renamed PlaylistView::deleteItems() to TrackView::deleteSelectedItems().

This commit is contained in:
Christian Muehlhaeuser
2012-09-15 06:45:15 +02:00
parent 36a323366c
commit 0049177348
4 changed files with 25 additions and 18 deletions

View File

@@ -88,12 +88,6 @@ PlaylistView::keyPressEvent( QKeyEvent* event )
if ( !model() ) if ( !model() )
return; return;
if ( ( event->key() == Qt::Key_Delete || event->key() == Qt::Key_Backspace ) && !model()->isReadOnly() )
{
qDebug() << "Removing selected items";
deleteItems();
}
} }
@@ -129,13 +123,6 @@ PlaylistView::eventFilter( QObject* obj, QEvent* event )
} }
void
PlaylistView::deleteItems()
{
proxyModel()->removeIndexes( selectedIndexes() );
}
QList<PlaylistUpdaterInterface*> QList<PlaylistUpdaterInterface*>
PlaylistView::updaters() const PlaylistView::updaters() const
{ {
@@ -183,10 +170,6 @@ PlaylistView::onMenuTriggered( int action )
{ {
switch ( action ) switch ( action )
{ {
case ContextMenu::ActionDelete:
deleteItems();
break;
default: default:
break; break;
} }

View File

@@ -54,7 +54,6 @@ protected:
private slots: private slots:
void onMenuTriggered( int action ); void onMenuTriggered( int action );
void deleteItems();
void onDeleted(); void onDeleted();
void onChanged(); void onChanged();

View File

@@ -324,6 +324,11 @@ TrackView::keyPressEvent( QKeyEvent* event )
{ {
onItemActivated( currentIndex() ); onItemActivated( currentIndex() );
} }
if ( event->key() == Qt::Key_Delete || event->key() == Qt::Key_Backspace )
{
tDebug() << "Removing selected items from playlist";
deleteSelectedItems();
}
} }
@@ -593,6 +598,10 @@ TrackView::onMenuTriggered( int action )
onItemActivated( m_contextMenuIndex ); onItemActivated( m_contextMenuIndex );
break; break;
case ContextMenu::ActionDelete:
deleteSelectedItems();
break;
default: default:
break; break;
} }
@@ -741,3 +750,17 @@ TrackView::setFilter( const QString& filter )
m_proxyModel->setFilter( filter ); m_proxyModel->setFilter( filter );
return true; return true;
} }
void
TrackView::deleteSelectedItems()
{
if ( !model()->isReadOnly() )
{
proxyModel()->removeIndexes( selectedIndexes() );
}
else
{
tDebug() << Q_FUNC_INFO << "Error: Model is read-only!";
}
}

View File

@@ -86,6 +86,8 @@ public:
public slots: public slots:
virtual void onItemActivated( const QModelIndex& index ); virtual void onItemActivated( const QModelIndex& index );
void deleteSelectedItems();
void playItem(); void playItem();
void onMenuTriggered( int action ); void onMenuTriggered( int action );