diff --git a/ShareX.HelpersLib/Controls/MyListView.cs b/ShareX.HelpersLib/Controls/MyListView.cs index f8aa1ea0d..951ff2ed0 100644 --- a/ShareX.HelpersLib/Controls/MyListView.cs +++ b/ShareX.HelpersLib/Controls/MyListView.cs @@ -51,6 +51,9 @@ public class MyListView : ListView [DefaultValue(false)] public bool AllowItemDrag { get; set; } + [DefaultValue(true)] + public bool AllowSelectAll { get; set; } = true; + [DefaultValue(false)] public bool DisableDeselect { get; set; } @@ -154,6 +157,17 @@ public void SelectSingle(ListViewItem lvi) } } + public void SelectAll() + { + if (AllowSelectAll && MultiSelect) + { + foreach (ListViewItem lvi in Items) + { + lvi.Selected = true; + } + } + } + public void UnselectAll() { if (MultiSelect) @@ -172,12 +186,9 @@ public void EnsureSelectedVisible() protected override void OnKeyDown(KeyEventArgs e) { - if (MultiSelect && e.KeyData == (Keys.Control | Keys.A)) + if (e.KeyData == (Keys.Control | Keys.A)) { - foreach (ListViewItem lvi in Items) - { - lvi.Selected = true; - } + SelectAll(); } base.OnKeyDown(e); diff --git a/ShareX.HistoryLib/Forms/HistoryForm.Designer.cs b/ShareX.HistoryLib/Forms/HistoryForm.Designer.cs index 613d0a531..31c4d44f0 100644 --- a/ShareX.HistoryLib/Forms/HistoryForm.Designer.cs +++ b/ShareX.HistoryLib/Forms/HistoryForm.Designer.cs @@ -97,6 +97,7 @@ private void InitializeComponent() // // lvHistory // + this.lvHistory.AllowSelectAll = false; this.lvHistory.AutoFillColumn = true; this.lvHistory.BorderStyle = System.Windows.Forms.BorderStyle.None; this.lvHistory.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { diff --git a/ShareX.HistoryLib/Forms/HistoryForm.resx b/ShareX.HistoryLib/Forms/HistoryForm.resx index d09aee922..3685caf8c 100644 --- a/ShareX.HistoryLib/Forms/HistoryForm.resx +++ b/ShareX.HistoryLib/Forms/HistoryForm.resx @@ -172,7 +172,7 @@ lvHistory - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.7.2.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=14.0.2.0, Culture=neutral, PublicKeyToken=null tscHistory.ContentPanel @@ -237,6 +237,51 @@ None + + 3, 0 + + + 477, 25 + + + 0 + + + tsHistory + + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tscHistory.TopToolStripPanel + + + 0 + + + tscHistory.TopToolStripPanel + + + System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tscHistory + + + 3 + + + tscHistory + + + System.Windows.Forms.ToolStripContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + scMain.Panel1 + + + 0 + 45, 22 @@ -300,49 +345,211 @@ Settings... - - 3, 0 + + btnAdvancedSearchClose - - 477, 25 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + gbAdvancedSearch + + 0 - - tsHistory + + btnAdvancedSearchReset - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tscHistory.TopToolStripPanel + + gbAdvancedSearch - - 0 + + 1 - - tscHistory.TopToolStripPanel + + lblURLFilter - - System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tscHistory + + gbAdvancedSearch - + + 2 + + + txtURLFilter + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbAdvancedSearch + + 3 - - tscHistory + + lblFilenameFilter - - System.Windows.Forms.ToolStripContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - scMain.Panel1 + + gbAdvancedSearch - + + 4 + + + cbHostFilterSelection + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbAdvancedSearch + + + 5 + + + cbTypeFilterSelection + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbAdvancedSearch + + + 6 + + + cbHostFilter + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbAdvancedSearch + + + 7 + + + cbTypeFilter + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbAdvancedSearch + + + 8 + + + dtpFilterFrom + + + System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbAdvancedSearch + + + 9 + + + lblFilterFrom + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbAdvancedSearch + + + 10 + + + lblFilterTo + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbAdvancedSearch + + + 11 + + + cbDateFilter + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbAdvancedSearch + + + 12 + + + dtpFilterTo + + + System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbAdvancedSearch + + + 13 + + + txtFilenameFilter + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbAdvancedSearch + + + 14 + + + 0, 0 + + + 409, 213 + + + 4 + + + Advanced search + + + False + + + gbAdvancedSearch + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + scHistoryItemInfo.Panel1 + + 0 @@ -729,33 +936,6 @@ 14 - - 0, 0 - - - 409, 213 - - - 4 - - - Advanced search - - - False - - - gbAdvancedSearch - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - scHistoryItemInfo.Panel1 - - - 0 - Fill @@ -796,7 +976,7 @@ 0, 0 - 627, 427 + 627, 424 3 @@ -805,7 +985,7 @@ pbThumbnail - ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=13.7.2.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=14.0.2.0, Culture=neutral, PublicKeyToken=null scHistoryItemInfo.Panel1 @@ -835,7 +1015,7 @@ 0, 0 - 627, 227 + 627, 230 0 @@ -868,7 +1048,7 @@ 627, 661 - 427 + 424 7 @@ -880,7 +1060,7 @@ scHistoryItemInfo - ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=13.7.2.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=14.0.2.0, Culture=neutral, PublicKeyToken=null scMain.Panel2 @@ -919,7 +1099,7 @@ scMain - ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=13.7.2.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=14.0.2.0, Culture=neutral, PublicKeyToken=null $this