diff --git a/HelpersLib/DNS/DNSChangerForm.resx b/HelpersLib/DNS/DNSChangerForm.resx
index ff1ab8b6f..f667c53df 100644
--- a/HelpersLib/DNS/DNSChangerForm.resx
+++ b/HelpersLib/DNS/DNSChangerForm.resx
@@ -119,10 +119,10 @@
- 136, 12
+ 152, 12
- 256, 21
+ 240, 21
@@ -168,10 +168,10 @@
11
- 136, 84
+ 152, 84
- 214, 20
+ 198, 20
6
@@ -243,10 +243,10 @@
8
- 136, 108
+ 152, 108
- 214, 20
+ 198, 20
9
@@ -312,10 +312,10 @@
5
- 136, 60
+ 152, 60
- 256, 21
+ 240, 21
4
diff --git a/HelpersLib/Forms/MonitorTestForm.Designer.cs b/HelpersLib/Forms/MonitorTestForm.Designer.cs
index 2930e3961..76dafcddb 100644
--- a/HelpersLib/Forms/MonitorTestForm.Designer.cs
+++ b/HelpersLib/Forms/MonitorTestForm.Designer.cs
@@ -30,8 +30,6 @@ private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MonitorTestForm));
this.pSettings = new System.Windows.Forms.Panel();
- this.btnGradientColor2 = new HelpersLib.ColorButton();
- this.btnGradientColor1 = new HelpersLib.ColorButton();
this.lblTip = new System.Windows.Forms.Label();
this.cbGradient = new System.Windows.Forms.ComboBox();
this.rbGradient = new System.Windows.Forms.RadioButton();
@@ -55,6 +53,8 @@ private void InitializeComponent()
this.lblBlackWhiteValue = new System.Windows.Forms.Label();
this.tbBlackWhite = new System.Windows.Forms.TrackBar();
this.rbBlackWhite = new System.Windows.Forms.RadioButton();
+ this.btnGradientColor2 = new HelpersLib.ColorButton();
+ this.btnGradientColor1 = new HelpersLib.ColorButton();
this.pSettings.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tbShapeSize)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tbBlue)).BeginInit();
@@ -95,22 +95,6 @@ private void InitializeComponent()
resources.ApplyResources(this.pSettings, "pSettings");
this.pSettings.Name = "pSettings";
//
- // btnGradientColor2
- //
- this.btnGradientColor2.Color = System.Drawing.Color.Empty;
- resources.ApplyResources(this.btnGradientColor2, "btnGradientColor2");
- this.btnGradientColor2.Name = "btnGradientColor2";
- this.btnGradientColor2.UseVisualStyleBackColor = true;
- this.btnGradientColor2.ColorChanged += new HelpersLib.ColorButton.ColorChangedEventHandler(this.btnGradientColor2_ColorChanged);
- //
- // btnGradientColor1
- //
- this.btnGradientColor1.Color = System.Drawing.Color.Empty;
- resources.ApplyResources(this.btnGradientColor1, "btnGradientColor1");
- this.btnGradientColor1.Name = "btnGradientColor1";
- this.btnGradientColor1.UseVisualStyleBackColor = true;
- this.btnGradientColor1.ColorChanged += new HelpersLib.ColorButton.ColorChangedEventHandler(this.btnGradientColor1_ColorChanged);
- //
// lblTip
//
resources.ApplyResources(this.lblTip, "lblTip");
@@ -265,6 +249,22 @@ private void InitializeComponent()
this.rbBlackWhite.UseVisualStyleBackColor = true;
this.rbBlackWhite.CheckedChanged += new System.EventHandler(this.rbBlackWhite_CheckedChanged);
//
+ // btnGradientColor2
+ //
+ this.btnGradientColor2.Color = System.Drawing.Color.Empty;
+ resources.ApplyResources(this.btnGradientColor2, "btnGradientColor2");
+ this.btnGradientColor2.Name = "btnGradientColor2";
+ this.btnGradientColor2.UseVisualStyleBackColor = true;
+ this.btnGradientColor2.ColorChanged += new HelpersLib.ColorButton.ColorChangedEventHandler(this.btnGradientColor2_ColorChanged);
+ //
+ // btnGradientColor1
+ //
+ this.btnGradientColor1.Color = System.Drawing.Color.Empty;
+ resources.ApplyResources(this.btnGradientColor1, "btnGradientColor1");
+ this.btnGradientColor1.Name = "btnGradientColor1";
+ this.btnGradientColor1.UseVisualStyleBackColor = true;
+ this.btnGradientColor1.ColorChanged += new HelpersLib.ColorButton.ColorChangedEventHandler(this.btnGradientColor1_ColorChanged);
+ //
// MonitorTestForm
//
resources.ApplyResources(this, "$this");
diff --git a/HelpersLib/Forms/MonitorTestForm.resx b/HelpersLib/Forms/MonitorTestForm.resx
index 4897e7b2b..07b7f8667 100644
--- a/HelpersLib/Forms/MonitorTestForm.resx
+++ b/HelpersLib/Forms/MonitorTestForm.resx
@@ -117,9 +117,13 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ NoControl
+
- 120, 256
+ 224, 257
96, 24
@@ -146,8 +150,11 @@
0
+
+ NoControl
+
- 16, 256
+ 120, 257
96, 24
@@ -179,6 +186,9 @@
Microsoft Sans Serif, 9.75pt
+
+ NoControl
+
16, 368
@@ -204,7 +214,7 @@
2
- 88, 222
+ 120, 223
216, 21
@@ -227,6 +237,9 @@
True
+
+ NoControl
+
16, 224
@@ -251,11 +264,14 @@
4
+
+ NoControl
+
- 208, 8
+ 211, 8
- 96, 23
+ 125, 23
1
@@ -278,6 +294,9 @@
True
+
+ NoControl
+
16, 334
@@ -308,8 +327,11 @@
Microsoft Sans Serif, 9.75pt
+
+ NoControl
+
- 280, 332
+ 315, 332
15, 16
@@ -335,11 +357,14 @@
False
+
+ NoControl
+
- 40, 328
+ 120, 328
- 232, 24
+ 187, 24
22
@@ -356,11 +381,14 @@
8
+
+ NoControl
+
- 208, 88
+ 211, 88
- 96, 23
+ 125, 23
5
@@ -390,7 +418,7 @@
Vertical lines
- 88, 294
+ 120, 295
216, 21
@@ -413,6 +441,9 @@
True
+
+ NoControl
+
16, 296
@@ -440,6 +471,9 @@
True
+
+ NoControl
+
16, 190
@@ -470,8 +504,11 @@
Microsoft Sans Serif, 9.75pt
+
+ NoControl
+
- 280, 188
+ 315, 188
15, 16
@@ -497,11 +534,14 @@
False
+
+ NoControl
+
32, 184
- 240, 24
+ 275, 24
13
@@ -521,6 +561,9 @@
True
+
+ NoControl
+
16, 158
@@ -551,8 +594,11 @@
Microsoft Sans Serif, 9.75pt
+
+ NoControl
+
- 280, 156
+ 315, 156
15, 16
@@ -578,11 +624,14 @@
False
+
+ NoControl
+
32, 152
- 240, 24
+ 275, 24
10
@@ -602,6 +651,9 @@
True
+
+ NoControl
+
16, 126
@@ -632,8 +684,11 @@
Microsoft Sans Serif, 9.75pt
+
+ NoControl
+
- 280, 124
+ 315, 124
15, 16
@@ -659,11 +714,14 @@
False
+
+ NoControl
+
32, 120
- 240, 24
+ 275, 24
7
@@ -683,6 +741,9 @@
True
+
+ NoControl
+
16, 88
@@ -713,8 +774,11 @@
Microsoft Sans Serif, 9.75pt
+
+ NoControl
+
- 280, 52
+ 315, 52
15, 16
@@ -740,11 +804,14 @@
False
+
+ NoControl
+
8, 48
- 264, 24
+ 299, 24
2
@@ -764,6 +831,9 @@
True
+
+ NoControl
+
16, 16
@@ -792,7 +862,7 @@
100, 100
- 320, 396
+ 353, 396
0
@@ -818,7 +888,9 @@
700, 700
-
+
+ NoControl
+
Manual
diff --git a/HistoryLib/HistoryForm.resx b/HistoryLib/HistoryForm.resx
index 709c3477f..169a39a69 100644
--- a/HistoryLib/HistoryForm.resx
+++ b/HistoryLib/HistoryForm.resx
@@ -303,7 +303,7 @@
192, 119
- 96, 21
+ 104, 21
7
@@ -459,7 +459,7 @@
0
- 112, 199
+ 166, 199
128, 20
@@ -489,7 +489,7 @@
Text
- 112, 172
+ 166, 172
128, 21
diff --git a/ImageEffectsLib/ImageEffectsLib.csproj b/ImageEffectsLib/ImageEffectsLib.csproj
index 638da6149..349d26ea3 100644
--- a/ImageEffectsLib/ImageEffectsLib.csproj
+++ b/ImageEffectsLib/ImageEffectsLib.csproj
@@ -163,12 +163,6 @@
Resources.Designer.cs
-
- WatermarkForm.cs
-
-
- WatermarkForm.cs
-
diff --git a/ImageEffectsLib/WatermarkForm.Designer.cs b/ImageEffectsLib/WatermarkForm.Designer.cs
index e79b667af..516b6cd3a 100644
--- a/ImageEffectsLib/WatermarkForm.Designer.cs
+++ b/ImageEffectsLib/WatermarkForm.Designer.cs
@@ -28,7 +28,6 @@ protected override void Dispose(bool disposing)
///
private void InitializeComponent()
{
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WatermarkForm));
this.lblWatermarkOffsetPixel = new System.Windows.Forms.Label();
this.cboWatermarkType = new System.Windows.Forms.ComboBox();
this.cbWatermarkAutoHide = new System.Windows.Forms.CheckBox();
@@ -68,57 +67,84 @@ private void InitializeComponent()
//
// lblWatermarkOffsetPixel
//
- resources.ApplyResources(this.lblWatermarkOffsetPixel, "lblWatermarkOffsetPixel");
+ this.lblWatermarkOffsetPixel.AutoSize = true;
+ this.lblWatermarkOffsetPixel.Location = new System.Drawing.Point(152, 80);
this.lblWatermarkOffsetPixel.Name = "lblWatermarkOffsetPixel";
+ this.lblWatermarkOffsetPixel.Size = new System.Drawing.Size(18, 13);
+ this.lblWatermarkOffsetPixel.TabIndex = 6;
+ this.lblWatermarkOffsetPixel.Text = "px";
//
// cboWatermarkType
//
this.cboWatermarkType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cboWatermarkType.FormattingEnabled = true;
- resources.ApplyResources(this.cboWatermarkType, "cboWatermarkType");
+ this.cboWatermarkType.Location = new System.Drawing.Point(88, 12);
this.cboWatermarkType.Name = "cboWatermarkType";
+ this.cboWatermarkType.Size = new System.Drawing.Size(120, 21);
+ this.cboWatermarkType.TabIndex = 1;
this.cboWatermarkType.SelectedIndexChanged += new System.EventHandler(this.cboWatermarkType_SelectedIndexChanged);
//
// cbWatermarkAutoHide
//
- resources.ApplyResources(this.cbWatermarkAutoHide, "cbWatermarkAutoHide");
+ this.cbWatermarkAutoHide.AutoSize = true;
+ this.cbWatermarkAutoHide.Location = new System.Drawing.Point(17, 112);
this.cbWatermarkAutoHide.Name = "cbWatermarkAutoHide";
+ this.cbWatermarkAutoHide.Size = new System.Drawing.Size(260, 17);
+ this.cbWatermarkAutoHide.TabIndex = 7;
+ this.cbWatermarkAutoHide.Text = "Hide watermark if image is smaller than watermark";
this.cbWatermarkAutoHide.UseVisualStyleBackColor = true;
this.cbWatermarkAutoHide.CheckedChanged += new System.EventHandler(this.cbWatermarkAutoHide_CheckedChanged);
//
// lblWatermarkType
//
- resources.ApplyResources(this.lblWatermarkType, "lblWatermarkType");
+ this.lblWatermarkType.AutoSize = true;
+ this.lblWatermarkType.Location = new System.Drawing.Point(16, 16);
this.lblWatermarkType.Name = "lblWatermarkType";
+ this.lblWatermarkType.Size = new System.Drawing.Size(34, 13);
+ this.lblWatermarkType.TabIndex = 0;
+ this.lblWatermarkType.Text = "Type:";
//
// chkWatermarkPosition
//
this.chkWatermarkPosition.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.chkWatermarkPosition.FormattingEnabled = true;
- resources.ApplyResources(this.chkWatermarkPosition, "chkWatermarkPosition");
+ this.chkWatermarkPosition.Location = new System.Drawing.Point(88, 44);
this.chkWatermarkPosition.Name = "chkWatermarkPosition";
+ this.chkWatermarkPosition.Size = new System.Drawing.Size(120, 21);
+ this.chkWatermarkPosition.TabIndex = 3;
this.chkWatermarkPosition.SelectedIndexChanged += new System.EventHandler(this.cbWatermarkPosition_SelectedIndexChanged);
//
// lblWatermarkPosition
//
- resources.ApplyResources(this.lblWatermarkPosition, "lblWatermarkPosition");
+ this.lblWatermarkPosition.AutoSize = true;
+ this.lblWatermarkPosition.Location = new System.Drawing.Point(16, 48);
this.lblWatermarkPosition.Name = "lblWatermarkPosition";
+ this.lblWatermarkPosition.Size = new System.Drawing.Size(60, 13);
+ this.lblWatermarkPosition.TabIndex = 2;
+ this.lblWatermarkPosition.Text = "Placement:";
//
// nudWatermarkOffset
//
- resources.ApplyResources(this.nudWatermarkOffset, "nudWatermarkOffset");
+ this.nudWatermarkOffset.Location = new System.Drawing.Point(88, 76);
this.nudWatermarkOffset.Maximum = new decimal(new int[] {
2000,
0,
0,
0});
this.nudWatermarkOffset.Name = "nudWatermarkOffset";
+ this.nudWatermarkOffset.Size = new System.Drawing.Size(56, 20);
+ this.nudWatermarkOffset.TabIndex = 5;
+ this.nudWatermarkOffset.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.nudWatermarkOffset.ValueChanged += new System.EventHandler(this.nudWatermarkOffset_ValueChanged);
//
// lblWatermarkOffset
//
- resources.ApplyResources(this.lblWatermarkOffset, "lblWatermarkOffset");
+ this.lblWatermarkOffset.AutoSize = true;
+ this.lblWatermarkOffset.Location = new System.Drawing.Point(16, 80);
this.lblWatermarkOffset.Name = "lblWatermarkOffset";
+ this.lblWatermarkOffset.Size = new System.Drawing.Size(38, 13);
+ this.lblWatermarkOffset.TabIndex = 4;
+ this.lblWatermarkOffset.Text = "Offset:";
//
// gbWatermarkBackground
//
@@ -131,77 +157,113 @@ private void InitializeComponent()
this.gbWatermarkBackground.Controls.Add(this.nudWatermarkCornerRadius);
this.gbWatermarkBackground.Controls.Add(this.lblWatermarkCornerRadiusTip);
this.gbWatermarkBackground.Controls.Add(this.cbWatermarkGradientType);
- resources.ApplyResources(this.gbWatermarkBackground, "gbWatermarkBackground");
+ this.gbWatermarkBackground.Location = new System.Drawing.Point(304, 126);
this.gbWatermarkBackground.Name = "gbWatermarkBackground";
+ this.gbWatermarkBackground.Size = new System.Drawing.Size(448, 210);
+ this.gbWatermarkBackground.TabIndex = 9;
this.gbWatermarkBackground.TabStop = false;
+ this.gbWatermarkBackground.Text = "Text background settings";
//
// btnBackgroundColor2
//
this.btnBackgroundColor2.Color = System.Drawing.Color.Empty;
- resources.ApplyResources(this.btnBackgroundColor2, "btnBackgroundColor2");
+ this.btnBackgroundColor2.Location = new System.Drawing.Point(16, 176);
this.btnBackgroundColor2.Name = "btnBackgroundColor2";
+ this.btnBackgroundColor2.Size = new System.Drawing.Size(144, 23);
+ this.btnBackgroundColor2.TabIndex = 8;
+ this.btnBackgroundColor2.Text = "Background color 2...";
+ this.btnBackgroundColor2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnBackgroundColor2.UseVisualStyleBackColor = true;
this.btnBackgroundColor2.ColorChanged += new HelpersLib.ColorButton.ColorChangedEventHandler(this.btnBackgroundColor2_ColorChanged);
//
// btnBackgroundColor
//
this.btnBackgroundColor.Color = System.Drawing.Color.Empty;
- resources.ApplyResources(this.btnBackgroundColor, "btnBackgroundColor");
+ this.btnBackgroundColor.Location = new System.Drawing.Point(16, 112);
this.btnBackgroundColor.Name = "btnBackgroundColor";
+ this.btnBackgroundColor.Size = new System.Drawing.Size(144, 23);
+ this.btnBackgroundColor.TabIndex = 5;
+ this.btnBackgroundColor.Text = "Background color...";
+ this.btnBackgroundColor.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnBackgroundColor.UseVisualStyleBackColor = true;
this.btnBackgroundColor.ColorChanged += new HelpersLib.ColorButton.ColorChangedEventHandler(this.btnBackgroundColor_ColorChanged);
//
// btnBorderColor
//
this.btnBorderColor.Color = System.Drawing.Color.Empty;
- resources.ApplyResources(this.btnBorderColor, "btnBorderColor");
+ this.btnBorderColor.Location = new System.Drawing.Point(16, 50);
this.btnBorderColor.Name = "btnBorderColor";
+ this.btnBorderColor.Size = new System.Drawing.Size(144, 23);
+ this.btnBorderColor.TabIndex = 1;
+ this.btnBorderColor.Text = "Border color...";
+ this.btnBorderColor.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnBorderColor.UseVisualStyleBackColor = true;
this.btnBorderColor.ColorChanged += new HelpersLib.ColorButton.ColorChangedEventHandler(this.btnBorderColor_ColorChanged);
//
// cbWatermarkUseGradient
//
- resources.ApplyResources(this.cbWatermarkUseGradient, "cbWatermarkUseGradient");
+ this.cbWatermarkUseGradient.AutoSize = true;
this.cbWatermarkUseGradient.Checked = true;
this.cbWatermarkUseGradient.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.cbWatermarkUseGradient.Location = new System.Drawing.Point(19, 149);
this.cbWatermarkUseGradient.Name = "cbWatermarkUseGradient";
+ this.cbWatermarkUseGradient.Size = new System.Drawing.Size(92, 17);
+ this.cbWatermarkUseGradient.TabIndex = 6;
+ this.cbWatermarkUseGradient.Text = "Gradient type:";
this.cbWatermarkUseGradient.UseVisualStyleBackColor = true;
this.cbWatermarkUseGradient.CheckedChanged += new System.EventHandler(this.cbWatermarkBackColor2_CheckedChanged);
//
// cbWatermarkDrawBackground
//
- resources.ApplyResources(this.cbWatermarkDrawBackground, "cbWatermarkDrawBackground");
+ this.cbWatermarkDrawBackground.AutoSize = true;
+ this.cbWatermarkDrawBackground.Location = new System.Drawing.Point(19, 24);
this.cbWatermarkDrawBackground.Name = "cbWatermarkDrawBackground";
+ this.cbWatermarkDrawBackground.Size = new System.Drawing.Size(111, 17);
+ this.cbWatermarkDrawBackground.TabIndex = 0;
+ this.cbWatermarkDrawBackground.Text = "Draw background";
this.cbWatermarkDrawBackground.UseVisualStyleBackColor = true;
this.cbWatermarkDrawBackground.CheckedChanged += new System.EventHandler(this.cbWatermarkDrawBackground_CheckedChanged);
//
// lblRectangleCornerRadius
//
- resources.ApplyResources(this.lblRectangleCornerRadius, "lblRectangleCornerRadius");
+ this.lblRectangleCornerRadius.AutoSize = true;
+ this.lblRectangleCornerRadius.Location = new System.Drawing.Point(16, 88);
this.lblRectangleCornerRadius.Name = "lblRectangleCornerRadius";
+ this.lblRectangleCornerRadius.Size = new System.Drawing.Size(123, 13);
+ this.lblRectangleCornerRadius.TabIndex = 2;
+ this.lblRectangleCornerRadius.Text = "Rectangle corner radius:";
//
// nudWatermarkCornerRadius
//
- resources.ApplyResources(this.nudWatermarkCornerRadius, "nudWatermarkCornerRadius");
+ this.nudWatermarkCornerRadius.Location = new System.Drawing.Point(144, 84);
this.nudWatermarkCornerRadius.Maximum = new decimal(new int[] {
15,
0,
0,
0});
this.nudWatermarkCornerRadius.Name = "nudWatermarkCornerRadius";
+ this.nudWatermarkCornerRadius.Size = new System.Drawing.Size(48, 20);
+ this.nudWatermarkCornerRadius.TabIndex = 3;
+ this.nudWatermarkCornerRadius.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.nudWatermarkCornerRadius.ValueChanged += new System.EventHandler(this.nudWatermarkCornerRadius_ValueChanged);
//
// lblWatermarkCornerRadiusTip
//
- resources.ApplyResources(this.lblWatermarkCornerRadiusTip, "lblWatermarkCornerRadiusTip");
+ this.lblWatermarkCornerRadiusTip.AutoSize = true;
+ this.lblWatermarkCornerRadiusTip.Location = new System.Drawing.Point(200, 88);
this.lblWatermarkCornerRadiusTip.Name = "lblWatermarkCornerRadiusTip";
+ this.lblWatermarkCornerRadiusTip.Size = new System.Drawing.Size(105, 13);
+ this.lblWatermarkCornerRadiusTip.TabIndex = 4;
+ this.lblWatermarkCornerRadiusTip.Text = "0 = Normal rectangle";
//
// cbWatermarkGradientType
//
this.cbWatermarkGradientType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cbWatermarkGradientType.FormattingEnabled = true;
- resources.ApplyResources(this.cbWatermarkGradientType, "cbWatermarkGradientType");
+ this.cbWatermarkGradientType.Location = new System.Drawing.Point(120, 147);
this.cbWatermarkGradientType.Name = "cbWatermarkGradientType";
+ this.cbWatermarkGradientType.Size = new System.Drawing.Size(121, 21);
+ this.cbWatermarkGradientType.TabIndex = 7;
this.cbWatermarkGradientType.SelectedIndexChanged += new System.EventHandler(this.cbWatermarkGradientType_SelectedIndexChanged);
//
// gbWatermarkText
@@ -211,53 +273,79 @@ private void InitializeComponent()
this.gbWatermarkText.Controls.Add(this.lblWatermarkFont);
this.gbWatermarkText.Controls.Add(this.btnWatermarkFont);
this.gbWatermarkText.Controls.Add(this.txtWatermarkText);
- resources.ApplyResources(this.gbWatermarkText, "gbWatermarkText");
+ this.gbWatermarkText.Location = new System.Drawing.Point(304, 8);
this.gbWatermarkText.Name = "gbWatermarkText";
+ this.gbWatermarkText.Size = new System.Drawing.Size(448, 112);
+ this.gbWatermarkText.TabIndex = 8;
this.gbWatermarkText.TabStop = false;
+ this.gbWatermarkText.Text = "Text settings";
//
// btnTextColor
//
this.btnTextColor.Color = System.Drawing.Color.Empty;
- resources.ApplyResources(this.btnTextColor, "btnTextColor");
+ this.btnTextColor.Location = new System.Drawing.Point(16, 80);
this.btnTextColor.Name = "btnTextColor";
+ this.btnTextColor.Size = new System.Drawing.Size(144, 23);
+ this.btnTextColor.TabIndex = 4;
+ this.btnTextColor.Text = "Text color...";
+ this.btnTextColor.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnTextColor.UseVisualStyleBackColor = true;
this.btnTextColor.ColorChanged += new HelpersLib.ColorButton.ColorChangedEventHandler(this.btnTextColor_ColorChanged);
//
// lblWatermarkText
//
- resources.ApplyResources(this.lblWatermarkText, "lblWatermarkText");
+ this.lblWatermarkText.AutoSize = true;
+ this.lblWatermarkText.Location = new System.Drawing.Point(16, 24);
this.lblWatermarkText.Name = "lblWatermarkText";
+ this.lblWatermarkText.Size = new System.Drawing.Size(31, 13);
+ this.lblWatermarkText.TabIndex = 0;
+ this.lblWatermarkText.Text = "Text:";
//
// lblWatermarkFont
//
- resources.ApplyResources(this.lblWatermarkFont, "lblWatermarkFont");
+ this.lblWatermarkFont.AutoSize = true;
+ this.lblWatermarkFont.Location = new System.Drawing.Point(168, 54);
this.lblWatermarkFont.Name = "lblWatermarkFont";
+ this.lblWatermarkFont.Size = new System.Drawing.Size(83, 13);
+ this.lblWatermarkFont.TabIndex = 3;
+ this.lblWatermarkFont.Text = "Font Information";
//
// btnWatermarkFont
//
- resources.ApplyResources(this.btnWatermarkFont, "btnWatermarkFont");
+ this.btnWatermarkFont.Location = new System.Drawing.Point(16, 48);
this.btnWatermarkFont.Name = "btnWatermarkFont";
+ this.btnWatermarkFont.Size = new System.Drawing.Size(144, 24);
+ this.btnWatermarkFont.TabIndex = 2;
+ this.btnWatermarkFont.Text = "Text font...";
+ this.btnWatermarkFont.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnWatermarkFont.UseVisualStyleBackColor = true;
this.btnWatermarkFont.Click += new System.EventHandler(this.btnWatermarkFont_Click);
//
// txtWatermarkText
//
- resources.ApplyResources(this.txtWatermarkText, "txtWatermarkText");
+ this.txtWatermarkText.Location = new System.Drawing.Point(56, 20);
this.txtWatermarkText.Name = "txtWatermarkText";
+ this.txtWatermarkText.Size = new System.Drawing.Size(384, 20);
+ this.txtWatermarkText.TabIndex = 1;
this.txtWatermarkText.TextChanged += new System.EventHandler(this.txtWatermarkText_TextChanged);
//
// btwWatermarkBrowseImage
//
- resources.ApplyResources(this.btwWatermarkBrowseImage, "btwWatermarkBrowseImage");
+ this.btwWatermarkBrowseImage.Location = new System.Drawing.Point(376, 22);
this.btwWatermarkBrowseImage.Name = "btwWatermarkBrowseImage";
+ this.btwWatermarkBrowseImage.Size = new System.Drawing.Size(64, 24);
+ this.btwWatermarkBrowseImage.TabIndex = 2;
this.btwWatermarkBrowseImage.Tag = "Browse for a Watermark Image";
+ this.btwWatermarkBrowseImage.Text = "Browse...";
this.btwWatermarkBrowseImage.UseVisualStyleBackColor = true;
this.btwWatermarkBrowseImage.Click += new System.EventHandler(this.btwWatermarkBrowseImage_Click);
//
// txtWatermarkImageLocation
//
- resources.ApplyResources(this.txtWatermarkImageLocation, "txtWatermarkImageLocation");
+ this.txtWatermarkImageLocation.Location = new System.Drawing.Point(64, 24);
this.txtWatermarkImageLocation.Name = "txtWatermarkImageLocation";
+ this.txtWatermarkImageLocation.Size = new System.Drawing.Size(304, 20);
+ this.txtWatermarkImageLocation.TabIndex = 1;
this.txtWatermarkImageLocation.TextChanged += new System.EventHandler(this.txtWatermarkImageLocation_TextChanged);
//
// gbImageWatermark
@@ -265,33 +353,47 @@ private void InitializeComponent()
this.gbImageWatermark.Controls.Add(this.lblImageLocation);
this.gbImageWatermark.Controls.Add(this.txtWatermarkImageLocation);
this.gbImageWatermark.Controls.Add(this.btwWatermarkBrowseImage);
- resources.ApplyResources(this.gbImageWatermark, "gbImageWatermark");
+ this.gbImageWatermark.Location = new System.Drawing.Point(304, 344);
this.gbImageWatermark.Name = "gbImageWatermark";
+ this.gbImageWatermark.Size = new System.Drawing.Size(448, 56);
+ this.gbImageWatermark.TabIndex = 10;
this.gbImageWatermark.TabStop = false;
+ this.gbImageWatermark.Text = "Image settings";
//
// lblImageLocation
//
- resources.ApplyResources(this.lblImageLocation, "lblImageLocation");
+ this.lblImageLocation.AutoSize = true;
+ this.lblImageLocation.Location = new System.Drawing.Point(16, 28);
this.lblImageLocation.Name = "lblImageLocation";
+ this.lblImageLocation.Size = new System.Drawing.Size(39, 13);
+ this.lblImageLocation.TabIndex = 0;
+ this.lblImageLocation.Text = "Image:";
//
// pbPreview
//
this.pbPreview.BackColor = System.Drawing.Color.White;
this.pbPreview.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.pbPreview.DrawCheckeredBackground = true;
- resources.ApplyResources(this.pbPreview, "pbPreview");
+ this.pbPreview.Location = new System.Drawing.Point(8, 160);
this.pbPreview.Name = "pbPreview";
+ this.pbPreview.Size = new System.Drawing.Size(288, 240);
+ this.pbPreview.TabIndex = 12;
//
// lblPreview
//
- resources.ApplyResources(this.lblPreview, "lblPreview");
+ this.lblPreview.AutoSize = true;
+ this.lblPreview.Location = new System.Drawing.Point(8, 144);
this.lblPreview.Name = "lblPreview";
+ this.lblPreview.Size = new System.Drawing.Size(102, 13);
+ this.lblPreview.TabIndex = 11;
+ this.lblPreview.Text = "Watermark preview:";
//
// WatermarkForm
//
- resources.ApplyResources(this, "$this");
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.White;
+ this.ClientSize = new System.Drawing.Size(761, 409);
this.Controls.Add(this.lblPreview);
this.Controls.Add(this.lblWatermarkOffsetPixel);
this.Controls.Add(this.gbImageWatermark);
@@ -308,6 +410,8 @@ private void InitializeComponent()
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.MaximizeBox = false;
this.Name = "WatermarkForm";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ this.Text = "ShareX - Watermark settings";
this.Load += new System.EventHandler(this.WatermarkUI_Load);
this.Resize += new System.EventHandler(this.WatermarkUI_Resize);
((System.ComponentModel.ISupportInitialize)(this.nudWatermarkOffset)).EndInit();
diff --git a/ImageEffectsLib/WatermarkForm.resx b/ImageEffectsLib/WatermarkForm.resx
deleted file mode 100644
index af801b1b0..000000000
--- a/ImageEffectsLib/WatermarkForm.resx
+++ /dev/null
@@ -1,900 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
-
- True
-
-
-
- 152, 80
-
-
- 18, 13
-
-
- 6
-
-
- px
- @Invariant
-
- lblWatermarkOffsetPixel
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 1
-
-
- 88, 12
-
-
- 120, 21
-
-
- 1
-
-
- cboWatermarkType
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 3
-
-
- True
-
-
- 17, 112
-
-
- 260, 17
-
-
- 7
-
-
- Hide watermark if image is smaller than watermark
-
-
- cbWatermarkAutoHide
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 5
-
-
- True
-
-
- 16, 16
-
-
- 34, 13
-
-
- 0
-
-
- Type:
-
-
- lblWatermarkType
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 7
-
-
- 88, 44
-
-
- 120, 21
-
-
- 3
-
-
- chkWatermarkPosition
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 8
-
-
- True
-
-
- 16, 48
-
-
- 60, 13
-
-
- 2
-
-
- Placement:
-
-
- lblWatermarkPosition
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 10
-
-
- 88, 76
-
-
- 56, 20
-
-
- 5
-
-
-
- Center
-
-
- nudWatermarkOffset
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 12
-
-
- True
-
-
- 16, 80
-
-
- 38, 13
-
-
- 4
-
-
- Offset:
-
-
- lblWatermarkOffset
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 11
-
-
- 16, 176
-
-
- 144, 23
-
-
- 8
-
-
- Background color 2...
-
-
- MiddleLeft
-
-
- btnBackgroundColor2
-
-
- HelpersLib.ColorButton, HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-
-
- gbWatermarkBackground
-
-
- 0
-
-
- 16, 112
-
-
- 144, 23
-
-
- 5
-
-
- Background color...
-
-
- MiddleLeft
-
-
- btnBackgroundColor
-
-
- HelpersLib.ColorButton, HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-
-
- gbWatermarkBackground
-
-
- 1
-
-
- 16, 50
-
-
- 144, 23
-
-
- 1
-
-
- Border color...
-
-
- MiddleLeft
-
-
- btnBorderColor
-
-
- HelpersLib.ColorButton, HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-
-
- gbWatermarkBackground
-
-
- 2
-
-
- True
-
-
- 19, 149
-
-
- 92, 17
-
-
- 6
-
-
- Gradient type:
-
-
- cbWatermarkUseGradient
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbWatermarkBackground
-
-
- 3
-
-
- True
-
-
- 19, 24
-
-
- 111, 17
-
-
- 0
-
-
- Draw background
-
-
- cbWatermarkDrawBackground
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbWatermarkBackground
-
-
- 4
-
-
- True
-
-
- 16, 88
-
-
- 123, 13
-
-
- 2
-
-
- Rectangle corner radius:
-
-
- lblRectangleCornerRadius
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbWatermarkBackground
-
-
- 5
-
-
- 144, 84
-
-
- 48, 20
-
-
- 3
-
-
- Center
-
-
- nudWatermarkCornerRadius
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbWatermarkBackground
-
-
- 6
-
-
- True
-
-
- 200, 88
-
-
- 105, 13
-
-
- 4
-
-
- 0 = Normal rectangle
-
-
- lblWatermarkCornerRadiusTip
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbWatermarkBackground
-
-
- 7
-
-
- 120, 147
-
-
- 121, 21
-
-
- 7
-
-
- cbWatermarkGradientType
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbWatermarkBackground
-
-
- 8
-
-
- 304, 126
-
-
- 448, 210
-
-
- 9
-
-
- Text background settings
-
-
- gbWatermarkBackground
-
-
- System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 6
-
-
- 16, 80
-
-
- 144, 23
-
-
- 4
-
-
- Text color...
-
-
- MiddleLeft
-
-
- btnTextColor
-
-
- HelpersLib.ColorButton, HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-
-
- gbWatermarkText
-
-
- 0
-
-
- True
-
-
- 16, 24
-
-
- 31, 13
-
-
- 0
-
-
- Text:
-
-
- lblWatermarkText
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbWatermarkText
-
-
- 1
-
-
- True
-
-
- 168, 54
-
-
- 83, 13
-
-
- 3
-
-
- Font Information
-
-
- lblWatermarkFont
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbWatermarkText
-
-
- 2
-
-
- 16, 48
-
-
- 144, 24
-
-
- 2
-
-
- Text font...
-
-
- MiddleLeft
-
-
- btnWatermarkFont
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbWatermarkText
-
-
- 3
-
-
- 56, 20
-
-
- 384, 20
-
-
- 1
-
-
- txtWatermarkText
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbWatermarkText
-
-
- 4
-
-
- 304, 8
-
-
- 448, 112
-
-
- 8
-
-
- Text settings
-
-
- gbWatermarkText
-
-
- System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 9
-
-
- 376, 22
-
-
- 64, 24
-
-
- 2
-
-
- Browse...
-
-
- btwWatermarkBrowseImage
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbImageWatermark
-
-
- 2
-
-
- 64, 24
-
-
- 304, 20
-
-
- 1
-
-
- txtWatermarkImageLocation
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbImageWatermark
-
-
- 1
-
-
- True
-
-
- 16, 28
-
-
- 39, 13
-
-
- 0
-
-
- Image:
-
-
- lblImageLocation
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- gbImageWatermark
-
-
- 0
-
-
- 304, 344
-
-
- 448, 56
-
-
- 10
-
-
- Image settings
-
-
- gbImageWatermark
-
-
- System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 2
-
-
- 8, 160
-
-
- 288, 240
-
-
- 12
-
-
- pbPreview
-
-
- HelpersLib.MyPictureBox, HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-
-
- $this
-
-
- 4
-
-
- True
-
-
- 8, 144
-
-
- 102, 13
-
-
- 11
-
-
- Watermark preview:
-
-
- lblPreview
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 0
-
-
- True
-
-
- 6, 13
-
-
- 761, 409
-
-
- CenterScreen
-
-
- ShareX - Watermark settings
-
-
- WatermarkForm
-
-
- System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/ImageEffectsLib/WatermarkForm.tr.resx b/ImageEffectsLib/WatermarkForm.tr.resx
deleted file mode 100644
index f20e592a8..000000000
--- a/ImageEffectsLib/WatermarkForm.tr.resx
+++ /dev/null
@@ -1,186 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- ShareX - Filigran ayarları
-
-
- Arkaplan rengi...
-
-
- Arkaplan rengi 2...
-
-
- Kenar rengi...
-
-
- Yazı rengi...
-
-
- Yazı tipi...
-
-
- Gözat...
-
-
- Resim ayarları
-
-
- Yazı arkaplan ayarları
-
-
- Yazı ayarları
-
-
- Resim:
-
-
- Filigran ön izleme:
-
-
- Konum:
-
-
- Yazı:
-
-
- Tür:
-
-
- Renk geçişi türü:
-
-
- Arkaplan çiz
-
-
- Yazı tipi bilgisi
-
-
- Dikdörtgen köşe yuvarlama:
-
-
- Resim filigrandan küçükse filigranı gizle
-
-
- 0 = Normal dikdörtgen
-
-
- Çıkıntı:
-
-
\ No newline at end of file
diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs
index 80b1e8d5f..2ff29d557 100644
--- a/ShareX/Forms/MainForm.Designer.cs
+++ b/ShareX/Forms/MainForm.Designer.cs
@@ -107,7 +107,6 @@ private void InitializeComponent()
this.tsmiTestFileUpload = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTestURLShortener = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTestURLSharing = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiTestUploaders = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiDonate = new System.Windows.Forms.ToolStripButton();
this.tsmiAbout = new System.Windows.Forms.ToolStripButton();
this.cmsTaskInfo = new System.Windows.Forms.ContextMenuStrip(this.components);
@@ -793,8 +792,7 @@ private void InitializeComponent()
this.tsmiTestTextUpload,
this.tsmiTestFileUpload,
this.tsmiTestURLShortener,
- this.tsmiTestURLSharing,
- this.tsmiTestUploaders});
+ this.tsmiTestURLSharing});
this.tsddbDebug.Image = global::ShareX.Properties.Resources.traffic_cone;
resources.ApplyResources(this.tsddbDebug, "tsddbDebug");
this.tsddbDebug.Name = "tsddbDebug";
@@ -841,13 +839,6 @@ private void InitializeComponent()
resources.ApplyResources(this.tsmiTestURLSharing, "tsmiTestURLSharing");
this.tsmiTestURLSharing.Click += new System.EventHandler(this.tsmiTestURLSharing_Click);
//
- // tsmiTestUploaders
- //
- this.tsmiTestUploaders.Image = global::ShareX.Properties.Resources.application_browser;
- this.tsmiTestUploaders.Name = "tsmiTestUploaders";
- resources.ApplyResources(this.tsmiTestUploaders, "tsmiTestUploaders");
- this.tsmiTestUploaders.Click += new System.EventHandler(this.tsmiTestUploaders_Click);
- //
// tsmiDonate
//
this.tsmiDonate.Image = global::ShareX.Properties.Resources.heart;
@@ -1858,7 +1849,6 @@ private void InitializeComponent()
private System.Windows.Forms.ToolStripMenuItem tsmiTestTextUpload;
private System.Windows.Forms.ToolStripMenuItem tsmiTestFileUpload;
private System.Windows.Forms.ToolStripMenuItem tsmiTestURLShortener;
- private System.Windows.Forms.ToolStripMenuItem tsmiTestUploaders;
private System.Windows.Forms.ToolStripSeparator tssCopy5;
private System.Windows.Forms.ToolStripMenuItem tsmiShowDebugLog;
private System.Windows.Forms.ToolStripButton tsbApplicationSettings;
diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs
index 0658e26ba..66c940d9d 100644
--- a/ShareX/Forms/MainForm.cs
+++ b/ShareX/Forms/MainForm.cs
@@ -930,14 +930,6 @@ private void tsmiTestURLSharing_Click(object sender, EventArgs e)
UploadManager.ShareURL(Links.URL_WEBSITE);
}
- private void tsmiTestUploaders_Click(object sender, EventArgs e)
- {
- using (UploadTestForm form = new UploadTestForm())
- {
- form.ShowDialog();
- }
- }
-
private void tsmiScreenRecordingFFmpeg_Click(object sender, EventArgs e)
{
TaskHelpers.DoScreenRecordingFFmpeg();
diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx
index f8d771d43..9262b226b 100644
--- a/ShareX/Forms/MainForm.resx
+++ b/ShareX/Forms/MainForm.resx
@@ -813,15 +813,6 @@
Test URL sharing
-
- 173, 22
-
-
- Test uploaders...
-
-
- False
-
MiddleLeft
@@ -1977,12 +1968,6 @@
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- tsmiTestUploaders
-
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
tsmiDonate
diff --git a/ShareX/Forms/MainForm.tr.resx b/ShareX/Forms/MainForm.tr.resx
index 27f5cb5ec..669fd5b0c 100644
--- a/ShareX/Forms/MainForm.tr.resx
+++ b/ShareX/Forms/MainForm.tr.resx
@@ -312,9 +312,6 @@
URL paylaşım testi
-
- Yükleyicileri test et...
-
Hata ayıklama
diff --git a/ShareX/Forms/UploadTestForm.Designer.cs b/ShareX/Forms/UploadTestForm.Designer.cs
deleted file mode 100644
index 24cdfe6a7..000000000
--- a/ShareX/Forms/UploadTestForm.Designer.cs
+++ /dev/null
@@ -1,229 +0,0 @@
-namespace ShareX
-{
- partial class UploadTestForm
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- this.components = new System.ComponentModel.Container();
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UploadTestForm));
- this.tscTesters = new System.Windows.Forms.ToolStripContainer();
- this.lvUploaders = new System.Windows.Forms.ListView();
- this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
- this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
- this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
- this.cmsUploaders = new System.Windows.Forms.ContextMenuStrip(this.components);
- this.testSelectedUploadersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.openURLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStrip1 = new System.Windows.Forms.ToolStrip();
- this.btnTestSelected = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
- this.btnTestAll = new System.Windows.Forms.ToolStripButton();
- this.tcTesters = new System.Windows.Forms.TabControl();
- this.tpTestUploaders = new System.Windows.Forms.TabPage();
- this.tpConsole = new System.Windows.Forms.TabPage();
- this.txtConsole = new System.Windows.Forms.TextBox();
- this.tscTesters.ContentPanel.SuspendLayout();
- this.tscTesters.TopToolStripPanel.SuspendLayout();
- this.tscTesters.SuspendLayout();
- this.cmsUploaders.SuspendLayout();
- this.toolStrip1.SuspendLayout();
- this.tcTesters.SuspendLayout();
- this.tpTestUploaders.SuspendLayout();
- this.tpConsole.SuspendLayout();
- this.SuspendLayout();
- //
- // tscTesters
- //
- //
- // tscTesters.ContentPanel
- //
- this.tscTesters.ContentPanel.Controls.Add(this.lvUploaders);
- resources.ApplyResources(this.tscTesters.ContentPanel, "tscTesters.ContentPanel");
- resources.ApplyResources(this.tscTesters, "tscTesters");
- this.tscTesters.Name = "tscTesters";
- //
- // tscTesters.TopToolStripPanel
- //
- this.tscTesters.TopToolStripPanel.BackColor = System.Drawing.Color.White;
- this.tscTesters.TopToolStripPanel.Controls.Add(this.toolStrip1);
- //
- // lvUploaders
- //
- this.lvUploaders.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
- this.columnHeader1,
- this.columnHeader2,
- this.columnHeader3});
- this.lvUploaders.ContextMenuStrip = this.cmsUploaders;
- resources.ApplyResources(this.lvUploaders, "lvUploaders");
- this.lvUploaders.FullRowSelect = true;
- this.lvUploaders.GridLines = true;
- this.lvUploaders.Name = "lvUploaders";
- this.lvUploaders.UseCompatibleStateImageBehavior = false;
- this.lvUploaders.View = System.Windows.Forms.View.Details;
- //
- // columnHeader1
- //
- resources.ApplyResources(this.columnHeader1, "columnHeader1");
- //
- // columnHeader2
- //
- resources.ApplyResources(this.columnHeader2, "columnHeader2");
- //
- // columnHeader3
- //
- resources.ApplyResources(this.columnHeader3, "columnHeader3");
- //
- // cmsUploaders
- //
- this.cmsUploaders.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.testSelectedUploadersToolStripMenuItem,
- this.openURLToolStripMenuItem,
- this.copyToolStripMenuItem});
- this.cmsUploaders.Name = "cmsUploaders";
- resources.ApplyResources(this.cmsUploaders, "cmsUploaders");
- //
- // testSelectedUploadersToolStripMenuItem
- //
- this.testSelectedUploadersToolStripMenuItem.Name = "testSelectedUploadersToolStripMenuItem";
- resources.ApplyResources(this.testSelectedUploadersToolStripMenuItem, "testSelectedUploadersToolStripMenuItem");
- this.testSelectedUploadersToolStripMenuItem.Click += new System.EventHandler(this.btnTestSelected_Click);
- //
- // openURLToolStripMenuItem
- //
- this.openURLToolStripMenuItem.Name = "openURLToolStripMenuItem";
- resources.ApplyResources(this.openURLToolStripMenuItem, "openURLToolStripMenuItem");
- this.openURLToolStripMenuItem.Click += new System.EventHandler(this.openURLToolStripMenuItem_Click);
- //
- // copyToolStripMenuItem
- //
- this.copyToolStripMenuItem.Name = "copyToolStripMenuItem";
- resources.ApplyResources(this.copyToolStripMenuItem, "copyToolStripMenuItem");
- this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click);
- //
- // toolStrip1
- //
- this.toolStrip1.BackColor = System.Drawing.Color.White;
- resources.ApplyResources(this.toolStrip1, "toolStrip1");
- this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.btnTestSelected,
- this.toolStripSeparator1,
- this.btnTestAll});
- this.toolStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow;
- this.toolStrip1.Name = "toolStrip1";
- this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
- //
- // btnTestSelected
- //
- this.btnTestSelected.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
- resources.ApplyResources(this.btnTestSelected, "btnTestSelected");
- this.btnTestSelected.Name = "btnTestSelected";
- this.btnTestSelected.Click += new System.EventHandler(this.btnTestSelected_Click);
- //
- // toolStripSeparator1
- //
- this.toolStripSeparator1.Name = "toolStripSeparator1";
- resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1");
- //
- // btnTestAll
- //
- this.btnTestAll.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
- resources.ApplyResources(this.btnTestAll, "btnTestAll");
- this.btnTestAll.Name = "btnTestAll";
- this.btnTestAll.Click += new System.EventHandler(this.btnTestAll_Click);
- //
- // tcTesters
- //
- this.tcTesters.Controls.Add(this.tpTestUploaders);
- this.tcTesters.Controls.Add(this.tpConsole);
- resources.ApplyResources(this.tcTesters, "tcTesters");
- this.tcTesters.Name = "tcTesters";
- this.tcTesters.SelectedIndex = 0;
- //
- // tpTestUploaders
- //
- this.tpTestUploaders.Controls.Add(this.tscTesters);
- resources.ApplyResources(this.tpTestUploaders, "tpTestUploaders");
- this.tpTestUploaders.Name = "tpTestUploaders";
- this.tpTestUploaders.UseVisualStyleBackColor = true;
- //
- // tpConsole
- //
- this.tpConsole.Controls.Add(this.txtConsole);
- resources.ApplyResources(this.tpConsole, "tpConsole");
- this.tpConsole.Name = "tpConsole";
- this.tpConsole.UseVisualStyleBackColor = true;
- //
- // txtConsole
- //
- resources.ApplyResources(this.txtConsole, "txtConsole");
- this.txtConsole.Name = "txtConsole";
- //
- // UploadTestForm
- //
- resources.ApplyResources(this, "$this");
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Controls.Add(this.tcTesters);
- this.Name = "UploadTestForm";
- this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.TesterGUI_FormClosing);
- this.tscTesters.ContentPanel.ResumeLayout(false);
- this.tscTesters.TopToolStripPanel.ResumeLayout(false);
- this.tscTesters.TopToolStripPanel.PerformLayout();
- this.tscTesters.ResumeLayout(false);
- this.tscTesters.PerformLayout();
- this.cmsUploaders.ResumeLayout(false);
- this.toolStrip1.ResumeLayout(false);
- this.toolStrip1.PerformLayout();
- this.tcTesters.ResumeLayout(false);
- this.tpTestUploaders.ResumeLayout(false);
- this.tpConsole.ResumeLayout(false);
- this.tpConsole.PerformLayout();
- this.ResumeLayout(false);
-
- }
-
- #endregion Windows Form Designer generated code
-
- private System.Windows.Forms.ListView lvUploaders;
- private System.Windows.Forms.ColumnHeader columnHeader1;
- private System.Windows.Forms.ColumnHeader columnHeader2;
- private System.Windows.Forms.TabControl tcTesters;
- private System.Windows.Forms.TabPage tpTestUploaders;
- private System.Windows.Forms.TabPage tpConsole;
- private System.Windows.Forms.ContextMenuStrip cmsUploaders;
- private System.Windows.Forms.ToolStripMenuItem openURLToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem copyToolStripMenuItem;
- private System.Windows.Forms.TextBox txtConsole;
- private System.Windows.Forms.ToolStripMenuItem testSelectedUploadersToolStripMenuItem;
- private System.Windows.Forms.ToolStripContainer tscTesters;
- private System.Windows.Forms.ToolStrip toolStrip1;
- private System.Windows.Forms.ToolStripButton btnTestAll;
- private System.Windows.Forms.ToolStripButton btnTestSelected;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
- private System.Windows.Forms.ColumnHeader columnHeader3;
- }
-}
\ No newline at end of file
diff --git a/ShareX/Forms/UploadTestForm.cs b/ShareX/Forms/UploadTestForm.cs
deleted file mode 100644
index 427eaa65a..000000000
--- a/ShareX/Forms/UploadTestForm.cs
+++ /dev/null
@@ -1,351 +0,0 @@
-#region License Information (GPL v3)
-
-/*
- ShareX - A program that allows you to take screenshots and share any file type
- Copyright (C) 2007-2014 ShareX Developers
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- Optionally you can also view the license at .
-*/
-
-#endregion License Information (GPL v3)
-
-using HelpersLib;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Drawing;
-using System.Linq;
-using System.Windows.Forms;
-using UploadersLib;
-
-namespace ShareX
-{
- public partial class UploadTestForm : Form
- {
- public enum UploadStatus
- {
- Uploading,
- Uploaded
- }
-
- private bool isTesting;
-
- public bool Testing
- {
- get
- {
- return isTesting;
- }
- set
- {
- isTesting = value;
- btnTestAll.Enabled = !value;
- btnTestSelected.Enabled = !value;
- testSelectedUploadersToolStripMenuItem.Enabled = !value;
- }
- }
-
- public Image TestImage { get; set; }
- public string TestText { get; set; }
- public string TestURL { get; set; }
-
- public UploadTestForm()
- {
- InitializeComponent();
- Icon = ShareXResources.Icon;
-
- if (TestImage == null)
- {
- TestImage = ShareXResources.Logo;
- }
-
- if (string.IsNullOrEmpty(TestText))
- {
- TestText = "ShareX text upload test";
- }
-
- if (string.IsNullOrEmpty(TestURL))
- {
- TestURL = Links.URL_WEBSITE;
- }
-
- ListViewItem lvi;
-
- ListViewGroup imageUploadersGroup = new ListViewGroup("Image Uploaders", HorizontalAlignment.Left);
- ListViewGroup textUploadersGroup = new ListViewGroup("Text Uploaders", HorizontalAlignment.Left);
- ListViewGroup fileUploadersGroup = new ListViewGroup("File Uploaders", HorizontalAlignment.Left);
- ListViewGroup urlShortenersGroup = new ListViewGroup("URL Shorteners", HorizontalAlignment.Left);
- lvUploaders.Groups.AddRange(new[] { imageUploadersGroup, textUploadersGroup, fileUploadersGroup, urlShortenersGroup });
-
- foreach (ImageDestination uploader in Helpers.GetEnums())
- {
- switch (uploader)
- {
- case ImageDestination.FileUploader: // We are going to test this in File Uploader tests
- continue;
- }
-
- lvi = new ListViewItem(uploader.GetDescription());
-
- TaskSettings defaultTaskSettings = TaskSettings.GetDefaultTaskSettings();
- UploadTask task = UploadTask.CreateImageUploaderTask((Image)TestImage.Clone(), defaultTaskSettings);
- task.Info.TaskSettings.ImageDestination = uploader;
-
- lvi.Tag = task;
- lvi.Group = imageUploadersGroup;
- lvUploaders.Items.Add(lvi);
- }
-
- foreach (TextDestination uploader in Helpers.GetEnums())
- {
- switch (uploader)
- {
- case TextDestination.FileUploader:
- continue;
- }
-
- lvi = new ListViewItem(uploader.GetDescription());
-
- TaskSettings defaultTaskSettings = TaskSettings.GetDefaultTaskSettings();
- UploadTask task = UploadTask.CreateTextUploaderTask(TestText, defaultTaskSettings);
- task.Info.TaskSettings.TextDestination = uploader;
-
- lvi.Tag = task;
- lvi.Group = textUploadersGroup;
- lvUploaders.Items.Add(lvi);
- }
-
- foreach (FileDestination uploader in Helpers.GetEnums())
- {
- switch (uploader)
- {
- case FileDestination.CustomFileUploader:
- case FileDestination.SharedFolder:
- case FileDestination.Email:
- continue;
- }
-
- lvi = new ListViewItem(uploader.GetDescription());
-
- TaskSettings defaultTaskSettings = TaskSettings.GetDefaultTaskSettings();
- UploadTask task = UploadTask.CreateImageUploaderTask((Image)TestImage.Clone(), defaultTaskSettings);
- task.Info.TaskSettings.ImageDestination = ImageDestination.FileUploader;
- task.Info.TaskSettings.FileDestination = uploader;
-
- lvi.Tag = task;
- lvi.Group = fileUploadersGroup;
- lvUploaders.Items.Add(lvi);
- }
-
- foreach (UrlShortenerType uploader in Helpers.GetEnums())
- {
- lvi = new ListViewItem(uploader.GetDescription());
-
- TaskSettings defaultTaskSettings = TaskSettings.GetDefaultTaskSettings();
- UploadTask task = UploadTask.CreateURLShortenerTask(TestURL, defaultTaskSettings);
- task.Info.TaskSettings.URLShortenerDestination = uploader;
-
- lvi.Tag = task;
- lvi.Group = urlShortenersGroup;
- lvUploaders.Items.Add(lvi);
- }
-
- PrepareListItems();
- }
-
- private void PrepareListItems()
- {
- for (int i = 0; i < lvUploaders.Items.Count; i++)
- {
- ListViewItem lvi = lvUploaders.Items[i];
-
- while (lvi.SubItems.Count < 3)
- {
- lvi.SubItems.Add(string.Empty);
- }
-
- lvi.SubItems[1].Text = "Waiting";
- lvi.BackColor = Color.LightYellow;
- }
- }
-
- private void btnTestAll_Click(object sender, EventArgs e)
- {
- UploadTask[] uploaders = lvUploaders.Items.Cast().Select(x => x.Tag as UploadTask).ToArray();
- StartTest(uploaders);
- }
-
- private void btnTestSelected_Click(object sender, EventArgs e)
- {
- UploadTask[] uploaders = lvUploaders.SelectedItems.Cast().Select(x => x.Tag as UploadTask).ToArray();
- StartTest(uploaders);
- }
-
- private void ConsoleWriteLine(string value)
- {
- this.InvokeSafe(() => txtConsole.AppendText(value + "\r\n"));
- }
-
- private ListViewItem FindListViewItem(UploadTask task)
- {
- foreach (ListViewItem lvi in lvUploaders.Items)
- {
- UploadTask x = lvi.Tag as UploadTask;
- if (x != null && x == task) return lvi;
- }
-
- return null;
- }
-
- public void StartTest(UploadTask[] uploaders)
- {
- Testing = true;
-
- BackgroundWorker bw = new BackgroundWorker();
- bw.WorkerReportsProgress = true;
- bw.DoWork += bw_DoWork;
- bw.ProgressChanged += bw_ProgressChanged;
- bw.RunWorkerCompleted += (x, x2) =>
- {
- TaskManager.UpdateProgressUI();
- Testing = false;
- };
- bw.RunWorkerAsync(uploaders);
- }
-
- private void bw_DoWork(object sender, DoWorkEventArgs e)
- {
- BackgroundWorker bw = (BackgroundWorker)sender;
- UploadTask[] uploaders = (UploadTask[])e.Argument;
-
- foreach (UploadTask task in uploaders)
- {
- if (IsDisposed || !isTesting || task == null)
- {
- break;
- }
-
- bw.ReportProgress((int)UploadStatus.Uploading, task);
-
- try
- {
- task.StartSync();
- }
- catch (Exception ex)
- {
- ConsoleWriteLine(ex.ToString());
- }
- finally
- {
- bw.ReportProgress((int)UploadStatus.Uploaded, task);
- }
- }
- }
-
- private void bw_ProgressChanged(object sender, ProgressChangedEventArgs e)
- {
- if (!IsDisposed)
- {
- UploadTask task = e.UserState as UploadTask;
-
- if (task != null)
- {
- ListViewItem lvi = FindListViewItem(task);
-
- if (lvi != null)
- {
- switch ((UploadStatus)e.ProgressPercentage)
- {
- case UploadStatus.Uploading:
- lvi.BackColor = Color.Gold;
- lvi.SubItems[1].Text = "Uploading...";
- lvi.SubItems[2].Text = string.Empty;
- break;
- case UploadStatus.Uploaded:
- TaskInfo info = task.Info;
-
- if (info != null && info.Result != null)
- {
- if (!info.Result.IsError && !string.IsNullOrEmpty(info.Result.ToString()))
- {
- lvi.BackColor = Color.LightGreen;
- lvi.SubItems[1].Text = "Success: " + info.Result;
- }
- else
- {
- lvi.BackColor = Color.LightCoral;
- lvi.SubItems[1].Text = "Failed: " + info.Result.ErrorsToString();
- txtConsole.AppendText(info.Result.ErrorsToString());
- }
- }
-
- lvi.SubItems[2].Text = (int)info.UploadDuration.TotalMilliseconds + " ms";
- break;
- }
- }
- }
- }
- }
-
- private void openURLToolStripMenuItem_Click(object sender, EventArgs e)
- {
- if (lvUploaders.SelectedItems.Count > 0)
- {
- UploadTask task = lvUploaders.SelectedItems[0].Tag as UploadTask;
-
- if (task != null && task.Info != null && task.Info.Result != null && !string.IsNullOrEmpty(task.Info.Result.ToString()))
- {
- TaskEx.Run(() => Process.Start(task.Info.Result.ToString()));
- }
- }
- }
-
- private void copyToolStripMenuItem_Click(object sender, EventArgs e)
- {
- if (lvUploaders.SelectedItems.Count > 0)
- {
- List urls = new List();
-
- foreach (ListViewItem lvi in lvUploaders.SelectedItems)
- {
- UploadTask task = lvi.Tag as UploadTask;
-
- if (task != null && task.Info != null && task.Info.Result != null && !string.IsNullOrEmpty(task.Info.Result.ToString()))
- {
- urls.Add(string.Format("{0}: {1}", lvi.Text, task.Info.Result));
- }
- }
-
- if (urls.Count > 0)
- {
- ClipboardHelpers.CopyText(string.Join("\r\n", urls.ToArray()));
- }
- }
- }
-
- private void TesterGUI_FormClosing(object sender, FormClosingEventArgs e)
- {
- isTesting = false;
-
- if (TestImage != null)
- {
- TestImage.Dispose();
- }
- }
- }
-}
\ No newline at end of file
diff --git a/ShareX/Forms/UploadTestForm.resx b/ShareX/Forms/UploadTestForm.resx
deleted file mode 100644
index 6b1623051..000000000
--- a/ShareX/Forms/UploadTestForm.resx
+++ /dev/null
@@ -1,510 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tscTesters.BottomToolStripPanel
-
-
- System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tscTesters
-
-
- 4
-
-
- Name
-
-
-
- 180
-
-
- Status
-
-
- 333
-
-
- Time
-
-
- 86
-
-
- 122, 17
-
-
-
- 206, 22
-
-
- Test selected uploaders
-
-
- 206, 22
-
-
- Open URL
-
-
- 206, 22
-
-
- Copy URL(s) to clipboard
-
-
- 207, 70
-
-
- cmsUploaders
-
-
- System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
-
- Fill
-
-
- 0, 0
-
-
- 621, 608
-
-
- 0
-
-
- lvUploaders
-
-
- System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tscTesters.ContentPanel
-
-
- 0
-
-
- 621, 608
-
-
- tscTesters.ContentPanel
-
-
- System.Windows.Forms.ToolStripContentPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tscTesters
-
-
- 0
-
-
- Fill
-
-
- tscTesters.LeftToolStripPanel
-
-
- System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tscTesters
-
-
- 1
-
-
- 3, 3
-
-
- tscTesters.RightToolStripPanel
-
-
- System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tscTesters
-
-
- 2
-
-
- 621, 631
-
-
- 0
-
-
- 17, 17
-
-
- None
-
-
- Magenta
-
-
- 79, 19
-
-
- Test selected
-
-
- 6, 23
-
-
- Magenta
-
-
- 48, 19
-
-
- Test all
-
-
- 3, 0
-
-
- 134, 23
-
-
- 0
-
-
- toolStrip1
-
-
- System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tscTesters.TopToolStripPanel
-
-
- 0
-
-
- tscTesters.TopToolStripPanel
-
-
- System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tscTesters
-
-
- 3
-
-
- tscTesters
-
-
- System.Windows.Forms.ToolStripContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tpTestUploaders
-
-
- 0
-
-
- 4, 22
-
-
- 3, 3, 3, 3
-
-
- 627, 637
-
-
- 0
-
-
- Test uploaders
-
-
- tpTestUploaders
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tcTesters
-
-
- 0
-
-
- Fill
-
-
- 3, 3
-
-
- True
-
-
- 621, 631
-
-
- 0
-
-
- txtConsole
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tpConsole
-
-
- 0
-
-
- 4, 22
-
-
- 3, 3, 3, 3
-
-
- 627, 637
-
-
- 1
-
-
- Console
-
-
- tpConsole
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tcTesters
-
-
- 1
-
-
- Fill
-
-
- 3, 3
-
-
- 635, 663
-
-
- 0
-
-
- tcTesters
-
-
- System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 1
-
-
- True
-
-
- 6, 13
-
-
- 641, 669
-
-
- 3, 3, 3, 3
-
-
- ShareX - Test uploaders
-
-
- columnHeader1
-
-
- System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- columnHeader2
-
-
- System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- columnHeader3
-
-
- System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- testSelectedUploadersToolStripMenuItem
-
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- openURLToolStripMenuItem
-
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- copyToolStripMenuItem
-
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- btnTestSelected
-
-
- System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- toolStripSeparator1
-
-
- System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- btnTestAll
-
-
- System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- UploadTestForm
-
-
- System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/ShareX/Forms/UploadTestForm.tr.resx b/ShareX/Forms/UploadTestForm.tr.resx
deleted file mode 100644
index b1d788750..000000000
--- a/ShareX/Forms/UploadTestForm.tr.resx
+++ /dev/null
@@ -1,153 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- Ad
-
-
- Durum
-
-
- Zaman
-
-
- Seçili yükleyicileri test et
-
-
- URL aç
-
-
- URL'leri panoya kopyala
-
-
- Seçili olanları test et
-
-
- Hepsini test et
-
-
- Yükleyicileri test et
-
-
- Konsol
-
-
- ShareX - Yükleyicileri test et
-
-
\ No newline at end of file
diff --git a/ShareX/ShareX.csproj b/ShareX/ShareX.csproj
index 29454ee95..7a5d582a2 100644
--- a/ShareX/ShareX.csproj
+++ b/ShareX/ShareX.csproj
@@ -166,12 +166,6 @@
Form
-
- Form
-
-
- UploadTestForm.cs
-
Form
@@ -335,12 +329,6 @@
TaskSettingsForm.cs
-
- UploadTestForm.cs
-
-
- UploadTestForm.cs
-
VideoEncodersForm.cs
diff --git a/UploadersLib/Controls/OAuthControl.resx b/UploadersLib/Controls/OAuthControl.resx
index 2cd6c79a2..c29220aec 100644
--- a/UploadersLib/Controls/OAuthControl.resx
+++ b/UploadersLib/Controls/OAuthControl.resx
@@ -201,7 +201,7 @@
True
- 16, 56
+ 13, 56
292, 13
@@ -276,7 +276,7 @@
True
- 16, 136
+ 13, 136
37, 13
diff --git a/UploadersLib/Forms/EmailForm.resx b/UploadersLib/Forms/EmailForm.resx
index ea1d2a074..c2b82a614 100644
--- a/UploadersLib/Forms/EmailForm.resx
+++ b/UploadersLib/Forms/EmailForm.resx
@@ -123,7 +123,7 @@
- 16, 16
+ 11, 16
51, 13
@@ -175,7 +175,7 @@
True
- 16, 40
+ 11, 40
46, 13
@@ -226,7 +226,7 @@
True
- 16, 64
+ 11, 64
53, 13
diff --git a/UploadersLib/Forms/GoogleTranslateGUI.Designer.cs b/UploadersLib/Forms/GoogleTranslateGUI.Designer.cs
deleted file mode 100644
index cc140e48f..000000000
--- a/UploadersLib/Forms/GoogleTranslateGUI.Designer.cs
+++ /dev/null
@@ -1,240 +0,0 @@
-namespace UploadersLib
-{
- partial class GoogleTranslateGUI
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- this.cbLanguageAutoDetect = new System.Windows.Forms.CheckBox();
- this.txtAutoTranslate = new System.Windows.Forms.TextBox();
- this.cbAutoTranslate = new System.Windows.Forms.CheckBox();
- this.btnTranslateTo = new System.Windows.Forms.Button();
- this.txtTranslateResult = new System.Windows.Forms.TextBox();
- this.txtLanguages = new System.Windows.Forms.TextBox();
- this.btnTranslate = new System.Windows.Forms.Button();
- this.txtTranslateText = new System.Windows.Forms.TextBox();
- this.lblToLanguage = new System.Windows.Forms.Label();
- this.lblFromLanguage = new System.Windows.Forms.Label();
- this.cbToLanguage = new System.Windows.Forms.ComboBox();
- this.cbFromLanguage = new System.Windows.Forms.ComboBox();
- this.txtGoogleApiKey = new System.Windows.Forms.TextBox();
- this.label1 = new System.Windows.Forms.Label();
- this.SuspendLayout();
- //
- // cbLanguageAutoDetect
- //
- this.cbLanguageAutoDetect.AutoSize = true;
- this.cbLanguageAutoDetect.Location = new System.Drawing.Point(224, 18);
- this.cbLanguageAutoDetect.Name = "cbLanguageAutoDetect";
- this.cbLanguageAutoDetect.Size = new System.Drawing.Size(128, 17);
- this.cbLanguageAutoDetect.TabIndex = 2;
- this.cbLanguageAutoDetect.Text = "Auto detect language";
- this.cbLanguageAutoDetect.UseVisualStyleBackColor = true;
- this.cbLanguageAutoDetect.CheckedChanged += new System.EventHandler(this.cbLanguageAutoDetect_CheckedChanged);
- //
- // txtAutoTranslate
- //
- this.txtAutoTranslate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.txtAutoTranslate.Location = new System.Drawing.Point(440, 248);
- this.txtAutoTranslate.Name = "txtAutoTranslate";
- this.txtAutoTranslate.Size = new System.Drawing.Size(56, 20);
- this.txtAutoTranslate.TabIndex = 11;
- this.txtAutoTranslate.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.txtAutoTranslate.TextChanged += new System.EventHandler(this.txtAutoTranslate_TextChanged);
- //
- // cbAutoTranslate
- //
- this.cbAutoTranslate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.cbAutoTranslate.AutoSize = true;
- this.cbAutoTranslate.Location = new System.Drawing.Point(24, 248);
- this.cbAutoTranslate.Name = "cbAutoTranslate";
- this.cbAutoTranslate.Size = new System.Drawing.Size(416, 17);
- this.cbAutoTranslate.TabIndex = 10;
- this.cbAutoTranslate.Text = "Automatically translate text instead of uploading text if the text length is smal" +
- "ler than";
- this.cbAutoTranslate.UseVisualStyleBackColor = true;
- this.cbAutoTranslate.CheckedChanged += new System.EventHandler(this.cbAutoTranslate_CheckedChanged);
- //
- // btnTranslateTo
- //
- this.btnTranslateTo.AllowDrop = true;
- this.btnTranslateTo.Location = new System.Drawing.Point(216, 208);
- this.btnTranslateTo.Name = "btnTranslateTo";
- this.btnTranslateTo.Size = new System.Drawing.Size(136, 24);
- this.btnTranslateTo.TabIndex = 7;
- this.btnTranslateTo.Text = "???";
- this.btnTranslateTo.UseVisualStyleBackColor = true;
- this.btnTranslateTo.Click += new System.EventHandler(this.btnTranslateTo_Click);
- this.btnTranslateTo.DragDrop += new System.Windows.Forms.DragEventHandler(this.btnTranslateTo1_DragDrop);
- this.btnTranslateTo.DragEnter += new System.Windows.Forms.DragEventHandler(this.btnTranslateTo_DragEnter);
- //
- // txtTranslateResult
- //
- this.txtTranslateResult.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)));
- this.txtTranslateResult.Location = new System.Drawing.Point(360, 104);
- this.txtTranslateResult.Multiline = true;
- this.txtTranslateResult.Name = "txtTranslateResult";
- this.txtTranslateResult.ReadOnly = true;
- this.txtTranslateResult.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
- this.txtTranslateResult.Size = new System.Drawing.Size(336, 114);
- this.txtTranslateResult.TabIndex = 9;
- //
- // txtLanguages
- //
- this.txtLanguages.Location = new System.Drawing.Point(360, 80);
- this.txtLanguages.Name = "txtLanguages";
- this.txtLanguages.ReadOnly = true;
- this.txtLanguages.Size = new System.Drawing.Size(336, 20);
- this.txtLanguages.TabIndex = 8;
- //
- // btnTranslate
- //
- this.btnTranslate.Location = new System.Drawing.Point(16, 208);
- this.btnTranslate.Name = "btnTranslate";
- this.btnTranslate.Size = new System.Drawing.Size(192, 24);
- this.btnTranslate.TabIndex = 6;
- this.btnTranslate.Text = "Translate ( Ctrl + Enter )";
- this.btnTranslate.UseVisualStyleBackColor = true;
- this.btnTranslate.Click += new System.EventHandler(this.btnTranslate_Click);
- //
- // txtTranslateText
- //
- this.txtTranslateText.Location = new System.Drawing.Point(16, 80);
- this.txtTranslateText.Multiline = true;
- this.txtTranslateText.Name = "txtTranslateText";
- this.txtTranslateText.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
- this.txtTranslateText.Size = new System.Drawing.Size(336, 120);
- this.txtTranslateText.TabIndex = 5;
- this.txtTranslateText.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtTranslateText_KeyDown);
- //
- // lblToLanguage
- //
- this.lblToLanguage.Cursor = System.Windows.Forms.Cursors.SizeAll;
- this.lblToLanguage.Location = new System.Drawing.Point(16, 40);
- this.lblToLanguage.Name = "lblToLanguage";
- this.lblToLanguage.Size = new System.Drawing.Size(48, 32);
- this.lblToLanguage.TabIndex = 3;
- this.lblToLanguage.Text = "Target:";
- this.lblToLanguage.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- this.lblToLanguage.MouseDown += new System.Windows.Forms.MouseEventHandler(this.lblToLanguage_MouseDown);
- //
- // lblFromLanguage
- //
- this.lblFromLanguage.Location = new System.Drawing.Point(16, 10);
- this.lblFromLanguage.Name = "lblFromLanguage";
- this.lblFromLanguage.Size = new System.Drawing.Size(48, 32);
- this.lblFromLanguage.TabIndex = 0;
- this.lblFromLanguage.Text = "Source:";
- this.lblFromLanguage.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- //
- // cbToLanguage
- //
- this.cbToLanguage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cbToLanguage.Enabled = false;
- this.cbToLanguage.FormattingEnabled = true;
- this.cbToLanguage.Location = new System.Drawing.Point(72, 48);
- this.cbToLanguage.MaxDropDownItems = 20;
- this.cbToLanguage.Name = "cbToLanguage";
- this.cbToLanguage.Size = new System.Drawing.Size(144, 21);
- this.cbToLanguage.TabIndex = 4;
- this.cbToLanguage.SelectedIndexChanged += new System.EventHandler(this.cbToLanguage_SelectedIndexChanged);
- //
- // cbFromLanguage
- //
- this.cbFromLanguage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cbFromLanguage.Enabled = false;
- this.cbFromLanguage.FormattingEnabled = true;
- this.cbFromLanguage.Location = new System.Drawing.Point(72, 16);
- this.cbFromLanguage.MaxDropDownItems = 20;
- this.cbFromLanguage.Name = "cbFromLanguage";
- this.cbFromLanguage.Size = new System.Drawing.Size(144, 21);
- this.cbFromLanguage.TabIndex = 1;
- this.cbFromLanguage.SelectedIndexChanged += new System.EventHandler(this.cbFromLanguage_SelectedIndexChanged);
- //
- // txtGoogleApiKey
- //
- this.txtGoogleApiKey.Location = new System.Drawing.Point(112, 280);
- this.txtGoogleApiKey.Name = "txtGoogleApiKey";
- this.txtGoogleApiKey.Size = new System.Drawing.Size(384, 20);
- this.txtGoogleApiKey.TabIndex = 13;
- this.txtGoogleApiKey.TextChanged += new System.EventHandler(this.txtGoogleApiKey_TextChanged);
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(24, 280);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(82, 13);
- this.label1.TabIndex = 12;
- this.label1.Text = "Google API Key";
- //
- // GoogleTranslateGUI
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(713, 313);
- this.Controls.Add(this.label1);
- this.Controls.Add(this.txtGoogleApiKey);
- this.Controls.Add(this.cbLanguageAutoDetect);
- this.Controls.Add(this.txtAutoTranslate);
- this.Controls.Add(this.cbAutoTranslate);
- this.Controls.Add(this.btnTranslateTo);
- this.Controls.Add(this.txtTranslateResult);
- this.Controls.Add(this.txtLanguages);
- this.Controls.Add(this.btnTranslate);
- this.Controls.Add(this.txtTranslateText);
- this.Controls.Add(this.lblToLanguage);
- this.Controls.Add(this.lblFromLanguage);
- this.Controls.Add(this.cbToLanguage);
- this.Controls.Add(this.cbFromLanguage);
- this.Name = "GoogleTranslateGUI";
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
- this.Text = "Google Translate GUI";
- this.Load += new System.EventHandler(this.GoogleTranslateGUI_Load);
- this.ResumeLayout(false);
- this.PerformLayout();
-
- }
-
- #endregion
-
- private System.Windows.Forms.CheckBox cbLanguageAutoDetect;
- public System.Windows.Forms.TextBox txtAutoTranslate;
- public System.Windows.Forms.CheckBox cbAutoTranslate;
- public System.Windows.Forms.Button btnTranslateTo;
- public System.Windows.Forms.TextBox txtTranslateResult;
- public System.Windows.Forms.TextBox txtLanguages;
- public System.Windows.Forms.Button btnTranslate;
- public System.Windows.Forms.TextBox txtTranslateText;
- public System.Windows.Forms.Label lblToLanguage;
- public System.Windows.Forms.Label lblFromLanguage;
- public System.Windows.Forms.ComboBox cbToLanguage;
- public System.Windows.Forms.ComboBox cbFromLanguage;
- private System.Windows.Forms.TextBox txtGoogleApiKey;
- private System.Windows.Forms.Label label1;
- }
-}
\ No newline at end of file
diff --git a/UploadersLib/Forms/GoogleTranslateGUI.cs b/UploadersLib/Forms/GoogleTranslateGUI.cs
deleted file mode 100644
index 9e8845fa7..000000000
--- a/UploadersLib/Forms/GoogleTranslateGUI.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-#region License Information (GPL v3)
-
-/*
- ShareX - A program that allows you to take screenshots and share any file type
- Copyright (C) 2007-2014 ShareX Developers
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- Optionally you can also view the license at .
-*/
-
-#endregion License Information (GPL v3)
-
-using System;
-using System.Windows.Forms;
-
-namespace UploadersLib
-{
- public partial class GoogleTranslateGUI : Form
- {
- public GoogleTranslatorConfig Config { get; private set; }
-
- public GoogleTranslateGUI(GoogleTranslatorConfig config)
- {
- InitializeComponent();
- Config = config;
- }
-
- private void btnTranslate_Click(object sender, EventArgs e)
- {
- TranslateFromTextBox();
- }
-
- private void cbFromLanguage_SelectedIndexChanged(object sender, EventArgs e)
- {
- Config.GoogleSourceLanguage = Config.GoogleLanguages[cbFromLanguage.SelectedIndex].Language;
- }
-
- private void cbLanguageAutoDetect_CheckedChanged(object sender, EventArgs e)
- {
- Config.GoogleAutoDetectSource = cbLanguageAutoDetect.Checked;
- }
-
- private void cbToLanguage_SelectedIndexChanged(object sender, EventArgs e)
- {
- Config.GoogleTargetLanguage = Config.GoogleLanguages[cbToLanguage.SelectedIndex].Language;
- }
-
- private void cbAutoTranslate_CheckedChanged(object sender, EventArgs e)
- {
- Config.AutoTranslate = cbAutoTranslate.Checked;
- }
-
- private void txtTranslateText_KeyDown(object sender, KeyEventArgs e)
- {
- if (e.Control && e.KeyCode == Keys.Enter)
- {
- e.SuppressKeyPress = true;
- TranslateFromTextBox();
- }
- }
-
- private void lblToLanguage_MouseDown(object sender, MouseEventArgs e)
- {
- if (cbToLanguage.SelectedIndex > -1)
- {
- cbToLanguage.DoDragDrop(Config.GoogleTargetLanguage, DragDropEffects.Move);
- }
- }
-
- private void btnTranslateTo1_DragDrop(object sender, DragEventArgs e)
- {
- Config.GoogleTargetLanguage2 = e.Data.GetData(DataFormats.Text).ToString();
- btnTranslateTo.Text = "To " + GetLanguageName(Config.GoogleTargetLanguage2);
- }
-
- private void btnTranslateTo_Click(object sender, EventArgs e)
- {
- TranslateTo1();
- }
-
- private void btnTranslateTo_DragEnter(object sender, DragEventArgs e)
- {
- if (e.Data.GetDataPresent(DataFormats.Text) && e.AllowedEffect == DragDropEffects.Move)
- {
- e.Effect = DragDropEffects.Move;
- }
- }
-
- private void GoogleTranslateGUI_Load(object sender, EventArgs e)
- {
- LoadSettings(Config);
- }
-
- private void txtAutoTranslate_TextChanged(object sender, EventArgs e)
- {
- int number;
- if (int.TryParse(txtAutoTranslate.Text, out number))
- {
- Config.AutoTranslateLength = number;
- }
- }
-
- private void txtGoogleApiKey_TextChanged(object sender, EventArgs e)
- {
- Config.APIKey = txtGoogleApiKey.Text;
- }
- }
-}
\ No newline at end of file
diff --git a/UploadersLib/Forms/GoogleTranslateGUI.resx b/UploadersLib/Forms/GoogleTranslateGUI.resx
deleted file mode 100644
index 1af7de150..000000000
--- a/UploadersLib/Forms/GoogleTranslateGUI.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/UploadersLib/Forms/GoogleTranslateGUIHelper.cs b/UploadersLib/Forms/GoogleTranslateGUIHelper.cs
deleted file mode 100644
index af7874305..000000000
--- a/UploadersLib/Forms/GoogleTranslateGUIHelper.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-#region License Information (GPL v3)
-
-/*
- ShareX - A program that allows you to take screenshots and share any file type
- Copyright (C) 2007-2014 ShareX Developers
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- Optionally you can also view the license at .
-*/
-
-#endregion License Information (GPL v3)
-
-using HelpersLib;
-using System.Windows.Forms;
-using UploadersLib.OtherServices;
-
-namespace UploadersLib
-{
- public partial class GoogleTranslateGUI : Form
- {
- public void LoadSettings(GoogleTranslatorConfig config)
- {
- cbLanguageAutoDetect.Checked = config.GoogleAutoDetectSource;
- cbAutoTranslate.Checked = config.AutoTranslate;
- txtAutoTranslate.Text = config.AutoTranslateLength.ToString();
-
- if (Config.GoogleLanguages != null && Config.GoogleLanguages.Count > 0)
- {
- cbFromLanguage.Items.Clear();
- cbToLanguage.Items.Clear();
-
- foreach (GoogleLanguage lang in Config.GoogleLanguages)
- {
- cbFromLanguage.Items.Add(lang.Name);
- cbToLanguage.Items.Add(lang.Name);
- }
-
- SelectLanguage(Config.GoogleSourceLanguage, Config.GoogleTargetLanguage, Config.GoogleTargetLanguage2);
-
- if (cbFromLanguage.Items.Count > 0)
- {
- cbFromLanguage.Enabled = true;
- }
-
- if (cbToLanguage.Items.Count > 0)
- {
- cbToLanguage.Enabled = true;
- }
- }
- }
-
- public void TranslateFromTextBox()
- {
- if (!string.IsNullOrEmpty(txtTranslateText.Text))
- {
- TranslateAsync(new GoogleTranslateInfo
- {
- Text = txtTranslateText.Text,
- SourceLanguage = Config.GoogleAutoDetectSource ? null : Config.GoogleSourceLanguage,
- TargetLanguage = Config.GoogleTargetLanguage
- });
- }
- }
-
- public void TranslateTo1()
- {
- if (Config.GoogleTargetLanguage2 == "?")
- {
- lblToLanguage.BorderStyle = BorderStyle.FixedSingle;
- MessageBox.Show("Drag n drop 'To:' label to this button for be able to set button language.", Text,
- MessageBoxButtons.OK, MessageBoxIcon.Information);
- lblToLanguage.BorderStyle = BorderStyle.None;
- }
- else
- {
- TranslateFromTextBox();
- }
- }
-
- public void SelectLanguage(string sourceLanguage, string targetLanguage, string targetLanguage2)
- {
- for (int i = 0; i < Config.GoogleLanguages.Count; i++)
- {
- if (Config.GoogleLanguages[i].Language == sourceLanguage)
- {
- if (cbFromLanguage.Items.Count > i)
- {
- cbFromLanguage.SelectedIndex = i;
- }
-
- break;
- }
- }
-
- for (int i = 0; i < Config.GoogleLanguages.Count; i++)
- {
- if (Config.GoogleLanguages[i].Language == targetLanguage)
- {
- if (cbToLanguage.Items.Count > i)
- {
- cbToLanguage.SelectedIndex = i;
- }
-
- break;
- }
- }
-
- btnTranslateTo.Text = "To " + GetLanguageName(targetLanguage2);
- }
-
- public string GetLanguageName(string language)
- {
- foreach (GoogleLanguage gl in Config.GoogleLanguages)
- {
- if (gl.Language == language) return gl.Name;
- }
-
- return string.Empty;
- }
-
- public void TranslateAsync(GoogleTranslateInfo info)
- {
- btnTranslate.Enabled = false;
- btnTranslateTo.Enabled = false;
-
- TaskEx.Run(() =>
- {
- info = new GoogleTranslate(Config.APIKey).TranslateText(info);
- },
- () =>
- {
- UpdateGoogleTranslateGUI(info);
- });
- }
-
- private void UpdateGoogleTranslateGUI(GoogleTranslateInfo info)
- {
- btnTranslate.Enabled = true;
- btnTranslateTo.Enabled = true;
-
- txtTranslateText.Text = info.Text;
- txtLanguages.Text = info.SourceLanguage + " -> " + info.TargetLanguage;
- txtTranslateResult.Text = info.Result;
- }
- }
-}
\ No newline at end of file
diff --git a/UploadersLib/UploadersLib.csproj b/UploadersLib/UploadersLib.csproj
index ed17010bd..229d769bd 100644
--- a/UploadersLib/UploadersLib.csproj
+++ b/UploadersLib/UploadersLib.csproj
@@ -138,12 +138,6 @@
EmailForm.cs
-
- Form
-
-
- GoogleTranslateGUI.cs
-
Form
@@ -204,9 +198,6 @@
DropboxFilesForm.cs
-
- Form
-
@@ -336,9 +327,6 @@
EmailForm.cs
-
- GoogleTranslateGUI.cs
-
JiraUpload.cs