CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-01 09:47:22 +13:00
Code Issues Projects Releases Packages Wiki Activity

fixed #727: Show custom uploader thumbnail and deletion URL in "Test result" section

Browse source
This commit is contained in:
Jaex 2015-06-06 13:15:54 +03:00
parent f004ae5c78
commit 53719e8c76
3 changed files with 37 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ShareX.HelpersLib/ShareX.HelpersLib.csproj
View file

@ -385,6 +385,9 @@
<EmbeddedResource Include="Automate\AutomateForm.es.resx">
<DependentUpon>AutomateForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Automate\AutomateForm.fr.resx">
<DependentUpon>AutomateForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Automate\AutomateForm.ko-KR.resx">
<DependentUpon>AutomateForm.cs</DependentUpon>
</EmbeddedResource>

12
ShareX.UploadersLib/Forms/UploadersConfigForm.cs
View file

@ -2383,9 +2383,6 @@ private void btnCustomUploaderImageUploaderTest_Click(object sender, EventArgs e
if (Config.CustomUploadersList.IsValidIndex(Config.CustomImageUploaderSelected))
{
btnCustomUploaderImageUploaderTest.Enabled = btnCustomUploaderTextUploaderTest.Enabled =
btnCustomUploaderFileUploaderTest.Enabled = btnCustomUploaderURLShortenerTest.Enabled = false;
TestCustomUploader(CustomUploaderType.Image, Config.CustomUploadersList[Config.CustomImageUploaderSelected]);
}
}
@ -2396,9 +2393,6 @@ private void btnCustomUploaderTextUploaderTest_Click(object sender, EventArgs e)
if (Config.CustomUploadersList.IsValidIndex(Config.CustomTextUploaderSelected))
{
btnCustomUploaderImageUploaderTest.Enabled = btnCustomUploaderTextUploaderTest.Enabled =
btnCustomUploaderFileUploaderTest.Enabled = btnCustomUploaderURLShortenerTest.Enabled = false;
TestCustomUploader(CustomUploaderType.Text, Config.CustomUploadersList[Config.CustomTextUploaderSelected]);
}
}
@ -2409,9 +2403,6 @@ private void btnCustomUploaderFileUploaderTest_Click(object sender, EventArgs e)
if (Config.CustomUploadersList.IsValidIndex(Config.CustomFileUploaderSelected))
{
btnCustomUploaderImageUploaderTest.Enabled = btnCustomUploaderTextUploaderTest.Enabled =
btnCustomUploaderFileUploaderTest.Enabled = btnCustomUploaderURLShortenerTest.Enabled = false;
TestCustomUploader(CustomUploaderType.File, Config.CustomUploadersList[Config.CustomFileUploaderSelected]);
}
}
@ -2422,9 +2413,6 @@ private void btnCustomUploaderURLShortenerTest_Click(object sender, EventArgs e)
if (Config.CustomUploadersList.IsValidIndex(Config.CustomURLShortenerSelected))
{
btnCustomUploaderImageUploaderTest.Enabled = btnCustomUploaderTextUploaderTest.Enabled =
btnCustomUploaderFileUploaderTest.Enabled = btnCustomUploaderURLShortenerTest.Enabled = false;
TestCustomUploader(CustomUploaderType.URL, Config.CustomUploadersList[Config.CustomURLShortenerSelected]);
}
}

52
ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs
View file

@ -1849,6 +1849,9 @@ private CustomUploaderItem GetCustomUploaderFromFields()
private void TestCustomUploader(CustomUploaderType type, CustomUploaderItem item)
{
btnCustomUploaderImageUploaderTest.Enabled = btnCustomUploaderTextUploaderTest.Enabled =
btnCustomUploaderFileUploaderTest.Enabled = btnCustomUploaderURLShortenerTest.Enabled = false;
UploadResult result = null;
txtCustomUploaderLog.ResetText();
@ -1895,29 +1898,42 @@ private void TestCustomUploader(CustomUploaderType type, CustomUploaderItem item
},
() =>
{
if (result != null)
if (!IsDisposed)
{
if ((type != CustomUploaderType.URL && !string.IsNullOrEmpty(result.URL)) || (type == CustomUploaderType.URL && !string.IsNullOrEmpty(result.ShortenedURL)))
if (result != null)
{
txtCustomUploaderLog.AppendText("URL: " + result + Environment.NewLine);
}
else if (result.IsError)
{
txtCustomUploaderLog.AppendText(Resources.UploadersConfigForm_Error + ": " + result.ErrorsToString() + Environment.NewLine);
}
else
{
txtCustomUploaderLog.AppendText(Resources.UploadersConfigForm_TestCustomUploader_Error__Result_is_empty_ + Environment.NewLine);
if ((type != CustomUploaderType.URL && !string.IsNullOrEmpty(result.URL)) || (type == CustomUploaderType.URL && !string.IsNullOrEmpty(result.ShortenedURL)))
{
txtCustomUploaderLog.AppendText("URL: " + result + Environment.NewLine);
if (!string.IsNullOrEmpty(result.ThumbnailURL))
{
txtCustomUploaderLog.AppendText("Thumbnail URL: " + result.ThumbnailURL + Environment.NewLine);
}
if (!string.IsNullOrEmpty(result.DeletionURL))
{
txtCustomUploaderLog.AppendText("Deletion URL: " + result.DeletionURL + Environment.NewLine);
}
}
else if (result.IsError)
{
txtCustomUploaderLog.AppendText(Resources.UploadersConfigForm_Error + ": " + result.ErrorsToString() + Environment.NewLine);
}
else
{
txtCustomUploaderLog.AppendText(Resources.UploadersConfigForm_TestCustomUploader_Error__Result_is_empty_ + Environment.NewLine);
}
txtCustomUploaderLog.ScrollToCaret();
btnCustomUploaderShowLastResponse.Tag = result.Response;
btnCustomUploaderShowLastResponse.Enabled = !string.IsNullOrEmpty(result.Response);
}
txtCustomUploaderLog.ScrollToCaret();
btnCustomUploaderShowLastResponse.Tag = result.Response;
btnCustomUploaderShowLastResponse.Enabled = !string.IsNullOrEmpty(result.Response);
btnCustomUploaderImageUploaderTest.Enabled = btnCustomUploaderTextUploaderTest.Enabled =
btnCustomUploaderFileUploaderTest.Enabled = btnCustomUploaderURLShortenerTest.Enabled = true;
}
btnCustomUploaderImageUploaderTest.Enabled = btnCustomUploaderTextUploaderTest.Enabled =
btnCustomUploaderFileUploaderTest.Enabled = btnCustomUploaderURLShortenerTest.Enabled = true;
});
}