use key (F)4 to reset search engine state while being in this screen
This commit is contained in:
@@ -254,6 +254,7 @@ void Help::GetKeybindings()
|
|||||||
*w << DisplayKeys(Key.EditTags) << "Edit song's tags\n";
|
*w << DisplayKeys(Key.EditTags) << "Edit song's tags\n";
|
||||||
# endif // HAVE_TAGLIB_H
|
# endif // HAVE_TAGLIB_H
|
||||||
*w << DisplayKeys(Key.ToggleSingle) << "Start searching immediately\n";
|
*w << DisplayKeys(Key.ToggleSingle) << "Start searching immediately\n";
|
||||||
|
*w << DisplayKeys(Key.SearchEngine) << "Reset search engine\n";
|
||||||
|
|
||||||
|
|
||||||
*w << "\n\n " << fmtBold << "Keys - Media library\n -----------------------------------------\n" << fmtBoldEnd;
|
*w << "\n\n " << fmtBold << "Keys - Media library\n -----------------------------------------\n" << fmtBoldEnd;
|
||||||
|
|||||||
@@ -84,7 +84,10 @@ void SearchEngine::SwitchTo()
|
|||||||
using Global::myScreen;
|
using Global::myScreen;
|
||||||
|
|
||||||
if (myScreen == this)
|
if (myScreen == this)
|
||||||
|
{
|
||||||
|
Reset();
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (!isInitialized)
|
if (!isInitialized)
|
||||||
Init();
|
Init();
|
||||||
@@ -169,11 +172,7 @@ void SearchEngine::EnterPressed()
|
|||||||
}
|
}
|
||||||
else if (option == ResetButton)
|
else if (option == ResetButton)
|
||||||
{
|
{
|
||||||
for (size_t i = 0; i < ConstraintsNumber; ++i)
|
Reset();
|
||||||
itsConstraints[i].clear();
|
|
||||||
w->Reset();
|
|
||||||
Prepare();
|
|
||||||
ShowMessage("Search state reset");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
w->Bold(w->Choice(), myPlaylist->Add(*w->Current().second, w->isBold(), 1));
|
w->Bold(w->Choice(), myPlaylist->Add(*w->Current().second, w->isBold(), 1));
|
||||||
@@ -301,6 +300,15 @@ void SearchEngine::Prepare()
|
|||||||
*w->at(ResetButton).first << "Reset";
|
*w->at(ResetButton).first << "Reset";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void SearchEngine::Reset()
|
||||||
|
{
|
||||||
|
for (size_t i = 0; i < ConstraintsNumber; ++i)
|
||||||
|
itsConstraints[i].clear();
|
||||||
|
w->Reset();
|
||||||
|
Prepare();
|
||||||
|
ShowMessage("Search state reset");
|
||||||
|
}
|
||||||
|
|
||||||
void SearchEngine::Search()
|
void SearchEngine::Search()
|
||||||
{
|
{
|
||||||
bool constraints_empty = 1;
|
bool constraints_empty = 1;
|
||||||
|
|||||||
@@ -59,6 +59,7 @@ class SearchEngine : public Screen< Menu< std::pair<Buffer *, MPD::Song *> > >
|
|||||||
private:
|
private:
|
||||||
void Prepare();
|
void Prepare();
|
||||||
void Search();
|
void Search();
|
||||||
|
void Reset();
|
||||||
|
|
||||||
const char **SearchMode;
|
const char **SearchMode;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user