Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #556 from AttorneyOnline/feature/remember-search

Browse Source 
Remember past search term when switching between area and music list
This commit is contained in:
oldmud0 2021-06-07 00:24:51 -05:00 committed by GitHub
commit 679d808417
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/courtroom.h
View File

@ -588,6 +588,9 @@ private:
QString current_background = "default"; QString current_background = "default";
QString current_side = ""; QString current_side = "";
QString last_music_search = "";
QString last_area_search = "";
QBrush free_brush; QBrush free_brush;
QBrush lfp_brush; QBrush lfp_brush;
QBrush casing_brush; QBrush casing_brush;

10
src/courtroom.cpp
View File

@ -4343,6 +4343,7 @@ void Courtroom::on_music_search_edited(QString p_text)
(*it)->setHidden(p_text != ""); (*it)->setHidden(p_text != "");
++it; ++it;
} }
last_music_search = p_text;
} }
if (!ui_area_list->isHidden()) { if (!ui_area_list->isHidden()) {
@ -4351,6 +4352,7 @@ void Courtroom::on_music_search_edited(QString p_text)
(*ait)->setHidden(p_text != ""); (*ait)->setHidden(p_text != "");
++ait; ++ait;
} }
last_area_search = p_text;
} }
if (p_text != "") { if (p_text != "") {
@ -5461,16 +5463,20 @@ void Courtroom::on_evidence_button_clicked()
void Courtroom::on_switch_area_music_clicked() void Courtroom::on_switch_area_music_clicked()
{ {
ui_music_search->setText("");
on_music_search_edited(ui_music_search->text());
if (ui_area_list->isHidden()) { if (ui_area_list->isHidden()) {
ui_area_list->show(); ui_area_list->show();
ui_music_list->hide(); ui_music_list->hide();
last_music_search = ui_music_search->text();
ui_music_search->setText(last_area_search);
} }
else { else {
ui_area_list->hide(); ui_area_list->hide();
ui_music_list->show(); ui_music_list->show();
last_area_search = ui_music_search->text();
ui_music_search->setText(last_music_search);
} }
on_music_search_edited(ui_music_search->text());
} }
void Courtroom::ping_server() void Courtroom::ping_server()