mirror of
https://github.com/ShareX/ShareX.git
synced 2024-09-30 09:17:36 +13:00
Added remember window state option to history forms
This commit is contained in:
parent
cc88068309
commit
1e094cae32
7 changed files with 34 additions and 8 deletions
1
ShareX.HistoryLib/Forms/HistoryForm.Designer.cs
generated
1
ShareX.HistoryLib/Forms/HistoryForm.Designer.cs
generated
|
@ -338,6 +338,7 @@ private void InitializeComponent()
|
||||||
this.Controls.Add(this.scMain);
|
this.Controls.Add(this.scMain);
|
||||||
this.KeyPreview = true;
|
this.KeyPreview = true;
|
||||||
this.Name = "HistoryForm";
|
this.Name = "HistoryForm";
|
||||||
|
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.HistoryForm_FormClosing);
|
||||||
this.Shown += new System.EventHandler(this.HistoryForm_Shown);
|
this.Shown += new System.EventHandler(this.HistoryForm_Shown);
|
||||||
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.HistoryForm_KeyDown);
|
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.HistoryForm_KeyDown);
|
||||||
this.Resize += new System.EventHandler(this.HistoryForm_Resize);
|
this.Resize += new System.EventHandler(this.HistoryForm_Resize);
|
||||||
|
|
|
@ -73,11 +73,6 @@ public HistoryForm(string historyPath, HistorySettings settings, Action<string>
|
||||||
pbThumbnail.Reset();
|
pbThumbnail.Reset();
|
||||||
lvHistory.FillLastColumn();
|
lvHistory.FillLastColumn();
|
||||||
|
|
||||||
if (Settings.SplitterDistance > 0)
|
|
||||||
{
|
|
||||||
scMain.SplitterDistance = Settings.SplitterDistance;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Settings.RememberSearchText)
|
if (Settings.RememberSearchText)
|
||||||
{
|
{
|
||||||
tstbSearch.Text = Settings.SearchText;
|
tstbSearch.Text = Settings.SearchText;
|
||||||
|
@ -85,7 +80,15 @@ public HistoryForm(string historyPath, HistorySettings settings, Action<string>
|
||||||
|
|
||||||
ShareXResources.ApplyTheme(this);
|
ShareXResources.ApplyTheme(this);
|
||||||
|
|
||||||
Settings.WindowState.AutoHandleFormState(this);
|
if (Settings.RememberWindowState)
|
||||||
|
{
|
||||||
|
Settings.WindowState.ApplyFormState(this);
|
||||||
|
|
||||||
|
if (Settings.SplitterDistance > 0)
|
||||||
|
{
|
||||||
|
scMain.SplitterDistance = Settings.SplitterDistance;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ResetFilters()
|
private void ResetFilters()
|
||||||
|
@ -371,6 +374,14 @@ private void HistoryForm_Resize(object sender, EventArgs e)
|
||||||
Refresh();
|
Refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void HistoryForm_FormClosing(object sender, FormClosingEventArgs e)
|
||||||
|
{
|
||||||
|
if (Settings.RememberWindowState)
|
||||||
|
{
|
||||||
|
Settings.WindowState.UpdateFormState(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void HistoryForm_KeyDown(object sender, KeyEventArgs e)
|
private void HistoryForm_KeyDown(object sender, KeyEventArgs e)
|
||||||
{
|
{
|
||||||
switch (e.KeyData)
|
switch (e.KeyData)
|
||||||
|
|
|
@ -712,7 +712,7 @@
|
||||||
<value>3, 0</value>
|
<value>3, 0</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="tsHistory.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="tsHistory.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>485, 25</value>
|
<value>454, 25</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="tsHistory.TabIndex" type="System.Int32, mscorlib">
|
<data name="tsHistory.TabIndex" type="System.Int32, mscorlib">
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
|
|
|
@ -156,6 +156,7 @@ private void InitializeComponent()
|
||||||
this.Controls.Add(this.tscMain);
|
this.Controls.Add(this.tscMain);
|
||||||
this.KeyPreview = true;
|
this.KeyPreview = true;
|
||||||
this.Name = "ImageHistoryForm";
|
this.Name = "ImageHistoryForm";
|
||||||
|
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ImageHistoryForm_FormClosing);
|
||||||
this.Shown += new System.EventHandler(this.ImageHistoryForm_Shown);
|
this.Shown += new System.EventHandler(this.ImageHistoryForm_Shown);
|
||||||
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ImageHistoryForm_KeyDown);
|
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ImageHistoryForm_KeyDown);
|
||||||
this.tscMain.ContentPanel.ResumeLayout(false);
|
this.tscMain.ContentPanel.ResumeLayout(false);
|
||||||
|
|
|
@ -83,7 +83,10 @@ public ImageHistoryForm(string historyPath, ImageHistorySettings settings, Actio
|
||||||
|
|
||||||
ShareXResources.ApplyTheme(this);
|
ShareXResources.ApplyTheme(this);
|
||||||
|
|
||||||
Settings.WindowState.AutoHandleFormState(this);
|
if (Settings.RememberWindowState)
|
||||||
|
{
|
||||||
|
Settings.WindowState.ApplyFormState(this);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void UpdateTitle(int total, int filtered)
|
private void UpdateTitle(int total, int filtered)
|
||||||
|
@ -168,6 +171,14 @@ private void ImageHistoryForm_Shown(object sender, EventArgs e)
|
||||||
RefreshHistoryItems();
|
RefreshHistoryItems();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void ImageHistoryForm_FormClosing(object sender, FormClosingEventArgs e)
|
||||||
|
{
|
||||||
|
if (Settings.RememberWindowState)
|
||||||
|
{
|
||||||
|
Settings.WindowState.UpdateFormState(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void ImageHistoryForm_KeyDown(object sender, KeyEventArgs e)
|
private void ImageHistoryForm_KeyDown(object sender, KeyEventArgs e)
|
||||||
{
|
{
|
||||||
if (e.KeyCode == Keys.F5)
|
if (e.KeyCode == Keys.F5)
|
||||||
|
|
|
@ -29,6 +29,7 @@ namespace ShareX.HistoryLib
|
||||||
{
|
{
|
||||||
public class HistorySettings
|
public class HistorySettings
|
||||||
{
|
{
|
||||||
|
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 int MaxItemCount { get; set; } = 0;
|
||||||
|
|
|
@ -30,6 +30,7 @@ namespace ShareX.HistoryLib
|
||||||
{
|
{
|
||||||
public class ImageHistorySettings
|
public class ImageHistorySettings
|
||||||
{
|
{
|
||||||
|
public bool RememberWindowState { get; set; } = true;
|
||||||
public WindowState WindowState { get; set; } = new WindowState();
|
public WindowState WindowState { get; set; } = new WindowState();
|
||||||
public int ViewMode { get; set; } = 3;
|
public int ViewMode { get; set; } = 3;
|
||||||
public Size ThumbnailSize { get; set; } = new Size(150, 150);
|
public Size ThumbnailSize { get; set; } = new Size(150, 150);
|
||||||
|
|
Loading…
Reference in a new issue