mirror of
https://github.com/ShareX/ShareX.git
synced 2024-06-28 19:20:27 +12:00
Removed MaxItemCount setting
This commit is contained in:
parent
9c8d7595c8
commit
091abd5c45
|
@ -191,8 +191,7 @@ private void ApplyFilterSimple()
|
||||||
|
|
||||||
HistoryFilter filter = new HistoryFilter()
|
HistoryFilter filter = new HistoryFilter()
|
||||||
{
|
{
|
||||||
Filename = searchText,
|
Filename = searchText
|
||||||
MaxItemCount = Settings.MaxItemCount
|
|
||||||
};
|
};
|
||||||
|
|
||||||
ApplyFilter(filter);
|
ApplyFilter(filter);
|
||||||
|
@ -208,8 +207,7 @@ private void ApplyFilterAdvanced()
|
||||||
FromDate = dtpFilterFrom.Value.Date,
|
FromDate = dtpFilterFrom.Value.Date,
|
||||||
ToDate = dtpFilterTo.Value.Date,
|
ToDate = dtpFilterTo.Value.Date,
|
||||||
FilterHost = cbHostFilter.Checked,
|
FilterHost = cbHostFilter.Checked,
|
||||||
Host = cbHostFilterSelection.Text,
|
Host = cbHostFilterSelection.Text
|
||||||
MaxItemCount = Settings.MaxItemCount
|
|
||||||
};
|
};
|
||||||
|
|
||||||
if (cbTypeFilter.Checked && allTypeNames.IsValidIndex(cbTypeFilterSelection.SelectedIndex))
|
if (cbTypeFilter.Checked && allTypeNames.IsValidIndex(cbTypeFilterSelection.SelectedIndex))
|
||||||
|
@ -450,17 +448,10 @@ private void tsbShowStats_Click(object sender, EventArgs e)
|
||||||
|
|
||||||
private void tsbSettings_Click(object sender, EventArgs e)
|
private void tsbSettings_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
int maxItemCount = Settings.MaxItemCount;
|
|
||||||
|
|
||||||
using (HistorySettingsForm form = new HistorySettingsForm(Settings))
|
using (HistorySettingsForm form = new HistorySettingsForm(Settings))
|
||||||
{
|
{
|
||||||
form.ShowDialog();
|
form.ShowDialog();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (maxItemCount != Settings.MaxItemCount)
|
|
||||||
{
|
|
||||||
RefreshHistoryItems();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void txtFilenameFilter_KeyDown(object sender, KeyEventArgs e)
|
private void txtFilenameFilter_KeyDown(object sender, KeyEventArgs e)
|
||||||
|
|
|
@ -30,29 +30,10 @@ protected override void Dispose(bool disposing)
|
||||||
private void InitializeComponent()
|
private void InitializeComponent()
|
||||||
{
|
{
|
||||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HistorySettingsForm));
|
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HistorySettingsForm));
|
||||||
this.lblMaximumItemLimit = new System.Windows.Forms.Label();
|
|
||||||
this.nudMaximumItemLimit = new System.Windows.Forms.NumericUpDown();
|
|
||||||
this.cbRememberSearchText = new System.Windows.Forms.CheckBox();
|
this.cbRememberSearchText = new System.Windows.Forms.CheckBox();
|
||||||
this.cbRememberWindowState = new System.Windows.Forms.CheckBox();
|
this.cbRememberWindowState = new System.Windows.Forms.CheckBox();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.nudMaximumItemLimit)).BeginInit();
|
|
||||||
this.SuspendLayout();
|
this.SuspendLayout();
|
||||||
//
|
//
|
||||||
// lblMaximumItemLimit
|
|
||||||
//
|
|
||||||
resources.ApplyResources(this.lblMaximumItemLimit, "lblMaximumItemLimit");
|
|
||||||
this.lblMaximumItemLimit.Name = "lblMaximumItemLimit";
|
|
||||||
//
|
|
||||||
// nudMaximumItemLimit
|
|
||||||
//
|
|
||||||
resources.ApplyResources(this.nudMaximumItemLimit, "nudMaximumItemLimit");
|
|
||||||
this.nudMaximumItemLimit.Maximum = new decimal(new int[] {
|
|
||||||
10000,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0});
|
|
||||||
this.nudMaximumItemLimit.Name = "nudMaximumItemLimit";
|
|
||||||
this.nudMaximumItemLimit.ValueChanged += new System.EventHandler(this.nudMaximumItemLimit_ValueChanged);
|
|
||||||
//
|
|
||||||
// cbRememberSearchText
|
// cbRememberSearchText
|
||||||
//
|
//
|
||||||
resources.ApplyResources(this.cbRememberSearchText, "cbRememberSearchText");
|
resources.ApplyResources(this.cbRememberSearchText, "cbRememberSearchText");
|
||||||
|
@ -74,21 +55,15 @@ private void InitializeComponent()
|
||||||
this.BackColor = System.Drawing.SystemColors.Window;
|
this.BackColor = System.Drawing.SystemColors.Window;
|
||||||
this.Controls.Add(this.cbRememberWindowState);
|
this.Controls.Add(this.cbRememberWindowState);
|
||||||
this.Controls.Add(this.cbRememberSearchText);
|
this.Controls.Add(this.cbRememberSearchText);
|
||||||
this.Controls.Add(this.nudMaximumItemLimit);
|
|
||||||
this.Controls.Add(this.lblMaximumItemLimit);
|
|
||||||
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
|
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
|
||||||
this.MaximizeBox = false;
|
this.MaximizeBox = false;
|
||||||
this.Name = "HistorySettingsForm";
|
this.Name = "HistorySettingsForm";
|
||||||
((System.ComponentModel.ISupportInitialize)(this.nudMaximumItemLimit)).EndInit();
|
|
||||||
this.ResumeLayout(false);
|
this.ResumeLayout(false);
|
||||||
this.PerformLayout();
|
this.PerformLayout();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
private System.Windows.Forms.Label lblMaximumItemLimit;
|
|
||||||
private System.Windows.Forms.NumericUpDown nudMaximumItemLimit;
|
|
||||||
private System.Windows.Forms.CheckBox cbRememberSearchText;
|
private System.Windows.Forms.CheckBox cbRememberSearchText;
|
||||||
private System.Windows.Forms.CheckBox cbRememberWindowState;
|
private System.Windows.Forms.CheckBox cbRememberWindowState;
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,16 +39,10 @@ public HistorySettingsForm(HistorySettings settings)
|
||||||
ShareXResources.ApplyTheme(this);
|
ShareXResources.ApplyTheme(this);
|
||||||
|
|
||||||
Settings = settings;
|
Settings = settings;
|
||||||
nudMaximumItemLimit.SetValue(Settings.MaxItemCount);
|
|
||||||
cbRememberSearchText.Checked = Settings.RememberSearchText;
|
cbRememberSearchText.Checked = Settings.RememberSearchText;
|
||||||
cbRememberWindowState.Checked = Settings.RememberWindowState;
|
cbRememberWindowState.Checked = Settings.RememberWindowState;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void nudMaximumItemLimit_ValueChanged(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
Settings.MaxItemCount = (int)nudMaximumItemLimit.Value;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void cbRememberSearchText_CheckedChanged(object sender, EventArgs e)
|
private void cbRememberSearchText_CheckedChanged(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
Settings.RememberSearchText = cbRememberSearchText.Checked;
|
Settings.RememberSearchText = cbRememberSearchText.Checked;
|
||||||
|
|
|
@ -118,70 +118,18 @@
|
||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||||
<data name="lblMaximumItemLimit.AutoSize" type="System.Boolean, mscorlib">
|
|
||||||
<value>True</value>
|
|
||||||
</data>
|
|
||||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
|
||||||
<data name="lblMaximumItemLimit.Location" type="System.Drawing.Point, System.Drawing">
|
|
||||||
<value>13, 16</value>
|
|
||||||
</data>
|
|
||||||
<data name="lblMaximumItemLimit.Size" type="System.Drawing.Size, System.Drawing">
|
|
||||||
<value>96, 13</value>
|
|
||||||
</data>
|
|
||||||
<data name="lblMaximumItemLimit.TabIndex" type="System.Int32, mscorlib">
|
|
||||||
<value>0</value>
|
|
||||||
</data>
|
|
||||||
<data name="lblMaximumItemLimit.Text" xml:space="preserve">
|
|
||||||
<value>Maximum item limit:</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>lblMaximumItemLimit.Name" xml:space="preserve">
|
|
||||||
<value>lblMaximumItemLimit</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>lblMaximumItemLimit.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=">>lblMaximumItemLimit.Parent" xml:space="preserve">
|
|
||||||
<value>$this</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>lblMaximumItemLimit.ZOrder" xml:space="preserve">
|
|
||||||
<value>3</value>
|
|
||||||
</data>
|
|
||||||
<data name="nudMaximumItemLimit.Location" type="System.Drawing.Point, System.Drawing">
|
|
||||||
<value>16, 32</value>
|
|
||||||
</data>
|
|
||||||
<data name="nudMaximumItemLimit.Size" type="System.Drawing.Size, System.Drawing">
|
|
||||||
<value>64, 20</value>
|
|
||||||
</data>
|
|
||||||
<data name="nudMaximumItemLimit.TabIndex" type="System.Int32, mscorlib">
|
|
||||||
<value>1</value>
|
|
||||||
</data>
|
|
||||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
|
||||||
<data name="nudMaximumItemLimit.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
|
|
||||||
<value>Center</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>nudMaximumItemLimit.Name" xml:space="preserve">
|
|
||||||
<value>nudMaximumItemLimit</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>nudMaximumItemLimit.Type" xml:space="preserve">
|
|
||||||
<value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>nudMaximumItemLimit.Parent" xml:space="preserve">
|
|
||||||
<value>$this</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>nudMaximumItemLimit.ZOrder" xml:space="preserve">
|
|
||||||
<value>2</value>
|
|
||||||
</data>
|
|
||||||
<data name="cbRememberSearchText.AutoSize" type="System.Boolean, mscorlib">
|
<data name="cbRememberSearchText.AutoSize" type="System.Boolean, mscorlib">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</data>
|
</data>
|
||||||
|
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||||
<data name="cbRememberSearchText.Location" type="System.Drawing.Point, System.Drawing">
|
<data name="cbRememberSearchText.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
<value>16, 64</value>
|
<value>16, 16</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="cbRememberSearchText.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="cbRememberSearchText.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>138, 17</value>
|
<value>138, 17</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="cbRememberSearchText.TabIndex" type="System.Int32, mscorlib">
|
<data name="cbRememberSearchText.TabIndex" type="System.Int32, mscorlib">
|
||||||
<value>2</value>
|
<value>0</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="cbRememberSearchText.Text" xml:space="preserve">
|
<data name="cbRememberSearchText.Text" xml:space="preserve">
|
||||||
<value>Remember search input</value>
|
<value>Remember search input</value>
|
||||||
|
@ -202,13 +150,13 @@
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="cbRememberWindowState.Location" type="System.Drawing.Point, System.Drawing">
|
<data name="cbRememberWindowState.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
<value>16, 88</value>
|
<value>16, 40</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="cbRememberWindowState.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="cbRememberWindowState.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>142, 17</value>
|
<value>142, 17</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="cbRememberWindowState.TabIndex" type="System.Int32, mscorlib">
|
<data name="cbRememberWindowState.TabIndex" type="System.Int32, mscorlib">
|
||||||
<value>3</value>
|
<value>1</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="cbRememberWindowState.Text" xml:space="preserve">
|
<data name="cbRememberWindowState.Text" xml:space="preserve">
|
||||||
<value>Remember window state</value>
|
<value>Remember window state</value>
|
||||||
|
@ -234,6 +182,7 @@
|
||||||
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
|
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>334, 211</value>
|
<value>334, 211</value>
|
||||||
</data>
|
</data>
|
||||||
|
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||||
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
|
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
|
||||||
<value>CenterScreen</value>
|
<value>CenterScreen</value>
|
||||||
</data>
|
</data>
|
||||||
|
|
|
@ -32,7 +32,6 @@ public class HistorySettings
|
||||||
public bool RememberWindowState { get; set; } = true;
|
public bool RememberWindowState { get; set; } = true;
|
||||||
public WindowState WindowState { get; set; } = new WindowState();
|
public WindowState WindowState { get; set; } = new WindowState();
|
||||||
public int SplitterDistance { get; set; } = 550;
|
public int SplitterDistance { get; set; } = 550;
|
||||||
public int MaxItemCount { get; set; } = 0;
|
|
||||||
public bool RememberSearchText { get; set; } = false;
|
public bool RememberSearchText { get; set; } = false;
|
||||||
public string SearchText { get; set; } = "";
|
public string SearchText { get; set; } = "";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue