mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-05 20:54:31 +13:00
Added request, response and test tabs to custom uploader tab to create more space
This commit is contained in:
parent
885f6c8851
commit
af952f5c1a
4 changed files with 3252 additions and 2668 deletions
1351
ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs
generated
1351
ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs
generated
File diff suppressed because it is too large
Load diff
|
@ -58,6 +58,7 @@ private UploadersConfigForm(UploadersConfig config)
|
||||||
{
|
{
|
||||||
Config = config;
|
Config = config;
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
Size = new Size(1016, 640);
|
||||||
InitializeControls();
|
InitializeControls();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -106,7 +107,7 @@ private void InitializeControls()
|
||||||
CodeMenuItem codeMenuItemInput = new CodeMenuItem("$input$", "Text/URL input");
|
CodeMenuItem codeMenuItemInput = new CodeMenuItem("$input$", "Text/URL input");
|
||||||
CodeMenuItem codeMenuItemFilename = new CodeMenuItem("$filename$", "File name");
|
CodeMenuItem codeMenuItemFilename = new CodeMenuItem("$filename$", "File name");
|
||||||
|
|
||||||
CodeMenu.Create<CodeMenuEntryFilename>(rtbCustomUploaderArgValue,
|
CodeMenu.Create<CodeMenuEntryFilename>(rtbCustomUploaderArgumentValue,
|
||||||
new CodeMenuEntryFilename[] { CodeMenuEntryFilename.n, CodeMenuEntryFilename.t, CodeMenuEntryFilename.pn },
|
new CodeMenuEntryFilename[] { CodeMenuEntryFilename.n, CodeMenuEntryFilename.t, CodeMenuEntryFilename.pn },
|
||||||
new CodeMenuItem[] { codeMenuItemInput, codeMenuItemFilename });
|
new CodeMenuItem[] { codeMenuItemInput, codeMenuItemFilename });
|
||||||
CodeMenu.Create<CodeMenuEntryFilename>(rtbCustomUploaderHeaderValue,
|
CodeMenu.Create<CodeMenuEntryFilename>(rtbCustomUploaderHeaderValue,
|
||||||
|
@ -121,15 +122,15 @@ private void InitializeControls()
|
||||||
// Custom uploader
|
// Custom uploader
|
||||||
rtbCustomUploaderRequestURL.AddContextMenu();
|
rtbCustomUploaderRequestURL.AddContextMenu();
|
||||||
rtbCustomUploaderData.AddContextMenu();
|
rtbCustomUploaderData.AddContextMenu();
|
||||||
rtbCustomUploaderArgValue.AddContextMenu();
|
rtbCustomUploaderArgumentValue.AddContextMenu();
|
||||||
rtbCustomUploaderHeaderValue.AddContextMenu();
|
rtbCustomUploaderHeaderValue.AddContextMenu();
|
||||||
rtbCustomUploaderURL.AddContextMenu();
|
rtbCustomUploaderURL.AddContextMenu();
|
||||||
rtbCustomUploaderThumbnailURL.AddContextMenu();
|
rtbCustomUploaderThumbnailURL.AddContextMenu();
|
||||||
rtbCustomUploaderDeletionURL.AddContextMenu();
|
rtbCustomUploaderDeletionURL.AddContextMenu();
|
||||||
rtbCustomUploaderLog.AddContextMenu();
|
rtbCustomUploaderResult.AddContextMenu();
|
||||||
eiCustomUploaders.ObjectType = typeof(CustomUploaderItem);
|
eiCustomUploaders.ObjectType = typeof(CustomUploaderItem);
|
||||||
CustomUploaderAddDestinationTypes();
|
CustomUploaderAddDestinationTypes();
|
||||||
cbCustomUploaderRequestType.Items.AddRange(Enum.GetNames(typeof(HttpMethod)));
|
cbCustomUploaderRequestMethod.Items.AddRange(Enum.GetNames(typeof(HttpMethod)));
|
||||||
cbCustomUploaderRequestFormat.Items.AddRange(Helpers.GetEnumDescriptions<CustomUploaderRequestFormat>());
|
cbCustomUploaderRequestFormat.Items.AddRange(Helpers.GetEnumDescriptions<CustomUploaderRequestFormat>());
|
||||||
cbCustomUploaderResponseType.Items.AddRange(Helpers.GetLocalizedEnumDescriptions<ResponseType>());
|
cbCustomUploaderResponseType.Items.AddRange(Helpers.GetLocalizedEnumDescriptions<ResponseType>());
|
||||||
|
|
||||||
|
@ -3503,7 +3504,7 @@ private void txtCustomUploaderName_TextChanged(object sender, EventArgs e)
|
||||||
private void cbCustomUploaderRequestType_SelectedIndexChanged(object sender, EventArgs e)
|
private void cbCustomUploaderRequestType_SelectedIndexChanged(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
CustomUploaderItem uploader = CustomUploaderGetSelected();
|
CustomUploaderItem uploader = CustomUploaderGetSelected();
|
||||||
if (uploader != null) uploader.RequestType = (HttpMethod)cbCustomUploaderRequestType.SelectedIndex;
|
if (uploader != null) uploader.RequestType = (HttpMethod)cbCustomUploaderRequestMethod.SelectedIndex;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void rtbCustomUploaderRequestURL_TextChanged(object sender, EventArgs e)
|
private void rtbCustomUploaderRequestURL_TextChanged(object sender, EventArgs e)
|
||||||
|
@ -3544,7 +3545,7 @@ private void btnCustomUploaderDataMinify_Click(object sender, EventArgs e)
|
||||||
private void txtCustomUploaderFileForm_TextChanged(object sender, EventArgs e)
|
private void txtCustomUploaderFileForm_TextChanged(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
CustomUploaderItem uploader = CustomUploaderGetSelected();
|
CustomUploaderItem uploader = CustomUploaderGetSelected();
|
||||||
if (uploader != null) uploader.FileFormName = txtCustomUploaderFileForm.Text;
|
if (uploader != null) uploader.FileFormName = txtCustomUploaderFileFormName.Text;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void txtCustomUploaderArgName_TextChanged(object sender, EventArgs e)
|
private void txtCustomUploaderArgName_TextChanged(object sender, EventArgs e)
|
||||||
|
@ -3554,12 +3555,12 @@ private void txtCustomUploaderArgName_TextChanged(object sender, EventArgs e)
|
||||||
|
|
||||||
private void rtbCustomUploaderArgValue_TextChanged(object sender, EventArgs e)
|
private void rtbCustomUploaderArgValue_TextChanged(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
CustomUploaderSyntaxHighlight(rtbCustomUploaderArgValue);
|
CustomUploaderSyntaxHighlight(rtbCustomUploaderArgumentValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void btnCustomUploaderArgAdd_Click(object sender, EventArgs e)
|
private void btnCustomUploaderArgAdd_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
string name = txtCustomUploaderArgName.Text;
|
string name = txtCustomUploaderArgumentName.Text;
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(name))
|
if (!string.IsNullOrEmpty(name))
|
||||||
{
|
{
|
||||||
|
@ -3575,14 +3576,14 @@ private void btnCustomUploaderArgAdd_Click(object sender, EventArgs e)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
string value = rtbCustomUploaderArgValue.Text;
|
string value = rtbCustomUploaderArgumentValue.Text;
|
||||||
lvCustomUploaderArguments.Items.Add(name).SubItems.Add(value);
|
lvCustomUploaderArguments.Items.Add(name).SubItems.Add(value);
|
||||||
uploader.Arguments.Add(name, value);
|
uploader.Arguments.Add(name, value);
|
||||||
|
|
||||||
lvCustomUploaderArguments.SelectedItems.Clear();
|
lvCustomUploaderArguments.SelectedItems.Clear();
|
||||||
txtCustomUploaderArgName.Text = "";
|
txtCustomUploaderArgumentName.Text = "";
|
||||||
rtbCustomUploaderArgValue.Text = "";
|
rtbCustomUploaderArgumentValue.Text = "";
|
||||||
txtCustomUploaderArgName.Focus();
|
txtCustomUploaderArgumentName.Focus();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3603,11 +3604,11 @@ private void btnCustomUploaderArgUpdate_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
if (lvCustomUploaderArguments.SelectedItems.Count > 0)
|
if (lvCustomUploaderArguments.SelectedItems.Count > 0)
|
||||||
{
|
{
|
||||||
string name = txtCustomUploaderArgName.Text;
|
string name = txtCustomUploaderArgumentName.Text;
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(name))
|
if (!string.IsNullOrEmpty(name))
|
||||||
{
|
{
|
||||||
string value = rtbCustomUploaderArgValue.Text;
|
string value = rtbCustomUploaderArgumentValue.Text;
|
||||||
|
|
||||||
CustomUploaderItem uploader = CustomUploaderGetSelected();
|
CustomUploaderItem uploader = CustomUploaderGetSelected();
|
||||||
if (uploader != null)
|
if (uploader != null)
|
||||||
|
@ -3633,8 +3634,8 @@ private void lvCustomUploaderArguments_SelectedIndexChanged(object sender, Event
|
||||||
value = lvCustomUploaderArguments.SelectedItems[0].SubItems[1].Text;
|
value = lvCustomUploaderArguments.SelectedItems[0].SubItems[1].Text;
|
||||||
}
|
}
|
||||||
|
|
||||||
txtCustomUploaderArgName.Text = name;
|
txtCustomUploaderArgumentName.Text = name;
|
||||||
rtbCustomUploaderArgValue.Text = value;
|
rtbCustomUploaderArgumentValue.Text = value;
|
||||||
|
|
||||||
CustomUploaderUpdateArgumentsState();
|
CustomUploaderUpdateArgumentsState();
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -963,7 +963,7 @@ private void CustomUploaderLoad(CustomUploaderItem uploader)
|
||||||
txtCustomUploaderName.Text = uploader.Name ?? "";
|
txtCustomUploaderName.Text = uploader.Name ?? "";
|
||||||
CustomUploaderSetDestinationType(uploader.DestinationType);
|
CustomUploaderSetDestinationType(uploader.DestinationType);
|
||||||
|
|
||||||
cbCustomUploaderRequestType.SelectedIndex = (int)uploader.RequestType;
|
cbCustomUploaderRequestMethod.SelectedIndex = (int)uploader.RequestType;
|
||||||
rtbCustomUploaderRequestURL.Text = uploader.RequestURL ?? "";
|
rtbCustomUploaderRequestURL.Text = uploader.RequestURL ?? "";
|
||||||
CustomUploaderSyntaxHighlight(rtbCustomUploaderRequestURL);
|
CustomUploaderSyntaxHighlight(rtbCustomUploaderRequestURL);
|
||||||
cbCustomUploaderRequestFormat.SelectedIndex = (int)uploader.RequestFormat;
|
cbCustomUploaderRequestFormat.SelectedIndex = (int)uploader.RequestFormat;
|
||||||
|
@ -971,8 +971,8 @@ private void CustomUploaderLoad(CustomUploaderItem uploader)
|
||||||
rtbCustomUploaderData.Text = uploader.Data ?? "";
|
rtbCustomUploaderData.Text = uploader.Data ?? "";
|
||||||
CustomUploaderSyntaxHighlight(rtbCustomUploaderData);
|
CustomUploaderSyntaxHighlight(rtbCustomUploaderData);
|
||||||
|
|
||||||
txtCustomUploaderArgName.Text = "";
|
txtCustomUploaderArgumentName.Text = "";
|
||||||
rtbCustomUploaderArgValue.Text = "";
|
rtbCustomUploaderArgumentValue.Text = "";
|
||||||
lvCustomUploaderArguments.Items.Clear();
|
lvCustomUploaderArguments.Items.Clear();
|
||||||
if (uploader.Arguments != null)
|
if (uploader.Arguments != null)
|
||||||
{
|
{
|
||||||
|
@ -982,7 +982,7 @@ private void CustomUploaderLoad(CustomUploaderItem uploader)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
txtCustomUploaderFileForm.Text = uploader.FileFormName ?? "";
|
txtCustomUploaderFileFormName.Text = uploader.FileFormName ?? "";
|
||||||
|
|
||||||
txtCustomUploaderHeaderName.Text = "";
|
txtCustomUploaderHeaderName.Text = "";
|
||||||
rtbCustomUploaderHeaderValue.Text = "";
|
rtbCustomUploaderHeaderValue.Text = "";
|
||||||
|
@ -1045,7 +1045,10 @@ private void CustomUploaderUpdateRequestFormatState()
|
||||||
CustomUploaderItem uploader = CustomUploaderGetSelected();
|
CustomUploaderItem uploader = CustomUploaderGetSelected();
|
||||||
if (uploader != null)
|
if (uploader != null)
|
||||||
{
|
{
|
||||||
if (uploader.ShouldSerializeData())
|
pCustomUploaderMultipartFormData.Visible = uploader.RequestFormat == CustomUploaderRequestFormat.MultipartFormData;
|
||||||
|
pCustomUploaderJSON.Visible = uploader.RequestFormat == CustomUploaderRequestFormat.JSON;
|
||||||
|
|
||||||
|
/*if (uploader.ShouldSerializeData())
|
||||||
{
|
{
|
||||||
if (!tcCustomUploaderArguments.TabPages.Contains(tpCustomUploaderData))
|
if (!tcCustomUploaderArguments.TabPages.Contains(tpCustomUploaderData))
|
||||||
{
|
{
|
||||||
|
@ -1067,14 +1070,14 @@ private void CustomUploaderUpdateRequestFormatState()
|
||||||
else if (tcCustomUploaderArguments.TabPages.Contains(tpCustomUploaderFile))
|
else if (tcCustomUploaderArguments.TabPages.Contains(tpCustomUploaderFile))
|
||||||
{
|
{
|
||||||
tcCustomUploaderArguments.TabPages.Remove(tpCustomUploaderFile);
|
tcCustomUploaderArguments.TabPages.Remove(tpCustomUploaderFile);
|
||||||
}
|
}*/
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void CustomUploaderUpdateArgumentsState()
|
private void CustomUploaderUpdateArgumentsState()
|
||||||
{
|
{
|
||||||
btnCustomUploaderArgAdd.Enabled = !string.IsNullOrEmpty(txtCustomUploaderArgName.Text);
|
btnCustomUploaderArgumentAdd.Enabled = !string.IsNullOrEmpty(txtCustomUploaderArgumentName.Text);
|
||||||
btnCustomUploaderArgRemove.Enabled = btnCustomUploaderArgUpdate.Enabled = lvCustomUploaderArguments.SelectedItems.Count > 0;
|
btnCustomUploaderArgumentRemove.Enabled = btnCustomUploaderArgumentUpdate.Enabled = lvCustomUploaderArguments.SelectedItems.Count > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void CustomUploaderUpdateHeadersState()
|
private void CustomUploaderUpdateHeadersState()
|
||||||
|
@ -1348,7 +1351,7 @@ private async Task TestCustomUploader(CustomUploaderDestinationType type, Custom
|
||||||
|
|
||||||
UploadResult result = null;
|
UploadResult result = null;
|
||||||
|
|
||||||
rtbCustomUploaderLog.ResetText();
|
rtbCustomUploaderResult.ResetText();
|
||||||
|
|
||||||
await Task.Run(() =>
|
await Task.Run(() =>
|
||||||
{
|
{
|
||||||
|
@ -1405,28 +1408,28 @@ await Task.Run(() =>
|
||||||
(type == CustomUploaderDestinationType.URLShortener && !string.IsNullOrEmpty(result.ShortenedURL)) ||
|
(type == CustomUploaderDestinationType.URLShortener && !string.IsNullOrEmpty(result.ShortenedURL)) ||
|
||||||
(type == CustomUploaderDestinationType.URLSharingService && !result.IsError && !string.IsNullOrEmpty(result.URL)))
|
(type == CustomUploaderDestinationType.URLSharingService && !result.IsError && !string.IsNullOrEmpty(result.URL)))
|
||||||
{
|
{
|
||||||
rtbCustomUploaderLog.AppendText("URL: " + result + Environment.NewLine);
|
rtbCustomUploaderResult.AppendText("URL: " + result + Environment.NewLine);
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(result.ThumbnailURL))
|
if (!string.IsNullOrEmpty(result.ThumbnailURL))
|
||||||
{
|
{
|
||||||
rtbCustomUploaderLog.AppendText("Thumbnail URL: " + result.ThumbnailURL + Environment.NewLine);
|
rtbCustomUploaderResult.AppendText("Thumbnail URL: " + result.ThumbnailURL + Environment.NewLine);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(result.DeletionURL))
|
if (!string.IsNullOrEmpty(result.DeletionURL))
|
||||||
{
|
{
|
||||||
rtbCustomUploaderLog.AppendText("Deletion URL: " + result.DeletionURL + Environment.NewLine);
|
rtbCustomUploaderResult.AppendText("Deletion URL: " + result.DeletionURL + Environment.NewLine);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (result.IsError)
|
else if (result.IsError)
|
||||||
{
|
{
|
||||||
rtbCustomUploaderLog.AppendText(Resources.UploadersConfigForm_Error + ": " + result.ErrorsToString() + Environment.NewLine);
|
rtbCustomUploaderResult.AppendText(Resources.UploadersConfigForm_Error + ": " + result.ErrorsToString() + Environment.NewLine);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
rtbCustomUploaderLog.AppendText(Resources.UploadersConfigForm_TestCustomUploader_Error__Result_is_empty_ + Environment.NewLine);
|
rtbCustomUploaderResult.AppendText(Resources.UploadersConfigForm_TestCustomUploader_Error__Result_is_empty_ + Environment.NewLine);
|
||||||
}
|
}
|
||||||
|
|
||||||
rtbCustomUploaderLog.ScrollToCaret();
|
rtbCustomUploaderResult.ScrollToCaret();
|
||||||
|
|
||||||
btnCustomUploaderShowLastResponse.Tag = result.Response;
|
btnCustomUploaderShowLastResponse.Tag = result.Response;
|
||||||
btnCustomUploaderShowLastResponse.Enabled = !string.IsNullOrEmpty(result.Response);
|
btnCustomUploaderShowLastResponse.Enabled = !string.IsNullOrEmpty(result.Response);
|
||||||
|
|
Loading…
Reference in a new issue