diff --git a/ShareX.HistoryLib/HistoryForm.Designer.cs b/ShareX.HistoryLib/HistoryForm.Designer.cs index df12ab2f6..73500e84b 100644 --- a/ShareX.HistoryLib/HistoryForm.Designer.cs +++ b/ShareX.HistoryLib/HistoryForm.Designer.cs @@ -30,17 +30,18 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HistoryForm)); - this.btnApplyFilters = new System.Windows.Forms.Button(); 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.panel1 = new System.Windows.Forms.Panel(); this.pbThumbnail = new ShareX.HelpersLib.MyPictureBox(); this.gbFilters = new System.Windows.Forms.GroupBox(); this.cbHostFilterSelection = new System.Windows.Forms.ComboBox(); this.btnRemoveFilters = new System.Windows.Forms.Button(); + this.btnApplyFilters = new System.Windows.Forms.Button(); this.cbTypeFilterSelection = new System.Windows.Forms.ComboBox(); this.cbHostFilter = new System.Windows.Forms.CheckBox(); this.cbTypeFilter = new System.Windows.Forms.CheckBox(); @@ -56,16 +57,10 @@ private void InitializeComponent() this.scMain.Panel1.SuspendLayout(); this.scMain.Panel2.SuspendLayout(); this.scMain.SuspendLayout(); + this.panel1.SuspendLayout(); this.gbFilters.SuspendLayout(); this.SuspendLayout(); // - // btnApplyFilters - // - resources.ApplyResources(this.btnApplyFilters, "btnApplyFilters"); - this.btnApplyFilters.Name = "btnApplyFilters"; - this.btnApplyFilters.UseVisualStyleBackColor = true; - this.btnApplyFilters.Click += new System.EventHandler(this.btnApplyFilters_Click); - // // scMain // resources.ApplyResources(this.scMain, "scMain"); @@ -78,8 +73,7 @@ private void InitializeComponent() // // scMain.Panel2 // - this.scMain.Panel2.Controls.Add(this.pbThumbnail); - this.scMain.Panel2.Controls.Add(this.gbFilters); + this.scMain.Panel2.Controls.Add(this.panel1); this.scMain.SplitterColor = System.Drawing.Color.DarkGray; this.scMain.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.scMain_SplitterMoved); // @@ -121,6 +115,13 @@ private void InitializeComponent() // resources.ApplyResources(this.chURL, "chURL"); // + // panel1 + // + this.panel1.Controls.Add(this.pbThumbnail); + this.panel1.Controls.Add(this.gbFilters); + resources.ApplyResources(this.panel1, "panel1"); + this.panel1.Name = "panel1"; + // // pbThumbnail // resources.ApplyResources(this.pbThumbnail, "pbThumbnail"); @@ -164,6 +165,13 @@ private void InitializeComponent() this.btnRemoveFilters.UseVisualStyleBackColor = true; this.btnRemoveFilters.Click += new System.EventHandler(this.btnRemoveFilters_Click); // + // btnApplyFilters + // + resources.ApplyResources(this.btnApplyFilters, "btnApplyFilters"); + this.btnApplyFilters.Name = "btnApplyFilters"; + this.btnApplyFilters.UseVisualStyleBackColor = true; + this.btnApplyFilters.Click += new System.EventHandler(this.btnApplyFilters_Click); + // // cbTypeFilterSelection // this.cbTypeFilterSelection.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -248,6 +256,7 @@ private void InitializeComponent() this.scMain.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.scMain)).EndInit(); this.scMain.ResumeLayout(false); + this.panel1.ResumeLayout(false); this.gbFilters.ResumeLayout(false); this.gbFilters.PerformLayout(); this.ResumeLayout(false); @@ -260,23 +269,24 @@ private void InitializeComponent() private System.Windows.Forms.ColumnHeader chFilename; private System.Windows.Forms.ColumnHeader chDateTime; private System.Windows.Forms.ColumnHeader chURL; - private System.Windows.Forms.DateTimePicker dtpFilterFrom; - private System.Windows.Forms.CheckBox cbDateFilter; - private System.Windows.Forms.Label lblFilterFrom; - private System.Windows.Forms.Label lblFilterTo; - private System.Windows.Forms.DateTimePicker dtpFilterTo; - private System.Windows.Forms.Button btnApplyFilters; - private System.Windows.Forms.TextBox txtFilenameFilter; - private System.Windows.Forms.ComboBox cbFilenameFilterMethod; - private System.Windows.Forms.CheckBox cbFilenameFilter; - private ShareX.HelpersLib.MyPictureBox pbThumbnail; + private System.Windows.Forms.ColumnHeader chIcon; + private ShareX.HelpersLib.SplitContainerCustomSplitter scMain; + private System.Windows.Forms.Panel panel1; + private HelpersLib.MyPictureBox pbThumbnail; private System.Windows.Forms.GroupBox gbFilters; + private System.Windows.Forms.ComboBox cbHostFilterSelection; private System.Windows.Forms.Button btnRemoveFilters; + private System.Windows.Forms.Button btnApplyFilters; private System.Windows.Forms.ComboBox cbTypeFilterSelection; private System.Windows.Forms.CheckBox cbHostFilter; private System.Windows.Forms.CheckBox cbTypeFilter; - private System.Windows.Forms.ColumnHeader chIcon; - private ShareX.HelpersLib.SplitContainerCustomSplitter scMain; - private System.Windows.Forms.ComboBox cbHostFilterSelection; + 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; } } \ No newline at end of file diff --git a/ShareX.HistoryLib/HistoryForm.resx b/ShareX.HistoryLib/HistoryForm.resx index 86a1ba650..57f895e46 100644 --- a/ShareX.HistoryLib/HistoryForm.resx +++ b/ShareX.HistoryLib/HistoryForm.resx @@ -118,44 +118,17 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - NoControl - - - - 16, 210 - - - 144, 24 - - - - 14 - - - Apply filters - - - btnApplyFilters - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbFilters - - - 2 - Fill + 0, 0 - @Invariant + + 24 @@ -173,7 +146,7 @@ URL - @Invariant + 230 @@ -193,7 +166,7 @@ lvHistory - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null scMain.Panel1 @@ -226,16 +199,16 @@ 406, 368 - 1 + 3 pbThumbnail - ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null - scMain.Panel2 + panel1 0 @@ -291,6 +264,33 @@ 1 + + NoControl + + + 16, 210 + + + 144, 24 + + + 14 + + + Apply filters + + + btnApplyFilters + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbFilters + + + 2 + 168, 150 @@ -595,7 +595,7 @@ 406, 250 - 2 + 4 Filters @@ -607,11 +607,35 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - scMain.Panel2 + panel1 1 + + Fill + + + 0, 0 + + + 428, 641 + + + 0 + + + panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + scMain.Panel2 + + + 0 + scMain.Panel2 @@ -643,7 +667,7 @@ scMain - ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null $this