diff --git a/ShareX.HelpersLib/Controls/SplitContainerCustomSplitter.cs b/ShareX.HelpersLib/Controls/SplitContainerCustomSplitter.cs
index 9fb9e033b..82d255b33 100644
--- a/ShareX.HelpersLib/Controls/SplitContainerCustomSplitter.cs
+++ b/ShareX.HelpersLib/Controls/SplitContainerCustomSplitter.cs
@@ -23,6 +23,7 @@
#endregion License Information (GPL v3)
+using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms;
@@ -30,12 +31,15 @@ namespace ShareX.HelpersLib
{
public class SplitContainerCustomSplitter : SplitContainer
{
+ [DefaultValue(typeof(Color), "Black")]
+ public Color SplitterColor { get; set; } = Color.Black;
+
protected override void OnPaint(PaintEventArgs pevent)
{
Graphics g = pevent.Graphics;
Rectangle rect = SplitterRectangle;
- using (Pen pen = new Pen(ForeColor))
+ using (Pen pen = new Pen(SplitterColor))
{
g.DrawLine(pen, rect.Left, rect.Top, rect.Left, rect.Bottom - 1);
g.DrawLine(pen, rect.Right - 1, rect.Top, rect.Right - 1, rect.Bottom - 1);
diff --git a/ShareX.HistoryLib/HistoryForm.Designer.cs b/ShareX.HistoryLib/HistoryForm.Designer.cs
index a1d9ef125..43c426cfc 100644
--- a/ShareX.HistoryLib/HistoryForm.Designer.cs
+++ b/ShareX.HistoryLib/HistoryForm.Designer.cs
@@ -30,59 +30,37 @@ protected override void Dispose(bool disposing)
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HistoryForm));
- this.dtpFilterFrom = new System.Windows.Forms.DateTimePicker();
- this.cbDateFilter = new System.Windows.Forms.CheckBox();
- this.lblFilterFrom = new System.Windows.Forms.Label();
- this.lblFilterTo = new System.Windows.Forms.Label();
- this.dtpFilterTo = new System.Windows.Forms.DateTimePicker();
this.btnApplyFilters = new System.Windows.Forms.Button();
- this.txtFilenameFilter = new System.Windows.Forms.TextBox();
- this.cbFilenameFilterMethod = new System.Windows.Forms.ComboBox();
- this.cbFilenameFilterCulture = new System.Windows.Forms.ComboBox();
- this.cbFilenameFilter = new System.Windows.Forms.CheckBox();
- this.cbFilenameFilterCase = new System.Windows.Forms.CheckBox();
- this.gbFilters = new System.Windows.Forms.GroupBox();
- this.btnRemoveFilters = new System.Windows.Forms.Button();
- this.txtHostFilter = new System.Windows.Forms.TextBox();
- this.cbTypeFilterSelection = new System.Windows.Forms.ComboBox();
- this.cbHostFilter = new System.Windows.Forms.CheckBox();
- this.cbTypeFilter = new System.Windows.Forms.CheckBox();
+ this.scMain = new ShareX.HelpersLib.SplitContainerCustomSplitter();
this.lvHistory = new ShareX.HelpersLib.MyListView();
this.chIcon = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chDateTime = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chFilename = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chURL = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.pbThumbnail = new ShareX.HelpersLib.MyPictureBox();
- this.lblStatus = new System.Windows.Forms.Label();
+ this.gbFilters = new System.Windows.Forms.GroupBox();
+ this.btnRemoveFilters = new System.Windows.Forms.Button();
+ this.txtHostFilter = new System.Windows.Forms.TextBox();
+ this.cbTypeFilterSelection = new System.Windows.Forms.ComboBox();
+ this.dtpFilterFrom = new System.Windows.Forms.DateTimePicker();
+ this.cbDateFilter = new System.Windows.Forms.CheckBox();
+ this.lblFilterFrom = new System.Windows.Forms.Label();
+ this.lblFilterTo = new System.Windows.Forms.Label();
+ this.dtpFilterTo = new System.Windows.Forms.DateTimePicker();
+ this.txtFilenameFilter = new System.Windows.Forms.TextBox();
+ this.cbFilenameFilterMethod = new System.Windows.Forms.ComboBox();
+ this.cbFilenameFilterCulture = new System.Windows.Forms.ComboBox();
+ this.cbFilenameFilter = new System.Windows.Forms.CheckBox();
+ this.cbFilenameFilterCase = new System.Windows.Forms.CheckBox();
+ this.cbHostFilter = new System.Windows.Forms.CheckBox();
+ this.cbTypeFilter = new System.Windows.Forms.CheckBox();
+ ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit();
+ this.scMain.Panel1.SuspendLayout();
+ this.scMain.Panel2.SuspendLayout();
+ this.scMain.SuspendLayout();
this.gbFilters.SuspendLayout();
this.SuspendLayout();
//
- // dtpFilterFrom
- //
- resources.ApplyResources(this.dtpFilterFrom, "dtpFilterFrom");
- this.dtpFilterFrom.Name = "dtpFilterFrom";
- //
- // cbDateFilter
- //
- resources.ApplyResources(this.cbDateFilter, "cbDateFilter");
- this.cbDateFilter.Name = "cbDateFilter";
- this.cbDateFilter.UseVisualStyleBackColor = true;
- //
- // lblFilterFrom
- //
- resources.ApplyResources(this.lblFilterFrom, "lblFilterFrom");
- this.lblFilterFrom.Name = "lblFilterFrom";
- //
- // lblFilterTo
- //
- resources.ApplyResources(this.lblFilterTo, "lblFilterTo");
- this.lblFilterTo.Name = "lblFilterTo";
- //
- // dtpFilterTo
- //
- resources.ApplyResources(this.dtpFilterTo, "dtpFilterTo");
- this.dtpFilterTo.Name = "dtpFilterTo";
- //
// btnApplyFilters
//
resources.ApplyResources(this.btnApplyFilters, "btnApplyFilters");
@@ -90,46 +68,67 @@ private void InitializeComponent()
this.btnApplyFilters.UseVisualStyleBackColor = true;
this.btnApplyFilters.Click += new System.EventHandler(this.btnApplyFilters_Click);
//
- // txtFilenameFilter
+ // scMain
//
- resources.ApplyResources(this.txtFilenameFilter, "txtFilenameFilter");
- this.txtFilenameFilter.Name = "txtFilenameFilter";
- this.txtFilenameFilter.TextChanged += new System.EventHandler(this.txtFilenameFilter_TextChanged);
+ resources.ApplyResources(this.scMain, "scMain");
+ this.scMain.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+ this.scMain.Name = "scMain";
//
- // cbFilenameFilterMethod
+ // scMain.Panel1
//
- 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";
+ this.scMain.Panel1.Controls.Add(this.lvHistory);
//
- // cbFilenameFilterCulture
+ // scMain.Panel2
//
- this.cbFilenameFilterCulture.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cbFilenameFilterCulture.FormattingEnabled = true;
- this.cbFilenameFilterCulture.Items.AddRange(new object[] {
- resources.GetString("cbFilenameFilterCulture.Items"),
- resources.GetString("cbFilenameFilterCulture.Items1"),
- resources.GetString("cbFilenameFilterCulture.Items2")});
- resources.ApplyResources(this.cbFilenameFilterCulture, "cbFilenameFilterCulture");
- this.cbFilenameFilterCulture.Name = "cbFilenameFilterCulture";
+ this.scMain.Panel2.Controls.Add(this.pbThumbnail);
+ this.scMain.Panel2.Controls.Add(this.gbFilters);
+ this.scMain.SplitterColor = System.Drawing.Color.DarkGray;
//
- // cbFilenameFilter
+ // lvHistory
//
- resources.ApplyResources(this.cbFilenameFilter, "cbFilenameFilter");
- this.cbFilenameFilter.Name = "cbFilenameFilter";
- this.cbFilenameFilter.UseVisualStyleBackColor = true;
+ this.lvHistory.AllowColumnSort = true;
+ this.lvHistory.AutoFillColumn = true;
+ this.lvHistory.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.lvHistory.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+ this.chIcon,
+ this.chDateTime,
+ this.chFilename,
+ this.chURL});
+ resources.ApplyResources(this.lvHistory, "lvHistory");
+ this.lvHistory.FullRowSelect = true;
+ this.lvHistory.HideSelection = false;
+ this.lvHistory.Name = "lvHistory";
+ this.lvHistory.UseCompatibleStateImageBehavior = false;
+ this.lvHistory.View = System.Windows.Forms.View.Details;
+ this.lvHistory.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.lvHistory_ItemSelectionChanged);
+ this.lvHistory.KeyDown += new System.Windows.Forms.KeyEventHandler(this.lvHistory_KeyDown);
+ this.lvHistory.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.lvHistory_MouseDoubleClick);
+ this.lvHistory.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lvHistory_MouseUp);
//
- // cbFilenameFilterCase
+ // chIcon
//
- resources.ApplyResources(this.cbFilenameFilterCase, "cbFilenameFilterCase");
- this.cbFilenameFilterCase.Name = "cbFilenameFilterCase";
- this.cbFilenameFilterCase.UseVisualStyleBackColor = true;
+ resources.ApplyResources(this.chIcon, "chIcon");
+ //
+ // chDateTime
+ //
+ resources.ApplyResources(this.chDateTime, "chDateTime");
+ //
+ // chFilename
+ //
+ resources.ApplyResources(this.chFilename, "chFilename");
+ //
+ // chURL
+ //
+ resources.ApplyResources(this.chURL, "chURL");
+ //
+ // pbThumbnail
+ //
+ resources.ApplyResources(this.pbThumbnail, "pbThumbnail");
+ this.pbThumbnail.BackColor = System.Drawing.Color.White;
+ this.pbThumbnail.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.pbThumbnail.DrawCheckeredBackground = true;
+ this.pbThumbnail.FullscreenOnClick = true;
+ this.pbThumbnail.Name = "pbThumbnail";
//
// gbFilters
//
@@ -177,6 +176,73 @@ private void InitializeComponent()
resources.ApplyResources(this.cbTypeFilterSelection, "cbTypeFilterSelection");
this.cbTypeFilterSelection.Name = "cbTypeFilterSelection";
//
+ // dtpFilterFrom
+ //
+ resources.ApplyResources(this.dtpFilterFrom, "dtpFilterFrom");
+ this.dtpFilterFrom.Name = "dtpFilterFrom";
+ //
+ // cbDateFilter
+ //
+ resources.ApplyResources(this.cbDateFilter, "cbDateFilter");
+ this.cbDateFilter.Name = "cbDateFilter";
+ this.cbDateFilter.UseVisualStyleBackColor = true;
+ //
+ // lblFilterFrom
+ //
+ resources.ApplyResources(this.lblFilterFrom, "lblFilterFrom");
+ this.lblFilterFrom.Name = "lblFilterFrom";
+ //
+ // lblFilterTo
+ //
+ resources.ApplyResources(this.lblFilterTo, "lblFilterTo");
+ this.lblFilterTo.Name = "lblFilterTo";
+ //
+ // dtpFilterTo
+ //
+ resources.ApplyResources(this.dtpFilterTo, "dtpFilterTo");
+ this.dtpFilterTo.Name = "dtpFilterTo";
+ //
+ // txtFilenameFilter
+ //
+ resources.ApplyResources(this.txtFilenameFilter, "txtFilenameFilter");
+ this.txtFilenameFilter.Name = "txtFilenameFilter";
+ this.txtFilenameFilter.TextChanged += new System.EventHandler(this.txtFilenameFilter_TextChanged);
+ //
+ // 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";
+ //
+ // cbFilenameFilterCulture
+ //
+ this.cbFilenameFilterCulture.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cbFilenameFilterCulture.FormattingEnabled = true;
+ this.cbFilenameFilterCulture.Items.AddRange(new object[] {
+ resources.GetString("cbFilenameFilterCulture.Items"),
+ resources.GetString("cbFilenameFilterCulture.Items1"),
+ resources.GetString("cbFilenameFilterCulture.Items2")});
+ resources.ApplyResources(this.cbFilenameFilterCulture, "cbFilenameFilterCulture");
+ this.cbFilenameFilterCulture.Name = "cbFilenameFilterCulture";
+ //
+ // cbFilenameFilter
+ //
+ resources.ApplyResources(this.cbFilenameFilter, "cbFilenameFilter");
+ this.cbFilenameFilter.Name = "cbFilenameFilter";
+ this.cbFilenameFilter.UseVisualStyleBackColor = true;
+ //
+ // cbFilenameFilterCase
+ //
+ resources.ApplyResources(this.cbFilenameFilterCase, "cbFilenameFilterCase");
+ this.cbFilenameFilterCase.Name = "cbFilenameFilterCase";
+ this.cbFilenameFilterCase.UseVisualStyleBackColor = true;
+ //
// cbHostFilter
//
resources.ApplyResources(this.cbHostFilter, "cbHostFilter");
@@ -189,73 +255,24 @@ private void InitializeComponent()
this.cbTypeFilter.Name = "cbTypeFilter";
this.cbTypeFilter.UseVisualStyleBackColor = true;
//
- // lvHistory
- //
- this.lvHistory.AllowColumnSort = true;
- resources.ApplyResources(this.lvHistory, "lvHistory");
- this.lvHistory.AutoFillColumn = true;
- this.lvHistory.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
- this.chIcon,
- this.chDateTime,
- this.chFilename,
- this.chURL});
- this.lvHistory.FullRowSelect = true;
- this.lvHistory.HideSelection = false;
- this.lvHistory.Name = "lvHistory";
- this.lvHistory.UseCompatibleStateImageBehavior = false;
- this.lvHistory.View = System.Windows.Forms.View.Details;
- this.lvHistory.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.lvHistory_ItemSelectionChanged);
- this.lvHistory.KeyDown += new System.Windows.Forms.KeyEventHandler(this.lvHistory_KeyDown);
- this.lvHistory.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.lvHistory_MouseDoubleClick);
- this.lvHistory.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lvHistory_MouseUp);
- //
- // chIcon
- //
- resources.ApplyResources(this.chIcon, "chIcon");
- //
- // chDateTime
- //
- resources.ApplyResources(this.chDateTime, "chDateTime");
- //
- // chFilename
- //
- resources.ApplyResources(this.chFilename, "chFilename");
- //
- // chURL
- //
- resources.ApplyResources(this.chURL, "chURL");
- //
- // pbThumbnail
- //
- resources.ApplyResources(this.pbThumbnail, "pbThumbnail");
- this.pbThumbnail.BackColor = System.Drawing.Color.White;
- this.pbThumbnail.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.pbThumbnail.DrawCheckeredBackground = true;
- this.pbThumbnail.FullscreenOnClick = true;
- this.pbThumbnail.Name = "pbThumbnail";
- //
- // lblStatus
- //
- resources.ApplyResources(this.lblStatus, "lblStatus");
- this.lblStatus.Name = "lblStatus";
- //
// HistoryForm
//
this.AcceptButton = this.btnApplyFilters;
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Controls.Add(this.lblStatus);
- this.Controls.Add(this.lvHistory);
- this.Controls.Add(this.pbThumbnail);
- this.Controls.Add(this.gbFilters);
+ this.Controls.Add(this.scMain);
this.KeyPreview = true;
this.Name = "HistoryForm";
this.Shown += new System.EventHandler(this.HistoryForm_Shown);
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.HistoryForm_KeyDown);
+ this.Resize += new System.EventHandler(this.HistoryForm_Resize);
+ this.scMain.Panel1.ResumeLayout(false);
+ this.scMain.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.scMain)).EndInit();
+ this.scMain.ResumeLayout(false);
this.gbFilters.ResumeLayout(false);
this.gbFilters.PerformLayout();
this.ResumeLayout(false);
- this.PerformLayout();
}
@@ -284,6 +301,6 @@ private void InitializeComponent()
private System.Windows.Forms.CheckBox cbTypeFilter;
private System.Windows.Forms.TextBox txtHostFilter;
private System.Windows.Forms.ColumnHeader chIcon;
- private System.Windows.Forms.Label lblStatus;
+ private ShareX.HelpersLib.SplitContainerCustomSplitter scMain;
}
}
\ No newline at end of file
diff --git a/ShareX.HistoryLib/HistoryForm.cs b/ShareX.HistoryLib/HistoryForm.cs
index 71605ebf6..42250e934 100644
--- a/ShareX.HistoryLib/HistoryForm.cs
+++ b/ShareX.HistoryLib/HistoryForm.cs
@@ -45,9 +45,12 @@ public partial class HistoryForm : Form
public HistoryForm(string historyPath, int maxItemCount = -1)
{
+ HistoryPath = historyPath;
+ MaxItemCount = maxItemCount;
+
InitializeComponent();
Icon = ShareXResources.Icon;
- Text = "ShareX - " + string.Format(Resources.HistoryForm_HistoryForm_History_, historyPath);
+ UpdateTitle();
ImageList il = new ImageList();
il.ColorDepth = ColorDepth.Depth32Bit;
@@ -57,9 +60,6 @@ public HistoryForm(string historyPath, int maxItemCount = -1)
il.Images.Add(Resources.globe);
lvHistory.SmallImageList = il;
- HistoryPath = historyPath;
- MaxItemCount = maxItemCount;
-
him = new HistoryItemManager();
him.GetHistoryItems += him_GetHistoryItems;
@@ -195,7 +195,7 @@ private StringComparison GetStringRule()
private void AddHistoryItems(HistoryItem[] historyItems)
{
- UpdateItemCount(historyItems);
+ UpdateTitle(historyItems);
lvHistory.Items.Clear();
@@ -234,30 +234,38 @@ private void AddHistoryItems(HistoryItem[] historyItems)
lvHistory.Focus();
}
- private void UpdateItemCount(HistoryItem[] historyItems)
+ private void UpdateTitle(HistoryItem[] historyItems = null)
{
- StringBuilder status = new StringBuilder();
+ string title = "ShareX - " + string.Format(Resources.HistoryForm_HistoryForm_History_, HistoryPath);
- status.AppendFormat(Resources.HistoryForm_UpdateItemCount_Total___0_, allHistoryItems.Length.ToString("N0"));
-
- if (allHistoryItems.Length > historyItems.Length)
+ if (historyItems != null)
{
- status.AppendFormat(" - " + Resources.HistoryForm_UpdateItemCount___Filtered___0_, historyItems.Length.ToString("N0"));
+ StringBuilder status = new StringBuilder();
+
+ status.Append(" - ");
+ status.AppendFormat(Resources.HistoryForm_UpdateItemCount_Total___0_, allHistoryItems.Length.ToString("N0"));
+
+ if (allHistoryItems.Length > historyItems.Length)
+ {
+ status.AppendFormat(" - " + Resources.HistoryForm_UpdateItemCount___Filtered___0_, historyItems.Length.ToString("N0"));
+ }
+
+ var types = from hi in historyItems
+ group hi by hi.Type
+ into t
+ let count = t.Count()
+ orderby t.Key
+ select string.Format(" - {0}: {1:N0}", t.Key, count);
+
+ foreach (string type in types)
+ {
+ status.Append(type);
+ }
+
+ title += status.ToString();
}
- var types = from hi in historyItems
- group hi by hi.Type
- into t
- let count = t.Count()
- orderby t.Key
- select string.Format(" - {0}: {1:N0}", t.Key, count);
-
- foreach (string type in types)
- {
- status.Append(type);
- }
-
- lblStatus.Text = status.ToString();
+ Text = title;
}
private void UpdateControls()
@@ -299,6 +307,11 @@ private void HistoryForm_Shown(object sender, EventArgs e)
this.ShowActivate();
}
+ private void HistoryForm_Resize(object sender, EventArgs e)
+ {
+ Refresh();
+ }
+
private void HistoryForm_KeyDown(object sender, KeyEventArgs e)
{
switch (e.KeyData)
diff --git a/ShareX.HistoryLib/HistoryForm.resx b/ShareX.HistoryLib/HistoryForm.resx
index 9fc181436..62eeacca2 100644
--- a/ShareX.HistoryLib/HistoryForm.resx
+++ b/ShareX.HistoryLib/HistoryForm.resx
@@ -117,14 +117,462 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ NoControl
+
+
+ 16, 232
+
+
+ 136, 24
+
+
+
+ 14
+
+
+ Apply filters
+
+
+ btnApplyFilters
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbFilters
+
+
+ 1
+
+
+ Fill
+
+
+ 0, 0
+
+
+ Fill
+
+
+ 0, 0
+
+
+ 550, 641
+
+
+ 0
+
+
+ lvHistory
+
+
+ ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+
+
+ scMain.Panel1
+
+
+ 0
+
+
+ scMain.Panel1
+
+
+ System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ scMain
+
+
+ 0
+
+
+ 100
+
+
+ Top, Bottom, Left, Right
+
+
+ 8, 8
+
+
+ 414, 344
+
+
+ 1
+
+
+ pbThumbnail
+
+
+ ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+
+
+ scMain.Panel2
+
+
+ 0
+
+
+ Bottom, Left
+
+
+ btnRemoveFilters
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbFilters
+
+
+ 0
+
+
+ txtHostFilter
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbFilters
+
+
+ 2
+
+
+ cbTypeFilterSelection
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbFilters
+
+
+ 3
+
+
+ cbHostFilter
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbFilters
+
+
+ 4
+
+
+ cbTypeFilter
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbFilters
+
+
+ 5
+
+
+ dtpFilterFrom
+
+
+ System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbFilters
+
+
+ 6
+
+
+ lblFilterFrom
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbFilters
+
+
+ 7
+
+
+ cbFilenameFilter
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbFilters
+
+
+ 8
+
+
+ lblFilterTo
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbFilters
+
+
+ 9
+
+
+ cbFilenameFilterCase
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbFilters
+
+
+ 10
+
+
+ cbDateFilter
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbFilters
+
+
+ 11
+
+
+ dtpFilterTo
+
+
+ System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbFilters
+
+
+ 12
+
+
+ cbFilenameFilterCulture
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbFilters
+
+
+ 13
+
+
+ txtFilenameFilter
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbFilters
+
+
+ 14
+
+
+ cbFilenameFilterMethod
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbFilters
+
+
+ 15
+
+
+ 8, 360
+
+
+ 312, 272
+
+
+ 2
+
+
+ Filters
+
+
+ gbFilters
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ scMain.Panel2
+
+
+ 1
+
+
+ scMain.Panel2
+
+
+ System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ scMain
+
+
+ 1
+
+
+ 100
+
+
+ 984, 641
+
+
+ 550
+
+
+ 6
+
+
+ 4
+
+
+ scMain
+
+
+ ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+
+
+ $this
+
+
+ 0
+
+
+
+
+
+ 24
+
+
+ Date
+
+
+ 115
+
+
+ Filename
+
+
+ 170
+
+
+ URL
+ @Invariant
+
+ 230
+
+
+ NoControl
+
+
+ 160, 232
+
+
+ 136, 24
+
+
+ 15
+
+
+ Remove filters
+
+
+ btnRemoveFilters
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbFilters
+
+
+ 0
+
+
+ 166, 199
+
+
+ 128, 20
+
+
+ 13
+
+
+ txtHostFilter
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbFilters
+
+
+ 2
+
+
+ Image
+
+
+ Text
+
+
+ File
+
+
+ URL
+
+
+ 166, 172
+
+
+ 128, 21
+
+
+ 11
+
+
+ cbTypeFilterSelection
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ gbFilters
+
+
+ 3
+
88, 46
206, 20
-
2
@@ -143,6 +591,9 @@
True
+
+ NoControl
+
16, 24
@@ -170,8 +621,11 @@
True
+
+ NoControl
+
- 16, 50
+ 13, 50
33, 13
@@ -197,8 +651,11 @@
True
+
+ NoControl
+
- 15, 74
+ 13, 74
23, 13
@@ -242,30 +699,6 @@
12
-
- 16, 232
-
-
- 136, 24
-
-
- 14
-
-
- Apply filters
-
-
- btnApplyFilters
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbFilters
-
-
- 1
-
16, 119
@@ -353,6 +786,9 @@
True
+
+ NoControl
+
16, 96
@@ -380,8 +816,11 @@
True
+
+ NoControl
+
- 192, 146
+ 192, 147
94, 17
@@ -404,91 +843,12 @@
10
-
-
- Top, Right
-
-
- 160, 232
-
-
- 136, 24
-
-
- 15
-
-
- Remove filters
-
-
- btnRemoveFilters
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbFilters
-
-
- 0
-
-
- 166, 199
-
-
- 128, 20
-
-
- 13
-
-
- txtHostFilter
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbFilters
-
-
- 2
-
-
- Image
-
-
- Text
-
-
- File
-
-
- URL
-
-
- 166, 172
-
-
- 128, 21
-
-
- 11
-
-
- cbTypeFilterSelection
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbFilters
-
-
- 3
-
True
+
+ NoControl
+
16, 201
@@ -516,6 +876,9 @@
True
+
+ NoControl
+
16, 174
@@ -540,132 +903,6 @@
5
-
- 592, 360
-
-
- 384, 272
-
-
- 2
-
-
- Filters
-
-
- gbFilters
-
-
- System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 3
-
-
- Top, Bottom, Left, Right
-
-
-
-
-
- 24
-
-
- Date
-
-
- 115
-
-
- Filename
-
-
- 170
-
-
- URL
- @Invariant
-
- 250
-
-
- 8, 8
-
-
- 576, 624
-
-
- 0
-
-
- lvHistory
-
-
- ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-
-
- $this
-
-
- 1
-
-
- Top, Right
-
-
- 592, 32
-
-
- 384, 320
-
-
- 1
-
-
- pbThumbnail
-
-
- ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-
-
- $this
-
-
- 2
-
-
- Top, Right
-
-
- True
-
-
- 589, 10
-
-
- 37, 13
-
-
- 3
-
-
- Status
-
-
- lblStatus
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 0
-
True
diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs
index 5e8baee4f..18fad12e7 100644
--- a/ShareX/Forms/MainForm.Designer.cs
+++ b/ShareX/Forms/MainForm.Designer.cs
@@ -248,7 +248,6 @@ private void InitializeComponent()
//
resources.ApplyResources(this.scMain, "scMain");
this.scMain.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
- this.scMain.ForeColor = System.Drawing.Color.DarkGray;
this.scMain.Name = "scMain";
//
// scMain.Panel1
@@ -260,6 +259,7 @@ private void InitializeComponent()
// scMain.Panel2
//
this.scMain.Panel2.Controls.Add(this.pbPreview);
+ this.scMain.SplitterColor = System.Drawing.Color.DarkGray;
this.scMain.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.scMain_SplitterMoved);
//
// lblMainFormTip
diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx
index 5ba9460bd..df8d7aaea 100644
--- a/ShareX/Forms/MainForm.resx
+++ b/ShareX/Forms/MainForm.resx
@@ -2773,6 +2773,6 @@
MainForm
- ShareX.HotkeyForm, ShareX, Version=10.6.1.0, Culture=neutral, PublicKeyToken=null
+ ShareX.HotkeyForm, ShareX, Version=10.7.1.0, Culture=neutral, PublicKeyToken=null
\ No newline at end of file