Interim commit for custom uploader parameters

ShareX.UploadersLib/CustomUploader/CustomUploaderItem.cs

@@ -52,6 +52,16 @@ public class CustomUploaderItem
         [DefaultValue("")]
         public string RequestURL { get; set; }
 
+        [DefaultValue(null)]
+        public Dictionary<string, string> Parameters { get; set; }
+
+        public bool ShouldSerializeParameters() => Parameters != null && Parameters.Count > 0;
+
+        [DefaultValue(null)]
+        public Dictionary<string, string> Headers { get; set; }
+
+        public bool ShouldSerializeHeaders() => Headers != null && Headers.Count > 0;
+
         public CustomUploaderRequestFormat RequestFormat { get; set; }
 
         [DefaultValue("")]
@@ -69,11 +79,6 @@ public class CustomUploaderItem
 
         public bool ShouldSerializeArguments() => Arguments != null && Arguments.Count > 0;
 
-        [DefaultValue(null)]
-        public Dictionary<string, string> Headers { get; set; }
-
-        public bool ShouldSerializeHeaders() => Headers != null && Headers.Count > 0;
-
         [DefaultValue(ResponseType.Text)]
         public ResponseType ResponseType { get; set; }
 

ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs

@@ -98,11 +98,6 @@ private void InitializeComponent()
             this.txtCustomUploaderArgumentName = new System.Windows.Forms.TextBox();
             this.txtCustomUploaderFileFormName = new System.Windows.Forms.TextBox();
             this.btnCustomUploaderArgumentUpdate = new System.Windows.Forms.Button();
-            this.pCustomUploaderJSON = new System.Windows.Forms.Panel();
-            this.btnCustomUploaderDataBeautify = new System.Windows.Forms.Button();
-            this.btnCustomUploaderDataMinify = new System.Windows.Forms.Button();
-            this.pCustomUploaderData = new System.Windows.Forms.Panel();
-            this.rtbCustomUploaderData = new System.Windows.Forms.RichTextBox();
             this.pCustomUploaderHeaderValue = new System.Windows.Forms.Panel();
             this.rtbCustomUploaderHeaderValue = new System.Windows.Forms.RichTextBox();
             this.lblCustomUploaderHeaders = new System.Windows.Forms.Label();
@@ -130,6 +125,11 @@ private void InitializeComponent()
             this.cbCustomUploaderRequestFormat = new System.Windows.Forms.ComboBox();
             this.lblCustomUploaderRequestMethod = new System.Windows.Forms.Label();
             this.lblCustomUploaderRequestFormat = new System.Windows.Forms.Label();
+            this.pCustomUploaderJSON = new System.Windows.Forms.Panel();
+            this.btnCustomUploaderDataBeautify = new System.Windows.Forms.Button();
+            this.btnCustomUploaderDataMinify = new System.Windows.Forms.Button();
+            this.pCustomUploaderData = new System.Windows.Forms.Panel();
+            this.rtbCustomUploaderData = new System.Windows.Forms.RichTextBox();
             this.tpCustomUploaderResponse = new System.Windows.Forms.TabPage();
             this.cbCustomUploaderResponseType = new System.Windows.Forms.ComboBox();
             this.pCustomUploaderDeletionURL = new System.Windows.Forms.Panel();
@@ -745,11 +745,11 @@ private void InitializeComponent()
             this.tpCustomUploaderRequest.SuspendLayout();
             this.pCustomUploaderMultipartFormData.SuspendLayout();
             this.pCustomUploaderArgumentValue.SuspendLayout();
-            this.pCustomUploaderJSON.SuspendLayout();
-            this.pCustomUploaderData.SuspendLayout();
             this.pCustomUploaderHeaderValue.SuspendLayout();
             this.pCustomUploaderParameterValue.SuspendLayout();
             this.pCustomUploaderRequestURL.SuspendLayout();
+            this.pCustomUploaderJSON.SuspendLayout();
+            this.pCustomUploaderData.SuspendLayout();
             this.tpCustomUploaderResponse.SuspendLayout();
             this.pCustomUploaderDeletionURL.SuspendLayout();
             this.pCustomUploaderThumbnailURL.SuspendLayout();
@@ -1211,43 +1211,6 @@ private void InitializeComponent()
             this.btnCustomUploaderArgumentUpdate.UseVisualStyleBackColor = true;
             this.btnCustomUploaderArgumentUpdate.Click += new System.EventHandler(this.btnCustomUploaderArgUpdate_Click);
             // 
-            // pCustomUploaderJSON
-            // 
-            this.pCustomUploaderJSON.Controls.Add(this.btnCustomUploaderDataBeautify);
-            this.pCustomUploaderJSON.Controls.Add(this.btnCustomUploaderDataMinify);
-            this.pCustomUploaderJSON.Controls.Add(this.pCustomUploaderData);
-            resources.ApplyResources(this.pCustomUploaderJSON, "pCustomUploaderJSON");
-            this.pCustomUploaderJSON.Name = "pCustomUploaderJSON";
-            // 
-            // btnCustomUploaderDataBeautify
-            // 
-            resources.ApplyResources(this.btnCustomUploaderDataBeautify, "btnCustomUploaderDataBeautify");
-            this.btnCustomUploaderDataBeautify.Name = "btnCustomUploaderDataBeautify";
-            this.btnCustomUploaderDataBeautify.UseVisualStyleBackColor = true;
-            this.btnCustomUploaderDataBeautify.Click += new System.EventHandler(this.btnCustomUploaderDataBeautify_Click);
-            // 
-            // btnCustomUploaderDataMinify
-            // 
-            resources.ApplyResources(this.btnCustomUploaderDataMinify, "btnCustomUploaderDataMinify");
-            this.btnCustomUploaderDataMinify.Name = "btnCustomUploaderDataMinify";
-            this.btnCustomUploaderDataMinify.UseVisualStyleBackColor = true;
-            this.btnCustomUploaderDataMinify.Click += new System.EventHandler(this.btnCustomUploaderDataMinify_Click);
-            // 
-            // pCustomUploaderData
-            // 
-            this.pCustomUploaderData.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.pCustomUploaderData.Controls.Add(this.rtbCustomUploaderData);
-            resources.ApplyResources(this.pCustomUploaderData, "pCustomUploaderData");
-            this.pCustomUploaderData.Name = "pCustomUploaderData";
-            // 
-            // rtbCustomUploaderData
-            // 
-            this.rtbCustomUploaderData.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.rtbCustomUploaderData.DetectUrls = false;
-            resources.ApplyResources(this.rtbCustomUploaderData, "rtbCustomUploaderData");
-            this.rtbCustomUploaderData.Name = "rtbCustomUploaderData";
-            this.rtbCustomUploaderData.TextChanged += new System.EventHandler(this.rtbCustomUploaderData_TextChanged);
-            // 
             // pCustomUploaderHeaderValue
             // 
             this.pCustomUploaderHeaderValue.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
@@ -1299,6 +1262,7 @@ private void InitializeComponent()
             this.rtbCustomUploaderParameterValue.DetectUrls = false;
             resources.ApplyResources(this.rtbCustomUploaderParameterValue, "rtbCustomUploaderParameterValue");
             this.rtbCustomUploaderParameterValue.Name = "rtbCustomUploaderParameterValue";
+            this.rtbCustomUploaderParameterValue.TextChanged += new System.EventHandler(this.rtbCustomUploaderParameterValue_TextChanged);
             // 
             // btnCustomUploaderHeaderAdd
             // 
@@ -1312,6 +1276,7 @@ private void InitializeComponent()
             resources.ApplyResources(this.btnCustomUploaderParameterUpdate, "btnCustomUploaderParameterUpdate");
             this.btnCustomUploaderParameterUpdate.Name = "btnCustomUploaderParameterUpdate";
             this.btnCustomUploaderParameterUpdate.UseVisualStyleBackColor = true;
+            this.btnCustomUploaderParameterUpdate.Click += new System.EventHandler(this.btnCustomUploaderParameterUpdate_Click);
             // 
             // btnCustomUploaderHeaderRemove
             // 
@@ -1324,6 +1289,7 @@ private void InitializeComponent()
             // 
             resources.ApplyResources(this.txtCustomUploaderParameterName, "txtCustomUploaderParameterName");
             this.txtCustomUploaderParameterName.Name = "txtCustomUploaderParameterName";
+            this.txtCustomUploaderParameterName.TextChanged += new System.EventHandler(this.txtCustomUploaderParameterName_TextChanged);
             // 
             // lvCustomUploaderHeaders
             // 
@@ -1357,12 +1323,14 @@ private void InitializeComponent()
             resources.ApplyResources(this.btnCustomUploaderParameterAdd, "btnCustomUploaderParameterAdd");
             this.btnCustomUploaderParameterAdd.Name = "btnCustomUploaderParameterAdd";
             this.btnCustomUploaderParameterAdd.UseVisualStyleBackColor = true;
+            this.btnCustomUploaderParameterAdd.Click += new System.EventHandler(this.btnCustomUploaderParameterAdd_Click);
             // 
             // btnCustomUploaderParameterRemove
             // 
             resources.ApplyResources(this.btnCustomUploaderParameterRemove, "btnCustomUploaderParameterRemove");
             this.btnCustomUploaderParameterRemove.Name = "btnCustomUploaderParameterRemove";
             this.btnCustomUploaderParameterRemove.UseVisualStyleBackColor = true;
+            this.btnCustomUploaderParameterRemove.Click += new System.EventHandler(this.btnCustomUploaderParameterRemove_Click);
             // 
             // lvCustomUploaderParameters
             // 
@@ -1381,6 +1349,7 @@ private void InitializeComponent()
             this.lvCustomUploaderParameters.Name = "lvCustomUploaderParameters";
             this.lvCustomUploaderParameters.UseCompatibleStateImageBehavior = false;
             this.lvCustomUploaderParameters.View = System.Windows.Forms.View.Details;
+            this.lvCustomUploaderParameters.SelectedIndexChanged += new System.EventHandler(this.lvCustomUploaderParameters_SelectedIndexChanged);
             // 
             // columnHeader1
             // 
@@ -1437,6 +1406,43 @@ private void InitializeComponent()
             resources.ApplyResources(this.lblCustomUploaderRequestFormat, "lblCustomUploaderRequestFormat");
             this.lblCustomUploaderRequestFormat.Name = "lblCustomUploaderRequestFormat";
             // 
+            // pCustomUploaderJSON
+            // 
+            this.pCustomUploaderJSON.Controls.Add(this.btnCustomUploaderDataBeautify);
+            this.pCustomUploaderJSON.Controls.Add(this.btnCustomUploaderDataMinify);
+            this.pCustomUploaderJSON.Controls.Add(this.pCustomUploaderData);
+            resources.ApplyResources(this.pCustomUploaderJSON, "pCustomUploaderJSON");
+            this.pCustomUploaderJSON.Name = "pCustomUploaderJSON";
+            // 
+            // btnCustomUploaderDataBeautify
+            // 
+            resources.ApplyResources(this.btnCustomUploaderDataBeautify, "btnCustomUploaderDataBeautify");
+            this.btnCustomUploaderDataBeautify.Name = "btnCustomUploaderDataBeautify";
+            this.btnCustomUploaderDataBeautify.UseVisualStyleBackColor = true;
+            this.btnCustomUploaderDataBeautify.Click += new System.EventHandler(this.btnCustomUploaderDataBeautify_Click);
+            // 
+            // btnCustomUploaderDataMinify
+            // 
+            resources.ApplyResources(this.btnCustomUploaderDataMinify, "btnCustomUploaderDataMinify");
+            this.btnCustomUploaderDataMinify.Name = "btnCustomUploaderDataMinify";
+            this.btnCustomUploaderDataMinify.UseVisualStyleBackColor = true;
+            this.btnCustomUploaderDataMinify.Click += new System.EventHandler(this.btnCustomUploaderDataMinify_Click);
+            // 
+            // pCustomUploaderData
+            // 
+            this.pCustomUploaderData.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pCustomUploaderData.Controls.Add(this.rtbCustomUploaderData);
+            resources.ApplyResources(this.pCustomUploaderData, "pCustomUploaderData");
+            this.pCustomUploaderData.Name = "pCustomUploaderData";
+            // 
+            // rtbCustomUploaderData
+            // 
+            this.rtbCustomUploaderData.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.rtbCustomUploaderData.DetectUrls = false;
+            resources.ApplyResources(this.rtbCustomUploaderData, "rtbCustomUploaderData");
+            this.rtbCustomUploaderData.Name = "rtbCustomUploaderData";
+            this.rtbCustomUploaderData.TextChanged += new System.EventHandler(this.rtbCustomUploaderData_TextChanged);
+            // 
             // tpCustomUploaderResponse
             // 
             this.tpCustomUploaderResponse.Controls.Add(this.cbCustomUploaderResponseType);
@@ -5896,11 +5902,11 @@ private void InitializeComponent()
             this.pCustomUploaderMultipartFormData.ResumeLayout(false);
             this.pCustomUploaderMultipartFormData.PerformLayout();
             this.pCustomUploaderArgumentValue.ResumeLayout(false);
-            this.pCustomUploaderJSON.ResumeLayout(false);
-            this.pCustomUploaderData.ResumeLayout(false);
             this.pCustomUploaderHeaderValue.ResumeLayout(false);
             this.pCustomUploaderParameterValue.ResumeLayout(false);
             this.pCustomUploaderRequestURL.ResumeLayout(false);
+            this.pCustomUploaderJSON.ResumeLayout(false);
+            this.pCustomUploaderData.ResumeLayout(false);
             this.tpCustomUploaderResponse.ResumeLayout(false);
             this.tpCustomUploaderResponse.PerformLayout();
             this.pCustomUploaderDeletionURL.ResumeLayout(false);

ShareX.UploadersLib/Forms/UploadersConfigForm.cs

@@ -3640,6 +3640,98 @@ private void lvCustomUploaderArguments_SelectedIndexChanged(object sender, Event
             CustomUploaderUpdateArgumentsState();
         }
 
+        private void txtCustomUploaderParameterName_TextChanged(object sender, EventArgs e)
+        {
+            CustomUploaderUpdateParametersState();
+        }
+
+        private void rtbCustomUploaderParameterValue_TextChanged(object sender, EventArgs e)
+        {
+            CustomUploaderSyntaxHighlight(rtbCustomUploaderParameterValue);
+        }
+
+        private void btnCustomUploaderParameterAdd_Click(object sender, EventArgs e)
+        {
+            string name = txtCustomUploaderParameterName.Text;
+
+            if (!string.IsNullOrEmpty(name))
+            {
+                CustomUploaderItem uploader = CustomUploaderGetSelected();
+                if (uploader != null)
+                {
+                    if (uploader.Parameters == null) uploader.Parameters = new Dictionary<string, string>();
+
+                    if (uploader.Parameters.ContainsKey(name))
+                    {
+                        // TODO: Translate
+                        MessageBox.Show("A parameter with the same name already exists.", "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    }
+                    else
+                    {
+                        string value = rtbCustomUploaderParameterValue.Text;
+                        lvCustomUploaderParameters.Items.Add(name).SubItems.Add(value);
+                        uploader.Parameters.Add(name, value);
+
+                        lvCustomUploaderParameters.SelectedItems.Clear();
+                        txtCustomUploaderParameterName.Text = "";
+                        rtbCustomUploaderParameterValue.Text = "";
+                        txtCustomUploaderParameterName.Focus();
+                    }
+                }
+            }
+        }
+
+        private void btnCustomUploaderParameterRemove_Click(object sender, EventArgs e)
+        {
+            if (lvCustomUploaderParameters.SelectedItems.Count > 0)
+            {
+                CustomUploaderItem uploader = CustomUploaderGetSelected();
+                if (uploader != null) uploader.Parameters.Remove(lvCustomUploaderParameters.SelectedItems[0].Text);
+
+                lvCustomUploaderParameters.SelectedItems[0].Remove();
+            }
+        }
+
+        private void btnCustomUploaderParameterUpdate_Click(object sender, EventArgs e)
+        {
+            if (lvCustomUploaderParameters.SelectedItems.Count > 0)
+            {
+                string name = txtCustomUploaderParameterName.Text;
+
+                if (!string.IsNullOrEmpty(name))
+                {
+                    string value = rtbCustomUploaderParameterValue.Text;
+
+                    CustomUploaderItem uploader = CustomUploaderGetSelected();
+                    if (uploader != null)
+                    {
+                        uploader.Parameters.Remove(lvCustomUploaderParameters.SelectedItems[0].Text);
+                        uploader.Parameters.Add(name, value);
+                    }
+
+                    lvCustomUploaderParameters.SelectedItems[0].Text = name;
+                    lvCustomUploaderParameters.SelectedItems[0].SubItems[1].Text = value;
+                }
+            }
+        }
+
+        private void lvCustomUploaderParameters_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            string name = "";
+            string value = "";
+
+            if (lvCustomUploaderParameters.SelectedItems.Count > 0)
+            {
+                name = lvCustomUploaderParameters.SelectedItems[0].Text;
+                value = lvCustomUploaderParameters.SelectedItems[0].SubItems[1].Text;
+            }
+
+            txtCustomUploaderParameterName.Text = name;
+            rtbCustomUploaderParameterValue.Text = value;
+
+            CustomUploaderUpdateParametersState();
+        }
+
         private void txtCustomUploaderHeaderName_TextChanged(object sender, EventArgs e)
         {
             CustomUploaderUpdateHeadersState();

ShareX.UploadersLib/Forms/UploadersConfigForm.resx

@@ -731,24 +731,6 @@ when you made the application key.</value>
   <data name="&gt;&gt;pCustomUploaderMultipartFormData.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="rtbCustomUploaderHeaderValue.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="rtbCustomUploaderHeaderValue.Location" type="System.Drawing.Point, System.Drawing">
-    <value>2, 2</value>
-  </data>
-  <data name="rtbCustomUploaderHeaderValue.Multiline" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="rtbCustomUploaderHeaderValue.Size" type="System.Drawing.Size, System.Drawing">
-    <value>106, 14</value>
-  </data>
-  <data name="rtbCustomUploaderHeaderValue.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="rtbCustomUploaderHeaderValue.Text" xml:space="preserve">
-    <value />
-  </data>
   <data name="&gt;&gt;rtbCustomUploaderHeaderValue.Name" xml:space="preserve">
     <value>rtbCustomUploaderHeaderValue</value>
   </data>
@@ -893,6 +875,24 @@ when you made the application key.</value>
   <data name="&gt;&gt;txtCustomUploaderHeaderName.ZOrder" xml:space="preserve">
     <value>5</value>
   </data>
+  <data name="rtbCustomUploaderParameterValue.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="rtbCustomUploaderParameterValue.Location" type="System.Drawing.Point, System.Drawing">
+    <value>2, 2</value>
+  </data>
+  <data name="rtbCustomUploaderParameterValue.Multiline" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="rtbCustomUploaderParameterValue.Size" type="System.Drawing.Size, System.Drawing">
+    <value>106, 14</value>
+  </data>
+  <data name="rtbCustomUploaderParameterValue.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="rtbCustomUploaderParameterValue.Text" xml:space="preserve">
+    <value />
+  </data>
   <data name="&gt;&gt;rtbCustomUploaderParameterValue.Name" xml:space="preserve">
     <value>rtbCustomUploaderParameterValue</value>
   </data>
@@ -1031,18 +1031,6 @@ when you made the application key.</value>
   <data name="&gt;&gt;txtCustomUploaderParameterName.ZOrder" xml:space="preserve">
     <value>10</value>
   </data>
-  <data name="chCustomUploaderHeadersName.Text" xml:space="preserve">
-    <value>Name</value>
-  </data>
-  <data name="chCustomUploaderHeadersName.Width" type="System.Int32, mscorlib">
-    <value>114</value>
-  </data>
-  <data name="chCustomUploaderHeadersValue.Text" xml:space="preserve">
-    <value>Value</value>
-  </data>
-  <data name="chCustomUploaderHeadersValue.Width" type="System.Int32, mscorlib">
-    <value>114</value>
-  </data>
   <data name="lvCustomUploaderHeaders.Location" type="System.Drawing.Point, System.Drawing">
     <value>16, 336</value>
   </data>
@@ -1118,18 +1106,6 @@ when you made the application key.</value>
   <data name="&gt;&gt;btnCustomUploaderParameterRemove.ZOrder" xml:space="preserve">
     <value>13</value>
   </data>
-  <data name="columnHeader1.Text" xml:space="preserve">
-    <value>Name</value>
-  </data>
-  <data name="columnHeader1.Width" type="System.Int32, mscorlib">
-    <value>114</value>
-  </data>
-  <data name="columnHeader2.Text" xml:space="preserve">
-    <value>Value</value>
-  </data>
-  <data name="columnHeader2.Width" type="System.Int32, mscorlib">
-    <value>114</value>
-  </data>
   <data name="lvCustomUploaderParameters.Location" type="System.Drawing.Point, System.Drawing">
     <value>16, 128</value>
   </data>
@@ -2819,6 +2795,90 @@ when you made the application key.</value>
   <data name="&gt;&gt;btnCustomUploaderArgumentUpdate.ZOrder" xml:space="preserve">
     <value>8</value>
   </data>
+  <data name="rtbCustomUploaderHeaderValue.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="rtbCustomUploaderHeaderValue.Location" type="System.Drawing.Point, System.Drawing">
+    <value>2, 2</value>
+  </data>
+  <data name="rtbCustomUploaderHeaderValue.Multiline" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="rtbCustomUploaderHeaderValue.Size" type="System.Drawing.Size, System.Drawing">
+    <value>106, 14</value>
+  </data>
+  <data name="rtbCustomUploaderHeaderValue.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="rtbCustomUploaderHeaderValue.Text" xml:space="preserve">
+    <value />
+  </data>
+  <data name="&gt;&gt;rtbCustomUploaderHeaderValue.Name" xml:space="preserve">
+    <value>rtbCustomUploaderHeaderValue</value>
+  </data>
+  <data name="&gt;&gt;rtbCustomUploaderHeaderValue.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RichTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;rtbCustomUploaderHeaderValue.Parent" xml:space="preserve">
+    <value>pCustomUploaderHeaderValue</value>
+  </data>
+  <data name="&gt;&gt;rtbCustomUploaderHeaderValue.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="chCustomUploaderHeadersName.Text" xml:space="preserve">
+    <value>Name</value>
+  </data>
+  <data name="chCustomUploaderHeadersName.Width" type="System.Int32, mscorlib">
+    <value>114</value>
+  </data>
+  <data name="chCustomUploaderHeadersValue.Text" xml:space="preserve">
+    <value>Value</value>
+  </data>
+  <data name="chCustomUploaderHeadersValue.Width" type="System.Int32, mscorlib">
+    <value>114</value>
+  </data>
+  <data name="columnHeader1.Text" xml:space="preserve">
+    <value>Name</value>
+  </data>
+  <data name="columnHeader1.Width" type="System.Int32, mscorlib">
+    <value>114</value>
+  </data>
+  <data name="columnHeader2.Text" xml:space="preserve">
+    <value>Value</value>
+  </data>
+  <data name="columnHeader2.Width" type="System.Int32, mscorlib">
+    <value>114</value>
+  </data>
+  <data name="rtbCustomUploaderRequestURL.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="rtbCustomUploaderRequestURL.Location" type="System.Drawing.Point, System.Drawing">
+    <value>2, 2</value>
+  </data>
+  <data name="rtbCustomUploaderRequestURL.Multiline" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="rtbCustomUploaderRequestURL.Size" type="System.Drawing.Size, System.Drawing">
+    <value>402, 14</value>
+  </data>
+  <data name="rtbCustomUploaderRequestURL.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="rtbCustomUploaderRequestURL.Text" xml:space="preserve">
+    <value />
+  </data>
+  <data name="&gt;&gt;rtbCustomUploaderRequestURL.Name" xml:space="preserve">
+    <value>rtbCustomUploaderRequestURL</value>
+  </data>
+  <data name="&gt;&gt;rtbCustomUploaderRequestURL.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RichTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;rtbCustomUploaderRequestURL.Parent" xml:space="preserve">
+    <value>pCustomUploaderRequestURL</value>
+  </data>
+  <data name="&gt;&gt;rtbCustomUploaderRequestURL.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <data name="btnCustomUploaderDataBeautify.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
@@ -2939,66 +2999,6 @@ when you made the application key.</value>
   <data name="&gt;&gt;rtbCustomUploaderData.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="rtbCustomUploaderParameterValue.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="rtbCustomUploaderParameterValue.Location" type="System.Drawing.Point, System.Drawing">
-    <value>2, 2</value>
-  </data>
-  <data name="rtbCustomUploaderParameterValue.Multiline" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="rtbCustomUploaderParameterValue.Size" type="System.Drawing.Size, System.Drawing">
-    <value>106, 14</value>
-  </data>
-  <data name="rtbCustomUploaderParameterValue.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="rtbCustomUploaderParameterValue.Text" xml:space="preserve">
-    <value />
-  </data>
-  <data name="&gt;&gt;rtbCustomUploaderParameterValue.Name" xml:space="preserve">
-    <value>rtbCustomUploaderParameterValue</value>
-  </data>
-  <data name="&gt;&gt;rtbCustomUploaderParameterValue.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RichTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;rtbCustomUploaderParameterValue.Parent" xml:space="preserve">
-    <value>pCustomUploaderParameterValue</value>
-  </data>
-  <data name="&gt;&gt;rtbCustomUploaderParameterValue.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="rtbCustomUploaderRequestURL.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="rtbCustomUploaderRequestURL.Location" type="System.Drawing.Point, System.Drawing">
-    <value>2, 2</value>
-  </data>
-  <data name="rtbCustomUploaderRequestURL.Multiline" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="rtbCustomUploaderRequestURL.Size" type="System.Drawing.Size, System.Drawing">
-    <value>402, 14</value>
-  </data>
-  <data name="rtbCustomUploaderRequestURL.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="rtbCustomUploaderRequestURL.Text" xml:space="preserve">
-    <value />
-  </data>
-  <data name="&gt;&gt;rtbCustomUploaderRequestURL.Name" xml:space="preserve">
-    <value>rtbCustomUploaderRequestURL</value>
-  </data>
-  <data name="&gt;&gt;rtbCustomUploaderRequestURL.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RichTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;rtbCustomUploaderRequestURL.Parent" xml:space="preserve">
-    <value>pCustomUploaderRequestURL</value>
-  </data>
-  <data name="&gt;&gt;rtbCustomUploaderRequestURL.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
   <data name="cbCustomUploaderResponseType.Location" type="System.Drawing.Point, System.Drawing">
     <value>16, 24</value>
   </data>

ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs

@@ -984,6 +984,17 @@ private void CustomUploaderLoad(CustomUploaderItem uploader)
 
             txtCustomUploaderFileFormName.Text = uploader.FileFormName ?? "";
 
+            txtCustomUploaderParameterName.Text = "";
+            rtbCustomUploaderParameterValue.Text = "";
+            lvCustomUploaderParameters.Items.Clear();
+            if (uploader.Parameters != null)
+            {
+                foreach (KeyValuePair<string, string> arg in uploader.Parameters)
+                {
+                    lvCustomUploaderParameters.Items.Add(arg.Key).SubItems.Add(arg.Value);
+                }
+            }
+
             txtCustomUploaderHeaderName.Text = "";
             rtbCustomUploaderHeaderValue.Text = "";
             lvCustomUploaderHeaders.Items.Clear();
@@ -1074,10 +1085,10 @@ private void CustomUploaderUpdateRequestFormatState()
             }
         }
 
-        private void CustomUploaderUpdateArgumentsState()
+        private void CustomUploaderUpdateParametersState()
         {
-            btnCustomUploaderArgumentAdd.Enabled = !string.IsNullOrEmpty(txtCustomUploaderArgumentName.Text);
-            btnCustomUploaderArgumentRemove.Enabled = btnCustomUploaderArgumentUpdate.Enabled = lvCustomUploaderArguments.SelectedItems.Count > 0;
+            btnCustomUploaderParameterAdd.Enabled = !string.IsNullOrEmpty(txtCustomUploaderParameterName.Text);
+            btnCustomUploaderParameterRemove.Enabled = btnCustomUploaderParameterUpdate.Enabled = lvCustomUploaderParameters.SelectedItems.Count > 0;
         }
 
         private void CustomUploaderUpdateHeadersState()
@@ -1086,6 +1097,12 @@ private void CustomUploaderUpdateHeadersState()
             btnCustomUploaderHeaderRemove.Enabled = btnCustomUploaderHeaderUpdate.Enabled = lvCustomUploaderHeaders.SelectedItems.Count > 0;
         }
 
+        private void CustomUploaderUpdateArgumentsState()
+        {
+            btnCustomUploaderArgumentAdd.Enabled = !string.IsNullOrEmpty(txtCustomUploaderArgumentName.Text);
+            btnCustomUploaderArgumentRemove.Enabled = btnCustomUploaderArgumentUpdate.Enabled = lvCustomUploaderArguments.SelectedItems.Count > 0;
+        }
+
         private void CustomUploaderUpdateResponseState()
         {
             btnCustomUploaderJsonAddSyntax.Enabled = !string.IsNullOrEmpty(txtCustomUploaderJsonPath.Text);