Skip to content

Commit

Permalink
Fixed bug with ActivePlaylistView were songs we're being removed
Browse files Browse the repository at this point in the history
correctly. Also incremented VERSION number.
  • Loading branch information
klnusbaum committed Sep 16, 2012
1 parent 6154efc commit 12e0f88
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
2 changes: 1 addition & 1 deletion VERSION.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set( VERSION_MAJOR 0 )
set( VERSION_MINOR 6 )
set( VERSION_PATCH 1 )
set( VERSION_PATCH 2 )
set( VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} )

11 changes: 4 additions & 7 deletions src/ActivePlaylistView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,16 +102,17 @@ void ActivePlaylistView::handleContextMenuRequest(const QPoint& /*pos*/){
contextMenu.addAction(removeSongAction);
QAction *selected = contextMenu.exec(QCursor::pos());
if(selected==NULL){
selectionModel()->clear();
selectionModel()->clearSelection();
}
}

void ActivePlaylistView::removeSongs(){
dataStore->removeSongsFromActivePlaylist(
QSet<library_song_id_t> toRemove =
Utils::getSelectedIds<library_song_id_t>(
this,
model,
DataStore::getActivePlaylistLibIdColName()));
DataStore::getActivePlaylistLibIdColName());
dataStore->removeSongsFromActivePlaylist(toRemove);
selectionModel()->clearSelection();
}

Expand Down Expand Up @@ -141,10 +142,6 @@ void ActivePlaylistView::focusOutEvent(QFocusEvent *event){
}
}

void ActivePlaylistView::focusInEvent(QFocusEvent* /*event*/){
selectionModel()->clearSelection();
}


} //end namespace

3 changes: 0 additions & 3 deletions src/ActivePlaylistView.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@ Q_OBJECT
/** \brief . */
void focusOutEvent(QFocusEvent *event);

/** \brief . */
void focusInEvent(QFocusEvent *event);

//@}

private:
Expand Down

0 comments on commit 12e0f88

Please sign in to comment.