Improve reset filters logic

This commit is contained in:
Jaex 2021-07-26 03:18:50 +03:00
parent bc108cdf9b
commit 17c95282e5

View file

@ -82,6 +82,23 @@ public HistoryForm(string historyPath, HistorySettings settings, Action<string>
Settings.WindowState.AutoHandleFormState(this);
}
private void ResetFilters()
{
tstbSearch.Text = "";
txtFilenameFilter.ResetText();
txtURLFilter.ResetText();
cbDateFilter.Checked = false;
dtpFilterFrom.ResetText();
dtpFilterTo.ResetText();
cbTypeFilter.Checked = false;
if (cbTypeFilterSelection.Items.Count > 0)
{
cbTypeFilterSelection.SelectedIndex = 0;
}
cbHostFilter.Checked = false;
cbHostFilterSelection.ResetText();
}
private void RefreshHistoryItems(bool mockData = false)
{
allHistoryItems = GetHistoryItems(mockData);
@ -325,14 +342,9 @@ private void HistoryForm_Shown(object sender, EventArgs e)
{
cbTypeFilterSelection.Items.Clear();
cbTypeFilterSelection.Items.AddRange(allHistoryItems.Select(x => x.Type).Distinct().Where(x => !string.IsNullOrEmpty(x)).ToArray());
if (cbTypeFilterSelection.Items.Count > 0)
{
cbTypeFilterSelection.SelectedIndex = 0;
}
cbHostFilterSelection.Items.Clear();
cbHostFilterSelection.Items.AddRange(allHistoryItems.Select(x => x.Host).Distinct().Where(x => !string.IsNullOrEmpty(x)).ToArray());
ResetFilters();
}
this.ForceActivate();
@ -432,7 +444,8 @@ private void btnAdvancedSearch_Click(object sender, EventArgs e)
private void btnAdvancedSearchReset_Click(object sender, EventArgs e)
{
AddHistoryItems(allHistoryItems);
ResetFilters();
ApplyFilterAdvanced();
}
private void lvHistory_ItemSelectionChanged(object sender, ListViewItemSelectionChangedEventArgs e)