diff --git a/ShareX.HistoryLib/Forms/HistoryForm.Designer.cs b/ShareX.HistoryLib/Forms/HistoryForm.Designer.cs
index 0511e4129..26b19455d 100644
--- a/ShareX.HistoryLib/Forms/HistoryForm.Designer.cs
+++ b/ShareX.HistoryLib/Forms/HistoryForm.Designer.cs
@@ -65,6 +65,7 @@ private void InitializeComponent()
this.scHistoryItemInfo = new ShareX.HelpersLib.SplitContainerCustomSplitter();
this.pbThumbnail = new ShareX.HelpersLib.MyPictureBox();
this.pgHistoryItemInfo = new System.Windows.Forms.PropertyGrid();
+ this.btnAdvancedSearchClose = new System.Windows.Forms.Button();
this.tscHistory.ContentPanel.SuspendLayout();
this.tscHistory.TopToolStripPanel.SuspendLayout();
this.tscHistory.SuspendLayout();
@@ -85,7 +86,6 @@ private void InitializeComponent()
//
// tscHistory.ContentPanel
//
- this.tscHistory.ContentPanel.Controls.Add(this.gbAdvancedSearch);
this.tscHistory.ContentPanel.Controls.Add(this.lvHistory);
resources.ApplyResources(this.tscHistory.ContentPanel, "tscHistory.ContentPanel");
resources.ApplyResources(this.tscHistory, "tscHistory");
@@ -97,6 +97,7 @@ private void InitializeComponent()
//
// gbAdvancedSearch
//
+ this.gbAdvancedSearch.Controls.Add(this.btnAdvancedSearchClose);
this.gbAdvancedSearch.Controls.Add(this.btnAdvancedSearchReset);
this.gbAdvancedSearch.Controls.Add(this.lblURLFilter);
this.gbAdvancedSearch.Controls.Add(this.txtURLFilter);
@@ -344,6 +345,7 @@ private void InitializeComponent()
//
// scHistoryItemInfo.Panel1
//
+ this.scHistoryItemInfo.Panel1.Controls.Add(this.gbAdvancedSearch);
this.scHistoryItemInfo.Panel1.Controls.Add(this.pbThumbnail);
//
// scHistoryItemInfo.Panel2
@@ -369,6 +371,13 @@ private void InitializeComponent()
this.pgHistoryItemInfo.PropertySort = System.Windows.Forms.PropertySort.NoSort;
this.pgHistoryItemInfo.ToolbarVisible = false;
//
+ // btnAdvancedSearchClose
+ //
+ resources.ApplyResources(this.btnAdvancedSearchClose, "btnAdvancedSearchClose");
+ this.btnAdvancedSearchClose.Name = "btnAdvancedSearchClose";
+ this.btnAdvancedSearchClose.UseVisualStyleBackColor = true;
+ this.btnAdvancedSearchClose.Click += new System.EventHandler(this.btnAdvancedSearchClose_Click);
+ //
// HistoryForm
//
resources.ApplyResources(this, "$this");
@@ -439,5 +448,6 @@ private void InitializeComponent()
private HelpersLib.SplitContainerCustomSplitter scHistoryItemInfo;
private System.Windows.Forms.ToolStripButton tsbToggleMoreInfo;
private System.Windows.Forms.ToolStripButton tsbShowStats;
+ private System.Windows.Forms.Button btnAdvancedSearchClose;
}
}
\ No newline at end of file
diff --git a/ShareX.HistoryLib/Forms/HistoryForm.cs b/ShareX.HistoryLib/Forms/HistoryForm.cs
index f032d70a2..415350098 100644
--- a/ShareX.HistoryLib/Forms/HistoryForm.cs
+++ b/ShareX.HistoryLib/Forms/HistoryForm.cs
@@ -464,6 +464,12 @@ private void btnAdvancedSearchReset_Click(object sender, EventArgs e)
ApplyFilterAdvanced();
}
+ private void btnAdvancedSearchClose_Click(object sender, EventArgs e)
+ {
+ gbAdvancedSearch.Visible = false;
+ tsbAdvancedSearch.Checked = false;
+ }
+
private void lvHistory_RetrieveVirtualItem(object sender, RetrieveVirtualItemEventArgs e)
{
if (listViewCache != null && e.ItemIndex >= listViewFirstItem && e.ItemIndex < listViewFirstItem + listViewCache.Length)
diff --git a/ShareX.HistoryLib/Forms/HistoryForm.resx b/ShareX.HistoryLib/Forms/HistoryForm.resx
index f4e0c7ebc..d8f68b7aa 100644
--- a/ShareX.HistoryLib/Forms/HistoryForm.resx
+++ b/ShareX.HistoryLib/Forms/HistoryForm.resx
@@ -129,405 +129,18 @@
4
-
-
- 272, 176
-
-
- 120, 24
-
-
-
- 22
-
-
- Reset
-
-
- btnAdvancedSearchReset
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbAdvancedSearch
-
-
- 0
-
-
- True
-
-
- NoControl
-
-
- 13, 48
-
-
- 32, 13
-
-
- 20
-
-
- URL:
-
-
- lblURLFilter
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbAdvancedSearch
-
-
- 1
-
-
- 96, 44
-
-
- 296, 20
-
-
- 19
-
-
- txtURLFilter
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbAdvancedSearch
-
-
- 2
-
-
- True
-
-
- NoControl
-
-
- 13, 24
-
-
- 52, 13
-
-
- 17
-
-
- Filename:
-
-
- lblFilenameFilter
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbAdvancedSearch
-
-
- 3
-
-
- 168, 142
-
-
- 224, 21
-
-
- 16
-
-
- cbHostFilterSelection
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbAdvancedSearch
-
-
- 4
-
-
- 168, 118
-
-
- 224, 21
-
-
- 11
-
-
- cbTypeFilterSelection
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbAdvancedSearch
-
-
- 5
-
-
- True
-
-
- NoControl
-
-
- 16, 144
-
-
- 51, 17
-
-
- 12
-
-
- Host:
-
-
- cbHostFilter
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbAdvancedSearch
-
-
- 6
-
-
- True
-
-
- NoControl
-
-
- 16, 120
-
-
- 53, 17
-
-
- 10
-
-
- Type:
-
-
- cbTypeFilter
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbAdvancedSearch
-
-
- 7
-
-
- 168, 70
-
-
- 224, 20
-
-
- 2
-
-
- dtpFilterFrom
-
-
- System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbAdvancedSearch
-
-
- 8
-
-
- True
-
-
- NoControl
-
-
- 93, 74
-
-
- 33, 13
-
-
- 1
-
-
- From:
-
-
- lblFilterFrom
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbAdvancedSearch
-
-
- 9
-
-
- True
-
-
- NoControl
-
-
- 93, 98
-
-
- 23, 13
-
-
- 3
-
-
- To:
-
-
- lblFilterTo
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbAdvancedSearch
-
-
- 10
-
-
- True
-
-
- NoControl
-
-
- 16, 72
-
-
- 52, 17
-
-
- 0
-
-
- Date:
-
-
- cbDateFilter
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbAdvancedSearch
-
-
- 11
-
-
- 168, 94
-
-
- 224, 20
-
-
- 4
-
-
- dtpFilterTo
-
-
- System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbAdvancedSearch
-
-
- 12
-
-
- 96, 20
-
-
- 296, 20
-
-
- 6
-
-
- txtFilenameFilter
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbAdvancedSearch
-
-
- 13
-
-
- 71, 3
-
-
- 409, 213
-
-
- 4
-
-
- Advanced search
-
-
- False
-
-
- gbAdvancedSearch
-
-
- System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tscHistory.ContentPanel
-
-
- 0
-
Fill
+
0, 0
550, 636
+
0
@@ -541,7 +154,7 @@
tscHistory.ContentPanel
- 1
+ 0
550, 636
@@ -645,6 +258,417 @@
0
+
+ 272, 176
+
+
+ 120, 24
+
+
+ 14
+
+
+ Close
+
+
+ btnAdvancedSearchClose
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbAdvancedSearch
+
+
+ 0
+
+
+ 144, 176
+
+
+ 120, 24
+
+
+ 13
+
+
+ Reset
+
+
+ btnAdvancedSearchReset
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbAdvancedSearch
+
+
+ 1
+
+
+ True
+
+
+ NoControl
+
+
+ 13, 48
+
+
+ 32, 13
+
+
+ 2
+
+
+ URL:
+
+
+ lblURLFilter
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbAdvancedSearch
+
+
+ 2
+
+
+ 96, 44
+
+
+ 296, 20
+
+
+ 3
+
+
+ txtURLFilter
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbAdvancedSearch
+
+
+ 3
+
+
+ True
+
+
+ NoControl
+
+
+ 13, 24
+
+
+ 52, 13
+
+
+ 0
+
+
+ Filename:
+
+
+ lblFilenameFilter
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbAdvancedSearch
+
+
+ 4
+
+
+ 152, 142
+
+
+ 240, 21
+
+
+ 12
+
+
+ cbHostFilterSelection
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbAdvancedSearch
+
+
+ 5
+
+
+ 152, 118
+
+
+ 240, 21
+
+
+ 10
+
+
+ cbTypeFilterSelection
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbAdvancedSearch
+
+
+ 6
+
+
+ True
+
+
+ NoControl
+
+
+ 16, 144
+
+
+ 51, 17
+
+
+ 11
+
+
+ Host:
+
+
+ cbHostFilter
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbAdvancedSearch
+
+
+ 7
+
+
+ True
+
+
+ NoControl
+
+
+ 16, 120
+
+
+ 53, 17
+
+
+ 9
+
+
+ Type:
+
+
+ cbTypeFilter
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbAdvancedSearch
+
+
+ 8
+
+
+ 152, 70
+
+
+ 240, 20
+
+
+ 6
+
+
+ dtpFilterFrom
+
+
+ System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbAdvancedSearch
+
+
+ 9
+
+
+ True
+
+
+ NoControl
+
+
+ 93, 74
+
+
+ 33, 13
+
+
+ 5
+
+
+ From:
+
+
+ lblFilterFrom
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbAdvancedSearch
+
+
+ 10
+
+
+ True
+
+
+ NoControl
+
+
+ 93, 98
+
+
+ 23, 13
+
+
+ 7
+
+
+ To:
+
+
+ lblFilterTo
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbAdvancedSearch
+
+
+ 11
+
+
+ True
+
+
+ NoControl
+
+
+ 16, 72
+
+
+ 52, 17
+
+
+ 4
+
+
+ Date:
+
+
+ cbDateFilter
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbAdvancedSearch
+
+
+ 12
+
+
+ 152, 94
+
+
+ 240, 20
+
+
+ 8
+
+
+ dtpFilterTo
+
+
+ System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbAdvancedSearch
+
+
+ 13
+
+
+ 96, 20
+
+
+ 296, 20
+
+
+ 1
+
+
+ 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
+
@@ -772,7 +796,7 @@
0, 0
- 627, 436
+ 627, 433
3
@@ -787,7 +811,7 @@
scHistoryItemInfo.Panel1
- 0
+ 1
scHistoryItemInfo.Panel1
@@ -811,7 +835,7 @@
0, 0
- 627, 218
+ 627, 221
0
@@ -844,7 +868,7 @@
627, 661
- 436
+ 433
7