CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-25 01:30:52 +12:00
Code Issues Packages Projects Releases Wiki Activity

Removed image history view mode option

Browse source
This commit is contained in:
Jaex 2021-08-10 03:09:30 +03:00
parent 0b487f24a4
commit 24be3fa7c4
6 changed files with 21 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ShareX.HistoryLib/Forms/HistorySettingsForm.resx
View file

@ -232,7 +232,7 @@
<value>96, 96</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>305, 191</value>
<value>334, 211</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterScreen</value>

3
ShareX.HistoryLib/Forms/ImageHistoryForm.cs
View file

@ -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();
}

22
ShareX.HistoryLib/Forms/ImageHistorySettingsForm.Designer.cs generated
View file

@ -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;

7
ShareX.HistoryLib/Forms/ImageHistorySettingsForm.cs
View file

@ -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);

86
ShareX.HistoryLib/Forms/ImageHistorySettingsForm.resx
View file

@ -118,45 +118,18 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="lblViewMode.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="lblViewMode.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 16</value>
</data>
<data name="lblViewMode.Size" type="System.Drawing.Size, System.Drawing">
<value>62, 13</value>
</data>
<data name="lblViewMode.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="lblViewMode.Text" xml:space="preserve">
<value>View mode:</value>
</data>
<data name="&gt;&gt;lblViewMode.Name" xml:space="preserve">
<value>lblViewMode</value>
</data>
<data name="&gt;&gt;lblViewMode.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="&gt;&gt;lblViewMode.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;lblViewMode.ZOrder" xml:space="preserve">
<value>9</value>
</data>
<data name="lblThumbnailSize.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="lblThumbnailSize.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 64</value>
<value>13, 16</value>
</data>
<data name="lblThumbnailSize.Size" type="System.Drawing.Size, System.Drawing">
<value>80, 13</value>
</data>
<data name="lblThumbnailSize.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
<value>0</value>
</data>
<data name="lblThumbnailSize.Text" xml:space="preserve">
<value>Thumbnail size:</value>
@ -171,19 +144,19 @@
<value>$this</value>
</data>
<data name="&gt;&gt;lblThumbnailSize.ZOrder" xml:space="preserve">
<value>8</value>
<value>7</value>
</data>
<data name="lblMaximumImageLimit.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lblMaximumImageLimit.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 112</value>
<value>13, 64</value>
</data>
<data name="lblMaximumImageLimit.Size" type="System.Drawing.Size, System.Drawing">
<value>105, 13</value>
</data>
<data name="lblMaximumImageLimit.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
<value>3</value>
</data>
<data name="lblMaximumImageLimit.Text" xml:space="preserve">
<value>Maximum image limit:</value>
@ -198,37 +171,16 @@
<value>$this</value>
</data>
<data name="&gt;&gt;lblMaximumImageLimit.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="cbViewMode.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 32</value>
</data>
<data name="cbViewMode.Size" type="System.Drawing.Size, System.Drawing">
<value>120, 21</value>
</data>
<data name="cbViewMode.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="&gt;&gt;cbViewMode.Name" xml:space="preserve">
<value>cbViewMode</value>
</data>
<data name="&gt;&gt;cbViewMode.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;cbViewMode.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;cbViewMode.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="nudThumbnailSize.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 80</value>
<value>16, 32</value>
</data>
<data name="nudThumbnailSize.Size" type="System.Drawing.Size, System.Drawing">
<value>64, 20</value>
</data>
<data name="nudThumbnailSize.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
<value>1</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="nudThumbnailSize.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
@ -247,13 +199,13 @@
<value>5</value>
</data>
<data name="nudMaximumImageLimit.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 128</value>
<value>16, 80</value>
</data>
<data name="nudMaximumImageLimit.Size" type="System.Drawing.Size, System.Drawing">
<value>64, 20</value>
</data>
<data name="nudMaximumImageLimit.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
<value>4</value>
</data>
<data name="nudMaximumImageLimit.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
<value>Center</value>
@ -274,13 +226,13 @@
<value>True</value>
</data>
<data name="lblThumbnailSizeUnit.Location" type="System.Drawing.Point, System.Drawing">
<value>85, 84</value>
<value>85, 36</value>
</data>
<data name="lblThumbnailSizeUnit.Size" type="System.Drawing.Size, System.Drawing">
<value>18, 13</value>
</data>
<data name="lblThumbnailSizeUnit.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
<value>2</value>
</data>
<data name="lblThumbnailSizeUnit.Text" xml:space="preserve">
<value>px</value>
@ -304,13 +256,13 @@
<value>NoControl</value>
</data>
<data name="cbRememberSearchText.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 184</value>
<value>16, 136</value>
</data>
<data name="cbRememberSearchText.Size" type="System.Drawing.Size, System.Drawing">
<value>138, 17</value>
</data>
<data name="cbRememberSearchText.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
<value>6</value>
</data>
<data name="cbRememberSearchText.Text" xml:space="preserve">
<value>Remember search input</value>
@ -331,13 +283,13 @@
<value>True</value>
</data>
<data name="cbFilterMissingFiles.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 160</value>
<value>16, 112</value>
</data>
<data name="cbFilterMissingFiles.Size" type="System.Drawing.Size, System.Drawing">
<value>106, 17</value>
</data>
<data name="cbFilterMissingFiles.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
<value>5</value>
</data>
<data name="cbFilterMissingFiles.Text" xml:space="preserve">
<value>Filter missing files</value>
@ -358,13 +310,13 @@
<value>True</value>
</data>
<data name="cbRememberWindowState.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 208</value>
<value>16, 160</value>
</data>
<data name="cbRememberWindowState.Size" type="System.Drawing.Size, System.Drawing">
<value>142, 17</value>
</data>
<data name="cbRememberWindowState.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
<value>7</value>
</data>
<data name="cbRememberWindowState.Text" xml:space="preserve">
<value>Remember window state</value>
@ -388,7 +340,7 @@
<value>96, 96</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>344, 237</value>
<value>334, 211</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterScreen</value>

1
ShareX.HistoryLib/ImageHistorySettings.cs
View file

@ -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;