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

actions: make find forward/backward incremental

Browse Source
This commit is contained in:
Andrzej Rybczak
2014-11-06 23:22:55 +01:00
parent 7c71df8dc7
commit 6a5f46a458
21 changed files with 236 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/playlist_editor.cpp
View File

@@ -328,50 +328,40 @@ bool PlaylistEditor::allowsSearching()
return true;
}
bool PlaylistEditor::setSearchConstraint(const std::string &constraint)
void PlaylistEditor::setSearchConstraint(const std::string &constraint)
{
if (constraint.empty())
if (isActiveWindow(Playlists))
{
if (isActiveWindow(Playlists))
m_playlists_search_predicate.clear();
else if (isActiveWindow(Content))
m_content_search_predicate.clear();
return false;
m_playlists_search_predicate = RegexFilter<MPD::Playlist>(
boost::regex(constraint, Config.regex_type),
PlaylistEntryMatcher
);
}
else
else if (isActiveWindow(Content))
{
if (isActiveWindow(Playlists))
{
m_playlists_search_predicate = RegexFilter<MPD::Playlist>(
boost::regex(constraint, Config.regex_type),
PlaylistEntryMatcher
);
}
else if (isActiveWindow(Content))
{
m_content_search_predicate = RegexFilter<MPD::Song>(
boost::regex(constraint, Config.regex_type),
SongEntryMatcher
);
}
return true;
m_content_search_predicate = RegexFilter<MPD::Song>(
boost::regex(constraint, Config.regex_type),
SongEntryMatcher
);
}
}
void PlaylistEditor::findForward(bool wrap)
void PlaylistEditor::clearConstraint()
{
if (isActiveWindow(Playlists))
searchForward(Playlists, m_playlists_search_predicate, wrap);
m_playlists_search_predicate.clear();
else if (isActiveWindow(Content))
searchForward(Content, m_content_search_predicate, wrap);
m_content_search_predicate.clear();
}
void PlaylistEditor::findBackward(bool wrap)
bool PlaylistEditor::find(SearchDirection direction, bool wrap, bool skip_current)
{
bool result = false;
if (isActiveWindow(Playlists))
searchBackward(Playlists, m_playlists_search_predicate, wrap);
result = search(Playlists, m_playlists_search_predicate, direction, wrap, skip_current);
else if (isActiveWindow(Content))
searchBackward(Content, m_content_search_predicate, wrap);
result = search(Content, m_content_search_predicate, direction, wrap, skip_current);
return result;
}
/***********************************************************************/