mirror of
https://github.com/ShareX/ShareX.git
synced 2024-09-30 01:07:21 +13:00
Show wait cursor when history loading, removed filename string match options because contains check is enough
This commit is contained in:
parent
65f18e70fa
commit
7a7a4e98bb
3 changed files with 37 additions and 99 deletions
39
ShareX.HistoryLib/Forms/HistoryForm.Designer.cs
generated
39
ShareX.HistoryLib/Forms/HistoryForm.Designer.cs
generated
|
@ -39,6 +39,8 @@ private void InitializeComponent()
|
|||
this.panel1 = new System.Windows.Forms.Panel();
|
||||
this.pbThumbnail = new ShareX.HelpersLib.MyPictureBox();
|
||||
this.gbFilters = new System.Windows.Forms.GroupBox();
|
||||
this.lblURLFilter = new System.Windows.Forms.Label();
|
||||
this.txtURLFilter = new System.Windows.Forms.TextBox();
|
||||
this.lblFilenameFilter = new System.Windows.Forms.Label();
|
||||
this.cbHostFilterSelection = new System.Windows.Forms.ComboBox();
|
||||
this.btnRemoveFilters = new System.Windows.Forms.Button();
|
||||
|
@ -52,9 +54,6 @@ private void InitializeComponent()
|
|||
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.txtURLFilter = new System.Windows.Forms.TextBox();
|
||||
this.lblURLFilter = new System.Windows.Forms.Label();
|
||||
((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit();
|
||||
this.scMain.Panel1.SuspendLayout();
|
||||
this.scMain.Panel2.SuspendLayout();
|
||||
|
@ -151,10 +150,19 @@ private void InitializeComponent()
|
|||
this.gbFilters.Controls.Add(this.cbDateFilter);
|
||||
this.gbFilters.Controls.Add(this.dtpFilterTo);
|
||||
this.gbFilters.Controls.Add(this.txtFilenameFilter);
|
||||
this.gbFilters.Controls.Add(this.cbFilenameFilterMethod);
|
||||
this.gbFilters.Name = "gbFilters";
|
||||
this.gbFilters.TabStop = false;
|
||||
//
|
||||
// lblURLFilter
|
||||
//
|
||||
resources.ApplyResources(this.lblURLFilter, "lblURLFilter");
|
||||
this.lblURLFilter.Name = "lblURLFilter";
|
||||
//
|
||||
// txtURLFilter
|
||||
//
|
||||
resources.ApplyResources(this.txtURLFilter, "txtURLFilter");
|
||||
this.txtURLFilter.Name = "txtURLFilter";
|
||||
//
|
||||
// lblFilenameFilter
|
||||
//
|
||||
resources.ApplyResources(this.lblFilenameFilter, "lblFilenameFilter");
|
||||
|
@ -230,28 +238,6 @@ private void InitializeComponent()
|
|||
resources.ApplyResources(this.txtFilenameFilter, "txtFilenameFilter");
|
||||
this.txtFilenameFilter.Name = "txtFilenameFilter";
|
||||
//
|
||||
// cbFilenameFilterMethod
|
||||
//
|
||||
this.cbFilenameFilterMethod.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
this.cbFilenameFilterMethod.FormattingEnabled = true;
|
||||
this.cbFilenameFilterMethod.Items.AddRange(new object[] {
|
||||
resources.GetString("cbFilenameFilterMethod.Items"),
|
||||
resources.GetString("cbFilenameFilterMethod.Items1"),
|
||||
resources.GetString("cbFilenameFilterMethod.Items2"),
|
||||
resources.GetString("cbFilenameFilterMethod.Items3")});
|
||||
resources.ApplyResources(this.cbFilenameFilterMethod, "cbFilenameFilterMethod");
|
||||
this.cbFilenameFilterMethod.Name = "cbFilenameFilterMethod";
|
||||
//
|
||||
// txtURLFilter
|
||||
//
|
||||
resources.ApplyResources(this.txtURLFilter, "txtURLFilter");
|
||||
this.txtURLFilter.Name = "txtURLFilter";
|
||||
//
|
||||
// lblURLFilter
|
||||
//
|
||||
resources.ApplyResources(this.lblURLFilter, "lblURLFilter");
|
||||
this.lblURLFilter.Name = "lblURLFilter";
|
||||
//
|
||||
// HistoryForm
|
||||
//
|
||||
resources.ApplyResources(this, "$this");
|
||||
|
@ -297,7 +283,6 @@ private void InitializeComponent()
|
|||
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;
|
||||
private System.Windows.Forms.Label lblURLFilter;
|
||||
private System.Windows.Forms.TextBox txtURLFilter;
|
||||
|
|
|
@ -69,7 +69,6 @@ public HistoryForm(string historyPath, HistorySettings settings, Action<string>
|
|||
him.GetHistoryItems += him_GetHistoryItems;
|
||||
|
||||
pbThumbnail.Reset();
|
||||
cbFilenameFilterMethod.SelectedIndex = 0; // Contains
|
||||
lvHistory.FillLastColumn();
|
||||
|
||||
if (Settings.SplitterDistance > 0)
|
||||
|
@ -150,24 +149,7 @@ private HistoryItem[] ApplyFilters(HistoryItem[] historyItems)
|
|||
|
||||
if (!string.IsNullOrEmpty(filenameFilter))
|
||||
{
|
||||
StringComparison filenameRule = StringComparison.InvariantCultureIgnoreCase;
|
||||
|
||||
switch (cbFilenameFilterMethod.SelectedIndex)
|
||||
{
|
||||
default:
|
||||
case 0: // Contains
|
||||
result = result.Where(x => x.Filename.Contains(filenameFilter, filenameRule));
|
||||
break;
|
||||
case 1: // Starts with
|
||||
result = result.Where(x => x.Filename.StartsWith(filenameFilter, filenameRule));
|
||||
break;
|
||||
case 2: // Ends with
|
||||
result = result.Where(x => x.Filename.EndsWith(filenameFilter, filenameRule));
|
||||
break;
|
||||
case 3: // Exact match
|
||||
result = result.Where(x => x.Filename.Equals(filenameFilter, filenameRule));
|
||||
break;
|
||||
}
|
||||
result = result.Where(x => x.Filename != null && x.Filename.Contains(filenameFilter, StringComparison.InvariantCultureIgnoreCase));
|
||||
}
|
||||
|
||||
string urlFilter = txtURLFilter.Text;
|
||||
|
@ -190,6 +172,8 @@ private HistoryItem[] ApplyFilters(HistoryItem[] historyItems)
|
|||
|
||||
private void AddHistoryItems(HistoryItem[] historyItems)
|
||||
{
|
||||
Cursor = Cursors.WaitCursor;
|
||||
|
||||
UpdateTitle(historyItems);
|
||||
|
||||
lvHistory.Items.Clear();
|
||||
|
@ -227,6 +211,8 @@ private void AddHistoryItems(HistoryItem[] historyItems)
|
|||
lvHistory.Items.AddRange(listViewItems);
|
||||
lvHistory.FillLastColumn();
|
||||
lvHistory.Focus();
|
||||
|
||||
Cursor = Cursors.Default;
|
||||
}
|
||||
|
||||
private void UpdateTitle(HistoryItem[] historyItems = null)
|
||||
|
|
|
@ -196,7 +196,7 @@
|
|||
<value>8, 8</value>
|
||||
</data>
|
||||
<data name="pbThumbnail.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>408, 352</value>
|
||||
<value>408, 384</value>
|
||||
</data>
|
||||
<data name="pbThumbnail.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>3</value>
|
||||
|
@ -220,7 +220,7 @@
|
|||
<value>True</value>
|
||||
</data>
|
||||
<data name="lblURLFilter.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>13, 203</value>
|
||||
<value>13, 48</value>
|
||||
</data>
|
||||
<data name="lblURLFilter.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>32, 13</value>
|
||||
|
@ -244,10 +244,10 @@
|
|||
<value>0</value>
|
||||
</data>
|
||||
<data name="txtURLFilter.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>168, 199</value>
|
||||
<value>96, 44</value>
|
||||
</data>
|
||||
<data name="txtURLFilter.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>144, 20</value>
|
||||
<value>216, 20</value>
|
||||
</data>
|
||||
<data name="txtURLFilter.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>19</value>
|
||||
|
@ -292,7 +292,7 @@
|
|||
<value>2</value>
|
||||
</data>
|
||||
<data name="cbHostFilterSelection.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>168, 174</value>
|
||||
<value>168, 168</value>
|
||||
</data>
|
||||
<data name="cbHostFilterSelection.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>144, 21</value>
|
||||
|
@ -316,7 +316,7 @@
|
|||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="btnRemoveFilters.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>168, 232</value>
|
||||
<value>168, 200</value>
|
||||
</data>
|
||||
<data name="btnRemoveFilters.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>144, 24</value>
|
||||
|
@ -343,7 +343,7 @@
|
|||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="btnApplyFilters.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>16, 232</value>
|
||||
<value>16, 200</value>
|
||||
</data>
|
||||
<data name="btnApplyFilters.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>144, 24</value>
|
||||
|
@ -367,7 +367,7 @@
|
|||
<value>5</value>
|
||||
</data>
|
||||
<data name="cbTypeFilterSelection.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>168, 150</value>
|
||||
<value>168, 142</value>
|
||||
</data>
|
||||
<data name="cbTypeFilterSelection.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>144, 21</value>
|
||||
|
@ -394,7 +394,7 @@
|
|||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="cbHostFilter.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>16, 176</value>
|
||||
<value>16, 170</value>
|
||||
</data>
|
||||
<data name="cbHostFilter.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>51, 17</value>
|
||||
|
@ -424,7 +424,7 @@
|
|||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="cbTypeFilter.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>16, 152</value>
|
||||
<value>16, 144</value>
|
||||
</data>
|
||||
<data name="cbTypeFilter.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>53, 17</value>
|
||||
|
@ -448,10 +448,10 @@
|
|||
<value>8</value>
|
||||
</data>
|
||||
<data name="dtpFilterFrom.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>88, 94</value>
|
||||
<value>96, 92</value>
|
||||
</data>
|
||||
<data name="dtpFilterFrom.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>224, 20</value>
|
||||
<value>216, 20</value>
|
||||
</data>
|
||||
<data name="dtpFilterFrom.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>2</value>
|
||||
|
@ -475,7 +475,7 @@
|
|||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="lblFilterFrom.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>13, 98</value>
|
||||
<value>13, 96</value>
|
||||
</data>
|
||||
<data name="lblFilterFrom.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>33, 13</value>
|
||||
|
@ -505,7 +505,7 @@
|
|||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="lblFilterTo.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>13, 122</value>
|
||||
<value>13, 120</value>
|
||||
</data>
|
||||
<data name="lblFilterTo.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>23, 13</value>
|
||||
|
@ -559,10 +559,10 @@
|
|||
<value>12</value>
|
||||
</data>
|
||||
<data name="dtpFilterTo.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>88, 118</value>
|
||||
<value>96, 116</value>
|
||||
</data>
|
||||
<data name="dtpFilterTo.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>224, 20</value>
|
||||
<value>216, 20</value>
|
||||
</data>
|
||||
<data name="dtpFilterTo.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>4</value>
|
||||
|
@ -580,10 +580,10 @@
|
|||
<value>13</value>
|
||||
</data>
|
||||
<data name="txtFilenameFilter.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>16, 46</value>
|
||||
<value>96, 20</value>
|
||||
</data>
|
||||
<data name="txtFilenameFilter.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>296, 20</value>
|
||||
<value>216, 20</value>
|
||||
</data>
|
||||
<data name="txtFilenameFilter.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>6</value>
|
||||
|
@ -600,44 +600,11 @@
|
|||
<data name=">>txtFilenameFilter.ZOrder" xml:space="preserve">
|
||||
<value>14</value>
|
||||
</data>
|
||||
<data name="cbFilenameFilterMethod.Items" xml:space="preserve">
|
||||
<value>Contains</value>
|
||||
</data>
|
||||
<data name="cbFilenameFilterMethod.Items1" xml:space="preserve">
|
||||
<value>Starts with</value>
|
||||
</data>
|
||||
<data name="cbFilenameFilterMethod.Items2" xml:space="preserve">
|
||||
<value>Ends with</value>
|
||||
</data>
|
||||
<data name="cbFilenameFilterMethod.Items3" xml:space="preserve">
|
||||
<value>Exact match</value>
|
||||
</data>
|
||||
<data name="cbFilenameFilterMethod.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>168, 20</value>
|
||||
</data>
|
||||
<data name="cbFilenameFilterMethod.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>144, 21</value>
|
||||
</data>
|
||||
<data name="cbFilenameFilterMethod.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>7</value>
|
||||
</data>
|
||||
<data name=">>cbFilenameFilterMethod.Name" xml:space="preserve">
|
||||
<value>cbFilenameFilterMethod</value>
|
||||
</data>
|
||||
<data name=">>cbFilenameFilterMethod.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>cbFilenameFilterMethod.Parent" xml:space="preserve">
|
||||
<value>gbFilters</value>
|
||||
</data>
|
||||
<data name=">>cbFilenameFilterMethod.ZOrder" xml:space="preserve">
|
||||
<value>15</value>
|
||||
</data>
|
||||
<data name="gbFilters.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>8, 368</value>
|
||||
<value>8, 400</value>
|
||||
</data>
|
||||
<data name="gbFilters.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>408, 266</value>
|
||||
<value>408, 234</value>
|
||||
</data>
|
||||
<data name="gbFilters.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>4</value>
|
||||
|
|
Loading…
Reference in a new issue