CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-09-30 01:07:21 +13:00
Code Issues Projects Releases Packages Wiki Activity

Improve reset filters logic

Browse source
This commit is contained in:
Jaex 2021-07-26 03:18:50 +03:00
parent bc108cdf9b
commit 17c95282e5
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
ShareX.HistoryLib/Forms/HistoryForm.cs
View file

@ -82,6 +82,23 @@ public HistoryForm(string historyPath, HistorySettings settings, Action<string>
Settings.WindowState.AutoHandleFormState(this); 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) private void RefreshHistoryItems(bool mockData = false)
{ {
allHistoryItems = GetHistoryItems(mockData); allHistoryItems = GetHistoryItems(mockData);
@ -325,14 +342,9 @@ private void HistoryForm_Shown(object sender, EventArgs e)
{ {
cbTypeFilterSelection.Items.Clear(); cbTypeFilterSelection.Items.Clear();
cbTypeFilterSelection.Items.AddRange(allHistoryItems.Select(x => x.Type).Distinct().Where(x => !string.IsNullOrEmpty(x)).ToArray()); 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.Clear();
cbHostFilterSelection.Items.AddRange(allHistoryItems.Select(x => x.Host).Distinct().Where(x => !string.IsNullOrEmpty(x)).ToArray()); cbHostFilterSelection.Items.AddRange(allHistoryItems.Select(x => x.Host).Distinct().Where(x => !string.IsNullOrEmpty(x)).ToArray());
ResetFilters();
} }
this.ForceActivate(); this.ForceActivate();
@ -432,7 +444,8 @@ private void btnAdvancedSearch_Click(object sender, EventArgs e)
private void btnAdvancedSearchReset_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) private void lvHistory_ItemSelectionChanged(object sender, ListViewItemSelectionChangedEventArgs e)