Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

actions: rename DeselectItems to RemoveSelection

Browse Source
This commit is contained in:
Andrzej Rybczak
2012-09-05 23:42:50 +02:00
parent fe9bcfbeab
commit c34bcee12b
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/actions.cpp
View File

@@ -1727,16 +1727,17 @@ void ReverseSelection::Run()
ShowMessage("Selection reversed"); ShowMessage("Selection reversed");
} }
bool DeselectItems::canBeRun() const bool RemoveSelection::canBeRun() const
{ {
return proxySongList(myScreen).get(); return proxySongList(myScreen).get();
} }
void DeselectItems::Run() void RemoveSelection::Run()
{ {
auto pl = proxySongList(myScreen); auto pl = proxySongList(myScreen);
for (size_t i = 0; i < pl->size(); ++i) for (size_t i = 0; i < pl->size(); ++i)
pl->setSelected(i, false); pl->setSelected(i, false);
ShowMessage("Selection removed");
} }
bool SelectAlbum::canBeRun() const bool SelectAlbum::canBeRun() const
@@ -2546,7 +2547,7 @@ void populateActions()
insertAction(new JumpToTagEditor()); insertAction(new JumpToTagEditor());
insertAction(new JumpToPositionInSong()); insertAction(new JumpToPositionInSong());
insertAction(new ReverseSelection()); insertAction(new ReverseSelection());
insertAction(new DeselectItems()); insertAction(new RemoveSelection());
insertAction(new SelectAlbum()); insertAction(new SelectAlbum());
insertAction(new AddSelectedItems()); insertAction(new AddSelectedItems());
insertAction(new CropMainPlaylist()); insertAction(new CropMainPlaylist());

6
src/actions.h
View File

@@ -39,7 +39,7 @@ enum ActionType
aToggleSingle, aToggleConsume, aToggleCrossfade, aSetCrossfade, aEditSong, aEditLibraryTag, aToggleSingle, aToggleConsume, aToggleCrossfade, aSetCrossfade, aEditSong, aEditLibraryTag,
aEditLibraryAlbum, aEditDirectoryName, aEditPlaylistName, aEditLyrics, aJumpToBrowser, aEditLibraryAlbum, aEditDirectoryName, aEditPlaylistName, aEditLyrics, aJumpToBrowser,
aJumpToMediaLibrary, aJumpToPlaylistEditor, aToggleScreenLock, aJumpToTagEditor, aJumpToMediaLibrary, aJumpToPlaylistEditor, aToggleScreenLock, aJumpToTagEditor,
aJumpToPositionInSong, aReverseSelection, aDeselectItems, aSelectAlbum, aAddSelectedItems, aJumpToPositionInSong, aReverseSelection, aRemoveSelection, aSelectAlbum, aAddSelectedItems,
aCropMainPlaylist, aCropPlaylist, aClearMainPlaylist, aClearPlaylist, aSortPlaylist, aReversePlaylist, aCropMainPlaylist, aCropPlaylist, aClearMainPlaylist, aClearPlaylist, aSortPlaylist, aReversePlaylist,
aApplyFilter, aFind, aFindItemForward, aFindItemBackward, aNextFoundItem, aApplyFilter, aFind, aFindItemForward, aFindItemBackward, aNextFoundItem,
aPreviousFoundItem, aToggleFindMode, aToggleReplayGainMode, aToggleSpaceMode, aToggleAddMode, aPreviousFoundItem, aToggleFindMode, aToggleReplayGainMode, aToggleSpaceMode, aToggleAddMode,
@@ -679,9 +679,9 @@ protected:
virtual void Run(); virtual void Run();
}; };
struct DeselectItems : public Action struct RemoveSelection : public Action
{ {
DeselectItems() : Action(aDeselectItems, "deselect_items") { } RemoveSelection() : Action(aRemoveSelection, "remove_selection") { }
protected: protected:
virtual bool canBeRun() const; virtual bool canBeRun() const;

2
src/bindings.cpp
View File

@@ -419,6 +419,8 @@ void BindingsConfiguration::generateDefault()
bind(k, aShowLyrics); bind(k, aShowLyrics);
if (notBound(k = stringToKey("v"))) if (notBound(k = stringToKey("v")))
bind(k, aReverseSelection); bind(k, aReverseSelection);
if (notBound(k = stringToKey("V")))
bind(k, aRemoveSelection);
if (notBound(k = stringToKey("B"))) if (notBound(k = stringToKey("B")))
bind(k, aSelectAlbum); bind(k, aSelectAlbum);
if (notBound(k = stringToKey("a"))) if (notBound(k = stringToKey("a")))

2
src/help.cpp
View File

@@ -237,7 +237,7 @@ void Help::GetKeybindings()
KeyDesc(aToggleAddMode, "Toggle add mode (add or remove/always add)"); KeyDesc(aToggleAddMode, "Toggle add mode (add or remove/always add)");
KeyDesc(aToggleMouse, "Toggle mouse support"); KeyDesc(aToggleMouse, "Toggle mouse support");
KeyDesc(aReverseSelection, "Reverse selection"); KeyDesc(aReverseSelection, "Reverse selection");
KeyDesc(aDeselectItems, "Deselect items"); KeyDesc(aRemoveSelection, "Remove selection");
KeyDesc(aSelectAlbum, "Select songs of album around the cursor"); KeyDesc(aSelectAlbum, "Select songs of album around the cursor");
KeyDesc(aAddSelectedItems, "Add selected items to playlist"); KeyDesc(aAddSelectedItems, "Add selected items to playlist");
KeyDesc(aAddRandomItems, "Add random items to playlist"); KeyDesc(aAddRandomItems, "Add random items to playlist");