mirror of
https://github.com/ShareX/ShareX.git
synced 2024-06-28 19:20:27 +12:00
No need checkbox for history filename filter
This commit is contained in:
Jaex
parent
b166e94131
commit
d4a1a69ee4
18
ShareX.HistoryLib/Forms/HistoryForm.Designer.cs
generated
18
ShareX.HistoryLib/Forms/HistoryForm.Designer.cs
generated
|
|
@ -47,12 +47,12 @@ private void InitializeComponent()
|
|||
this.cbTypeFilter = new System.Windows.Forms.CheckBox();
|
||||
this.dtpFilterFrom = new System.Windows.Forms.DateTimePicker();
|
||||
this.lblFilterFrom = new System.Windows.Forms.Label();
|
||||
this.cbFilenameFilter = new System.Windows.Forms.CheckBox();
|
||||
this.lblFilterTo = new System.Windows.Forms.Label();
|
||||
this.cbDateFilter = new System.Windows.Forms.CheckBox();
|
||||
this.dtpFilterTo = new System.Windows.Forms.DateTimePicker();
|
||||
this.txtFilenameFilter = new System.Windows.Forms.TextBox();
|
||||
this.cbFilenameFilterMethod = new System.Windows.Forms.ComboBox();
|
||||
this.lblFilenameFilter = new System.Windows.Forms.Label();
|
||||
((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit();
|
||||
this.scMain.Panel1.SuspendLayout();
|
||||
this.scMain.Panel2.SuspendLayout();
|
||||
|
|
@ -134,6 +134,7 @@ private void InitializeComponent()
|
|||
// gbFilters
|
||||
//
|
||||
resources.ApplyResources(this.gbFilters, "gbFilters");
|
||||
this.gbFilters.Controls.Add(this.lblFilenameFilter);
|
||||
this.gbFilters.Controls.Add(this.cbHostFilterSelection);
|
||||
this.gbFilters.Controls.Add(this.btnRemoveFilters);
|
||||
this.gbFilters.Controls.Add(this.btnApplyFilters);
|
||||
|
|
@ -142,7 +143,6 @@ private void InitializeComponent()
|
|||
this.gbFilters.Controls.Add(this.cbTypeFilter);
|
||||
this.gbFilters.Controls.Add(this.dtpFilterFrom);
|
||||
this.gbFilters.Controls.Add(this.lblFilterFrom);
|
||||
this.gbFilters.Controls.Add(this.cbFilenameFilter);
|
||||
this.gbFilters.Controls.Add(this.lblFilterTo);
|
||||
this.gbFilters.Controls.Add(this.cbDateFilter);
|
||||
this.gbFilters.Controls.Add(this.dtpFilterTo);
|
||||
|
|
@ -200,12 +200,6 @@ private void InitializeComponent()
|
|||
resources.ApplyResources(this.lblFilterFrom, "lblFilterFrom");
|
||||
this.lblFilterFrom.Name = "lblFilterFrom";
|
||||
//
|
||||
// cbFilenameFilter
|
||||
//
|
||||
resources.ApplyResources(this.cbFilenameFilter, "cbFilenameFilter");
|
||||
this.cbFilenameFilter.Name = "cbFilenameFilter";
|
||||
this.cbFilenameFilter.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// lblFilterTo
|
||||
//
|
||||
resources.ApplyResources(this.lblFilterTo, "lblFilterTo");
|
||||
|
|
@ -226,7 +220,6 @@ private void InitializeComponent()
|
|||
//
|
||||
resources.ApplyResources(this.txtFilenameFilter, "txtFilenameFilter");
|
||||
this.txtFilenameFilter.Name = "txtFilenameFilter";
|
||||
this.txtFilenameFilter.TextChanged += new System.EventHandler(this.txtFilenameFilter_TextChanged);
|
||||
//
|
||||
// cbFilenameFilterMethod
|
||||
//
|
||||
|
|
@ -240,6 +233,11 @@ private void InitializeComponent()
|
|||
resources.ApplyResources(this.cbFilenameFilterMethod, "cbFilenameFilterMethod");
|
||||
this.cbFilenameFilterMethod.Name = "cbFilenameFilterMethod";
|
||||
//
|
||||
// lblFilenameFilter
|
||||
//
|
||||
resources.ApplyResources(this.lblFilenameFilter, "lblFilenameFilter");
|
||||
this.lblFilenameFilter.Name = "lblFilenameFilter";
|
||||
//
|
||||
// HistoryForm
|
||||
//
|
||||
resources.ApplyResources(this, "$this");
|
||||
|
|
@ -281,11 +279,11 @@ private void InitializeComponent()
|
|||
private System.Windows.Forms.CheckBox cbTypeFilter;
|
||||
private System.Windows.Forms.DateTimePicker dtpFilterFrom;
|
||||
private System.Windows.Forms.Label lblFilterFrom;
|
||||
private System.Windows.Forms.CheckBox cbFilenameFilter;
|
||||
private System.Windows.Forms.Label lblFilterTo;
|
||||
private System.Windows.Forms.CheckBox cbDateFilter;
|
||||
private System.Windows.Forms.DateTimePicker dtpFilterTo;
|
||||
private System.Windows.Forms.TextBox txtFilenameFilter;
|
||||
private System.Windows.Forms.ComboBox cbFilenameFilterMethod;
|
||||
private System.Windows.Forms.Label lblFilenameFilter;
|
||||
}
|
||||
}
|
||||
|
|
@ -119,7 +119,7 @@ private void ApplyFiltersAndAdd()
|
|||
|
||||
private HistoryItem[] ApplyFilters(HistoryItem[] historyItems)
|
||||
{
|
||||
if (!cbTypeFilter.Checked && !cbHostFilter.Checked && !cbFilenameFilter.Checked && !cbDateFilter.Checked)
|
||||
if (!cbTypeFilter.Checked && !cbHostFilter.Checked && string.IsNullOrEmpty(txtFilenameFilter.Text) && !cbDateFilter.Checked)
|
||||
{
|
||||
return historyItems;
|
||||
}
|
||||
|
|
@ -146,13 +146,13 @@ private HistoryItem[] ApplyFilters(HistoryItem[] historyItems)
|
|||
}
|
||||
}
|
||||
|
||||
if (cbFilenameFilter.Checked)
|
||||
if (!string.IsNullOrEmpty(txtFilenameFilter.Text))
|
||||
{
|
||||
string filenameFilter = txtFilenameFilter.Text;
|
||||
|
||||
if (!string.IsNullOrEmpty(filenameFilter))
|
||||
{
|
||||
StringComparison filenameRule = StringComparison.CurrentCultureIgnoreCase;
|
||||
StringComparison filenameRule = StringComparison.InvariantCultureIgnoreCase;
|
||||
|
||||
switch (cbFilenameFilterMethod.SelectedIndex)
|
||||
{
|
||||
|
|
@ -411,11 +411,6 @@ private void lvHistory_ItemDrag(object sender, ItemDragEventArgs e)
|
|||
}
|
||||
}
|
||||
|
||||
private void txtFilenameFilter_TextChanged(object sender, EventArgs e)
|
||||
{
|
||||
cbFilenameFilter.Checked = txtFilenameFilter.TextLength > 0;
|
||||
}
|
||||
|
||||
#endregion Form events
|
||||
}
|
||||
}
|
||||
|
|
@ -166,7 +166,7 @@
|
|||
<value>lvHistory</value>
|
||||
</data>
|
||||
<data name=">>lvHistory.Type" xml:space="preserve">
|
||||
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.3.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>lvHistory.Parent" xml:space="preserve">
|
||||
<value>scMain.Panel1</value>
|
||||
|
|
@ -205,7 +205,7 @@
|
|||
<value>pbThumbnail</value>
|
||||
</data>
|
||||
<data name=">>pbThumbnail.Type" xml:space="preserve">
|
||||
<value>ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=12.3.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>pbThumbnail.Parent" xml:space="preserve">
|
||||
<value>panel1</value>
|
||||
|
|
@ -216,6 +216,33 @@
|
|||
<data name="gbFilters.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left, Right</value>
|
||||
</data>
|
||||
<data name="lblFilenameFilter.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="lblFilenameFilter.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>13, 24</value>
|
||||
</data>
|
||||
<data name="lblFilenameFilter.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>74, 13</value>
|
||||
</data>
|
||||
<data name="lblFilenameFilter.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>17</value>
|
||||
</data>
|
||||
<data name="lblFilenameFilter.Text" xml:space="preserve">
|
||||
<value>Filename filter:</value>
|
||||
</data>
|
||||
<data name=">>lblFilenameFilter.Name" xml:space="preserve">
|
||||
<value>lblFilenameFilter</value>
|
||||
</data>
|
||||
<data name=">>lblFilenameFilter.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>lblFilenameFilter.Parent" xml:space="preserve">
|
||||
<value>gbFilters</value>
|
||||
</data>
|
||||
<data name=">>lblFilenameFilter.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="cbHostFilterSelection.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>168, 176</value>
|
||||
</data>
|
||||
|
|
@ -235,7 +262,7 @@
|
|||
<value>gbFilters</value>
|
||||
</data>
|
||||
<data name=">>cbHostFilterSelection.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="btnRemoveFilters.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
|
|
@ -262,7 +289,7 @@
|
|||
<value>gbFilters</value>
|
||||
</data>
|
||||
<data name=">>btnRemoveFilters.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="btnApplyFilters.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
|
|
@ -289,7 +316,7 @@
|
|||
<value>gbFilters</value>
|
||||
</data>
|
||||
<data name=">>btnApplyFilters.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="cbTypeFilterSelection.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>168, 150</value>
|
||||
|
|
@ -310,7 +337,7 @@
|
|||
<value>gbFilters</value>
|
||||
</data>
|
||||
<data name=">>cbTypeFilterSelection.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name="cbHostFilter.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
|
@ -340,7 +367,7 @@
|
|||
<value>gbFilters</value>
|
||||
</data>
|
||||
<data name=">>cbHostFilter.ZOrder" xml:space="preserve">
|
||||
<value>4</value>
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name="cbTypeFilter.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
|
@ -370,10 +397,10 @@
|
|||
<value>gbFilters</value>
|
||||
</data>
|
||||
<data name=">>cbTypeFilter.ZOrder" xml:space="preserve">
|
||||
<value>5</value>
|
||||
<value>6</value>
|
||||
</data>
|
||||
<data name="dtpFilterFrom.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>88, 46</value>
|
||||
<value>88, 94</value>
|
||||
</data>
|
||||
<data name="dtpFilterFrom.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>224, 20</value>
|
||||
|
|
@ -391,7 +418,7 @@
|
|||
<value>gbFilters</value>
|
||||
</data>
|
||||
<data name=">>dtpFilterFrom.ZOrder" xml:space="preserve">
|
||||
<value>6</value>
|
||||
<value>7</value>
|
||||
</data>
|
||||
<data name="lblFilterFrom.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
|
@ -400,7 +427,7 @@
|
|||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="lblFilterFrom.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>13, 50</value>
|
||||
<value>13, 98</value>
|
||||
</data>
|
||||
<data name="lblFilterFrom.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>33, 13</value>
|
||||
|
|
@ -421,36 +448,6 @@
|
|||
<value>gbFilters</value>
|
||||
</data>
|
||||
<data name=">>lblFilterFrom.ZOrder" xml:space="preserve">
|
||||
<value>7</value>
|
||||
</data>
|
||||
<data name="cbFilenameFilter.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="cbFilenameFilter.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="cbFilenameFilter.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>16, 96</value>
|
||||
</data>
|
||||
<data name="cbFilenameFilter.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>93, 17</value>
|
||||
</data>
|
||||
<data name="cbFilenameFilter.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name="cbFilenameFilter.Text" xml:space="preserve">
|
||||
<value>Filename filter:</value>
|
||||
</data>
|
||||
<data name=">>cbFilenameFilter.Name" xml:space="preserve">
|
||||
<value>cbFilenameFilter</value>
|
||||
</data>
|
||||
<data name=">>cbFilenameFilter.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>cbFilenameFilter.Parent" xml:space="preserve">
|
||||
<value>gbFilters</value>
|
||||
</data>
|
||||
<data name=">>cbFilenameFilter.ZOrder" xml:space="preserve">
|
||||
<value>8</value>
|
||||
</data>
|
||||
<data name="lblFilterTo.AutoSize" type="System.Boolean, mscorlib">
|
||||
|
|
@ -460,7 +457,7 @@
|
|||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="lblFilterTo.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>13, 74</value>
|
||||
<value>13, 122</value>
|
||||
</data>
|
||||
<data name="lblFilterTo.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>23, 13</value>
|
||||
|
|
@ -490,7 +487,7 @@
|
|||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="cbDateFilter.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>16, 24</value>
|
||||
<value>16, 72</value>
|
||||
</data>
|
||||
<data name="cbDateFilter.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>74, 17</value>
|
||||
|
|
@ -514,7 +511,7 @@
|
|||
<value>10</value>
|
||||
</data>
|
||||
<data name="dtpFilterTo.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>88, 70</value>
|
||||
<value>88, 118</value>
|
||||
</data>
|
||||
<data name="dtpFilterTo.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>224, 20</value>
|
||||
|
|
@ -535,7 +532,7 @@
|
|||
<value>11</value>
|
||||
</data>
|
||||
<data name="txtFilenameFilter.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>16, 121</value>
|
||||
<value>16, 46</value>
|
||||
</data>
|
||||
<data name="txtFilenameFilter.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>296, 20</value>
|
||||
|
|
@ -568,7 +565,7 @@
|
|||
<value>Exact match</value>
|
||||
</data>
|
||||
<data name="cbFilenameFilterMethod.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>168, 96</value>
|
||||
<value>168, 20</value>
|
||||
</data>
|
||||
<data name="cbFilenameFilterMethod.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>144, 21</value>
|
||||
|
|
@ -667,7 +664,7 @@
|
|||
<value>scMain</value>
|
||||
</data>
|
||||
<data name=">>scMain.Type" xml:space="preserve">
|
||||
<value>ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=12.3.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>scMain.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ private IEnumerable<HistoryItem> GetHistoryItems()
|
|||
HistoryItem hi = historyItems[i];
|
||||
|
||||
if (!string.IsNullOrEmpty(hi.Filepath) && Helpers.IsImageFile(hi.Filepath) &&
|
||||
(string.IsNullOrEmpty(SearchText) || Helpers.GetFilenameSafe(hi.Filepath).Contains(SearchText, StringComparison.InvariantCultureIgnoreCase)))
|
||||
(string.IsNullOrEmpty(SearchText) || hi.Filename.Contains(SearchText, StringComparison.InvariantCultureIgnoreCase)))
|
||||
{
|
||||
filteredHistoryItems.Add(hi);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue