diff --git a/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.Designer.cs b/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.Designer.cs
index 75e0d8801..0701bce55 100644
--- a/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.Designer.cs
+++ b/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.Designer.cs
@@ -29,7 +29,6 @@ protected override void Dispose(bool disposing)
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CustomUploaderSettingsForm));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -38,8 +37,8 @@ private void InitializeComponent()
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CustomUploaderSettingsForm));
this.tscResponseText = new System.Windows.Forms.ToolStripContainer();
- this.txtResponseText = new System.Windows.Forms.TextBox();
this.tsResponseText = new System.Windows.Forms.ToolStrip();
this.tsbResponseTextJSONFormat = new System.Windows.Forms.ToolStripButton();
this.tsbResponseTextXMLFormat = new System.Windows.Forms.ToolStripButton();
@@ -121,6 +120,7 @@ private void InitializeComponent()
this.lblXPath = new System.Windows.Forms.Label();
this.txtXPath = new System.Windows.Forms.TextBox();
this.tpRegexParse = new System.Windows.Forms.TabPage();
+ this.lblRegex = new System.Windows.Forms.Label();
this.dgvRegex = new System.Windows.Forms.DataGridView();
this.cRegex = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.btnRegexAddSyntax = new System.Windows.Forms.Button();
@@ -139,7 +139,8 @@ private void InitializeComponent()
this.cbURLSharingService = new System.Windows.Forms.ComboBox();
this.btnURLSharingServiceTest = new System.Windows.Forms.Button();
this.ttHelpTip = new System.Windows.Forms.ToolTip(this.components);
- this.lblRegex = new System.Windows.Forms.Label();
+ this.pResponseText = new System.Windows.Forms.Panel();
+ this.rtbResponseText = new System.Windows.Forms.RichTextBox();
this.tscResponseText.ContentPanel.SuspendLayout();
this.tscResponseText.TopToolStripPanel.SuspendLayout();
this.tscResponseText.SuspendLayout();
@@ -169,6 +170,7 @@ private void InitializeComponent()
this.tpResult.SuspendLayout();
this.pResult.SuspendLayout();
this.tpResponseText.SuspendLayout();
+ this.pResponseText.SuspendLayout();
this.SuspendLayout();
//
// tscResponseText
@@ -176,7 +178,7 @@ private void InitializeComponent()
//
// tscResponseText.ContentPanel
//
- this.tscResponseText.ContentPanel.Controls.Add(this.txtResponseText);
+ this.tscResponseText.ContentPanel.Controls.Add(this.pResponseText);
resources.ApplyResources(this.tscResponseText.ContentPanel, "tscResponseText.ContentPanel");
resources.ApplyResources(this.tscResponseText, "tscResponseText");
this.tscResponseText.Name = "tscResponseText";
@@ -186,11 +188,6 @@ private void InitializeComponent()
this.tscResponseText.TopToolStripPanel.Controls.Add(this.tsResponseText);
this.tscResponseText.TopToolStripPanel.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
//
- // txtResponseText
- //
- resources.ApplyResources(this.txtResponseText, "txtResponseText");
- this.txtResponseText.Name = "txtResponseText";
- //
// tsResponseText
//
resources.ApplyResources(this.tsResponseText, "tsResponseText");
@@ -870,6 +867,11 @@ private void InitializeComponent()
this.tpRegexParse.Name = "tpRegexParse";
this.tpRegexParse.UseVisualStyleBackColor = true;
//
+ // lblRegex
+ //
+ resources.ApplyResources(this.lblRegex, "lblRegex");
+ this.lblRegex.Name = "lblRegex";
+ //
// dgvRegex
//
this.dgvRegex.AllowUserToResizeRows = false;
@@ -1026,10 +1028,19 @@ private void InitializeComponent()
this.ttHelpTip.UseAnimation = false;
this.ttHelpTip.UseFading = false;
//
- // lblRegex
+ // pResponseText
//
- resources.ApplyResources(this.lblRegex, "lblRegex");
- this.lblRegex.Name = "lblRegex";
+ this.pResponseText.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.pResponseText.Controls.Add(this.rtbResponseText);
+ resources.ApplyResources(this.pResponseText, "pResponseText");
+ this.pResponseText.Name = "pResponseText";
+ //
+ // rtbResponseText
+ //
+ this.rtbResponseText.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ resources.ApplyResources(this.rtbResponseText, "rtbResponseText");
+ this.rtbResponseText.Name = "rtbResponseText";
+ this.rtbResponseText.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.txtCustomUploaderLog_LinkClicked);
//
// CustomUploaderSettingsForm
//
@@ -1063,7 +1074,6 @@ private void InitializeComponent()
this.DragDrop += new System.Windows.Forms.DragEventHandler(this.CustomUploaderSettingsForm_DragDrop);
this.DragEnter += new System.Windows.Forms.DragEventHandler(this.CustomUploaderSettingsForm_DragEnter);
this.tscResponseText.ContentPanel.ResumeLayout(false);
- this.tscResponseText.ContentPanel.PerformLayout();
this.tscResponseText.TopToolStripPanel.ResumeLayout(false);
this.tscResponseText.TopToolStripPanel.PerformLayout();
this.tscResponseText.ResumeLayout(false);
@@ -1101,6 +1111,7 @@ private void InitializeComponent()
this.tpResult.ResumeLayout(false);
this.pResult.ResumeLayout(false);
this.tpResponseText.ResumeLayout(false);
+ this.pResponseText.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@@ -1179,7 +1190,6 @@ private void InitializeComponent()
private System.Windows.Forms.RichTextBox rtbResult;
private System.Windows.Forms.TabPage tpResponseText;
private System.Windows.Forms.ToolStripContainer tscResponseText;
- private System.Windows.Forms.TextBox txtResponseText;
private System.Windows.Forms.ToolStrip tsResponseText;
private System.Windows.Forms.ToolStripButton tsbResponseTextJSONFormat;
private System.Windows.Forms.ToolStripButton tsbResponseTextXMLFormat;
@@ -1210,5 +1220,7 @@ private void InitializeComponent()
private System.Windows.Forms.DataGridView dgvRegex;
private System.Windows.Forms.DataGridViewTextBoxColumn cRegex;
private System.Windows.Forms.Label lblRegex;
+ private System.Windows.Forms.Panel pResponseText;
+ private System.Windows.Forms.RichTextBox rtbResponseText;
}
}
\ No newline at end of file
diff --git a/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.cs b/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.cs
index 32ca75f8d..94913fbe2 100644
--- a/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.cs
+++ b/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.cs
@@ -98,6 +98,7 @@ public CustomUploaderSettingsForm(UploadersConfig config)
rtbResultThumbnailURL.AddContextMenu();
rtbResultDeletionURL.AddContextMenu();
rtbResult.AddContextMenu();
+ rtbResponseText.AddContextMenu();
eiCustomUploaders.ObjectType = typeof(CustomUploaderItem);
CustomUploaderAddDestinationTypes();
cbRequestMethod.Items.AddRange(Enum.GetNames(typeof(HttpMethod)));
@@ -626,7 +627,7 @@ private async Task TestCustomUploader(CustomUploaderDestinationType type, int in
btnImageUploaderTest.Enabled = btnTextUploaderTest.Enabled = btnFileUploaderTest.Enabled =
btnURLShortenerTest.Enabled = btnURLSharingServiceTest.Enabled = false;
rtbResult.ResetText();
- txtResponseText.ResetText();
+ rtbResponseText.ResetText();
lbCustomUploaderList.SelectedIndex = index;
CustomUploaderItem item = Config.CustomUploadersList[index];
@@ -719,7 +720,7 @@ await Task.Run(() =>
}
rtbResult.Text = sbResult.ToString();
- txtResponseText.Text = result.ResponseInfo?.ResponseText;
+ rtbResponseText.Text = result.ResponseInfo?.ResponseText;
tcCustomUploader.SelectedTab = tpTest;
}
@@ -1217,13 +1218,13 @@ private void txtCustomUploaderLog_LinkClicked(object sender, LinkClickedEventArg
private void tsbCustomUploaderJSONFormat_Click(object sender, EventArgs e)
{
- string response = txtResponseText.Text;
+ string response = rtbResponseText.Text;
if (!string.IsNullOrEmpty(response))
{
try
{
response = Helpers.JSONFormat(response, Formatting.Indented);
- txtResponseText.Text = response;
+ rtbResponseText.Text = response;
}
catch
{
@@ -1234,13 +1235,13 @@ private void tsbCustomUploaderJSONFormat_Click(object sender, EventArgs e)
private void tsbCustomUploaderXMLFormat_Click(object sender, EventArgs e)
{
- string response = txtResponseText.Text;
+ string response = rtbResponseText.Text;
if (!string.IsNullOrEmpty(response))
{
try
{
response = Helpers.XMLFormat(response);
- txtResponseText.Text = response;
+ rtbResponseText.Text = response;
}
catch
{
@@ -1251,7 +1252,7 @@ private void tsbCustomUploaderXMLFormat_Click(object sender, EventArgs e)
private void tsbCustomUploaderCopyResponseText_Click(object sender, EventArgs e)
{
- string response = txtResponseText.Text;
+ string response = rtbResponseText.Text;
if (!string.IsNullOrEmpty(response))
{
ClipboardHelpers.CopyText(response);
diff --git a/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.resx b/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.resx
index cd133e13e..0166a2aab 100644
--- a/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.resx
+++ b/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.resx
@@ -130,33 +130,60 @@
4
-
+
Fill
-
- 0, 0
+
+ 2, 2
+
+
+ 486, 409
-
- True
+
+ 0
-
+
+
+
+
+ rtbResponseText
+
+
+ System.Windows.Forms.RichTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ pResponseText
+
+
+ 0
+
+
+ Fill
+
+
+ 0, 0
+
+
+ 2, 2, 2, 2
+
+
492, 415
-
- 43
+
+ 42
-
- txtResponseText
+
+ pResponseText
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
tscResponseText.ContentPanel
-
+
0