diff --git a/ShareX.HistoryLib/Forms/HistorySettingsForm.resx b/ShareX.HistoryLib/Forms/HistorySettingsForm.resx index 0ada9d67b..8729fa400 100644 --- a/ShareX.HistoryLib/Forms/HistorySettingsForm.resx +++ b/ShareX.HistoryLib/Forms/HistorySettingsForm.resx @@ -232,7 +232,7 @@ 96, 96 - 305, 191 + 334, 211 CenterScreen diff --git a/ShareX.HistoryLib/Forms/ImageHistoryForm.cs b/ShareX.HistoryLib/Forms/ImageHistoryForm.cs index 051d63c11..951dfbd82 100644 --- a/ShareX.HistoryLib/Forms/ImageHistoryForm.cs +++ b/ShareX.HistoryLib/Forms/ImageHistoryForm.cs @@ -33,7 +33,6 @@ using System.Linq; using System.Text.RegularExpressions; using System.Windows.Forms; -using View = Manina.Windows.Forms.View; namespace ShareX.HistoryLib { @@ -55,7 +54,6 @@ public ImageHistoryForm(string historyPath, ImageHistorySettings settings, Actio HistoryPath = historyPath; Settings = settings; - ilvImages.View = (View)Settings.ViewMode; ilvImages.ThumbnailSize = Settings.ThumbnailSize; if (ShareXResources.UseCustomTheme) @@ -237,7 +235,6 @@ private void tsbSettings_Click(object sender, EventArgs e) form.ShowDialog(); } - ilvImages.View = (View)Settings.ViewMode; ilvImages.ThumbnailSize = Settings.ThumbnailSize; RefreshHistoryItems(); } diff --git a/ShareX.HistoryLib/Forms/ImageHistorySettingsForm.Designer.cs b/ShareX.HistoryLib/Forms/ImageHistorySettingsForm.Designer.cs index ba6d72942..bff6a4f4d 100644 --- a/ShareX.HistoryLib/Forms/ImageHistorySettingsForm.Designer.cs +++ b/ShareX.HistoryLib/Forms/ImageHistorySettingsForm.Designer.cs @@ -29,10 +29,8 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ImageHistorySettingsForm)); - this.lblViewMode = new System.Windows.Forms.Label(); this.lblThumbnailSize = new System.Windows.Forms.Label(); this.lblMaximumImageLimit = new System.Windows.Forms.Label(); - this.cbViewMode = new System.Windows.Forms.ComboBox(); this.nudThumbnailSize = new System.Windows.Forms.NumericUpDown(); this.nudMaximumImageLimit = new System.Windows.Forms.NumericUpDown(); this.lblThumbnailSizeUnit = new System.Windows.Forms.Label(); @@ -43,11 +41,6 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.nudMaximumImageLimit)).BeginInit(); this.SuspendLayout(); // - // lblViewMode - // - resources.ApplyResources(this.lblViewMode, "lblViewMode"); - this.lblViewMode.Name = "lblViewMode"; - // // lblThumbnailSize // resources.ApplyResources(this.lblThumbnailSize, "lblThumbnailSize"); @@ -58,14 +51,6 @@ private void InitializeComponent() resources.ApplyResources(this.lblMaximumImageLimit, "lblMaximumImageLimit"); this.lblMaximumImageLimit.Name = "lblMaximumImageLimit"; // - // cbViewMode - // - this.cbViewMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cbViewMode.FormattingEnabled = true; - resources.ApplyResources(this.cbViewMode, "cbViewMode"); - this.cbViewMode.Name = "cbViewMode"; - this.cbViewMode.SelectedIndexChanged += new System.EventHandler(this.cbViewMode_SelectedIndexChanged); - // // nudThumbnailSize // resources.ApplyResources(this.nudThumbnailSize, "nudThumbnailSize"); @@ -81,7 +66,7 @@ private void InitializeComponent() 0}); this.nudThumbnailSize.Name = "nudThumbnailSize"; this.nudThumbnailSize.Value = new decimal(new int[] { - 50, + 100, 0, 0, 0}); @@ -135,10 +120,8 @@ private void InitializeComponent() this.Controls.Add(this.lblThumbnailSizeUnit); this.Controls.Add(this.nudMaximumImageLimit); this.Controls.Add(this.nudThumbnailSize); - this.Controls.Add(this.cbViewMode); this.Controls.Add(this.lblMaximumImageLimit); this.Controls.Add(this.lblThumbnailSize); - this.Controls.Add(this.lblViewMode); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.MaximizeBox = false; this.Name = "ImageHistorySettingsForm"; @@ -150,11 +133,8 @@ private void InitializeComponent() } #endregion - - private System.Windows.Forms.Label lblViewMode; private System.Windows.Forms.Label lblThumbnailSize; private System.Windows.Forms.Label lblMaximumImageLimit; - private System.Windows.Forms.ComboBox cbViewMode; private System.Windows.Forms.NumericUpDown nudThumbnailSize; private System.Windows.Forms.NumericUpDown nudMaximumImageLimit; private System.Windows.Forms.Label lblThumbnailSizeUnit; diff --git a/ShareX.HistoryLib/Forms/ImageHistorySettingsForm.cs b/ShareX.HistoryLib/Forms/ImageHistorySettingsForm.cs index be9c62c7e..762a4a1c0 100644 --- a/ShareX.HistoryLib/Forms/ImageHistorySettingsForm.cs +++ b/ShareX.HistoryLib/Forms/ImageHistorySettingsForm.cs @@ -40,8 +40,6 @@ public ImageHistorySettingsForm(ImageHistorySettings settings) ShareXResources.ApplyTheme(this); Settings = settings; - cbViewMode.Items.AddRange(Enum.GetNames(typeof(Manina.Windows.Forms.View))); - cbViewMode.SelectedIndex = Settings.ViewMode; nudThumbnailSize.SetValue(Settings.ThumbnailSize.Width); nudMaximumImageLimit.SetValue(Settings.MaxItemCount); cbFilterMissingFiles.Checked = Settings.FilterMissingFiles; @@ -49,11 +47,6 @@ public ImageHistorySettingsForm(ImageHistorySettings settings) cbRememberWindowState.Checked = Settings.RememberWindowState; } - private void cbViewMode_SelectedIndexChanged(object sender, EventArgs e) - { - Settings.ViewMode = cbViewMode.SelectedIndex; - } - private void nudThumbnailSize_ValueChanged(object sender, EventArgs e) { Settings.ThumbnailSize = new Size((int)nudThumbnailSize.Value, (int)nudThumbnailSize.Value); diff --git a/ShareX.HistoryLib/Forms/ImageHistorySettingsForm.resx b/ShareX.HistoryLib/Forms/ImageHistorySettingsForm.resx index a00830bcf..bf7f81b41 100644 --- a/ShareX.HistoryLib/Forms/ImageHistorySettingsForm.resx +++ b/ShareX.HistoryLib/Forms/ImageHistorySettingsForm.resx @@ -118,45 +118,18 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - - - 13, 16 - - - 62, 13 - - - 0 - - - View mode: - - - lblViewMode - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 9 - True + - 13, 64 + 13, 16 80, 13 - 2 + 0 Thumbnail size: @@ -171,19 +144,19 @@ $this - 8 + 7 True - 13, 112 + 13, 64 105, 13 - 5 + 3 Maximum image limit: @@ -198,37 +171,16 @@ $this - 7 - - - 16, 32 - - - 120, 21 - - - 1 - - - cbViewMode - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - 6 - 16, 80 + 16, 32 64, 20 - 3 + 1 @@ -247,13 +199,13 @@ 5 - 16, 128 + 16, 80 64, 20 - 6 + 4 Center @@ -274,13 +226,13 @@ True - 85, 84 + 85, 36 18, 13 - 4 + 2 px @@ -304,13 +256,13 @@ NoControl - 16, 184 + 16, 136 138, 17 - 8 + 6 Remember search input @@ -331,13 +283,13 @@ True - 16, 160 + 16, 112 106, 17 - 7 + 5 Filter missing files @@ -358,13 +310,13 @@ True - 16, 208 + 16, 160 142, 17 - 9 + 7 Remember window state @@ -388,7 +340,7 @@ 96, 96 - 344, 237 + 334, 211 CenterScreen diff --git a/ShareX.HistoryLib/ImageHistorySettings.cs b/ShareX.HistoryLib/ImageHistorySettings.cs index e7af82ed0..a7fd5e4bc 100644 --- a/ShareX.HistoryLib/ImageHistorySettings.cs +++ b/ShareX.HistoryLib/ImageHistorySettings.cs @@ -32,7 +32,6 @@ public class ImageHistorySettings { public bool RememberWindowState { get; set; } = true; public WindowState WindowState { get; set; } = new WindowState(); - public int ViewMode { get; set; } = 3; public Size ThumbnailSize { get; set; } = new Size(150, 150); public int MaxItemCount { get; set; } = 250; public bool FilterMissingFiles { get; set; } = false;