diff --git a/ShareX.UploadersLib/Enums.cs b/ShareX.UploadersLib/Enums.cs
index 43c7b4efc..e7172267f 100644
--- a/ShareX.UploadersLib/Enums.cs
+++ b/ShareX.UploadersLib/Enums.cs
@@ -291,7 +291,7 @@ public enum LinkFormatEnum
public enum CustomUploaderBody
{
- [Description("None")]
+ [Description("No body")]
None,
[Description("Form data (multipart/form-data)")]
MultipartFormData,
diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs
index aa4848736..dab57d4af 100644
--- a/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs
+++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs
@@ -718,6 +718,10 @@ private void InitializeComponent()
this.tsmiCustomUploaderGuide = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiCustomUploaderExamples = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiCustomUploaderExportAll = new System.Windows.Forms.ToolStripMenuItem();
+ this.tscCustomUploaderResponseText = new System.Windows.Forms.ToolStripContainer();
+ this.tsCustomUploaderResponseText = new System.Windows.Forms.ToolStrip();
+ this.tsbCustomUploaderJSONFormat = new System.Windows.Forms.ToolStripButton();
+ this.tsbCustomUploaderXMLFormat = new System.Windows.Forms.ToolStripButton();
this.atcImgurAccountType = new ShareX.UploadersLib.AccountTypeControl();
this.oauth2Imgur = new ShareX.UploadersLib.OAuthControl();
this.atcTinyPicAccountType = new ShareX.UploadersLib.AccountTypeControl();
@@ -845,6 +849,10 @@ private void InitializeComponent()
this.tpVgyme.SuspendLayout();
this.tcUploaders.SuspendLayout();
this.cmsCustomUploaderHelp.SuspendLayout();
+ this.tscCustomUploaderResponseText.ContentPanel.SuspendLayout();
+ this.tscCustomUploaderResponseText.TopToolStripPanel.SuspendLayout();
+ this.tscCustomUploaderResponseText.SuspendLayout();
+ this.tsCustomUploaderResponseText.SuspendLayout();
this.SuspendLayout();
//
// txtRapidSharePremiumUserName
@@ -1729,7 +1737,7 @@ private void InitializeComponent()
//
// tpCustomUploaderResponseText
//
- this.tpCustomUploaderResponseText.Controls.Add(this.txtCustomUploaderResponse);
+ this.tpCustomUploaderResponseText.Controls.Add(this.tscCustomUploaderResponseText);
resources.ApplyResources(this.tpCustomUploaderResponseText, "tpCustomUploaderResponseText");
this.tpCustomUploaderResponseText.Name = "tpCustomUploaderResponseText";
this.tpCustomUploaderResponseText.UseVisualStyleBackColor = true;
@@ -5727,6 +5735,45 @@ private void InitializeComponent()
resources.ApplyResources(this.tsmiCustomUploaderExportAll, "tsmiCustomUploaderExportAll");
this.tsmiCustomUploaderExportAll.Click += new System.EventHandler(this.tsmiCustomUploaderExportAll_Click);
//
+ // tscCustomUploaderResponseText
+ //
+ //
+ // tscCustomUploaderResponseText.ContentPanel
+ //
+ this.tscCustomUploaderResponseText.ContentPanel.Controls.Add(this.txtCustomUploaderResponse);
+ resources.ApplyResources(this.tscCustomUploaderResponseText.ContentPanel, "tscCustomUploaderResponseText.ContentPanel");
+ resources.ApplyResources(this.tscCustomUploaderResponseText, "tscCustomUploaderResponseText");
+ this.tscCustomUploaderResponseText.Name = "tscCustomUploaderResponseText";
+ //
+ // tscCustomUploaderResponseText.TopToolStripPanel
+ //
+ this.tscCustomUploaderResponseText.TopToolStripPanel.Controls.Add(this.tsCustomUploaderResponseText);
+ this.tscCustomUploaderResponseText.TopToolStripPanel.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
+ //
+ // tsCustomUploaderResponseText
+ //
+ resources.ApplyResources(this.tsCustomUploaderResponseText, "tsCustomUploaderResponseText");
+ this.tsCustomUploaderResponseText.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
+ this.tsCustomUploaderResponseText.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.tsbCustomUploaderJSONFormat,
+ this.tsbCustomUploaderXMLFormat});
+ this.tsCustomUploaderResponseText.Name = "tsCustomUploaderResponseText";
+ //
+ // tsbCustomUploaderJSONFormat
+ //
+ this.tsbCustomUploaderJSONFormat.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ resources.ApplyResources(this.tsbCustomUploaderJSONFormat, "tsbCustomUploaderJSONFormat");
+ this.tsbCustomUploaderJSONFormat.Name = "tsbCustomUploaderJSONFormat";
+ this.tsbCustomUploaderJSONFormat.Click += new System.EventHandler(this.tsbCustomUploaderJSONFormat_Click);
+ //
+ // tsbCustomUploaderXMLFormat
+ //
+ this.tsbCustomUploaderXMLFormat.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ resources.ApplyResources(this.tsbCustomUploaderXMLFormat, "tsbCustomUploaderXMLFormat");
+ this.tsbCustomUploaderXMLFormat.Margin = new System.Windows.Forms.Padding(3, 1, 0, 2);
+ this.tsbCustomUploaderXMLFormat.Name = "tsbCustomUploaderXMLFormat";
+ this.tsbCustomUploaderXMLFormat.Click += new System.EventHandler(this.tsbCustomUploaderXMLFormat_Click);
+ //
// atcImgurAccountType
//
resources.ApplyResources(this.atcImgurAccountType, "atcImgurAccountType");
@@ -5937,7 +5984,6 @@ private void InitializeComponent()
this.tpCustomUploaderResult.ResumeLayout(false);
this.pCustomUploaderResult.ResumeLayout(false);
this.tpCustomUploaderResponseText.ResumeLayout(false);
- this.tpCustomUploaderResponseText.PerformLayout();
this.gbCustomUploaders.ResumeLayout(false);
this.tpURLShorteners.ResumeLayout(false);
this.tcURLShorteners.ResumeLayout(false);
@@ -6082,6 +6128,14 @@ private void InitializeComponent()
this.tpVgyme.PerformLayout();
this.tcUploaders.ResumeLayout(false);
this.cmsCustomUploaderHelp.ResumeLayout(false);
+ this.tscCustomUploaderResponseText.ContentPanel.ResumeLayout(false);
+ this.tscCustomUploaderResponseText.ContentPanel.PerformLayout();
+ this.tscCustomUploaderResponseText.TopToolStripPanel.ResumeLayout(false);
+ this.tscCustomUploaderResponseText.TopToolStripPanel.PerformLayout();
+ this.tscCustomUploaderResponseText.ResumeLayout(false);
+ this.tscCustomUploaderResponseText.PerformLayout();
+ this.tsCustomUploaderResponseText.ResumeLayout(false);
+ this.tsCustomUploaderResponseText.PerformLayout();
this.ResumeLayout(false);
}
@@ -6771,5 +6825,9 @@ private void InitializeComponent()
private System.Windows.Forms.ToolStripMenuItem tsmiCustomUploaderGuide;
private System.Windows.Forms.ToolStripMenuItem tsmiCustomUploaderExamples;
private System.Windows.Forms.ToolStripMenuItem tsmiCustomUploaderExportAll;
+ private System.Windows.Forms.ToolStripContainer tscCustomUploaderResponseText;
+ private System.Windows.Forms.ToolStrip tsCustomUploaderResponseText;
+ private System.Windows.Forms.ToolStripButton tsbCustomUploaderJSONFormat;
+ private System.Windows.Forms.ToolStripButton tsbCustomUploaderXMLFormat;
}
}
\ No newline at end of file
diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs
index c2ed9cc19..5ff27f5e0 100644
--- a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs
+++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs
@@ -4073,6 +4073,40 @@ private void AddTextToActiveURLField(string text)
rtb.AppendText(text);
}
+ private void tsbCustomUploaderJSONFormat_Click(object sender, EventArgs e)
+ {
+ string response = txtCustomUploaderResponse.Text;
+ if (!string.IsNullOrEmpty(response))
+ {
+ try
+ {
+ response = Helpers.JSONFormat(response, Formatting.Indented);
+ txtCustomUploaderResponse.Text = response;
+ }
+ catch
+ {
+ MessageBox.Show("Formatting failed.", "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+ }
+
+ private void tsbCustomUploaderXMLFormat_Click(object sender, EventArgs e)
+ {
+ string response = txtCustomUploaderResponse.Text;
+ if (!string.IsNullOrEmpty(response))
+ {
+ try
+ {
+ response = Helpers.XMLFormat(response);
+ txtCustomUploaderResponse.Text = response;
+ }
+ catch
+ {
+ MessageBox.Show("Formatting failed.", "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+ }
+
private void cbCustomUploaderImageUploader_SelectedIndexChanged(object sender, EventArgs e)
{
Config.CustomImageUploaderSelected = cbCustomUploaderImageUploader.SelectedIndex;
diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.resx
index 88b1fa04f..5607136a5 100644
--- a/ShareX.UploadersLib/Forms/UploadersConfigForm.resx
+++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.resx
@@ -2759,17 +2759,29 @@ store.book[0].title
0
+
+ tscCustomUploaderResponseText.BottomToolStripPanel
+
+
+ System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tscCustomUploaderResponseText
+
+
+ 4
+
Fill
- 3, 3
+ 0, 0
True
- 492, 440
+ 492, 415
43
@@ -2781,11 +2793,164 @@ store.book[0].title
System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- tpCustomUploaderResponseText
+ tscCustomUploaderResponseText.ContentPanel
0
+
+ 492, 415
+
+
+ tscCustomUploaderResponseText.ContentPanel
+
+
+ System.Windows.Forms.ToolStripContentPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tscCustomUploaderResponseText
+
+
+ 0
+
+
+ Fill
+
+
+ tscCustomUploaderResponseText.LeftToolStripPanel
+
+
+ System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tscCustomUploaderResponseText
+
+
+ 1
+
+
+ 3, 3
+
+
+ tscCustomUploaderResponseText.RightToolStripPanel
+
+
+ System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tscCustomUploaderResponseText
+
+
+ 2
+
+
+ 492, 440
+
+
+ 44
+
+
+ toolStripContainer1
+
+
+ 564, 17
+
+
+ None
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+ YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+ 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+ bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+ VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+ c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+ Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+ mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+ kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+ TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+
+
+
+ Magenta
+
+
+ 78, 22
+
+
+ JSON format
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+ YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+ 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+ bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+ VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+ c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+ Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+ mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+ kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+ TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+
+
+
+ Magenta
+
+
+ 74, 22
+
+
+ XML format
+
+
+ 3, 0
+
+
+ 158, 25
+
+
+ 0
+
+
+ tsCustomUploaderResponseText
+
+
+ System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tscCustomUploaderResponseText.TopToolStripPanel
+
+
+ 0
+
+
+ tscCustomUploaderResponseText.TopToolStripPanel
+
+
+ System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tscCustomUploaderResponseText
+
+
+ 3
+
+
+ tscCustomUploaderResponseText
+
+
+ System.Windows.Forms.ToolStripContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tpCustomUploaderResponseText
+
+
+ 0
+
4, 22
@@ -17554,7 +17719,7 @@ Using an encrypted library disables sharing.
$this
- 1
+ 2
Fill
@@ -17640,6 +17805,9 @@ Using an encrypted library disables sharing.
1000, 633
+
+ NoControl
+
840, 572
@@ -17790,6 +17958,18 @@ Using an encrypted library disables sharing.
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ tsbCustomUploaderJSONFormat
+
+
+ System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tsbCustomUploaderXMLFormat
+
+
+ System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
UploadersConfigForm