diff --git a/src/network/connection.cpp b/src/network/connection.cpp index 361b674d9..3e83e650f 100644 --- a/src/network/connection.cpp +++ b/src/network/connection.cpp @@ -298,7 +298,7 @@ Connection::setId( const QString& id ) void Connection::readyRead() { - qDebug() << "readyRead, bytesavail:" << m_sock->bytesAvailable(); +// qDebug() << "readyRead, bytesavail:" << m_sock->bytesAvailable(); if( m_msg.isNull() ) { diff --git a/src/playlist/playlistview.cpp b/src/playlist/playlistview.cpp index 1502adef3..305e1d30e 100644 --- a/src/playlist/playlistview.cpp +++ b/src/playlist/playlistview.cpp @@ -43,15 +43,15 @@ PlaylistView::setupMenus() m_itemMenu.addSeparator(); m_addItemsToPlaylistAction = m_itemMenu.addAction( tr( "&Add to Playlist" ) ); m_itemMenu.addSeparator(); - m_deleteItemAction = m_itemMenu.addAction( tr( "&Delete Item" ) ); + m_deleteItemsAction = m_itemMenu.addAction( tr( "&Delete Item" ) ); if ( model() ) - m_deleteItemAction->setEnabled( !model()->isReadOnly() ); + m_deleteItemsAction->setEnabled( !model()->isReadOnly() ); connect( m_playItemAction, SIGNAL( triggered() ), SLOT( playItem() ) ); connect( m_addItemsToQueueAction, SIGNAL( triggered() ), SLOT( addItemsToQueue() ) ); connect( m_addItemsToPlaylistAction, SIGNAL( triggered() ), SLOT( addItemsToPlaylist() ) ); - connect( m_deleteItemAction, SIGNAL( triggered() ), SLOT( deleteItem() ) ); + connect( m_deleteItemsAction, SIGNAL( triggered() ), SLOT( deleteItems() ) ); } @@ -96,7 +96,7 @@ PlaylistView::addItemsToPlaylist() void -PlaylistView::deleteItem() +PlaylistView::deleteItems() { - proxyModel()->removeIndex( contextMenuIndex() ); + proxyModel()->removeIndexes( selectedIndexes() ); } diff --git a/src/playlist/playlistview.h b/src/playlist/playlistview.h index a28cc4a69..6f340a585 100644 --- a/src/playlist/playlistview.h +++ b/src/playlist/playlistview.h @@ -23,7 +23,7 @@ private slots: void onCustomContextMenu( const QPoint& pos ); void addItemsToPlaylist(); - void deleteItem(); + void deleteItems(); private: void setupMenus(); @@ -33,7 +33,7 @@ private: QAction* m_playItemAction; QAction* m_addItemsToQueueAction; QAction* m_addItemsToPlaylistAction; - QAction* m_deleteItemAction; + QAction* m_deleteItemsAction; }; #endif // PLAYLISTVIEW_H