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

fixed #4363 #6860: Support closing windows with "Escape" key

Browse source
This commit is contained in:
Jaex 2023-06-04 00:20:57 +03:00
parent fbbf58c954
commit 9b008ac399
35 changed files with 490 additions and 364 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ShareX.HelpersLib/Extensions/Extensions.cs
View file

@ -923,5 +923,18 @@ public static void ChangeFontStyle(this Control control, FontStyle fontStyle)
{
control.Font = new Font(control.Font, fontStyle);
}
public static void CloseOnEscape(this Form form)
{
form.KeyPreview = true;
form.KeyUp += (sender, e) =>
{
if (e.KeyCode == Keys.Escape)
{
form.Close();
}
};
}
}
}

1
ShareX.HelpersLib/Forms/ClipboardViewerForm.cs
View file

@ -38,6 +38,7 @@ public ClipboardViewerForm()
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
this.CloseOnEscape();
}
private void ClipboardViewerForm_Load(object sender, EventArgs e)

1
ShareX.HelpersLib/Forms/ColorPickerForm.cs
View file

@ -47,6 +47,7 @@ public ColorPickerForm(Color currentColor, bool isScreenColorPickerMode = false,
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
this.CloseOnEscape();
clipboardStatusHider = new ControlHider(btnClipboardStatus, 2000);
IsScreenColorPickerMode = isScreenColorPickerMode;

3
ShareX.HelpersLib/Forms/DNSChangerForm.Designer.cs generated
View file

@ -88,6 +88,7 @@ private void InitializeComponent()
//
// btnCancel
//
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
resources.ApplyResources(this.btnCancel, "btnCancel");
this.btnCancel.Name = "btnCancel";
this.btnCancel.UseVisualStyleBackColor = true;
@ -131,10 +132,8 @@ private void InitializeComponent()
//
this.AcceptButton = this.btnSave;
resources.ApplyResources(this, "$this");
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.SystemColors.Window;
this.CancelButton = this.btnCancel;
this.Controls.Add(this.btnPingSecondary);
this.Controls.Add(this.btnPingPrimary);
this.Controls.Add(this.cbAutomatic);

1
ShareX.HelpersLib/Forms/DNSChangerForm.cs
View file

@ -36,6 +36,7 @@ public DNSChangerForm()
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
this.CloseOnEscape();
AddDNS(Resources.DNSChangerForm_DNSChangerForm_Manual);
AddDNS("Google Public DNS", "8.8.8.8", "8.8.4.4"); // https://developers.google.com/speed/public-dns/

2
ShareX.HelpersLib/Forms/DNSChangerForm.resx
View file

@ -438,7 +438,7 @@
<value>True</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>6, 13</value>
<value>96, 96</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>404, 170</value>

1
ShareX.HelpersLib/Forms/HashCheckForm.cs
View file

@ -41,6 +41,7 @@ public HashCheckForm()
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
this.CloseOnEscape();
UpdateCompareControls();
cbHashType.Items.AddRange(Helpers.GetEnumDescriptions<HashType>());

18
ShareX.HelpersLib/Forms/ImageViewer.cs
View file

@ -279,11 +279,6 @@ private void pbPreview_KeyDown(object sender, KeyEventArgs e)
{
switch (e.KeyCode)
{
case Keys.Escape:
case Keys.Enter:
case Keys.Space:
Close();
break;
case Keys.Left:
NavigateImage(-1);
break;
@ -293,6 +288,18 @@ private void pbPreview_KeyDown(object sender, KeyEventArgs e)
}
}
private void pbPreview_KeyUp(object sender, KeyEventArgs e)
{
switch (e.KeyCode)
{
case Keys.Escape:
case Keys.Enter:
case Keys.Space:
Close();
break;
}
}
private void pbPreview_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
{
switch (e.KeyCode)
@ -379,6 +386,7 @@ private void InitializeComponent()
pbPreview.MouseMove += pbPreview_MouseMove;
pbPreview.MouseWheel += pbPreview_MouseWheel;
pbPreview.KeyDown += pbPreview_KeyDown;
pbPreview.KeyUp += pbPreview_KeyUp;
pbPreview.PreviewKeyDown += pbPreview_PreviewKeyDown;
lblStatus.MouseEnter += lblStatus_MouseEnter;

1
ShareX.HelpersLib/Forms/InputBox.cs
View file

@ -37,6 +37,7 @@ private InputBox(string title, string inputText = null, string okText = null, st
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
this.CloseOnEscape();
InputText = inputText;

7
ShareX.HelpersLib/Forms/MonitorTestForm.Designer.cs generated
View file

@ -107,6 +107,7 @@ private void InitializeComponent()
// btnGradientColor2
//
this.btnGradientColor2.Color = System.Drawing.Color.Empty;
this.btnGradientColor2.ColorPickerOptions = null;
resources.ApplyResources(this.btnGradientColor2, "btnGradientColor2");
this.btnGradientColor2.Name = "btnGradientColor2";
this.btnGradientColor2.UseVisualStyleBackColor = true;
@ -115,6 +116,7 @@ private void InitializeComponent()
// btnGradientColor1
//
this.btnGradientColor1.Color = System.Drawing.Color.Empty;
this.btnGradientColor1.ColorPickerOptions = null;
resources.ApplyResources(this.btnGradientColor1, "btnGradientColor1");
this.btnGradientColor1.Name = "btnGradientColor1";
this.btnGradientColor1.UseVisualStyleBackColor = true;
@ -278,18 +280,15 @@ private void InitializeComponent()
// MonitorTestForm
//
resources.ApplyResources(this, "$this");
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.Color.White;
this.Controls.Add(this.pSettings);
this.Cursor = System.Windows.Forms.Cursors.Default;
this.DoubleBuffered = true;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.KeyPreview = true;
this.Name = "MonitorTestForm";
this.TopMost = true;
this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.MainForm_KeyUp);
this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.MainForm_MouseDown);
this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.MonitorTestForm_MouseDown);
this.pSettings.ResumeLayout(false);
this.pSettings.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.tbShapeSize)).EndInit();

11
ShareX.HelpersLib/Forms/MonitorTestForm.cs
View file

@ -36,6 +36,7 @@ public MonitorTestForm()
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
this.CloseOnEscape();
Rectangle screenBounds = CaptureHelpers.GetScreenBounds();
Location = screenBounds.Location;
@ -187,15 +188,7 @@ private void DrawSelectedShape()
#region Form events
private void MainForm_KeyUp(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Escape)
{
Close();
}
}
private void MainForm_MouseDown(object sender, MouseEventArgs e)
private void MonitorTestForm_MouseDown(object sender, MouseEventArgs e)
{
bool visible = !pSettings.Visible;
if (visible) pSettings.Location = e.Location;

379
ShareX.HelpersLib/Forms/MonitorTestForm.resx
View file

@ -117,18 +117,351 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="&gt;&gt;btnScreenTearingTest.Name" xml:space="preserve">
<value>btnScreenTearingTest</value>
</data>
<data name="&gt;&gt;btnScreenTearingTest.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btnScreenTearingTest.Parent" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;btnScreenTearingTest.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;btnGradientColor2.Name" xml:space="preserve">
<value>btnGradientColor2</value>
</data>
<data name="&gt;&gt;btnGradientColor2.Type" xml:space="preserve">
<value>ShareX.HelpersLib.ColorButton, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;btnGradientColor2.Parent" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;btnGradientColor2.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="&gt;&gt;btnGradientColor1.Name" xml:space="preserve">
<value>btnGradientColor1</value>
</data>
<data name="&gt;&gt;btnGradientColor1.Type" xml:space="preserve">
<value>ShareX.HelpersLib.ColorButton, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;btnGradientColor1.Parent" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;btnGradientColor1.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="&gt;&gt;lblTip.Name" xml:space="preserve">
<value>lblTip</value>
</data>
<data name="&gt;&gt;lblTip.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;lblTip.Parent" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;lblTip.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="&gt;&gt;cbGradient.Name" xml:space="preserve">
<value>cbGradient</value>
</data>
<data name="&gt;&gt;cbGradient.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;cbGradient.Parent" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;cbGradient.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="&gt;&gt;rbGradient.Name" xml:space="preserve">
<value>rbGradient</value>
</data>
<data name="&gt;&gt;rbGradient.Type" xml:space="preserve">
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;rbGradient.Parent" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;rbGradient.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="&gt;&gt;btnClose.Name" xml:space="preserve">
<value>btnClose</value>
</data>
<data name="&gt;&gt;btnClose.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btnClose.Parent" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="&gt;&gt;lblShapeSize.Name" xml:space="preserve">
<value>lblShapeSize</value>
</data>
<data name="&gt;&gt;lblShapeSize.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;lblShapeSize.Parent" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;lblShapeSize.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="&gt;&gt;lblShapeSizeValue.Name" xml:space="preserve">
<value>lblShapeSizeValue</value>
</data>
<data name="&gt;&gt;lblShapeSizeValue.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;lblShapeSizeValue.Parent" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;lblShapeSizeValue.ZOrder" xml:space="preserve">
<value>8</value>
</data>
<data name="&gt;&gt;tbShapeSize.Name" xml:space="preserve">
<value>tbShapeSize</value>
</data>
<data name="&gt;&gt;tbShapeSize.Type" xml:space="preserve">
<value>System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tbShapeSize.Parent" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;tbShapeSize.ZOrder" xml:space="preserve">
<value>9</value>
</data>
<data name="&gt;&gt;btnColorDialog.Name" xml:space="preserve">
<value>btnColorDialog</value>
</data>
<data name="&gt;&gt;btnColorDialog.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btnColorDialog.Parent" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;btnColorDialog.ZOrder" xml:space="preserve">
<value>10</value>
</data>
<data name="&gt;&gt;cbShapes.Name" xml:space="preserve">
<value>cbShapes</value>
</data>
<data name="&gt;&gt;cbShapes.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;cbShapes.Parent" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;cbShapes.ZOrder" xml:space="preserve">
<value>11</value>
</data>
<data name="&gt;&gt;rbShapes.Name" xml:space="preserve">
<value>rbShapes</value>
</data>
<data name="&gt;&gt;rbShapes.Type" xml:space="preserve">
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;rbShapes.Parent" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;rbShapes.ZOrder" xml:space="preserve">
<value>12</value>
</data>
<data name="&gt;&gt;lblBlue.Name" xml:space="preserve">
<value>lblBlue</value>
</data>
<data name="&gt;&gt;lblBlue.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;lblBlue.Parent" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;lblBlue.ZOrder" xml:space="preserve">
<value>13</value>
</data>
<data name="&gt;&gt;lblBlueValue.Name" xml:space="preserve">
<value>lblBlueValue</value>
</data>
<data name="&gt;&gt;lblBlueValue.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;lblBlueValue.Parent" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;lblBlueValue.ZOrder" xml:space="preserve">
<value>14</value>
</data>
<data name="&gt;&gt;tbBlue.Name" xml:space="preserve">
<value>tbBlue</value>
</data>
<data name="&gt;&gt;tbBlue.Type" xml:space="preserve">
<value>System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tbBlue.Parent" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;tbBlue.ZOrder" xml:space="preserve">
<value>15</value>
</data>
<data name="&gt;&gt;lblGreen.Name" xml:space="preserve">
<value>lblGreen</value>
</data>
<data name="&gt;&gt;lblGreen.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;lblGreen.Parent" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;lblGreen.ZOrder" xml:space="preserve">
<value>16</value>
</data>
<data name="&gt;&gt;lblGreenValue.Name" xml:space="preserve">
<value>lblGreenValue</value>
</data>
<data name="&gt;&gt;lblGreenValue.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;lblGreenValue.Parent" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;lblGreenValue.ZOrder" xml:space="preserve">
<value>17</value>
</data>
<data name="&gt;&gt;tbGreen.Name" xml:space="preserve">
<value>tbGreen</value>
</data>
<data name="&gt;&gt;tbGreen.Type" xml:space="preserve">
<value>System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tbGreen.Parent" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;tbGreen.ZOrder" xml:space="preserve">
<value>18</value>
</data>
<data name="&gt;&gt;lblRed.Name" xml:space="preserve">
<value>lblRed</value>
</data>
<data name="&gt;&gt;lblRed.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;lblRed.Parent" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;lblRed.ZOrder" xml:space="preserve">
<value>19</value>
</data>
<data name="&gt;&gt;lblRedValue.Name" xml:space="preserve">
<value>lblRedValue</value>
</data>
<data name="&gt;&gt;lblRedValue.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;lblRedValue.Parent" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;lblRedValue.ZOrder" xml:space="preserve">
<value>20</value>
</data>
<data name="&gt;&gt;tbRed.Name" xml:space="preserve">
<value>tbRed</value>
</data>
<data name="&gt;&gt;tbRed.Type" xml:space="preserve">
<value>System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tbRed.Parent" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;tbRed.ZOrder" xml:space="preserve">
<value>21</value>
</data>
<data name="&gt;&gt;rbRedGreenBlue.Name" xml:space="preserve">
<value>rbRedGreenBlue</value>
</data>
<data name="&gt;&gt;rbRedGreenBlue.Type" xml:space="preserve">
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;rbRedGreenBlue.Parent" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;rbRedGreenBlue.ZOrder" xml:space="preserve">
<value>22</value>
</data>
<data name="&gt;&gt;lblBlackWhiteValue.Name" xml:space="preserve">
<value>lblBlackWhiteValue</value>
</data>
<data name="&gt;&gt;lblBlackWhiteValue.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;lblBlackWhiteValue.Parent" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;lblBlackWhiteValue.ZOrder" xml:space="preserve">
<value>23</value>
</data>
<data name="&gt;&gt;tbBlackWhite.Name" xml:space="preserve">
<value>tbBlackWhite</value>
</data>
<data name="&gt;&gt;tbBlackWhite.Type" xml:space="preserve">
<value>System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tbBlackWhite.Parent" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;tbBlackWhite.ZOrder" xml:space="preserve">
<value>24</value>
</data>
<data name="&gt;&gt;rbBlackWhite.Name" xml:space="preserve">
<value>rbBlackWhite</value>
</data>
<data name="&gt;&gt;rbBlackWhite.Type" xml:space="preserve">
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;rbBlackWhite.Parent" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;rbBlackWhite.ZOrder" xml:space="preserve">
<value>25</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="pSettings.Location" type="System.Drawing.Point, System.Drawing">
<value>88, 88</value>
</data>
<data name="pSettings.Size" type="System.Drawing.Size, System.Drawing">
<value>352, 448</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="pSettings.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;pSettings.Name" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;pSettings.Type" xml:space="preserve">
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pSettings.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;pSettings.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="btnScreenTearingTest.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnScreenTearingTest.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 368</value>
</data>
<data name="btnScreenTearingTest.Size" type="System.Drawing.Size, System.Drawing">
<value>320, 24</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="btnScreenTearingTest.TabIndex" type="System.Int32, mscorlib">
<value>25</value>
</data>
@ -169,7 +502,7 @@
<value>btnGradientColor2</value>
</data>
<data name="&gt;&gt;btnGradientColor2.Type" xml:space="preserve">
<value>ShareX.HelpersLib.ColorButton, ShareX.HelpersLib, Version=12.4.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.ColorButton, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;btnGradientColor2.Parent" xml:space="preserve">
<value>pSettings</value>
@ -199,7 +532,7 @@
<value>btnGradientColor1</value>
</data>
<data name="&gt;&gt;btnGradientColor1.Type" xml:space="preserve">
<value>ShareX.HelpersLib.ColorButton, ShareX.HelpersLib, Version=12.4.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.ColorButton, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;btnGradientColor1.Parent" xml:space="preserve">
<value>pSettings</value>
@ -361,14 +694,13 @@
<value>315, 332</value>
</data>
<data name="lblShapeSizeValue.Size" type="System.Drawing.Size, System.Drawing">
<value>15, 16</value>
<value>14, 16</value>
</data>
<data name="lblShapeSizeValue.TabIndex" type="System.Int32, mscorlib">
<value>23</value>
</data>
<data name="lblShapeSizeValue.Text" xml:space="preserve">
<value>1</value>
<comment>@Invariant</comment>
</data>
<data name="&gt;&gt;lblShapeSizeValue.Name" xml:space="preserve">
<value>lblShapeSizeValue</value>
@ -539,14 +871,13 @@
<value>315, 188</value>
</data>
<data name="lblBlueValue.Size" type="System.Drawing.Size, System.Drawing">
<value>15, 16</value>
<value>14, 16</value>
</data>
<data name="lblBlueValue.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
</data>
<data name="lblBlueValue.Text" xml:space="preserve">
<value>0</value>
<comment>@Invariant</comment>
</data>
<data name="&gt;&gt;lblBlueValue.Name" xml:space="preserve">
<value>lblBlueValue</value>
@ -630,14 +961,13 @@
<value>315, 156</value>
</data>
<data name="lblGreenValue.Size" type="System.Drawing.Size, System.Drawing">
<value>15, 16</value>
<value>14, 16</value>
</data>
<data name="lblGreenValue.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
</data>
<data name="lblGreenValue.Text" xml:space="preserve">
<value>0</value>
<comment>@Invariant</comment>
</data>
<data name="&gt;&gt;lblGreenValue.Name" xml:space="preserve">
<value>lblGreenValue</value>
@ -721,14 +1051,13 @@
<value>315, 124</value>
</data>
<data name="lblRedValue.Size" type="System.Drawing.Size, System.Drawing">
<value>15, 16</value>
<value>14, 16</value>
</data>
<data name="lblRedValue.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
<data name="lblRedValue.Text" xml:space="preserve">
<value>0</value>
<comment>@Invariant</comment>
</data>
<data name="&gt;&gt;lblRedValue.Name" xml:space="preserve">
<value>lblRedValue</value>
@ -812,14 +1141,13 @@
<value>315, 52</value>
</data>
<data name="lblBlackWhiteValue.Size" type="System.Drawing.Size, System.Drawing">
<value>15, 16</value>
<value>14, 16</value>
</data>
<data name="lblBlackWhiteValue.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="lblBlackWhiteValue.Text" xml:space="preserve">
<value>0</value>
<comment>@Invariant</comment>
</data>
<data name="&gt;&gt;lblBlackWhiteValue.Name" xml:space="preserve">
<value>lblBlackWhiteValue</value>
@ -890,32 +1218,11 @@
<data name="&gt;&gt;rbBlackWhite.ZOrder" xml:space="preserve">
<value>25</value>
</data>
<data name="pSettings.Location" type="System.Drawing.Point, System.Drawing">
<value>88, 88</value>
</data>
<data name="pSettings.Size" type="System.Drawing.Size, System.Drawing">
<value>352, 448</value>
</data>
<data name="pSettings.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;pSettings.Name" xml:space="preserve">
<value>pSettings</value>
</data>
<data name="&gt;&gt;pSettings.Type" xml:space="preserve">
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pSettings.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;pSettings.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>6, 13</value>
<value>96, 96</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>700, 700</value>

1
ShareX.HelpersLib/Forms/OutputBox.Designer.cs generated
View file

@ -42,7 +42,6 @@ private void InitializeComponent()
this.rtbText.Size = new System.Drawing.Size(968, 745);
this.rtbText.TabIndex = 1;
this.rtbText.Text = "";
this.rtbText.KeyUp += new System.Windows.Forms.KeyEventHandler(this.rtbText_KeyUp);
//
// OutputBox
//

9
ShareX.HelpersLib/Forms/OutputBox.cs
View file

@ -37,6 +37,7 @@ private OutputBox(string text, string title, bool scrollToEnd = false)
InitializeComponent();
rtbText.AddContextMenu();
ShareXResources.ApplyTheme(this);
this.CloseOnEscape();
Text = "ShareX - " + title;
rtbText.Text = text;
@ -66,13 +67,5 @@ private void OutputBox_Shown(object sender, EventArgs e)
NativeMethods.SendMessage(rtbText.Handle, (int)WindowsMessages.VSCROLL, (int)ScrollBarCommands.SB_TOP, 0);
}
}
private void rtbText_KeyUp(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Escape)
{
Close();
}
}
}
}

14
ShareX.HelpersLib/Forms/ScreenTearingTestForm.cs
View file

@ -60,6 +60,8 @@ public ScreenTearingTestForm()
ResumeLayout(false);
this.CloseOnEscape();
animationTime = Stopwatch.StartNew();
}
@ -70,18 +72,6 @@ protected override void OnShown(EventArgs e)
base.OnShown(e);
}
protected override void OnKeyUp(KeyEventArgs e)
{
if (e.KeyCode == Keys.Escape)
{
Close();
}
else
{
base.OnKeyUp(e);
}
}
protected override void OnMouseUp(MouseEventArgs e)
{
if (Mode == ScreenTearingTestMode.VerticalLines)

1
ShareX.HistoryLib/Forms/HistoryForm.Designer.cs generated
View file

@ -386,7 +386,6 @@ private void InitializeComponent()
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.SystemColors.Window;
this.Controls.Add(this.scMain);
this.KeyPreview = true;
this.Name = "HistoryForm";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.HistoryForm_FormClosing);
this.Shown += new System.EventHandler(this.HistoryForm_Shown);

2
ShareX.HistoryLib/Forms/HistoryForm.cs
View file

@ -91,6 +91,8 @@ public HistoryForm(string historyPath, HistorySettings settings, Action<string>
ShareXResources.ApplyTheme(this);
this.CloseOnEscape();
if (Settings.RememberWindowState)
{
Settings.WindowState.ApplyFormState(this);

303
ShareX.HistoryLib/Forms/HistoryForm.resx
View file

@ -131,7 +131,6 @@
</data>
<data name="chIcon.Text" xml:space="preserve">
<value />
<comment>@Invariant</comment>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="chIcon.Width" type="System.Int32, mscorlib">
@ -173,7 +172,7 @@
<value>lvHistory</value>
</data>
<data name="&gt;&gt;lvHistory.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=14.0.2.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvHistory.Parent" xml:space="preserve">
<value>tscHistory.ContentPanel</value>
@ -238,51 +237,6 @@
<data name="tsHistory.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>None</value>
</data>
<data name="tsHistory.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 0</value>
</data>
<data name="tsHistory.Size" type="System.Drawing.Size, System.Drawing">
<value>477, 25</value>
</data>
<data name="tsHistory.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;tsHistory.Name" xml:space="preserve">
<value>tsHistory</value>
</data>
<data name="&gt;&gt;tsHistory.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsHistory.Parent" xml:space="preserve">
<value>tscHistory.TopToolStripPanel</value>
</data>
<data name="&gt;&gt;tsHistory.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;tscHistory.TopToolStripPanel.Name" xml:space="preserve">
<value>tscHistory.TopToolStripPanel</value>
</data>
<data name="&gt;&gt;tscHistory.TopToolStripPanel.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tscHistory.TopToolStripPanel.Parent" xml:space="preserve">
<value>tscHistory</value>
</data>
<data name="&gt;&gt;tscHistory.TopToolStripPanel.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="&gt;&gt;tscHistory.Name" xml:space="preserve">
<value>tscHistory</value>
</data>
<data name="&gt;&gt;tscHistory.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tscHistory.Parent" xml:space="preserve">
<value>scMain.Panel1</value>
</data>
<data name="&gt;&gt;tscHistory.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="tslSearch.Size" type="System.Drawing.Size, System.Drawing">
<value>45, 22</value>
</data>
@ -346,211 +300,49 @@
<data name="tsbSettings.Text" xml:space="preserve">
<value>Settings...</value>
</data>
<data name="&gt;&gt;btnAdvancedSearchClose.Name" xml:space="preserve">
<value>btnAdvancedSearchClose</value>
<data name="tsHistory.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 0</value>
</data>
<data name="&gt;&gt;btnAdvancedSearchClose.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="tsHistory.Size" type="System.Drawing.Size, System.Drawing">
<value>477, 25</value>
</data>
<data name="&gt;&gt;btnAdvancedSearchClose.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;btnAdvancedSearchClose.ZOrder" xml:space="preserve">
<data name="tsHistory.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;btnAdvancedSearchReset.Name" xml:space="preserve">
<value>btnAdvancedSearchReset</value>
<data name="&gt;&gt;tsHistory.Name" xml:space="preserve">
<value>tsHistory</value>
</data>
<data name="&gt;&gt;btnAdvancedSearchReset.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="&gt;&gt;tsHistory.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btnAdvancedSearchReset.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
<data name="&gt;&gt;tsHistory.Parent" xml:space="preserve">
<value>tscHistory.TopToolStripPanel</value>
</data>
<data name="&gt;&gt;btnAdvancedSearchReset.ZOrder" xml:space="preserve">
<value>1</value>
<data name="&gt;&gt;tsHistory.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;lblURLFilter.Name" xml:space="preserve">
<value>lblURLFilter</value>
<data name="&gt;&gt;tscHistory.TopToolStripPanel.Name" xml:space="preserve">
<value>tscHistory.TopToolStripPanel</value>
</data>
<data name="&gt;&gt;lblURLFilter.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="&gt;&gt;tscHistory.TopToolStripPanel.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lblURLFilter.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
<data name="&gt;&gt;tscHistory.TopToolStripPanel.Parent" xml:space="preserve">
<value>tscHistory</value>
</data>
<data name="&gt;&gt;lblURLFilter.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="&gt;&gt;txtURLFilter.Name" xml:space="preserve">
<value>txtURLFilter</value>
</data>
<data name="&gt;&gt;txtURLFilter.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;txtURLFilter.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;txtURLFilter.ZOrder" xml:space="preserve">
<data name="&gt;&gt;tscHistory.TopToolStripPanel.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="&gt;&gt;lblFilenameFilter.Name" xml:space="preserve">
<value>lblFilenameFilter</value>
<data name="&gt;&gt;tscHistory.Name" xml:space="preserve">
<value>tscHistory</value>
</data>
<data name="&gt;&gt;lblFilenameFilter.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="&gt;&gt;tscHistory.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lblFilenameFilter.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
<data name="&gt;&gt;tscHistory.Parent" xml:space="preserve">
<value>scMain.Panel1</value>
</data>
<data name="&gt;&gt;lblFilenameFilter.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="&gt;&gt;cbHostFilterSelection.Name" xml:space="preserve">
<value>cbHostFilterSelection</value>
</data>
<data name="&gt;&gt;cbHostFilterSelection.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;cbHostFilterSelection.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;cbHostFilterSelection.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="&gt;&gt;cbTypeFilterSelection.Name" xml:space="preserve">
<value>cbTypeFilterSelection</value>
</data>
<data name="&gt;&gt;cbTypeFilterSelection.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;cbTypeFilterSelection.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;cbTypeFilterSelection.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="&gt;&gt;cbHostFilter.Name" xml:space="preserve">
<value>cbHostFilter</value>
</data>
<data name="&gt;&gt;cbHostFilter.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;cbHostFilter.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;cbHostFilter.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="&gt;&gt;cbTypeFilter.Name" xml:space="preserve">
<value>cbTypeFilter</value>
</data>
<data name="&gt;&gt;cbTypeFilter.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;cbTypeFilter.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;cbTypeFilter.ZOrder" xml:space="preserve">
<value>8</value>
</data>
<data name="&gt;&gt;dtpFilterFrom.Name" xml:space="preserve">
<value>dtpFilterFrom</value>
</data>
<data name="&gt;&gt;dtpFilterFrom.Type" xml:space="preserve">
<value>System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;dtpFilterFrom.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;dtpFilterFrom.ZOrder" xml:space="preserve">
<value>9</value>
</data>
<data name="&gt;&gt;lblFilterFrom.Name" xml:space="preserve">
<value>lblFilterFrom</value>
</data>
<data name="&gt;&gt;lblFilterFrom.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;lblFilterFrom.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;lblFilterFrom.ZOrder" xml:space="preserve">
<value>10</value>
</data>
<data name="&gt;&gt;lblFilterTo.Name" xml:space="preserve">
<value>lblFilterTo</value>
</data>
<data name="&gt;&gt;lblFilterTo.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;lblFilterTo.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;lblFilterTo.ZOrder" xml:space="preserve">
<value>11</value>
</data>
<data name="&gt;&gt;cbDateFilter.Name" xml:space="preserve">
<value>cbDateFilter</value>
</data>
<data name="&gt;&gt;cbDateFilter.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;cbDateFilter.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;cbDateFilter.ZOrder" xml:space="preserve">
<value>12</value>
</data>
<data name="&gt;&gt;dtpFilterTo.Name" xml:space="preserve">
<value>dtpFilterTo</value>
</data>
<data name="&gt;&gt;dtpFilterTo.Type" xml:space="preserve">
<value>System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;dtpFilterTo.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;dtpFilterTo.ZOrder" xml:space="preserve">
<value>13</value>
</data>
<data name="&gt;&gt;txtFilenameFilter.Name" xml:space="preserve">
<value>txtFilenameFilter</value>
</data>
<data name="&gt;&gt;txtFilenameFilter.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;txtFilenameFilter.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;txtFilenameFilter.ZOrder" xml:space="preserve">
<value>14</value>
</data>
<data name="gbAdvancedSearch.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="gbAdvancedSearch.Size" type="System.Drawing.Size, System.Drawing">
<value>409, 213</value>
</data>
<data name="gbAdvancedSearch.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="gbAdvancedSearch.Text" xml:space="preserve">
<value>Advanced search</value>
</data>
<data name="gbAdvancedSearch.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;gbAdvancedSearch.Name" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;gbAdvancedSearch.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;gbAdvancedSearch.Parent" xml:space="preserve">
<value>scHistoryItemInfo.Panel1</value>
</data>
<data name="&gt;&gt;gbAdvancedSearch.ZOrder" xml:space="preserve">
<data name="&gt;&gt;tscHistory.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="btnAdvancedSearchClose.Location" type="System.Drawing.Point, System.Drawing">
@ -937,6 +729,33 @@
<data name="&gt;&gt;txtFilenameFilter.ZOrder" xml:space="preserve">
<value>14</value>
</data>
<data name="gbAdvancedSearch.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="gbAdvancedSearch.Size" type="System.Drawing.Size, System.Drawing">
<value>409, 213</value>
</data>
<data name="gbAdvancedSearch.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="gbAdvancedSearch.Text" xml:space="preserve">
<value>Advanced search</value>
</data>
<data name="gbAdvancedSearch.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;gbAdvancedSearch.Name" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;gbAdvancedSearch.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;gbAdvancedSearch.Parent" xml:space="preserve">
<value>scHistoryItemInfo.Panel1</value>
</data>
<data name="&gt;&gt;gbAdvancedSearch.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="scMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
@ -977,7 +796,7 @@
<value>0, 0</value>
</data>
<data name="pbThumbnail.Size" type="System.Drawing.Size, System.Drawing">
<value>627, 424</value>
<value>627, 421</value>
</data>
<data name="pbThumbnail.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@ -986,7 +805,7 @@
<value>pbThumbnail</value>
</data>
<data name="&gt;&gt;pbThumbnail.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=14.0.2.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;pbThumbnail.Parent" xml:space="preserve">
<value>scHistoryItemInfo.Panel1</value>
@ -1016,7 +835,7 @@
<value>0, 0</value>
</data>
<data name="pgHistoryItemInfo.Size" type="System.Drawing.Size, System.Drawing">
<value>627, 230</value>
<value>627, 233</value>
</data>
<data name="pgHistoryItemInfo.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -1049,7 +868,7 @@
<value>627, 661</value>
</data>
<data name="scHistoryItemInfo.SplitterDistance" type="System.Int32, mscorlib">
<value>424</value>
<value>421</value>
</data>
<data name="scHistoryItemInfo.SplitterWidth" type="System.Int32, mscorlib">
<value>7</value>
@ -1061,7 +880,7 @@
<value>scHistoryItemInfo</value>
</data>
<data name="&gt;&gt;scHistoryItemInfo.Type" xml:space="preserve">
<value>ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=14.0.2.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;scHistoryItemInfo.Parent" xml:space="preserve">
<value>scMain.Panel2</value>
@ -1100,7 +919,7 @@
<value>scMain</value>
</data>
<data name="&gt;&gt;scMain.Type" xml:space="preserve">
<value>ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=14.0.2.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;scMain.Parent" xml:space="preserve">
<value>$this</value>

57
ShareX.HistoryLib/Forms/ImageHistoryForm.Designer.cs generated
View file

@ -28,10 +28,10 @@ protected override void Dispose(bool disposing)
/// </summary>
private void InitializeComponent()
{
Manina.Windows.Forms.ImageListView.ImageListViewColumnHeader ımageListViewColumnHeader1 = new Manina.Windows.Forms.ImageListView.ImageListViewColumnHeader(Manina.Windows.Forms.ColumnType.Name, "Name", 100, 0, true);
Manina.Windows.Forms.ImageListView.ImageListViewColumnHeader ımageListViewColumnHeader2 = new Manina.Windows.Forms.ImageListView.ImageListViewColumnHeader(Manina.Windows.Forms.ColumnType.FileSize, "Size", 100, 1, true);
Manina.Windows.Forms.ImageListView.ImageListViewColumnHeader ımageListViewColumnHeader3 = new Manina.Windows.Forms.ImageListView.ImageListViewColumnHeader(Manina.Windows.Forms.ColumnType.Dimensions, "Dimensions", 100, 2, true);
Manina.Windows.Forms.ImageListView.ImageListViewColumnHeader ımageListViewColumnHeader4 = new Manina.Windows.Forms.ImageListView.ImageListViewColumnHeader(Manina.Windows.Forms.ColumnType.FilePath, "Path", 100, 3, true);
Manina.Windows.Forms.ImageListView.ImageListViewColumnHeader imageListViewColumnHeader1 = new Manina.Windows.Forms.ImageListView.ImageListViewColumnHeader(Manina.Windows.Forms.ColumnType.Name, "Name", 100, 0, true);
Manina.Windows.Forms.ImageListView.ImageListViewColumnHeader imageListViewColumnHeader2 = new Manina.Windows.Forms.ImageListView.ImageListViewColumnHeader(Manina.Windows.Forms.ColumnType.FileSize, "Size", 100, 1, true);
Manina.Windows.Forms.ImageListView.ImageListViewColumnHeader imageListViewColumnHeader3 = new Manina.Windows.Forms.ImageListView.ImageListViewColumnHeader(Manina.Windows.Forms.ColumnType.Dimensions, "Dimensions", 100, 2, true);
Manina.Windows.Forms.ImageListView.ImageListViewColumnHeader imageListViewColumnHeader4 = new Manina.Windows.Forms.ImageListView.ImageListViewColumnHeader(Manina.Windows.Forms.ColumnType.FilePath, "Path", 100, 3, true);
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ImageHistoryForm));
this.tscMain = new System.Windows.Forms.ToolStripContainer();
this.ilvImages = new Manina.Windows.Forms.ImageListView();
@ -68,31 +68,31 @@ private void InitializeComponent()
this.ilvImages.AllowItemReorder = false;
this.ilvImages.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.ilvImages.CacheLimit = "100MB";
ımageListViewColumnHeader1.Comparer = null;
ımageListViewColumnHeader1.DisplayIndex = 0;
ımageListViewColumnHeader1.Grouper = null;
ımageListViewColumnHeader1.Key = "";
ımageListViewColumnHeader1.Type = Manina.Windows.Forms.ColumnType.Name;
ımageListViewColumnHeader2.Comparer = null;
ımageListViewColumnHeader2.DisplayIndex = 1;
ımageListViewColumnHeader2.Grouper = null;
ımageListViewColumnHeader2.Key = "";
ımageListViewColumnHeader2.Type = Manina.Windows.Forms.ColumnType.FileSize;
ımageListViewColumnHeader3.Comparer = null;
ımageListViewColumnHeader3.DisplayIndex = 2;
ımageListViewColumnHeader3.Grouper = null;
ımageListViewColumnHeader3.Key = "";
ımageListViewColumnHeader3.Type = Manina.Windows.Forms.ColumnType.Dimensions;
ımageListViewColumnHeader4.Comparer = null;
ımageListViewColumnHeader4.DisplayIndex = 3;
ımageListViewColumnHeader4.Grouper = null;
ımageListViewColumnHeader4.Key = "";
ımageListViewColumnHeader4.Type = Manina.Windows.Forms.ColumnType.FilePath;
imageListViewColumnHeader1.Comparer = null;
imageListViewColumnHeader1.DisplayIndex = 0;
imageListViewColumnHeader1.Grouper = null;
imageListViewColumnHeader1.Key = "";
imageListViewColumnHeader1.Type = Manina.Windows.Forms.ColumnType.Name;
imageListViewColumnHeader2.Comparer = null;
imageListViewColumnHeader2.DisplayIndex = 1;
imageListViewColumnHeader2.Grouper = null;
imageListViewColumnHeader2.Key = "";
imageListViewColumnHeader2.Type = Manina.Windows.Forms.ColumnType.FileSize;
imageListViewColumnHeader3.Comparer = null;
imageListViewColumnHeader3.DisplayIndex = 2;
imageListViewColumnHeader3.Grouper = null;
imageListViewColumnHeader3.Key = "";
imageListViewColumnHeader3.Type = Manina.Windows.Forms.ColumnType.Dimensions;
imageListViewColumnHeader4.Comparer = null;
imageListViewColumnHeader4.DisplayIndex = 3;
imageListViewColumnHeader4.Grouper = null;
imageListViewColumnHeader4.Key = "";
imageListViewColumnHeader4.Type = Manina.Windows.Forms.ColumnType.FilePath;
this.ilvImages.Columns.AddRange(new Manina.Windows.Forms.ImageListView.ImageListViewColumnHeader[] {
ımageListViewColumnHeader1,
ımageListViewColumnHeader2,
ımageListViewColumnHeader3,
ımageListViewColumnHeader4});
imageListViewColumnHeader1,
imageListViewColumnHeader2,
imageListViewColumnHeader3,
imageListViewColumnHeader4});
resources.ApplyResources(this.ilvImages, "ilvImages");
this.ilvImages.Name = "ilvImages";
this.ilvImages.PersistentCacheDirectory = "";
@ -154,7 +154,6 @@ private void InitializeComponent()
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.SystemColors.Window;
this.Controls.Add(this.tscMain);
this.KeyPreview = true;
this.Name = "ImageHistoryForm";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ImageHistoryForm_FormClosing);
this.Shown += new System.EventHandler(this.ImageHistoryForm_Shown);

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

@ -76,6 +76,8 @@ public ImageHistoryForm(string historyPath, ImageHistorySettings settings, Actio
ShareXResources.ApplyTheme(this);
this.CloseOnEscape();
if (Settings.RememberWindowState)
{
Settings.WindowState.ApplyFormState(this);

1
ShareX.IndexerLib/Forms/DirectoryIndexerForm.cs
View file

@ -44,6 +44,7 @@ public DirectoryIndexerForm(IndexerSettings settings)
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
this.CloseOnEscape();
Settings = settings;
pgSettings.SelectedObject = Settings;

1
ShareX.MediaLib/Forms/ImageBeautifierForm.cs
View file

@ -56,6 +56,7 @@ private ImageBeautifierForm(ImageBeautifierOptions options = null)
InitializeComponent();
ShareXResources.ApplyTheme(this);
this.CloseOnEscape();
title = Text;
LoadOptions();

1
ShareX.MediaLib/Forms/ImageCombinerForm.cs
View file

@ -45,6 +45,7 @@ public ImageCombinerForm(ImageCombinerOptions options)
InitializeComponent();
ShareXResources.ApplyTheme(this);
this.CloseOnEscape();
if (Options.Orientation == Orientation.Horizontal)
{

1
ShareX.MediaLib/Forms/ImageSplitterForm.cs
View file

@ -43,6 +43,7 @@ public ImageSplitterForm()
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
this.CloseOnEscape();
UpdateButtonStates();
}

1
ShareX.MediaLib/Forms/ImageThumbnailerForm.cs
View file

@ -38,6 +38,7 @@ public ImageThumbnailerForm()
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
this.CloseOnEscape();
}
private void UpdateEnabled()

1
ShareX.MediaLib/Forms/VideoConverterForm.cs
View file

@ -47,6 +47,7 @@ public VideoConverterForm(string ffmpegFilePath, VideoConverterOptions options)
InitializeComponent();
ShareXResources.ApplyTheme(this);
this.CloseOnEscape();
UpdateOptions();

1
ShareX.MediaLib/Forms/VideoThumbnailerForm.cs
View file

@ -47,6 +47,7 @@ public VideoThumbnailerForm(string ffmpegPath, VideoThumbnailOptions options)
InitializeComponent();
ShareXResources.ApplyTheme(this);
this.CloseOnEscape();
txtMediaPath.Text = Options.LastVideoPath ?? "";
pgOptions.SelectedObject = Options;

1
ShareX.UploadersLib/Forms/TextUploadForm.Designer.cs generated
View file

@ -58,7 +58,6 @@ private void InitializeComponent()
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.CancelButton = this.btnCancel;
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnUpload);
this.Controls.Add(this.txtContent);

1
ShareX.UploadersLib/Forms/TextUploadForm.cs
View file

@ -37,6 +37,7 @@ public TextUploadForm(string content = null)
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
this.CloseOnEscape();
if (string.IsNullOrEmpty(content) && ClipboardHelpers.ContainsText())
{

1
ShareX/Forms/InspectWindowForm.cs
View file

@ -41,6 +41,7 @@ public InspectWindowForm()
InitializeComponent();
rtbInfo.AddContextMenu();
ShareXResources.ApplyTheme(this);
this.CloseOnEscape();
SelectHandle(true);
}

1
ShareX/Forms/QRCodeForm.cs
View file

@ -62,6 +62,7 @@ public QRCodeForm(string text = null)
InitializeComponent();
rtbDecodeResult.AddContextMenu();
ShareXResources.ApplyTheme(this);
this.CloseOnEscape();
if (!string.IsNullOrEmpty(text))
{

1
ShareX/Tools/BorderlessWindow/BorderlessWindowForm.cs
View file

@ -41,6 +41,7 @@ public BorderlessWindowForm(BorderlessWindowSettings settings)
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
this.CloseOnEscape();
Settings = settings;
}

2
ShareX/Tools/OCR/OCRForm.Designer.cs generated
View file

@ -164,11 +164,9 @@ private void InitializeComponent()
this.Controls.Add(this.lblResult);
this.Controls.Add(this.cbLanguages);
this.Controls.Add(this.lblLanguage);
this.KeyPreview = true;
this.Name = "OCRForm";
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
this.Shown += new System.EventHandler(this.OCRForm_Shown);
this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.OCRForm_KeyUp);
((System.ComponentModel.ISupportInitialize)(this.nudScaleFactor)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();

9
ShareX/Tools/OCR/OCRForm.cs
View file

@ -49,6 +49,7 @@ public OCRForm(Bitmap bmp, OCROptions options)
InitializeComponent();
ShareXResources.ApplyTheme(this);
this.CloseOnEscape();
OCRLanguage[] languages = OCRHelper.AvailableLanguages.OrderBy(x => x.DisplayName).ToArray();
@ -171,14 +172,6 @@ private async void OCRForm_Shown(object sender, EventArgs e)
await OCR(bmpSource);
}
private void OCRForm_KeyUp(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Escape)
{
Close();
}
}
private async void btnSelectRegion_Click(object sender, EventArgs e)
{
FormWindowState previousState = WindowState;

4
ShareX/Tools/PinToScreen/PinToScreenForm.cs
View file

@ -148,6 +148,7 @@ private PinToScreenForm(PinToScreenOptions options)
ShareXResources.ApplyTheme(this);
TopMost = Options.TopMost;
SetStyle(ControlStyles.AllPaintingInWmPaint | ControlStyles.OptimizedDoubleBuffer | ControlStyles.UserPaint, true);
this.CloseOnEscape();
tsMain.Cursor = Cursors.Arrow;
openHandCursor = Helpers.CreateCursor(Resources.openhand);
@ -484,9 +485,6 @@ private void PinToScreenForm_KeyUp(object sender, KeyEventArgs e)
{
switch (e.KeyData)
{
case Keys.Escape:
Close();
break;
case Keys.Control | Keys.C:
ClipboardHelpers.CopyImage(Image);
break;