mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-02 18:26:27 +13:00
If none of filters checked then return
This commit is contained in:
parent
09ca7c6a33
commit
a5e04243da
3 changed files with 35 additions and 30 deletions
|
@ -119,6 +119,11 @@ private void ApplyFiltersAndAdd()
|
||||||
|
|
||||||
private HistoryItem[] ApplyFilters(HistoryItem[] historyItems)
|
private HistoryItem[] ApplyFilters(HistoryItem[] historyItems)
|
||||||
{
|
{
|
||||||
|
if (!cbTypeFilter.Checked && !cbHostFilter.Checked && !cbFilenameFilter.Checked && !cbDateFilter.Checked)
|
||||||
|
{
|
||||||
|
return historyItems;
|
||||||
|
}
|
||||||
|
|
||||||
IEnumerable<HistoryItem> result = historyItems.AsEnumerable();
|
IEnumerable<HistoryItem> result = historyItems.AsEnumerable();
|
||||||
|
|
||||||
if (cbTypeFilter.Checked)
|
if (cbTypeFilter.Checked)
|
||||||
|
|
|
@ -153,30 +153,6 @@
|
||||||
<data name="scMain.Location" type="System.Drawing.Point, System.Drawing">
|
<data name="scMain.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
<value>0, 0</value>
|
<value>0, 0</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="chIcon.Text" xml:space="preserve">
|
|
||||||
<value />
|
|
||||||
<comment>@Invariant</comment></data>
|
|
||||||
<data name="chIcon.Width" type="System.Int32, mscorlib">
|
|
||||||
<value>24</value>
|
|
||||||
</data>
|
|
||||||
<data name="chDateTime.Text" xml:space="preserve">
|
|
||||||
<value>Date</value>
|
|
||||||
</data>
|
|
||||||
<data name="chDateTime.Width" type="System.Int32, mscorlib">
|
|
||||||
<value>115</value>
|
|
||||||
</data>
|
|
||||||
<data name="chFilename.Text" xml:space="preserve">
|
|
||||||
<value>Filename</value>
|
|
||||||
</data>
|
|
||||||
<data name="chFilename.Width" type="System.Int32, mscorlib">
|
|
||||||
<value>170</value>
|
|
||||||
</data>
|
|
||||||
<data name="chURL.Text" xml:space="preserve">
|
|
||||||
<value>URL</value>
|
|
||||||
<comment>@Invariant</comment></data>
|
|
||||||
<data name="chURL.Width" type="System.Int32, mscorlib">
|
|
||||||
<value>230</value>
|
|
||||||
</data>
|
|
||||||
<data name="lvHistory.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
<data name="lvHistory.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||||
<value>Fill</value>
|
<value>Fill</value>
|
||||||
</data>
|
</data>
|
||||||
|
@ -223,7 +199,7 @@
|
||||||
<value>8, 8</value>
|
<value>8, 8</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="pbThumbnail.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="pbThumbnail.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>410, 368</value>
|
<value>414, 368</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="pbThumbnail.TabIndex" type="System.Int32, mscorlib">
|
<data name="pbThumbnail.TabIndex" type="System.Int32, mscorlib">
|
||||||
<value>1</value>
|
<value>1</value>
|
||||||
|
@ -241,7 +217,7 @@
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="gbFilters.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
<data name="gbFilters.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||||
<value>Bottom, Left</value>
|
<value>Bottom, Left, Right</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="btnRemoveFilters.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
<data name="btnRemoveFilters.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||||
<value>NoControl</value>
|
<value>NoControl</value>
|
||||||
|
@ -364,13 +340,13 @@
|
||||||
<value>16, 152</value>
|
<value>16, 152</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="cbTypeFilter.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="cbTypeFilter.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>90, 17</value>
|
<value>75, 17</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="cbTypeFilter.TabIndex" type="System.Int32, mscorlib">
|
<data name="cbTypeFilter.TabIndex" type="System.Int32, mscorlib">
|
||||||
<value>10</value>
|
<value>10</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="cbTypeFilter.Text" xml:space="preserve">
|
<data name="cbTypeFilter.Text" xml:space="preserve">
|
||||||
<value>File type filter:</value>
|
<value>Type filter:</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>cbTypeFilter.Name" xml:space="preserve">
|
<data name=">>cbTypeFilter.Name" xml:space="preserve">
|
||||||
<value>cbTypeFilter</value>
|
<value>cbTypeFilter</value>
|
||||||
|
@ -604,7 +580,7 @@
|
||||||
<value>8, 384</value>
|
<value>8, 384</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="gbFilters.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="gbFilters.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>328, 248</value>
|
<value>414, 250</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="gbFilters.TabIndex" type="System.Int32, mscorlib">
|
<data name="gbFilters.TabIndex" type="System.Int32, mscorlib">
|
||||||
<value>2</value>
|
<value>2</value>
|
||||||
|
@ -663,6 +639,30 @@
|
||||||
<data name=">>scMain.ZOrder" xml:space="preserve">
|
<data name=">>scMain.ZOrder" xml:space="preserve">
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="chIcon.Text" xml:space="preserve">
|
||||||
|
<value />
|
||||||
|
<comment>@Invariant</comment></data>
|
||||||
|
<data name="chIcon.Width" type="System.Int32, mscorlib">
|
||||||
|
<value>24</value>
|
||||||
|
</data>
|
||||||
|
<data name="chDateTime.Text" xml:space="preserve">
|
||||||
|
<value>Date</value>
|
||||||
|
</data>
|
||||||
|
<data name="chDateTime.Width" type="System.Int32, mscorlib">
|
||||||
|
<value>115</value>
|
||||||
|
</data>
|
||||||
|
<data name="chFilename.Text" xml:space="preserve">
|
||||||
|
<value>Filename</value>
|
||||||
|
</data>
|
||||||
|
<data name="chFilename.Width" type="System.Int32, mscorlib">
|
||||||
|
<value>170</value>
|
||||||
|
</data>
|
||||||
|
<data name="chURL.Text" xml:space="preserve">
|
||||||
|
<value>URL</value>
|
||||||
|
<comment>@Invariant</comment></data>
|
||||||
|
<data name="chURL.Width" type="System.Int32, mscorlib">
|
||||||
|
<value>230</value>
|
||||||
|
</data>
|
||||||
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
|
|
@ -136,7 +136,7 @@ public AreaManager(RectangleRegion surface)
|
||||||
RoundedRectangleRadius = 25;
|
RoundedRectangleRadius = 25;
|
||||||
RoundedRectangleRadiusIncrement = 3;
|
RoundedRectangleRadiusIncrement = 3;
|
||||||
TriangleAngle = TriangleAngle.Top;
|
TriangleAngle = TriangleAngle.Top;
|
||||||
MinimumSize = 5;
|
MinimumSize = 3;
|
||||||
|
|
||||||
surface.MouseDown += surface_MouseDown;
|
surface.MouseDown += surface_MouseDown;
|
||||||
surface.MouseUp += surface_MouseUp;
|
surface.MouseUp += surface_MouseUp;
|
||||||
|
|
Loading…
Reference in a new issue