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

add separate keys to move sel. before/after cursor

Browse Source
This commit is contained in:
Frank Blendinger
2010-07-14 12:29:46 +02:00
committed by Andrzej Rybczak
parent 883d1a6cdd
commit dc8aff65a2
5 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/help.cpp
View File

@@ -231,6 +231,8 @@ void Help::GetKeybindings()
*w << DisplayKeys(Key.MvSongUp) << "Move item(s) up\n";
*w << DisplayKeys(Key.MvSongDown) << "Move item(s) down\n";
*w << DisplayKeys(Key.MoveTo) << "Move selected item(s) to cursor position\n";
*w << DisplayKeys(Key.MoveBefore) << "Move selected item(s) before cursor position\n";
*w << DisplayKeys(Key.MoveAfter) << "Move selected item(s) after cursor position\n";
*w << DisplayKeys(Key.Add) << "Add url/file/directory to playlist\n";
# ifdef HAVE_TAGLIB_H
*w << DisplayKeys(Key.EditTags) << "Edit song's tags\n";

14
src/ncmpcpp.cpp
View File

@@ -1137,7 +1137,8 @@ int main(int argc, char *argv[])
wFooter->SetTimeout(ncmpcpp_window_timeout);
}
}
else if (Keypressed(input, Key.MoveTo) && myScreen == myPlaylist)
else if ((Keypressed(input, Key.MoveTo) || Keypressed(input, Key.MoveBefore)
|| Keypressed(input, Key.MoveAfter)) && myScreen == myPlaylist)
{
CHECK_PLAYLIST_FOR_FILTERING;
if (!myPlaylist->Items->hasSelected())
@@ -1147,13 +1148,18 @@ int main(int argc, char *argv[])
}
Playlist::BlockUpdate = 1;
size_t pos = myPlaylist->Items->Choice();
// if cursor is at the last item, break convention and move at the end of playlist
if (pos == myPlaylist->Items->Size()-1)
pos++;
std::vector<size_t> list;
myPlaylist->Items->GetSelected(list);
if (pos >= list.front() && pos <= list.back())
continue;
if (Keypressed(input, Key.MoveTo))
{
// if cursor is at the last item, break convention and move at the end of playlist
if (pos == myPlaylist->Items->Size()-1)
pos++;
}
else if (Keypressed(input, Key.MoveAfter))
pos++;
int diff = pos-list.front();
Mpd.StartCommandsList();
if (diff > 0)

8
src/settings.cpp
View File

@@ -220,6 +220,8 @@ void NcmpcppKeys::SetDefaults()
MvSongUp[0] = 'm';
MvSongDown[0] = 'n';
MoveTo[0] = 'M';
MoveBefore[0] = NullKey;
MoveAfter[0] = NullKey;
Add[0] = 'a';
SavePlaylist[0] = 'S';
GoToNowPlaying[0] = 'o';
@@ -302,6 +304,8 @@ void NcmpcppKeys::SetDefaults()
MvSongUp[1] = NullKey;
MvSongDown[1] = NullKey;
MoveTo[1] = NullKey;
MoveBefore[1] = NullKey;
MoveAfter[1] = NullKey;
Add[1] = NullKey;
SavePlaylist[1] = NullKey;
GoToNowPlaying[1] = NullKey;
@@ -571,6 +575,10 @@ void NcmpcppKeys::Read()
GetKeys(key, MvSongDown);
else if (key.find("key_move_to ") != std::string::npos)
GetKeys(key, MoveTo);
else if (key.find("key_move_before ") != std::string::npos)
GetKeys(key, MoveBefore);
else if (key.find("key_move_after ") != std::string::npos)
GetKeys(key, MoveAfter);
else if (key.find("key_add ") != std::string::npos)
GetKeys(key, Add);
else if (key.find("key_save_playlist ") != std::string::npos)

2
src/settings.h
View File

@@ -125,6 +125,8 @@ struct NcmpcppKeys
int MvSongUp[2];
int MvSongDown[2];
int MoveTo[2];
int MoveBefore[2];
int MoveAfter[2];
int Add[2];
int SavePlaylist[2];
int GoToNowPlaying[2];