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

Code refactoring

Browse source
This commit is contained in:
Jaex 2023-06-05 01:17:51 +03:00
parent 5e7dbd23fa
commit ca49519968
74 changed files with 300 additions and 277 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -940,6 +940,7 @@ public static void CloseOnEscape(this Form form)
{
if (e.KeyCode == Keys.Escape)
{
form.DialogResult = DialogResult.Cancel;
form.Close();
}
};

25
ShareX.HelpersLib/Forms/ColorPickerForm.Designer.cs generated
View file

@ -70,6 +70,7 @@ private void InitializeComponent()
this.ttMain = new System.Windows.Forms.ToolTip(this.components);
this.btnScreenColorPicker = new System.Windows.Forms.Button();
this.btnClipboardColorPicker = new System.Windows.Forms.Button();
this.cbTransparent = new ShareX.HelpersLib.ColorButton();
this.cmsCopy = new System.Windows.Forms.ContextMenuStrip(this.components);
this.tsmiCopyAll = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiCopyRGB = new System.Windows.Forms.ToolStripMenuItem();
@ -93,7 +94,6 @@ private void InitializeComponent()
this.lblNameValue = new System.Windows.Forms.Label();
this.btnClipboardStatus = new System.Windows.Forms.Button();
this.mbCopy = new ShareX.HelpersLib.MenuButton();
this.cbTransparent = new ShareX.HelpersLib.ColorButton();
this.pbColorPreview = new ShareX.HelpersLib.MyPictureBox();
this.colorPicker = new ShareX.HelpersLib.ColorPicker();
((System.ComponentModel.ISupportInitialize)(this.nudKey)).BeginInit();
@ -114,7 +114,6 @@ 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;
@ -437,6 +436,17 @@ private void InitializeComponent()
this.btnClipboardColorPicker.UseVisualStyleBackColor = true;
this.btnClipboardColorPicker.Click += new System.EventHandler(this.btnClipboardColorPicker_Click);
//
// cbTransparent
//
this.cbTransparent.Color = System.Drawing.Color.Transparent;
this.cbTransparent.ColorPickerOptions = null;
resources.ApplyResources(this.cbTransparent, "cbTransparent");
this.cbTransparent.ManualButtonClick = true;
this.cbTransparent.Name = "cbTransparent";
this.ttMain.SetToolTip(this.cbTransparent, resources.GetString("cbTransparent.ToolTip"));
this.cbTransparent.UseVisualStyleBackColor = true;
this.cbTransparent.Click += new System.EventHandler(this.cbTransparent_Click);
//
// cmsCopy
//
this.cmsCopy.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -588,16 +598,6 @@ private void InitializeComponent()
this.mbCopy.Name = "mbCopy";
this.mbCopy.UseVisualStyleBackColor = true;
//
// cbTransparent
//
this.cbTransparent.Color = System.Drawing.Color.Transparent;
resources.ApplyResources(this.cbTransparent, "cbTransparent");
this.cbTransparent.ManualButtonClick = true;
this.cbTransparent.Name = "cbTransparent";
this.ttMain.SetToolTip(this.cbTransparent, resources.GetString("cbTransparent.ToolTip"));
this.cbTransparent.UseVisualStyleBackColor = true;
this.cbTransparent.Click += new System.EventHandler(this.cbTransparent_Click);
//
// pbColorPreview
//
this.pbColorPreview.BackColor = System.Drawing.SystemColors.Window;
@ -620,7 +620,6 @@ private void InitializeComponent()
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.SystemColors.Window;
this.CancelButton = this.btnCancel;
this.Controls.Add(this.btnClipboardStatus);
this.Controls.Add(this.btnClipboardColorPicker);
this.Controls.Add(this.lblName);

73
ShareX.HelpersLib/Forms/ColorPickerForm.resx
View file

@ -248,7 +248,6 @@
</data>
<data name="txtHex.Text" xml:space="preserve">
<value>FF00FF00</value>
<comment>@Invariant</comment>
</data>
<data name="txtHex.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
<value>Center</value>
@ -531,7 +530,6 @@
</data>
<data name="lblHue.Text" xml:space="preserve">
<value>°</value>
<comment>@Invariant</comment>
</data>
<data name="&gt;&gt;lblHue.Name" xml:space="preserve">
<value>lblHue</value>
@ -565,7 +563,6 @@
</data>
<data name="lblBrightnessPerc.Text" xml:space="preserve">
<value>%</value>
<comment>@Invariant</comment>
</data>
<data name="&gt;&gt;lblBrightnessPerc.Name" xml:space="preserve">
<value>lblBrightnessPerc</value>
@ -599,7 +596,6 @@
</data>
<data name="lblSaturationPerc.Text" xml:space="preserve">
<value>%</value>
<comment>@Invariant</comment>
</data>
<data name="&gt;&gt;lblSaturationPerc.Name" xml:space="preserve">
<value>lblSaturationPerc</value>
@ -978,7 +974,6 @@
</data>
<data name="txtDecimal.Text" xml:space="preserve">
<value>12345678</value>
<comment>@Invariant</comment>
</data>
<data name="txtDecimal.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
<value>Center</value>
@ -1015,7 +1010,6 @@
</data>
<data name="lblCyanPerc.Text" xml:space="preserve">
<value>%</value>
<comment>@Invariant</comment>
</data>
<data name="&gt;&gt;lblCyanPerc.Name" xml:space="preserve">
<value>lblCyanPerc</value>
@ -1049,7 +1043,6 @@
</data>
<data name="lblMagentaPerc.Text" xml:space="preserve">
<value>%</value>
<comment>@Invariant</comment>
</data>
<data name="&gt;&gt;lblMagentaPerc.Name" xml:space="preserve">
<value>lblMagentaPerc</value>
@ -1083,7 +1076,6 @@
</data>
<data name="lblYellowPerc.Text" xml:space="preserve">
<value>%</value>
<comment>@Invariant</comment>
</data>
<data name="&gt;&gt;lblYellowPerc.Name" xml:space="preserve">
<value>lblYellowPerc</value>
@ -1117,7 +1109,6 @@
</data>
<data name="lblKeyPerc.Text" xml:space="preserve">
<value>%</value>
<comment>@Invariant</comment>
</data>
<data name="&gt;&gt;lblKeyPerc.Name" xml:space="preserve">
<value>lblKeyPerc</value>
@ -1245,6 +1236,33 @@
<data name="&gt;&gt;btnClipboardColorPicker.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="cbTransparent.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cbTransparent.Location" type="System.Drawing.Point, System.Drawing">
<value>652, 13</value>
</data>
<data name="cbTransparent.Size" type="System.Drawing.Size, System.Drawing">
<value>23, 23</value>
</data>
<data name="cbTransparent.TabIndex" type="System.Int32, mscorlib">
<value>39</value>
</data>
<data name="cbTransparent.ToolTip" xml:space="preserve">
<value>Transparent</value>
</data>
<data name="&gt;&gt;cbTransparent.Name" xml:space="preserve">
<value>cbTransparent</value>
</data>
<data name="&gt;&gt;cbTransparent.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;cbTransparent.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;cbTransparent.ZOrder" xml:space="preserve">
<value>11</value>
</data>
<metadata name="cmsCopy.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>104, 17</value>
</metadata>
@ -1310,7 +1328,6 @@
</data>
<data name="txtY.Text" xml:space="preserve">
<value>0</value>
<comment>@Invariant</comment>
</data>
<data name="txtY.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
<value>Center</value>
@ -1338,7 +1355,6 @@
</data>
<data name="txtX.Text" xml:space="preserve">
<value>0</value>
<comment>@Invariant</comment>
</data>
<data name="txtX.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
<value>Center</value>
@ -1372,7 +1388,6 @@
</data>
<data name="lblY.Text" xml:space="preserve">
<value>Y:</value>
<comment>@Invariant</comment>
</data>
<data name="&gt;&gt;lblY.Name" xml:space="preserve">
<value>lblY</value>
@ -1403,7 +1418,6 @@
</data>
<data name="lblX.Text" xml:space="preserve">
<value>X:</value>
<comment>@Invariant</comment>
</data>
<data name="&gt;&gt;lblX.Name" xml:space="preserve">
<value>lblX</value>
@ -1721,7 +1735,7 @@
<value>mbCopy</value>
</data>
<data name="&gt;&gt;mbCopy.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.1.1.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;mbCopy.Parent" xml:space="preserve">
<value>$this</value>
@ -1729,33 +1743,6 @@
<data name="&gt;&gt;mbCopy.ZOrder" xml:space="preserve">
<value>10</value>
</data>
<data name="cbTransparent.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cbTransparent.Location" type="System.Drawing.Point, System.Drawing">
<value>652, 13</value>
</data>
<data name="cbTransparent.Size" type="System.Drawing.Size, System.Drawing">
<value>23, 23</value>
</data>
<data name="cbTransparent.TabIndex" type="System.Int32, mscorlib">
<value>39</value>
</data>
<data name="cbTransparent.ToolTip" xml:space="preserve">
<value>Transparent</value>
</data>
<data name="&gt;&gt;cbTransparent.Name" xml:space="preserve">
<value>cbTransparent</value>
</data>
<data name="&gt;&gt;cbTransparent.Type" xml:space="preserve">
<value>ShareX.HelpersLib.ColorButton, ShareX.HelpersLib, Version=13.1.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;cbTransparent.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;cbTransparent.ZOrder" xml:space="preserve">
<value>11</value>
</data>
<data name="pbColorPreview.Location" type="System.Drawing.Point, System.Drawing">
<value>408, 232</value>
</data>
@ -1769,7 +1756,7 @@
<value>pbColorPreview</value>
</data>
<data name="&gt;&gt;pbColorPreview.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=13.1.1.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;pbColorPreview.Parent" xml:space="preserve">
<value>$this</value>
@ -1793,7 +1780,7 @@
<value>colorPicker</value>
</data>
<data name="&gt;&gt;colorPicker.Type" xml:space="preserve">
<value>ShareX.HelpersLib.ColorPicker, ShareX.HelpersLib, Version=13.1.1.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.ColorPicker, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;colorPicker.Parent" xml:space="preserve">
<value>$this</value>

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

@ -88,7 +88,6 @@ 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;

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

@ -145,6 +145,16 @@ private async Task SendPing(string ip)
}
}
private async void btnPingPrimary_Click(object sender, EventArgs e)
{
await SendPing(txtPreferredDNS.Text);
}
private async void btnPingSecondary_Click(object sender, EventArgs e)
{
await SendPing(txtAlternateDNS.Text);
}
private void btnSave_Click(object sender, EventArgs e)
{
if (cbAdapters.SelectedItem is AdapterInfo adapter)
@ -195,17 +205,8 @@ private void btnSave_Click(object sender, EventArgs e)
private void btnCancel_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.Cancel;
Close();
}
private async void btnPingPrimary_Click(object sender, EventArgs e)
{
await SendPing(txtPreferredDNS.Text);
}
private async void btnPingSecondary_Click(object sender, EventArgs e)
{
await SendPing(txtAlternateDNS.Text);
}
}
}

2
ShareX.HelpersLib/Forms/ErrorForm.Designer.cs generated
View file

@ -105,10 +105,8 @@ private void InitializeComponent()
//
this.AcceptButton = this.btnContinue;
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.btnClose;
this.Controls.Add(this.lblErrorMessage);
this.Controls.Add(this.flpMenu);
this.Controls.Add(this.txtException);

2
ShareX.HelpersLib/Forms/ErrorForm.cs
View file

@ -42,7 +42,7 @@ public ErrorForm(Exception error, string logFilePath, string bugReportPath) : th
public ErrorForm(string errorTitle, string errorMessage, string logFilePath, string bugReportPath, bool unhandledException = true)
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
ShareXResources.ApplyTheme(this, true);
IsUnhandledException = unhandledException;
LogFilePath = logFilePath;

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

@ -341,7 +341,7 @@ Error 2</value>
<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>584, 411</value>

2
ShareX.HelpersLib/Forms/GradientPickerForm.Designer.cs generated
View file

@ -108,7 +108,6 @@ 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;
@ -204,7 +203,6 @@ private void InitializeComponent()
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.SystemColors.Window;
this.CancelButton = this.btnCancel;
this.Controls.Add(this.btnClear);
this.Controls.Add(this.lvPresets);
this.Controls.Add(this.lblPresets);

2
ShareX.HelpersLib/Forms/GradientPickerForm.cs
View file

@ -41,7 +41,7 @@ public GradientPickerForm(GradientInfo gradient)
Gradient = gradient;
InitializeComponent();
ShareXResources.ApplyTheme(this);
ShareXResources.ApplyTheme(this, true);
cbGradientType.Items.AddRange(Helpers.GetLocalizedEnumDescriptions<LinearGradientMode>());
cbGradientType.SelectedIndex = (int)Gradient.Type;

2
ShareX.HelpersLib/Forms/PrintForm.Designer.cs generated
View file

@ -93,7 +93,6 @@ 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;
@ -105,7 +104,6 @@ private void InitializeComponent()
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.SystemColors.Window;
this.CancelButton = this.btnCancel;
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnPrint);
this.Controls.Add(this.btnShowPreview);

2
ShareX.HelpersLib/Forms/PrintForm.cs
View file

@ -38,7 +38,7 @@ public partial class PrintForm : Form
public PrintForm(Image img, PrintSettings settings, bool previewOnly = false)
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
ShareXResources.ApplyTheme(this, true);
printHelper = new PrintHelper(img);
printHelper.Settings = printSettings = settings;

2
ShareX.ImageEffectsLib/Forms/ImageEffectsForm.Designer.cs generated
View file

@ -113,7 +113,6 @@ private void InitializeComponent()
// btnClose
//
resources.ApplyResources(this.btnClose, "btnClose");
this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnClose.Name = "btnClose";
this.btnClose.UseVisualStyleBackColor = true;
this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
@ -329,7 +328,6 @@ private void InitializeComponent()
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.SystemColors.Window;
this.CancelButton = this.btnClose;
this.Controls.Add(this.txtEffectName);
this.Controls.Add(this.lblEffectName);
this.Controls.Add(this.btnImageEffects);

3
ShareX.ImageEffectsLib/Forms/ImageEffectsForm.cs
View file

@ -57,7 +57,7 @@ public ImageEffectsForm(Bitmap bmp, List<ImageEffectPreset> presets, int selecte
pauseUpdate = true;
InitializeComponent();
ShareXResources.ApplyTheme(this);
ShareXResources.ApplyTheme(this, true);
PreviewImage = bmp;
if (PreviewImage == null)
@ -883,6 +883,7 @@ private void btnOK_Click(object sender, EventArgs e)
private void btnClose_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.Cancel;
Close();
}

39
ShareX.ImageEffectsLib/Forms/ImageEffectsForm.resx
View file

@ -171,15 +171,6 @@
<metadata name="cmsLoadImage.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>126, 17</value>
</metadata>
<data name="cmsLoadImage.Size" type="System.Drawing.Size, System.Drawing">
<value>131, 48</value>
</data>
<data name="&gt;&gt;cmsLoadImage.Name" xml:space="preserve">
<value>cmsLoadImage</value>
</data>
<data name="&gt;&gt;cmsLoadImage.Type" xml:space="preserve">
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="tsmiLoadImageFromFile.Size" type="System.Drawing.Size, System.Drawing">
<value>130, 22</value>
</data>
@ -192,6 +183,15 @@
<data name="tsmiLoadImageFromClipboard.Text" xml:space="preserve">
<value>From clipboard</value>
</data>
<data name="cmsLoadImage.Size" type="System.Drawing.Size, System.Drawing">
<value>131, 48</value>
</data>
<data name="&gt;&gt;cmsLoadImage.Name" xml:space="preserve">
<value>cmsLoadImage</value>
</data>
<data name="&gt;&gt;cmsLoadImage.Type" xml:space="preserve">
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="lblPresetName.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -399,9 +399,6 @@
<data name="&gt;&gt;btnPackager.ZOrder" xml:space="preserve">
<value>17</value>
</data>
<metadata name="ttMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>260, 17</value>
</metadata>
<data name="btnPresetNew.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
@ -414,6 +411,9 @@
<data name="btnPresetNew.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<metadata name="ttMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>260, 17</value>
</metadata>
<data name="btnPresetNew.ToolTip" xml:space="preserve">
<value>New</value>
</data>
@ -648,9 +648,6 @@
<data name="&gt;&gt;btnEffectRefresh.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<metadata name="ttMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>260, 17</value>
</metadata>
<data name="pgSettings.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left</value>
</data>
@ -786,6 +783,9 @@
<data name="lvPresets.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left</value>
</data>
<data name="chPreset.Width" type="System.Int32, mscorlib">
<value>164</value>
</data>
<data name="lvPresets.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 53</value>
</data>
@ -807,9 +807,6 @@
<data name="&gt;&gt;lvPresets.ZOrder" xml:space="preserve">
<value>13</value>
</data>
<data name="chPreset.Width" type="System.Int32, mscorlib">
<value>164</value>
</data>
<data name="mbLoadImage.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left</value>
</data>
@ -846,6 +843,9 @@
<data name="lvEffects.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left</value>
</data>
<data name="chEffect.Width" type="System.Int32, mscorlib">
<value>50</value>
</data>
<data name="lvEffects.Location" type="System.Drawing.Point, System.Drawing">
<value>184, 101</value>
</data>
@ -867,9 +867,6 @@
<data name="&gt;&gt;lvEffects.ZOrder" xml:space="preserve">
<value>26</value>
</data>
<data name="chEffect.Width" type="System.Int32, mscorlib">
<value>50</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>

2
ShareX.ScreenCaptureLib/Forms/CanvasSizeForm.Designer.cs generated
View file

@ -135,7 +135,6 @@ 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;
@ -155,7 +154,6 @@ private void InitializeComponent()
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Window;
this.CancelButton = this.btnCancel;
this.Controls.Add(this.cbtnCanvasColor);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnOK);

6
ShareX.ScreenCaptureLib/Forms/CanvasSizeForm.cs
View file

@ -38,7 +38,7 @@ public partial class CanvasSizeForm : Form
public CanvasSizeForm()
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
ShareXResources.ApplyTheme(this, true);
}
public CanvasSizeForm(Padding canvas, Color canvasColor) : this()
@ -60,18 +60,16 @@ private void CanvasSizeForm_Shown(object sender, EventArgs e)
private void btnOK_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.OK;
Canvas = new Padding((int)nudLeft.Value, (int)nudTop.Value, (int)nudRight.Value, (int)nudBottom.Value);
CanvasColor = cbtnCanvasColor.Color;
DialogResult = DialogResult.OK;
Close();
}
private void btnCancel_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.Cancel;
Close();
}
}

2
ShareX.ScreenCaptureLib/Forms/CanvasSizeForm.resx
View file

@ -391,7 +391,7 @@
<value>cbtnCanvasColor</value>
</data>
<data name="&gt;&gt;cbtnCanvasColor.Type" xml:space="preserve">
<value>ShareX.HelpersLib.ColorButton, ShareX.HelpersLib, Version=13.7.1.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;cbtnCanvasColor.Parent" xml:space="preserve">
<value>$this</value>

2
ShareX.ScreenCaptureLib/Forms/EditorStartupForm.Designer.cs generated
View file

@ -61,7 +61,6 @@ private void InitializeComponent()
//
// btnCancel
//
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Image = global::ShareX.ScreenCaptureLib.Properties.Resources.cross;
resources.ApplyResources(this.btnCancel, "btnCancel");
this.btnCancel.Name = "btnCancel";
@ -73,7 +72,6 @@ private void InitializeComponent()
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Window;
this.CancelButton = this.btnCancel;
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnLoadImageFromClipboard);
this.Controls.Add(this.btnCreateNewImage);

2
ShareX.ScreenCaptureLib/Forms/EditorStartupForm.cs
View file

@ -43,7 +43,7 @@ public EditorStartupForm(RegionCaptureOptions options)
Options = options;
InitializeComponent();
ShareXResources.ApplyTheme(this);
ShareXResources.ApplyTheme(this, true);
}
private void LoadImageFile(string imageFilePath)

2
ShareX.ScreenCaptureLib/Forms/ImageSizeForm.Designer.cs generated
View file

@ -92,7 +92,6 @@ 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;
@ -127,7 +126,6 @@ private void InitializeComponent()
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Window;
this.CancelButton = this.btnCancel;
this.Controls.Add(this.cbResampling);
this.Controls.Add(this.lblResampling);
this.Controls.Add(this.lblHeightPixels);

2
ShareX.ScreenCaptureLib/Forms/ImageSizeForm.cs
View file

@ -41,7 +41,7 @@ public partial class ImageSizeForm : Form
public ImageSizeForm(Size size, ImageInterpolationMode interpolationMode)
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
ShareXResources.ApplyTheme(this, true);
ImageSize = size;
InterpolationMode = interpolationMode;

3
ShareX.ScreenCaptureLib/Forms/NewImageForm.Designer.cs generated
View file

@ -105,6 +105,7 @@ private void InitializeComponent()
// btnChangeColor
//
this.btnChangeColor.Color = System.Drawing.Color.Empty;
this.btnChangeColor.ColorPickerOptions = null;
resources.ApplyResources(this.btnChangeColor, "btnChangeColor");
this.btnChangeColor.Name = "btnChangeColor";
this.btnChangeColor.UseVisualStyleBackColor = true;
@ -118,7 +119,6 @@ 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;
@ -138,7 +138,6 @@ private void InitializeComponent()
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Window;
this.CancelButton = this.btnCancel;
this.Controls.Add(this.gbBackgroundColor);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnOK);

2
ShareX.ScreenCaptureLib/Forms/NewImageForm.cs
View file

@ -37,7 +37,7 @@ public partial class NewImageForm : Form
public NewImageForm(RegionCaptureOptions options)
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
ShareXResources.ApplyTheme(this, true);
Options = options;

2
ShareX.ScreenCaptureLib/Forms/NewImageForm.resx
View file

@ -334,7 +334,7 @@
<value>btnChangeColor</value>
</data>
<data name="&gt;&gt;btnChangeColor.Type" xml:space="preserve">
<value>ShareX.HelpersLib.ColorButton, ShareX.HelpersLib, Version=12.2.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;btnChangeColor.Parent" xml:space="preserve">
<value>gbBackgroundColor</value>

2
ShareX.ScreenCaptureLib/Forms/ScrollingCaptureOptionsForm.Designer.cs generated
View file

@ -202,7 +202,6 @@ private void InitializeComponent()
//
// btnOK
//
this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
this.btnOK.Location = new System.Drawing.Point(152, 312);
this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(104, 32);
@ -213,7 +212,6 @@ private void InitializeComponent()
//
// btnCancel
//
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Location = new System.Drawing.Point(264, 312);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(104, 32);

2
ShareX.ScreenCaptureLib/Forms/ScrollingCaptureOptionsForm.cs
View file

@ -67,11 +67,13 @@ private void btnOK_Click(object sender, EventArgs e)
{
SaveOptions();
DialogResult = DialogResult.OK;
Close();
}
private void btnCancel_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.Cancel;
Close();
}
}

2
ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.Designer.cs generated
View file

@ -273,7 +273,6 @@ private void InitializeComponent()
// btnCancel
//
resources.ApplyResources(this.btnCancel, "btnCancel");
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Name = "btnCancel";
this.btnCancel.UseVisualStyleBackColor = true;
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
@ -357,7 +356,6 @@ private void InitializeComponent()
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Window;
this.CancelButton = this.btnCancel;
this.Controls.Add(this.btnSwapEnterKey);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.lblTip);

2
ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.cs
View file

@ -44,7 +44,7 @@ internal partial class TextDrawingInputBox : Form
public TextDrawingInputBox(string text, TextDrawingOptions options, bool supportGradient, ColorPickerOptions colorPickerOptions)
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
ShareXResources.ApplyTheme(this, true);
InputText = text;
Options = options;

10
ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.resx
View file

@ -304,7 +304,7 @@
<value>btnTextColor</value>
</data>
<data name="&gt;&gt;btnTextColor.Type" xml:space="preserve">
<value>ShareX.HelpersLib.ColorButton, ShareX.HelpersLib, Version=14.1.3.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;btnTextColor.Parent" xml:space="preserve">
<value>flpProperties</value>
@ -823,25 +823,25 @@
<value>tsrbmiGradientHorizontal</value>
</data>
<data name="&gt;&gt;tsrbmiGradientHorizontal.Type" xml:space="preserve">
<value>ShareX.HelpersLib.ToolStripRadioButtonMenuItem, ShareX.HelpersLib, Version=14.1.3.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.ToolStripRadioButtonMenuItem, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;tsrbmiGradientVertical.Name" xml:space="preserve">
<value>tsrbmiGradientVertical</value>
</data>
<data name="&gt;&gt;tsrbmiGradientVertical.Type" xml:space="preserve">
<value>ShareX.HelpersLib.ToolStripRadioButtonMenuItem, ShareX.HelpersLib, Version=14.1.3.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.ToolStripRadioButtonMenuItem, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;tsrbmiGradientForwardDiagonal.Name" xml:space="preserve">
<value>tsrbmiGradientForwardDiagonal</value>
</data>
<data name="&gt;&gt;tsrbmiGradientForwardDiagonal.Type" xml:space="preserve">
<value>ShareX.HelpersLib.ToolStripRadioButtonMenuItem, ShareX.HelpersLib, Version=14.1.3.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.ToolStripRadioButtonMenuItem, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;tsrbmiGradientBackwardDiagonal.Name" xml:space="preserve">
<value>tsrbmiGradientBackwardDiagonal</value>
</data>
<data name="&gt;&gt;tsrbmiGradientBackwardDiagonal.Type" xml:space="preserve">
<value>ShareX.HelpersLib.ToolStripRadioButtonMenuItem, ShareX.HelpersLib, Version=14.1.3.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.ToolStripRadioButtonMenuItem, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;ttTextInput.Name" xml:space="preserve">
<value>ttTextInput</value>

3
ShareX.UploadersLib/Forms/EmailForm.Designer.cs generated
View file

@ -79,7 +79,6 @@ private void InitializeComponent()
// btnCancel
//
resources.ApplyResources(this.btnCancel, "btnCancel");
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Name = "btnCancel";
this.btnCancel.UseVisualStyleBackColor = true;
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
@ -88,10 +87,8 @@ private void InitializeComponent()
//
this.AcceptButton = this.btnSend;
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.btnCancel);
this.Controls.Add(this.btnSend);
this.Controls.Add(this.txtMessage);

2
ShareX.UploadersLib/Forms/EmailForm.cs
View file

@ -38,7 +38,7 @@ public partial class EmailForm : Form
public EmailForm()
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
ShareXResources.ApplyTheme(this, true);
}
public EmailForm(string toEmail, string subject, string body) : this()

2
ShareX.UploadersLib/Forms/EmailForm.resx
View file

@ -334,7 +334,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>312, 304</value>

5
ShareX.UploadersLib/Forms/JiraUpload.Designer.cs generated
View file

@ -47,7 +47,7 @@ private void InitializeComponent()
//
resources.ApplyResources(this.txtIssueId, "txtIssueId");
this.txtIssueId.Name = "txtIssueId";
this.txtIssueId.TextChanged += new System.EventHandler(this.textBox1_TextChanged);
this.txtIssueId.TextChanged += new System.EventHandler(this.txtIssueId_TextChanged);
//
// lblSummary
//
@ -64,7 +64,6 @@ private void InitializeComponent()
// btnCancel
//
resources.ApplyResources(this.btnCancel, "btnCancel");
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Name = "btnCancel";
this.btnCancel.UseVisualStyleBackColor = true;
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
@ -80,10 +79,8 @@ private void InitializeComponent()
//
this.AcceptButton = this.btnUpload;
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.txtIssueId);
this.Controls.Add(this.lblIssueId);
this.Controls.Add(this.gpSummary);

19
ShareX.UploadersLib/Forms/JiraUpload.cs
View file

@ -49,7 +49,7 @@ public string IssueId
public JiraUpload()
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
ShareXResources.ApplyTheme(this, true);
}
public JiraUpload(string issuePrefix, GetSummaryHandler getSummary) : this()
@ -66,15 +66,9 @@ private void JiraUpload_Load(object sender, EventArgs e)
txtIssueId.SelectionStart = txtIssueId.Text.Length;
}
private void textBox1_TextChanged(object sender, EventArgs e)
private void txtIssueId_TextChanged(object sender, EventArgs e)
{
ValidateIssueId(((TextBox)sender).Text);
}
private void btnSend_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.OK;
Close();
ValidateIssueId(txtIssueId.Text);
}
private void ValidateIssueId(string issueId)
@ -95,8 +89,15 @@ private void UpdateSummary(string summary)
lblSummary.Enabled = summary != null;
}
private void btnSend_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.OK;
Close();
}
private void btnCancel_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.Cancel;
Close();
}
}

13
ShareX.UploadersLib/Forms/JiraUpload.resx
View file

@ -208,13 +208,13 @@
<value>NoControl</value>
</data>
<data name="btnUpload.Location" type="System.Drawing.Point, System.Drawing">
<value>120, 98</value>
<value>8, 98</value>
</data>
<data name="btnUpload.Size" type="System.Drawing.Size, System.Drawing">
<value>104, 23</value>
</data>
<data name="btnUpload.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
<value>3</value>
</data>
<data name="btnUpload.Text" xml:space="preserve">
<value>Upload</value>
@ -235,13 +235,13 @@
<value>Bottom, Left</value>
</data>
<data name="btnCancel.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 98</value>
<value>120, 98</value>
</data>
<data name="btnCancel.Size" type="System.Drawing.Size, System.Drawing">
<value>104, 23</value>
</data>
<data name="btnCancel.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
<value>4</value>
</data>
<data name="btnCancel.Text" xml:space="preserve">
<value>Cancel</value>
@ -289,14 +289,11 @@
<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>237, 127</value>
</data>
<data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterScreen</value>
</data>

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

@ -49,7 +49,6 @@ private void InitializeComponent()
// btnCancel
//
resources.ApplyResources(this.btnCancel, "btnCancel");
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Name = "btnCancel";
this.btnCancel.UseVisualStyleBackColor = true;
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);

2
ShareX.UploadersLib/Forms/TwitterTweetForm.Designer.cs generated
View file

@ -65,10 +65,8 @@ private void InitializeComponent()
// TwitterTweetForm
//
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.txtTweet);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnOK);

5
ShareX.UploadersLib/Forms/TwitterTweetForm.cs
View file

@ -97,7 +97,7 @@ public bool MediaMode
public TwitterTweetForm()
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
ShareXResources.ApplyTheme(this, true);
MediaMode = false;
}
@ -122,8 +122,9 @@ private void OK()
{
if (IsValidMessage)
{
DialogResult = DialogResult.OK;
SendTweet();
DialogResult = DialogResult.OK;
Close();
}
}

4
ShareX.UploadersLib/Forms/TwitterTweetForm.resx
View file

@ -211,7 +211,7 @@
</data>
<data name="lblTweetLength.Text" xml:space="preserve">
<value>140</value>
<comment>@Invariant</comment></data>
</data>
<data name="&gt;&gt;lblTweetLength.Name" xml:space="preserve">
<value>lblTweetLength</value>
</data>
@ -228,7 +228,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>400, 240</value>

4
ShareX/Forms/AboutForm.Designer.cs generated
View file

@ -33,7 +33,7 @@ private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutForm));
this.lblProductName = new System.Windows.Forms.Label();
this.rtbInfo = new HelpersLib.ReadOnlyRichTextBox();
this.rtbInfo = new ShareX.HelpersLib.ReadOnlyRichTextBox();
this.pbLogo = new System.Windows.Forms.PictureBox();
this.btnClose = new System.Windows.Forms.Button();
this.btnShareXLicense = new System.Windows.Forms.Button();
@ -71,7 +71,6 @@ private void InitializeComponent()
// btnClose
//
resources.ApplyResources(this.btnClose, "btnClose");
this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnClose.Name = "btnClose";
this.btnClose.UseVisualStyleBackColor = true;
this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
@ -111,7 +110,6 @@ private void InitializeComponent()
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.SystemColors.Window;
this.CancelButton = this.btnClose;
this.Controls.Add(this.pbLogo);
this.Controls.Add(this.cLogo);
this.Controls.Add(this.lblProductName);

3
ShareX/Forms/AboutForm.cs
View file

@ -41,7 +41,7 @@ public AboutForm()
InitializeComponent();
lblProductName.Text = Program.Title;
pbLogo.Image = ShareXResources.Logo;
ShareXResources.ApplyTheme(this);
ShareXResources.ApplyTheme(this, true);
#if STEAM
uclUpdate.Visible = false;
@ -154,6 +154,7 @@ private void btnLicenses_Click(object sender, EventArgs e)
private void btnClose_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.Cancel;
Close();
}
}

13
ShareX/Forms/AboutForm.resx
View file

@ -140,7 +140,6 @@
</data>
<data name="lblProductName.Text" xml:space="preserve">
<value>ShareX</value>
<comment>@Invariant</comment>
</data>
<data name="lblProductName.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleCenter</value>
@ -172,6 +171,9 @@
<data name="rtbInfo.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
</data>
<data name="rtbInfo.Text" xml:space="preserve">
<value />
</data>
<data name="rtbInfo.WordWrap" type="System.Boolean, mscorlib">
<value>False</value>
</data>
@ -179,7 +181,7 @@
<value>rtbInfo</value>
</data>
<data name="&gt;&gt;rtbInfo.Type" xml:space="preserve">
<value>System.Windows.Forms.RichTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>ShareX.HelpersLib.ReadOnlyRichTextBox, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;rtbInfo.Parent" xml:space="preserve">
<value>$this</value>
@ -377,7 +379,7 @@
<value>cLogo</value>
</data>
<data name="&gt;&gt;cLogo.Type" xml:space="preserve">
<value>ShareX.HelpersLib.Canvas, ShareX.HelpersLib, Version=13.6.2.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.Canvas, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;cLogo.Parent" xml:space="preserve">
<value>$this</value>
@ -404,7 +406,7 @@
<value>uclUpdate</value>
</data>
<data name="&gt;&gt;uclUpdate.Type" xml:space="preserve">
<value>ShareX.HelpersLib.UpdateCheckerLabel, ShareX.HelpersLib, Version=13.6.2.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.UpdateCheckerLabel, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;uclUpdate.Parent" xml:space="preserve">
<value>$this</value>
@ -421,9 +423,6 @@
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>684, 593</value>
</data>
<data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>600, 600</value>
</data>

2
ShareX/Forms/ActionsForm.Designer.cs generated
View file

@ -93,7 +93,6 @@ private void InitializeComponent()
// btnCancel
//
resources.ApplyResources(this.btnCancel, "btnCancel");
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Name = "btnCancel";
this.btnCancel.UseVisualStyleBackColor = true;
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
@ -137,7 +136,6 @@ private void InitializeComponent()
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.SystemColors.Window;
this.CancelButton = this.btnCancel;
this.Controls.Add(this.cbDeleteInputFile);
this.Controls.Add(this.cbHiddenWindow);
this.Controls.Add(this.lblOutputExtension);

2
ShareX/Forms/ActionsForm.cs
View file

@ -41,7 +41,7 @@ public ActionsForm() : this(new ExternalProgram())
public ActionsForm(ExternalProgram fileAction)
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
ShareXResources.ApplyTheme(this, true);
FileAction = fileAction;
txtName.Text = fileAction.Name ?? "";

1
ShareX/Forms/ActionsForm.resx
View file

@ -287,7 +287,6 @@
</data>
<data name="btnPathBrowse.Text" xml:space="preserve">
<value>...</value>
<comment>@Invariant</comment>
</data>
<data name="&gt;&gt;btnPathBrowse.Name" xml:space="preserve">
<value>btnPathBrowse</value>

5
ShareX/Forms/AfterCaptureForm.Designer.cs generated
View file

@ -60,14 +60,13 @@ private void InitializeComponent()
// btnCancel
//
resources.ApplyResources(this.btnCancel, "btnCancel");
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Name = "btnCancel";
this.btnCancel.UseVisualStyleBackColor = true;
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
//
// btnCopy
//
resources.ApplyResources(this.btnCopy, "btnCopy");
this.btnCopy.DialogResult = System.Windows.Forms.DialogResult.OK;
this.btnCopy.Name = "btnCopy";
this.btnCopy.UseVisualStyleBackColor = true;
this.btnCopy.Click += new System.EventHandler(this.btnCopy_Click);
@ -169,10 +168,8 @@ private void InitializeComponent()
// AfterCaptureForm
//
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.txtFileName);
this.Controls.Add(this.lblFileName);
this.Controls.Add(this.tcTasks);

10
ShareX/Forms/AfterCaptureForm.cs
View file

@ -42,7 +42,7 @@ private AfterCaptureForm(TaskSettings taskSettings)
TaskSettings = taskSettings;
InitializeComponent();
ShareXResources.ApplyTheme(this);
ShareXResources.ApplyTheme(this, true);
ImageList imageList = new ImageList { ColorDepth = ColorDepth.Depth32Bit };
imageList.Images.Add(Resources.checkbox_uncheck);
@ -235,6 +235,14 @@ private void btnCopy_Click(object sender, EventArgs e)
{
TaskSettings.AfterCaptureJob = AfterCaptureTasks.CopyImageToClipboard;
FileName = txtFileName.Text;
DialogResult = DialogResult.OK;
Close();
}
private void btnCancel_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.Cancel;
Close();
}
}
}

160
ShareX/Forms/AfterCaptureForm.resx
View file

@ -216,26 +216,68 @@
<data name="tcTasks.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left</value>
</data>
<data name="lvAfterCaptureTasks.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
<data name="&gt;&gt;tpAfterCapture.Name" xml:space="preserve">
<value>tpAfterCapture</value>
</data>
<data name="lvAfterCaptureTasks.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft Sans Serif, 9.75pt</value>
<data name="&gt;&gt;tpAfterCapture.Type" xml:space="preserve">
<value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="lvAfterCaptureTasks.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 5</value>
<data name="&gt;&gt;tpAfterCapture.Parent" xml:space="preserve">
<value>tcTasks</value>
</data>
<data name="lvAfterCaptureTasks.Size" type="System.Drawing.Size, System.Drawing">
<value>290, 305</value>
<data name="&gt;&gt;tpAfterCapture.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="lvAfterCaptureTasks.TabIndex" type="System.Int32, mscorlib">
<data name="&gt;&gt;tpBeforeUpload.Name" xml:space="preserve">
<value>tpBeforeUpload</value>
</data>
<data name="&gt;&gt;tpBeforeUpload.Type" xml:space="preserve">
<value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tpBeforeUpload.Parent" xml:space="preserve">
<value>tcTasks</value>
</data>
<data name="&gt;&gt;tpBeforeUpload.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="&gt;&gt;tpAfterUpload.Name" xml:space="preserve">
<value>tpAfterUpload</value>
</data>
<data name="&gt;&gt;tpAfterUpload.Type" xml:space="preserve">
<value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tpAfterUpload.Parent" xml:space="preserve">
<value>tcTasks</value>
</data>
<data name="&gt;&gt;tpAfterUpload.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="tcTasks.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 8</value>
</data>
<data name="tcTasks.Size" type="System.Drawing.Size, System.Drawing">
<value>304, 339</value>
</data>
<data name="tcTasks.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
</data>
<data name="&gt;&gt;tcTasks.Name" xml:space="preserve">
<value>tcTasks</value>
</data>
<data name="&gt;&gt;tcTasks.Type" xml:space="preserve">
<value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tcTasks.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;tcTasks.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="&gt;&gt;lvAfterCaptureTasks.Name" xml:space="preserve">
<value>lvAfterCaptureTasks</value>
</data>
<data name="&gt;&gt;lvAfterCaptureTasks.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.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;lvAfterCaptureTasks.Parent" xml:space="preserve">
<value>tpAfterCapture</value>
@ -270,23 +312,38 @@
<data name="&gt;&gt;tpAfterCapture.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="ucBeforeUpload.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<data name="lvAfterCaptureTasks.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="ucBeforeUpload.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 3</value>
<data name="lvAfterCaptureTasks.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft Sans Serif, 9.75pt</value>
</data>
<data name="ucBeforeUpload.Size" type="System.Drawing.Size, System.Drawing">
<value>290, 307</value>
<data name="lvAfterCaptureTasks.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 5</value>
</data>
<data name="ucBeforeUpload.TabIndex" type="System.Int32, mscorlib">
<data name="lvAfterCaptureTasks.Size" type="System.Drawing.Size, System.Drawing">
<value>290, 305</value>
</data>
<data name="lvAfterCaptureTasks.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="&gt;&gt;lvAfterCaptureTasks.Name" xml:space="preserve">
<value>lvAfterCaptureTasks</value>
</data>
<data name="&gt;&gt;lvAfterCaptureTasks.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvAfterCaptureTasks.Parent" xml:space="preserve">
<value>tpAfterCapture</value>
</data>
<data name="&gt;&gt;lvAfterCaptureTasks.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;ucBeforeUpload.Name" xml:space="preserve">
<value>ucBeforeUpload</value>
</data>
<data name="&gt;&gt;ucBeforeUpload.Type" xml:space="preserve">
<value>ShareX.BeforeUploadControl, ShareX, Version=13.0.2.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.BeforeUploadControl, ShareX, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;ucBeforeUpload.Parent" xml:space="preserve">
<value>tpBeforeUpload</value>
@ -321,26 +378,35 @@
<data name="&gt;&gt;tpBeforeUpload.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="lvAfterUploadTasks.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<data name="ucBeforeUpload.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="lvAfterUploadTasks.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft Sans Serif, 9.75pt</value>
<data name="ucBeforeUpload.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 3</value>
</data>
<data name="lvAfterUploadTasks.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 5</value>
<data name="ucBeforeUpload.Size" type="System.Drawing.Size, System.Drawing">
<value>290, 307</value>
</data>
<data name="lvAfterUploadTasks.Size" type="System.Drawing.Size, System.Drawing">
<value>290, 305</value>
<data name="ucBeforeUpload.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="lvAfterUploadTasks.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
<data name="&gt;&gt;ucBeforeUpload.Name" xml:space="preserve">
<value>ucBeforeUpload</value>
</data>
<data name="&gt;&gt;ucBeforeUpload.Type" xml:space="preserve">
<value>ShareX.BeforeUploadControl, ShareX, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;ucBeforeUpload.Parent" xml:space="preserve">
<value>tpBeforeUpload</value>
</data>
<data name="&gt;&gt;ucBeforeUpload.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;lvAfterUploadTasks.Name" xml:space="preserve">
<value>lvAfterUploadTasks</value>
</data>
<data name="&gt;&gt;lvAfterUploadTasks.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.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;lvAfterUploadTasks.Parent" xml:space="preserve">
<value>tpAfterUpload</value>
@ -375,27 +441,33 @@
<data name="&gt;&gt;tpAfterUpload.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="tcTasks.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 8</value>
<data name="lvAfterUploadTasks.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="tcTasks.Size" type="System.Drawing.Size, System.Drawing">
<value>304, 339</value>
<data name="lvAfterUploadTasks.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft Sans Serif, 9.75pt</value>
</data>
<data name="tcTasks.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
<data name="lvAfterUploadTasks.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 5</value>
</data>
<data name="&gt;&gt;tcTasks.Name" xml:space="preserve">
<value>tcTasks</value>
<data name="lvAfterUploadTasks.Size" type="System.Drawing.Size, System.Drawing">
<value>290, 305</value>
</data>
<data name="&gt;&gt;tcTasks.Type" xml:space="preserve">
<value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tcTasks.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;tcTasks.ZOrder" xml:space="preserve">
<data name="lvAfterUploadTasks.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="&gt;&gt;lvAfterUploadTasks.Name" xml:space="preserve">
<value>lvAfterUploadTasks</value>
</data>
<data name="&gt;&gt;lvAfterUploadTasks.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvAfterUploadTasks.Parent" xml:space="preserve">
<value>tpAfterUpload</value>
</data>
<data name="&gt;&gt;lvAfterUploadTasks.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="lblFileName.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left</value>
</data>
@ -469,7 +541,7 @@
<value>pbImage</value>
</data>
<data name="&gt;&gt;pbImage.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=13.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;pbImage.Parent" xml:space="preserve">
<value>$this</value>
@ -481,7 +553,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>784, 441</value>

3
ShareX/Forms/AfterUploadForm.cs
View file

@ -46,7 +46,7 @@ public partial class AfterUploadForm : Form
public AfterUploadForm(TaskInfo info)
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
ShareXResources.ApplyTheme(this, true);
Info = info;
@ -190,6 +190,7 @@ private void btnFolderOpen_Click(object sender, EventArgs e)
private void btnClose_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.Cancel;
Close();
}

2
ShareX/Forms/AfterUploadForm.designer.cs generated
View file

@ -98,7 +98,6 @@ private void InitializeComponent()
// btnClose
//
resources.ApplyResources(this.btnClose, "btnClose");
this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnClose.Name = "btnClose";
this.btnClose.UseVisualStyleBackColor = true;
this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
@ -132,7 +131,6 @@ private void InitializeComponent()
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.SystemColors.Window;
this.CancelButton = this.btnClose;
this.Controls.Add(this.lvClipboardFormats);
this.Controls.Add(this.btnClose);
this.Controls.Add(this.btnOpenLink);

4
ShareX/Forms/AfterUploadForm.resx
View file

@ -136,7 +136,7 @@
<value>pbPreview</value>
</data>
<data name="&gt;&gt;pbPreview.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;pbPreview.Parent" xml:space="preserve">
<value>$this</value>
@ -367,7 +367,7 @@
<value>lvClipboardFormats</value>
</data>
<data name="&gt;&gt;lvClipboardFormats.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;lvClipboardFormats.Parent" xml:space="preserve">
<value>$this</value>

5
ShareX/Forms/BeforeUploadForm.Designer.cs generated
View file

@ -46,7 +46,6 @@ private void InitializeComponent()
// btnCancel
//
resources.ApplyResources(this.btnCancel, "btnCancel");
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Name = "btnCancel";
this.btnCancel.UseVisualStyleBackColor = true;
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
@ -59,11 +58,13 @@ private void InitializeComponent()
// pbPreview
//
resources.ApplyResources(this.pbPreview, "pbPreview");
this.pbPreview.BackColor = System.Drawing.SystemColors.Window;
this.pbPreview.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.pbPreview.DrawCheckeredBackground = true;
this.pbPreview.EnableRightClickMenu = true;
this.pbPreview.FullscreenOnClick = true;
this.pbPreview.Name = "pbPreview";
this.pbPreview.PictureBoxBackColor = System.Drawing.SystemColors.Window;
this.pbPreview.ShowImageSizeLabel = true;
//
// ucBeforeUpload
@ -75,10 +76,8 @@ private void InitializeComponent()
//
this.AcceptButton = this.btnOK;
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.pbPreview);
this.Controls.Add(this.lblTitle);
this.Controls.Add(this.btnCancel);

2
ShareX/Forms/BeforeUploadForm.cs
View file

@ -35,7 +35,7 @@ public partial class BeforeUploadForm : Form
public BeforeUploadForm(TaskInfo info)
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
ShareXResources.ApplyTheme(this, true);
DialogResult = DialogResult.OK;
ucBeforeUpload.InitCompleted += currentDestination =>

6
ShareX/Forms/BeforeUploadForm.resx
View file

@ -232,7 +232,7 @@
<value>pbPreview</value>
</data>
<data name="&gt;&gt;pbPreview.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=1.0.0.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;pbPreview.Parent" xml:space="preserve">
<value>$this</value>
@ -256,7 +256,7 @@
<value>ucBeforeUpload</value>
</data>
<data name="&gt;&gt;ucBeforeUpload.Type" xml:space="preserve">
<value>ShareX.BeforeUploadControl, ShareX, Version=10.9.1.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.BeforeUploadControl, ShareX, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;ucBeforeUpload.Parent" xml:space="preserve">
<value>$this</value>
@ -268,7 +268,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>774, 382</value>

2
ShareX/Forms/ClipboardFormatForm.Designer.cs generated
View file

@ -81,10 +81,8 @@ private void InitializeComponent()
//
this.AcceptButton = this.btnOK;
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.btnCancel);
this.Controls.Add(this.btnOK);
this.Controls.Add(this.lblExample);

2
ShareX/Forms/ClipboardFormatForm.cs
View file

@ -41,7 +41,7 @@ public ClipboardFormatForm() : this(new ClipboardFormat())
public ClipboardFormatForm(ClipboardFormat cbf)
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
ShareXResources.ApplyTheme(this, true);
ClipboardFormat = cbf;
txtDescription.Text = cbf.Description ?? "";

2
ShareX/Forms/ClipboardFormatForm.resx
View file

@ -288,7 +288,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>417, 168</value>

3
ShareX/Forms/ClipboardUploadForm.Designer.cs generated
View file

@ -48,7 +48,6 @@ private void InitializeComponent()
// btnCancel
//
resources.ApplyResources(this.btnCancel, "btnCancel");
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Name = "btnCancel";
this.btnCancel.UseVisualStyleBackColor = true;
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
@ -87,7 +86,6 @@ private void InitializeComponent()
// btnUpload
//
resources.ApplyResources(this.btnUpload, "btnUpload");
this.btnUpload.DialogResult = System.Windows.Forms.DialogResult.OK;
this.btnUpload.Name = "btnUpload";
this.btnUpload.UseVisualStyleBackColor = true;
this.btnUpload.Click += new System.EventHandler(this.btnUpload_Click);
@ -98,7 +96,6 @@ private void InitializeComponent()
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.SystemColors.Window;
this.CancelButton = this.btnCancel;
this.Controls.Add(this.btnUpload);
this.Controls.Add(this.pbClipboard);
this.Controls.Add(this.cbDontShowThisWindow);

5
ShareX/Forms/ClipboardUploadForm.cs
View file

@ -43,7 +43,7 @@ public partial class ClipboardUploadForm : Form
public ClipboardUploadForm(TaskSettings taskSettings, bool showCheckBox = false)
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
ShareXResources.ApplyTheme(this, true);
this.taskSettings = taskSettings;
if (ShareXResources.UseCustomTheme)
@ -147,11 +147,14 @@ private void cbDontShowThisWindow_CheckedChanged(object sender, EventArgs e)
private void btnUpload_Click(object sender, EventArgs e)
{
ClipboardUpload();
DialogResult = DialogResult.OK;
Close();
}
private void btnCancel_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.Cancel;
Close();
}
}

2
ShareX/Forms/ClipboardUploadForm.resx
View file

@ -289,7 +289,7 @@
<value>pbClipboard</value>
</data>
<data name="&gt;&gt;pbClipboard.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=13.1.1.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;pbClipboard.Parent" xml:space="preserve">
<value>$this</value>

3
ShareX/Forms/FirstTimeUploadForm.Designer.cs generated
View file

@ -44,7 +44,6 @@ private void InitializeComponent()
//
// btnYes
//
this.btnYes.DialogResult = System.Windows.Forms.DialogResult.Yes;
resources.ApplyResources(this.btnYes, "btnYes");
this.btnYes.Name = "btnYes";
this.btnYes.UseVisualStyleBackColor = true;
@ -52,7 +51,6 @@ private void InitializeComponent()
//
// btnNo
//
this.btnNo.DialogResult = System.Windows.Forms.DialogResult.No;
resources.ApplyResources(this.btnNo, "btnNo");
this.btnNo.Name = "btnNo";
this.btnNo.UseVisualStyleBackColor = true;
@ -72,7 +70,6 @@ private void InitializeComponent()
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.btnNo;
this.Controls.Add(this.lblHeader);
this.Controls.Add(this.btnNo);
this.Controls.Add(this.btnYes);

18
ShareX/Forms/FirstTimeUploadForm.cs
View file

@ -38,7 +38,7 @@ public partial class FirstTimeUploadForm : Form
public FirstTimeUploadForm()
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
ShareXResources.ApplyTheme(this, true);
lblHeader.BackColor = Color.DarkRed;
lblHeader.ForeColor = Color.WhiteSmoke;
@ -63,6 +63,14 @@ private void UpdateCountdown()
}
}
public static bool ShowForm()
{
using (FirstTimeUploadForm form = new FirstTimeUploadForm())
{
return form.ShowDialog() == DialogResult.Yes;
}
}
private void FirstTimeUploadForm_Shown(object sender, EventArgs e)
{
this.ForceActivate();
@ -87,13 +95,5 @@ private void btnNo_Click(object sender, EventArgs e)
DialogResult = DialogResult.No;
Close();
}
public static bool ShowForm()
{
using (FirstTimeUploadForm form = new FirstTimeUploadForm())
{
return form.ShowDialog() == DialogResult.Yes;
}
}
}
}

2
ShareX/Forms/QuickTaskInfoEditForm.Designer.cs generated
View file

@ -88,10 +88,10 @@ private void InitializeComponent()
//
// btnOK
//
this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
resources.ApplyResources(this.btnOK, "btnOK");
this.btnOK.Name = "btnOK";
this.btnOK.UseVisualStyleBackColor = true;
this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
//
// QuickTaskInfoEditForm
//

18
ShareX/Forms/QuickTaskInfoEditForm.cs
View file

@ -39,7 +39,7 @@ public QuickTaskInfoEditForm(QuickTaskInfo taskInfo)
TaskInfo = taskInfo;
InitializeComponent();
ShareXResources.ApplyTheme(this);
ShareXResources.ApplyTheme(this, true);
txtName.Text = TaskInfo.Name;
AddMultiEnumItemsContextMenu<AfterCaptureTasks>(x => TaskInfo.AfterCaptureTasks = TaskInfo.AfterCaptureTasks.Swap(x), cmsAfterCapture);
@ -49,11 +49,6 @@ public QuickTaskInfoEditForm(QuickTaskInfo taskInfo)
UpdateUploaderMenuNames();
}
private void txtName_TextChanged(object sender, EventArgs e)
{
TaskInfo.Name = txtName.Text;
}
private void AddMultiEnumItemsContextMenu<T>(Action<T> selectedEnum, params ToolStripDropDown[] parents) where T : Enum
{
string[] enums = Helpers.GetLocalizedEnumDescriptions<T>().Skip(1).Select(x => x.Replace("&", "&&")).ToArray();
@ -103,5 +98,16 @@ private void UpdateUploaderMenuNames()
mbAfterCaptureTasks.Text = string.Join(", ", TaskInfo.AfterCaptureTasks.GetFlags().Select(x => x.GetLocalizedDescription()));
mbAfterUploadTasks.Text = string.Join(", ", TaskInfo.AfterUploadTasks.GetFlags().Select(x => x.GetLocalizedDescription()));
}
private void txtName_TextChanged(object sender, EventArgs e)
{
TaskInfo.Name = txtName.Text;
}
private void btnOK_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.OK;
Close();
}
}
}

4
ShareX/Forms/QuickTaskInfoEditForm.resx
View file

@ -147,7 +147,7 @@
<value>mbAfterCaptureTasks</value>
</data>
<data name="&gt;&gt;mbAfterCaptureTasks.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;mbAfterCaptureTasks.Parent" xml:space="preserve">
<value>$this</value>
@ -183,7 +183,7 @@
<value>mbAfterUploadTasks</value>
</data>
<data name="&gt;&gt;mbAfterUploadTasks.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;mbAfterUploadTasks.Parent" xml:space="preserve">
<value>$this</value>

2
ShareX/Forms/QuickTaskMenuEditorForm.Designer.cs generated
View file

@ -50,6 +50,7 @@ private void InitializeComponent()
this.lvPresets.FullRowSelect = true;
this.lvPresets.GridLines = true;
this.lvPresets.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
this.lvPresets.HideSelection = false;
this.lvPresets.Name = "lvPresets";
this.lvPresets.UseCompatibleStateImageBehavior = false;
this.lvPresets.View = System.Windows.Forms.View.Details;
@ -105,7 +106,6 @@ private void InitializeComponent()
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Window;
this.CancelButton = this.btnClose;
this.Controls.Add(this.lblTip);
this.Controls.Add(this.btnClose);
this.Controls.Add(this.btnReset);

3
ShareX/Forms/QuickTaskMenuEditorForm.cs
View file

@ -36,7 +36,7 @@ public partial class QuickTaskMenuEditorForm : Form
public QuickTaskMenuEditorForm()
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
ShareXResources.ApplyTheme(this, true);
if (Program.Settings.QuickTaskPresets == null)
{
@ -130,6 +130,7 @@ private void btnReset_Click(object sender, EventArgs e)
private void btnClose_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.Cancel;
Close();
}
}

2
ShareX/Forms/QuickTaskMenuEditorForm.resx
View file

@ -142,7 +142,7 @@
<value>lvPresets</value>
</data>
<data name="&gt;&gt;lvPresets.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=1.0.0.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;lvPresets.Parent" xml:space="preserve">
<value>$this</value>

2
ShareX/Forms/WatchFolderForm.Designer.cs generated
View file

@ -82,7 +82,6 @@ private void InitializeComponent()
// btnCancel
//
resources.ApplyResources(this.btnCancel, "btnCancel");
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Name = "btnCancel";
this.btnCancel.UseVisualStyleBackColor = true;
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
@ -106,7 +105,6 @@ private void InitializeComponent()
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.SystemColors.Window;
this.CancelButton = this.btnCancel;
this.Controls.Add(this.cbMoveToScreenshotsFolder);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnOK);

2
ShareX/Forms/WatchFolderForm.cs
View file

@ -42,7 +42,7 @@ public WatchFolderForm(WatchFolderSettings watchFolder)
WatchFolder = watchFolder;
InitializeComponent();
ShareXResources.ApplyTheme(this);
ShareXResources.ApplyTheme(this, true);
txtFolderPath.Text = watchFolder.FolderPath ?? "";
txtFilter.Text = watchFolder.Filter ?? "";

1
ShareX/Forms/WatchFolderForm.resx
View file

@ -130,7 +130,6 @@
</data>
<data name="btnPathBrowse.Text" xml:space="preserve">
<value>...</value>
<comment>@Invariant</comment>
</data>
<data name="&gt;&gt;btnPathBrowse.Name" xml:space="preserve">
<value>btnPathBrowse</value>

2
ShareX/Tools/PinToScreen/PinToScreenStartupForm.Designer.cs generated
View file

@ -61,7 +61,6 @@ private void InitializeComponent()
//
// btnCancel
//
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Image = global::ShareX.Properties.Resources.cross;
resources.ApplyResources(this.btnCancel, "btnCancel");
this.btnCancel.Name = "btnCancel";
@ -72,7 +71,6 @@ private void InitializeComponent()
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.btnCancel;
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnFromScreen);
this.Controls.Add(this.btnFromClipboard);

2
ShareX/Tools/PinToScreen/PinToScreenStartupForm.cs
View file

@ -41,7 +41,7 @@ public partial class PinToScreenStartupForm : Form
public PinToScreenStartupForm()
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
ShareXResources.ApplyTheme(this, true);
}
private void btnFromScreen_Click(object sender, EventArgs e)