Merge branch 'custom-uploader-improvements'

This commit is contained in:
Jaex 2019-01-09 21:47:44 +03:00
commit 3de07df1a9
12 changed files with 673 additions and 309 deletions

View file

@ -24,6 +24,8 @@ You should have received a copy of the GNU General Public License
#endregion License Information (GPL v3)
using Microsoft.Win32;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using ShareX.HelpersLib.Properties;
using System;
using System.Collections.Generic;
@ -49,6 +51,8 @@ You should have received a copy of the GNU General Public License
using System.Threading.Tasks;
using System.Web;
using System.Windows.Forms;
using System.Xml;
using System.Xml.Linq;
namespace ShareX.HelpersLib
{
@ -1381,5 +1385,37 @@ public static bool IsTabletMode()
return false;
}
public static string JSONFormat(string json, Newtonsoft.Json.Formatting formatting)
{
return JToken.Parse(json).ToString(formatting);
}
public static string XMLFormat(string xml)
{
using (MemoryStream ms = new MemoryStream())
using (XmlTextWriter writer = new XmlTextWriter(ms, Encoding.Unicode))
{
// Load the XmlDocument with the XML.
XmlDocument document = new XmlDocument();
document.LoadXml(xml);
writer.Formatting = System.Xml.Formatting.Indented;
// Write the XML into a formatting XmlTextWriter
document.WriteContentTo(writer);
writer.Flush();
ms.Flush();
// Have to rewind the MemoryStream in order to read its contents.
ms.Position = 0;
// Read MemoryStream contents into a StreamReader.
StreamReader sReader = new StreamReader(ms);
// Extract the text from the StreamReader.
return sReader.ReadToEnd();
}
}
}
}

View file

@ -83,7 +83,7 @@ public bool ShouldSerializeArguments() => (Body == CustomUploaderBody.MultipartF
[DefaultValue("")]
public string Data { get; set; }
public bool ShouldSerializeData() => Body == CustomUploaderBody.JSON && !string.IsNullOrEmpty(Data);
public bool ShouldSerializeData() => (Body == CustomUploaderBody.JSON || Body == CustomUploaderBody.XML) && !string.IsNullOrEmpty(Data);
[DefaultValue(ResponseType.Text)]
public ResponseType ResponseType { get; set; }
@ -163,11 +163,25 @@ public Dictionary<string, string> GetParameters(CustomUploaderInput input)
return parameters;
}
public string GetContentType()
{
switch (Body)
{
case CustomUploaderBody.JSON:
return UploadHelpers.ContentTypeJSON;
case CustomUploaderBody.XML:
return UploadHelpers.ContentTypeXML;
}
return null;
}
public string GetData(CustomUploaderInput input)
{
CustomUploaderParser parser = new CustomUploaderParser(input);
parser.UseNameParser = true;
parser.JSONEncode = Body == CustomUploaderBody.JSON;
parser.XMLEncode = Body == CustomUploaderBody.XML;
return parser.Parse(Data);
}

View file

@ -30,6 +30,7 @@ You should have received a copy of the GNU General Public License
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Security;
using System.Text;
using System.Text.RegularExpressions;
using System.Windows.Forms;
@ -50,6 +51,7 @@ public class CustomUploaderParser
public List<Match> RegexMatches { get; set; }
public bool URLEncode { get; set; } // Only URL encodes filename and input
public bool JSONEncode { get; set; }
public bool XMLEncode { get; set; }
public bool UseNameParser { get; set; }
public bool SkipSyntaxParse { get; set; }
@ -143,6 +145,10 @@ private string Parse(string text, bool isOutput)
{
syntaxResult = URLHelpers.JSONEncode(syntaxResult);
}
else if (XMLEncode)
{
syntaxResult = SecurityElement.Escape(syntaxResult);
}
sbResult.Append(syntaxResult);
}

View file

@ -291,16 +291,18 @@ public enum LinkFormatEnum
public enum CustomUploaderBody
{
[Description("None")]
[Description("No body")]
None,
[Description("Form data (multipart/form-data)")]
MultipartFormData,
[Description("Form URL encoded (application/x-www-form-urlencoded)")]
FormURLEncoded,
[Description("JSON (application/json)")]
JSON,
[Description("XML (application/xml)")]
XML,
[Description("Binary")]
Binary,
[Description("Form URL encoded (application/x-www-form-urlencoded)")]
FormURLEncoded
Binary
}
[Flags]

View file

@ -54,6 +54,12 @@ private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UploadersConfigForm));
this.tscCustomUploaderResponseText = new System.Windows.Forms.ToolStripContainer();
this.txtCustomUploaderResponse = new System.Windows.Forms.TextBox();
this.tsCustomUploaderResponseText = new System.Windows.Forms.ToolStrip();
this.tsbCustomUploaderJSONFormat = new System.Windows.Forms.ToolStripButton();
this.tsbCustomUploaderXMLFormat = new System.Windows.Forms.ToolStripButton();
this.tsbCustomUploaderCopyResponseText = new System.Windows.Forms.ToolStripButton();
this.txtRapidSharePremiumUserName = new System.Windows.Forms.TextBox();
this.ttHelpTip = new System.Windows.Forms.ToolTip(this.components);
this.cbAmazonS3CustomCNAME = new System.Windows.Forms.CheckBox();
@ -73,6 +79,7 @@ private void InitializeComponent()
this.lblTwitterDefaultMessage = new System.Windows.Forms.Label();
this.txtTwitterDefaultMessage = new System.Windows.Forms.TextBox();
this.cbTwitterSkipMessageBox = new System.Windows.Forms.CheckBox();
this.oauthTwitter = new ShareX.UploadersLib.OAuthControl();
this.txtTwitterDescription = new System.Windows.Forms.TextBox();
this.lblTwitterDescription = new System.Windows.Forms.Label();
this.btnTwitterRemove = new System.Windows.Forms.Button();
@ -168,7 +175,6 @@ private void InitializeComponent()
this.pCustomUploaderResult = new System.Windows.Forms.Panel();
this.rtbCustomUploaderResult = new System.Windows.Forms.RichTextBox();
this.tpCustomUploaderResponseText = new System.Windows.Forms.TabPage();
this.txtCustomUploaderResponse = new System.Windows.Forms.TextBox();
this.lblCustomUploaderDestinationType = new System.Windows.Forms.Label();
this.lblCustomUploaderName = new System.Windows.Forms.Label();
this.txtCustomUploaderName = new System.Windows.Forms.TextBox();
@ -197,6 +203,7 @@ private void InitializeComponent()
this.tpBitly = new System.Windows.Forms.TabPage();
this.txtBitlyDomain = new System.Windows.Forms.TextBox();
this.lblBitlyDomain = new System.Windows.Forms.Label();
this.oauth2Bitly = new ShareX.UploadersLib.OAuthControl();
this.tpYourls = new System.Windows.Forms.TabPage();
this.txtYourlsPassword = new System.Windows.Forms.TextBox();
this.txtYourlsUsername = new System.Windows.Forms.TextBox();
@ -298,10 +305,12 @@ private void InitializeComponent()
this.cbDropboxAutoCreateShareableLink = new System.Windows.Forms.CheckBox();
this.lblDropboxPath = new System.Windows.Forms.Label();
this.txtDropboxPath = new System.Windows.Forms.TextBox();
this.oauth2Dropbox = new ShareX.UploadersLib.OAuthControl();
this.tpOneDrive = new System.Windows.Forms.TabPage();
this.tvOneDrive = new System.Windows.Forms.TreeView();
this.lblOneDriveFolderID = new System.Windows.Forms.Label();
this.cbOneDriveCreateShareableLink = new System.Windows.Forms.CheckBox();
this.oAuth2OneDrive = new ShareX.UploadersLib.OAuthControl();
this.tpGoogleDrive = new System.Windows.Forms.TabPage();
this.cbGoogleDriveDirectLink = new System.Windows.Forms.CheckBox();
this.cbGoogleDriveUseFolder = new System.Windows.Forms.CheckBox();
@ -312,6 +321,7 @@ private void InitializeComponent()
this.chGoogleDriveDescription = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.btnGoogleDriveRefreshFolders = new System.Windows.Forms.Button();
this.cbGoogleDriveIsPublic = new System.Windows.Forms.CheckBox();
this.oauth2GoogleDrive = new ShareX.UploadersLib.OAuthControl();
this.tpPuush = new System.Windows.Forms.TabPage();
this.lblPuushAPIKey = new System.Windows.Forms.Label();
this.txtPuushAPIKey = new System.Windows.Forms.TextBox();
@ -328,6 +338,7 @@ private void InitializeComponent()
this.chBoxFoldersName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.lblBoxFolderID = new System.Windows.Forms.Label();
this.btnBoxRefreshFolders = new System.Windows.Forms.Button();
this.oauth2Box = new ShareX.UploadersLib.OAuthControl();
this.tpAmazonS3 = new System.Windows.Forms.TabPage();
this.gbAmazonS3Advanced = new System.Windows.Forms.GroupBox();
this.cbAmazonS3SignedPayload = new System.Windows.Forms.CheckBox();
@ -372,6 +383,7 @@ private void InitializeComponent()
this.txtGoogleCloudStorageDomain = new System.Windows.Forms.TextBox();
this.lblGoogleCloudStorageBucket = new System.Windows.Forms.Label();
this.txtGoogleCloudStorageBucket = new System.Windows.Forms.TextBox();
this.oauth2GoogleCloudStorage = new ShareX.UploadersLib.OAuthControl();
this.tpAzureStorage = new System.Windows.Forms.TabPage();
this.lblAzureStorageURLPreview = new System.Windows.Forms.Label();
this.lblAzureStorageURLPreviewLabel = new System.Windows.Forms.Label();
@ -398,6 +410,8 @@ private void InitializeComponent()
this.lblB2ApplicationKeyId = new System.Windows.Forms.Label();
this.tpGfycat = new System.Windows.Forms.TabPage();
this.cbGfycatIsPublic = new System.Windows.Forms.CheckBox();
this.atcGfycatAccountType = new ShareX.UploadersLib.AccountTypeControl();
this.oauth2Gfycat = new ShareX.UploadersLib.OAuthControl();
this.tpMega = new System.Windows.Forms.TabPage();
this.btnMegaRefreshFolders = new System.Windows.Forms.Button();
this.lblMegaStatus = new System.Windows.Forms.Label();
@ -447,6 +461,7 @@ private void InitializeComponent()
this.lblSendSpaceUsername = new System.Windows.Forms.Label();
this.txtSendSpacePassword = new System.Windows.Forms.TextBox();
this.txtSendSpaceUserName = new System.Windows.Forms.TextBox();
this.atcSendSpaceAccountType = new ShareX.UploadersLib.AccountTypeControl();
this.tpGe_tt = new System.Windows.Forms.TabPage();
this.lblGe_ttStatus = new System.Windows.Forms.Label();
this.lblGe_ttPassword = new System.Windows.Forms.Label();
@ -467,6 +482,7 @@ private void InitializeComponent()
this.txtJiraConfigHelp = new System.Windows.Forms.TextBox();
this.txtJiraHost = new System.Windows.Forms.TextBox();
this.lblJiraHost = new System.Windows.Forms.Label();
this.oAuthJira = new ShareX.UploadersLib.OAuthControl();
this.tpLambda = new System.Windows.Forms.TabPage();
this.lblLambdaInfo = new System.Windows.Forms.Label();
this.lblLambdaApiKey = new System.Windows.Forms.Label();
@ -563,6 +579,7 @@ private void InitializeComponent()
this.cbYouTubeUseShortenedLink = new System.Windows.Forms.CheckBox();
this.cbYouTubePrivacyType = new System.Windows.Forms.ComboBox();
this.lblYouTubePrivacyType = new System.Windows.Forms.Label();
this.oauth2YouTube = new ShareX.UploadersLib.OAuthControl();
this.tpSharedFolder = new System.Windows.Forms.TabPage();
this.lbSharedFolderAccounts = new System.Windows.Forms.ListBox();
this.pgSharedFolderAccount = new System.Windows.Forms.PropertyGrid();
@ -622,6 +639,7 @@ private void InitializeComponent()
this.txtGistCustomURL = new System.Windows.Forms.TextBox();
this.cbGistUseRawURL = new System.Windows.Forms.CheckBox();
this.cbGistPublishPublic = new System.Windows.Forms.CheckBox();
this.oAuth2Gist = new ShareX.UploadersLib.OAuthControl();
this.tpUpaste = new System.Windows.Forms.TabPage();
this.cbUpasteIsPublic = new System.Windows.Forms.CheckBox();
this.lblUpasteUserKey = new System.Windows.Forms.Label();
@ -645,6 +663,8 @@ private void InitializeComponent()
this.cbImgurUseGIFV = new System.Windows.Forms.CheckBox();
this.cbImgurUploadSelectedAlbum = new System.Windows.Forms.CheckBox();
this.cbImgurDirectLink = new System.Windows.Forms.CheckBox();
this.atcImgurAccountType = new ShareX.UploadersLib.AccountTypeControl();
this.oauth2Imgur = new ShareX.UploadersLib.OAuthControl();
this.lvImgurAlbumList = new System.Windows.Forms.ListView();
this.chImgurID = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chImgurTitle = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
@ -662,6 +682,7 @@ private void InitializeComponent()
this.txtImageShackPassword = new System.Windows.Forms.TextBox();
this.lblImageShackPassword = new System.Windows.Forms.Label();
this.tpTinyPic = new System.Windows.Forms.TabPage();
this.atcTinyPicAccountType = new ShareX.UploadersLib.AccountTypeControl();
this.btnTinyPicLogin = new System.Windows.Forms.Button();
this.txtTinyPicPassword = new System.Windows.Forms.TextBox();
this.lblTinyPicPassword = new System.Windows.Forms.Label();
@ -670,6 +691,7 @@ private void InitializeComponent()
this.btnTinyPicOpenMyImages = new System.Windows.Forms.Button();
this.tpFlickr = new System.Windows.Forms.TabPage();
this.cbFlickrDirectLink = new System.Windows.Forms.CheckBox();
this.oauthFlickr = new ShareX.UploadersLib.OAuthControl();
this.tpPhotobucket = new System.Windows.Forms.TabPage();
this.gbPhotobucketAlbumPath = new System.Windows.Forms.GroupBox();
this.btnPhotobucketAddAlbum = new System.Windows.Forms.Button();
@ -697,6 +719,7 @@ private void InitializeComponent()
this.chPicasaName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chPicasaDescription = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.btnPicasaRefreshAlbumList = new System.Windows.Forms.Button();
this.oauth2Picasa = new ShareX.UploadersLib.OAuthControl();
this.tpChevereto = new System.Windows.Forms.TabPage();
this.btnCheveretoTestAll = new System.Windows.Forms.Button();
this.lblCheveretoUploadURLExample = new System.Windows.Forms.Label();
@ -718,25 +741,11 @@ 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.atcImgurAccountType = new ShareX.UploadersLib.AccountTypeControl();
this.oauth2Imgur = new ShareX.UploadersLib.OAuthControl();
this.atcTinyPicAccountType = new ShareX.UploadersLib.AccountTypeControl();
this.oauthFlickr = new ShareX.UploadersLib.OAuthControl();
this.oauth2Picasa = new ShareX.UploadersLib.OAuthControl();
this.oAuth2Gist = new ShareX.UploadersLib.OAuthControl();
this.oauth2Dropbox = new ShareX.UploadersLib.OAuthControl();
this.oAuth2OneDrive = new ShareX.UploadersLib.OAuthControl();
this.oauth2GoogleDrive = new ShareX.UploadersLib.OAuthControl();
this.oauth2Box = new ShareX.UploadersLib.OAuthControl();
this.oauth2GoogleCloudStorage = new ShareX.UploadersLib.OAuthControl();
this.oauthTwitter = new ShareX.UploadersLib.OAuthControl();
this.oauth2Bitly = new ShareX.UploadersLib.OAuthControl();
this.atcGfycatAccountType = new ShareX.UploadersLib.AccountTypeControl();
this.oauth2Gfycat = new ShareX.UploadersLib.OAuthControl();
this.atcSendSpaceAccountType = new ShareX.UploadersLib.AccountTypeControl();
this.oAuthJira = new ShareX.UploadersLib.OAuthControl();
this.oauth2YouTube = new ShareX.UploadersLib.OAuthControl();
this.actRapidShareAccountType = new ShareX.UploadersLib.AccountTypeControl();
this.tscCustomUploaderResponseText.ContentPanel.SuspendLayout();
this.tscCustomUploaderResponseText.TopToolStripPanel.SuspendLayout();
this.tscCustomUploaderResponseText.SuspendLayout();
this.tsCustomUploaderResponseText.SuspendLayout();
this.tpOtherUploaders.SuspendLayout();
this.tcOtherUploaders.SuspendLayout();
this.tpTwitter.SuspendLayout();
@ -847,6 +856,60 @@ private void InitializeComponent()
this.cmsCustomUploaderHelp.SuspendLayout();
this.SuspendLayout();
//
// 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;
//
// txtCustomUploaderResponse
//
resources.ApplyResources(this.txtCustomUploaderResponse, "txtCustomUploaderResponse");
this.txtCustomUploaderResponse.Name = "txtCustomUploaderResponse";
//
// 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.tsbCustomUploaderCopyResponseText});
this.tsCustomUploaderResponseText.Name = "tsCustomUploaderResponseText";
this.tsCustomUploaderResponseText.ShowItemToolTips = false;
//
// 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);
//
// tsbCustomUploaderCopyResponseText
//
this.tsbCustomUploaderCopyResponseText.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
resources.ApplyResources(this.tsbCustomUploaderCopyResponseText, "tsbCustomUploaderCopyResponseText");
this.tsbCustomUploaderCopyResponseText.Margin = new System.Windows.Forms.Padding(3, 1, 0, 2);
this.tsbCustomUploaderCopyResponseText.Name = "tsbCustomUploaderCopyResponseText";
this.tsbCustomUploaderCopyResponseText.Click += new System.EventHandler(this.tsbCustomUploaderCopyResponseText_Click);
//
// txtRapidSharePremiumUserName
//
resources.ApplyResources(this.txtRapidSharePremiumUserName, "txtRapidSharePremiumUserName");
@ -994,6 +1057,15 @@ private void InitializeComponent()
this.cbTwitterSkipMessageBox.UseVisualStyleBackColor = true;
this.cbTwitterSkipMessageBox.CheckedChanged += new System.EventHandler(this.cbTwitterSkipMessageBox_CheckedChanged);
//
// oauthTwitter
//
resources.ApplyResources(this.oauthTwitter, "oauthTwitter");
this.oauthTwitter.IsRefreshable = false;
this.oauthTwitter.Name = "oauthTwitter";
this.oauthTwitter.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauthTwitter_OpenButtonClicked);
this.oauthTwitter.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauthTwitter_CompleteButtonClicked);
this.oauthTwitter.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauthTwitter_ClearButtonClicked);
//
// txtTwitterDescription
//
resources.ApplyResources(this.txtTwitterDescription, "txtTwitterDescription");
@ -1729,16 +1801,11 @@ 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;
//
// txtCustomUploaderResponse
//
resources.ApplyResources(this.txtCustomUploaderResponse, "txtCustomUploaderResponse");
this.txtCustomUploaderResponse.Name = "txtCustomUploaderResponse";
//
// lblCustomUploaderDestinationType
//
resources.ApplyResources(this.lblCustomUploaderDestinationType, "lblCustomUploaderDestinationType");
@ -1942,6 +2009,15 @@ private void InitializeComponent()
resources.ApplyResources(this.lblBitlyDomain, "lblBitlyDomain");
this.lblBitlyDomain.Name = "lblBitlyDomain";
//
// oauth2Bitly
//
this.oauth2Bitly.IsRefreshable = false;
resources.ApplyResources(this.oauth2Bitly, "oauth2Bitly");
this.oauth2Bitly.Name = "oauth2Bitly";
this.oauth2Bitly.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Bitly_OpenButtonClicked);
this.oauth2Bitly.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Bitly_CompleteButtonClicked);
this.oauth2Bitly.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Bitly_ClearButtonClicked);
//
// tpYourls
//
this.tpYourls.BackColor = System.Drawing.SystemColors.Window;
@ -2698,6 +2774,15 @@ private void InitializeComponent()
this.txtDropboxPath.Name = "txtDropboxPath";
this.txtDropboxPath.TextChanged += new System.EventHandler(this.txtDropboxPath_TextChanged);
//
// oauth2Dropbox
//
this.oauth2Dropbox.IsRefreshable = false;
resources.ApplyResources(this.oauth2Dropbox, "oauth2Dropbox");
this.oauth2Dropbox.Name = "oauth2Dropbox";
this.oauth2Dropbox.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Dropbox_OpenButtonClicked);
this.oauth2Dropbox.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Dropbox_CompleteButtonClicked);
this.oauth2Dropbox.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Dropbox_ClearButtonClicked);
//
// tpOneDrive
//
this.tpOneDrive.BackColor = System.Drawing.SystemColors.Window;
@ -2727,6 +2812,15 @@ private void InitializeComponent()
this.cbOneDriveCreateShareableLink.UseVisualStyleBackColor = true;
this.cbOneDriveCreateShareableLink.CheckedChanged += new System.EventHandler(this.cbOneDriveCreateShareableLink_CheckedChanged);
//
// oAuth2OneDrive
//
resources.ApplyResources(this.oAuth2OneDrive, "oAuth2OneDrive");
this.oAuth2OneDrive.Name = "oAuth2OneDrive";
this.oAuth2OneDrive.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuth2OneDrive_OpenButtonClicked);
this.oAuth2OneDrive.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuth2OneDrive_CompleteButtonClicked);
this.oAuth2OneDrive.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuth2OneDrive_ClearButtonClicked);
this.oAuth2OneDrive.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oAuth2OneDrive_RefreshButtonClicked);
//
// tpGoogleDrive
//
this.tpGoogleDrive.BackColor = System.Drawing.SystemColors.Window;
@ -2802,6 +2896,15 @@ private void InitializeComponent()
this.cbGoogleDriveIsPublic.UseVisualStyleBackColor = true;
this.cbGoogleDriveIsPublic.CheckedChanged += new System.EventHandler(this.cbGoogleDriveIsPublic_CheckedChanged);
//
// oauth2GoogleDrive
//
resources.ApplyResources(this.oauth2GoogleDrive, "oauth2GoogleDrive");
this.oauth2GoogleDrive.Name = "oauth2GoogleDrive";
this.oauth2GoogleDrive.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2GoogleDrive_OpenButtonClicked);
this.oauth2GoogleDrive.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2GoogleDrive_CompleteButtonClicked);
this.oauth2GoogleDrive.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2GoogleDrive_ClearButtonClicked);
this.oauth2GoogleDrive.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2GoogleDrive_RefreshButtonClicked);
//
// tpPuush
//
this.tpPuush.BackColor = System.Drawing.SystemColors.Window;
@ -2916,6 +3019,15 @@ private void InitializeComponent()
this.btnBoxRefreshFolders.UseVisualStyleBackColor = true;
this.btnBoxRefreshFolders.Click += new System.EventHandler(this.btnBoxRefreshFolders_Click);
//
// oauth2Box
//
resources.ApplyResources(this.oauth2Box, "oauth2Box");
this.oauth2Box.Name = "oauth2Box";
this.oauth2Box.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Box_OpenButtonClicked);
this.oauth2Box.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Box_CompleteButtonClicked);
this.oauth2Box.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Box_ClearButtonClicked);
this.oauth2Box.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Box_RefreshButtonClicked);
//
// tpAmazonS3
//
this.tpAmazonS3.BackColor = System.Drawing.SystemColors.Window;
@ -3224,6 +3336,15 @@ private void InitializeComponent()
this.txtGoogleCloudStorageBucket.Name = "txtGoogleCloudStorageBucket";
this.txtGoogleCloudStorageBucket.TextChanged += new System.EventHandler(this.txtGoogleCloudStorageBucket_TextChanged);
//
// oauth2GoogleCloudStorage
//
resources.ApplyResources(this.oauth2GoogleCloudStorage, "oauth2GoogleCloudStorage");
this.oauth2GoogleCloudStorage.Name = "oauth2GoogleCloudStorage";
this.oauth2GoogleCloudStorage.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2GoogleCloudStorage_OpenButtonClicked);
this.oauth2GoogleCloudStorage.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2GoogleCloudStorage_CompleteButtonClicked);
this.oauth2GoogleCloudStorage.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2GoogleCloudStorage_ClearButtonClicked);
this.oauth2GoogleCloudStorage.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2GoogleCloudStorage_RefreshButtonClicked);
//
// tpAzureStorage
//
this.tpAzureStorage.BackColor = System.Drawing.SystemColors.Window;
@ -3409,6 +3530,22 @@ private void InitializeComponent()
this.cbGfycatIsPublic.UseVisualStyleBackColor = true;
this.cbGfycatIsPublic.CheckedChanged += new System.EventHandler(this.cbGfycatIsPublic_CheckedChanged);
//
// atcGfycatAccountType
//
resources.ApplyResources(this.atcGfycatAccountType, "atcGfycatAccountType");
this.atcGfycatAccountType.Name = "atcGfycatAccountType";
this.atcGfycatAccountType.SelectedAccountType = ShareX.UploadersLib.AccountType.Anonymous;
this.atcGfycatAccountType.AccountTypeChanged += new ShareX.UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcGfycatAccountType_AccountTypeChanged);
//
// oauth2Gfycat
//
resources.ApplyResources(this.oauth2Gfycat, "oauth2Gfycat");
this.oauth2Gfycat.Name = "oauth2Gfycat";
this.oauth2Gfycat.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Gfycat_OpenButtonClicked);
this.oauth2Gfycat.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Gfycat_CompleteButtonClicked);
this.oauth2Gfycat.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Gfycat_ClearButtonClicked);
this.oauth2Gfycat.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Gfycat_RefreshButtonClicked);
//
// tpMega
//
this.tpMega.BackColor = System.Drawing.SystemColors.Window;
@ -3766,6 +3903,13 @@ private void InitializeComponent()
this.txtSendSpaceUserName.Name = "txtSendSpaceUserName";
this.txtSendSpaceUserName.TextChanged += new System.EventHandler(this.txtSendSpaceUserName_TextChanged);
//
// atcSendSpaceAccountType
//
resources.ApplyResources(this.atcSendSpaceAccountType, "atcSendSpaceAccountType");
this.atcSendSpaceAccountType.Name = "atcSendSpaceAccountType";
this.atcSendSpaceAccountType.SelectedAccountType = ShareX.UploadersLib.AccountType.Anonymous;
this.atcSendSpaceAccountType.AccountTypeChanged += new ShareX.UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcSendSpaceAccountType_AccountTypeChanged);
//
// tpGe_tt
//
this.tpGe_tt.BackColor = System.Drawing.SystemColors.Window;
@ -3900,6 +4044,15 @@ private void InitializeComponent()
resources.ApplyResources(this.lblJiraHost, "lblJiraHost");
this.lblJiraHost.Name = "lblJiraHost";
//
// oAuthJira
//
resources.ApplyResources(this.oAuthJira, "oAuthJira");
this.oAuthJira.Name = "oAuthJira";
this.oAuthJira.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuthJira_OpenButtonClicked);
this.oAuthJira.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuthJira_CompleteButtonClicked);
this.oAuthJira.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuthJira_ClearButtonClicked);
this.oAuthJira.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oAuthJira_RefreshButtonClicked);
//
// tpLambda
//
this.tpLambda.BackColor = System.Drawing.SystemColors.Window;
@ -4609,6 +4762,15 @@ private void InitializeComponent()
resources.ApplyResources(this.lblYouTubePrivacyType, "lblYouTubePrivacyType");
this.lblYouTubePrivacyType.Name = "lblYouTubePrivacyType";
//
// oauth2YouTube
//
resources.ApplyResources(this.oauth2YouTube, "oauth2YouTube");
this.oauth2YouTube.Name = "oauth2YouTube";
this.oauth2YouTube.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2YouTube_OpenButtonClicked);
this.oauth2YouTube.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2YouTube_CompleteButtonClicked);
this.oauth2YouTube.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2YouTube_ClearButtonClicked);
this.oauth2YouTube.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2YouTube_RefreshButtonClicked);
//
// tpSharedFolder
//
this.tpSharedFolder.BackColor = System.Drawing.SystemColors.Window;
@ -5041,6 +5203,15 @@ private void InitializeComponent()
this.cbGistPublishPublic.UseVisualStyleBackColor = true;
this.cbGistPublishPublic.CheckedChanged += new System.EventHandler(this.chkGistPublishPublic_CheckedChanged);
//
// oAuth2Gist
//
this.oAuth2Gist.IsRefreshable = false;
resources.ApplyResources(this.oAuth2Gist, "oAuth2Gist");
this.oAuth2Gist.Name = "oAuth2Gist";
this.oAuth2Gist.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuth2Gist_OpenButtonClicked);
this.oAuth2Gist.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuth2Gist_CompleteButtonClicked);
this.oAuth2Gist.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuth2Gist_ClearButtonClicked);
//
// tpUpaste
//
this.tpUpaste.BackColor = System.Drawing.SystemColors.Window;
@ -5213,6 +5384,22 @@ private void InitializeComponent()
this.cbImgurDirectLink.UseVisualStyleBackColor = true;
this.cbImgurDirectLink.CheckedChanged += new System.EventHandler(this.cbImgurDirectLink_CheckedChanged);
//
// atcImgurAccountType
//
resources.ApplyResources(this.atcImgurAccountType, "atcImgurAccountType");
this.atcImgurAccountType.Name = "atcImgurAccountType";
this.atcImgurAccountType.SelectedAccountType = ShareX.UploadersLib.AccountType.Anonymous;
this.atcImgurAccountType.AccountTypeChanged += new ShareX.UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcImgurAccountType_AccountTypeChanged);
//
// oauth2Imgur
//
resources.ApplyResources(this.oauth2Imgur, "oauth2Imgur");
this.oauth2Imgur.Name = "oauth2Imgur";
this.oauth2Imgur.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Imgur_OpenButtonClicked);
this.oauth2Imgur.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Imgur_CompleteButtonClicked);
this.oauth2Imgur.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Imgur_ClearButtonClicked);
this.oauth2Imgur.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Imgur_RefreshButtonClicked);
//
// lvImgurAlbumList
//
this.lvImgurAlbumList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
@ -5339,6 +5526,13 @@ private void InitializeComponent()
resources.ApplyResources(this.tpTinyPic, "tpTinyPic");
this.tpTinyPic.Name = "tpTinyPic";
//
// atcTinyPicAccountType
//
resources.ApplyResources(this.atcTinyPicAccountType, "atcTinyPicAccountType");
this.atcTinyPicAccountType.Name = "atcTinyPicAccountType";
this.atcTinyPicAccountType.SelectedAccountType = ShareX.UploadersLib.AccountType.Anonymous;
this.atcTinyPicAccountType.AccountTypeChanged += new ShareX.UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcTinyPicAccountType_AccountTypeChanged);
//
// btnTinyPicLogin
//
resources.ApplyResources(this.btnTinyPicLogin, "btnTinyPicLogin");
@ -5391,6 +5585,15 @@ private void InitializeComponent()
this.cbFlickrDirectLink.UseVisualStyleBackColor = true;
this.cbFlickrDirectLink.CheckedChanged += new System.EventHandler(this.cbFlickrDirectLink_CheckedChanged);
//
// oauthFlickr
//
this.oauthFlickr.IsRefreshable = false;
resources.ApplyResources(this.oauthFlickr, "oauthFlickr");
this.oauthFlickr.Name = "oauthFlickr";
this.oauthFlickr.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauthFlickr_OpenButtonClicked);
this.oauthFlickr.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauthFlickr_CompleteButtonClicked);
this.oauthFlickr.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauthFlickr_ClearButtonClicked);
//
// tpPhotobucket
//
this.tpPhotobucket.BackColor = System.Drawing.SystemColors.Window;
@ -5576,6 +5779,15 @@ private void InitializeComponent()
this.btnPicasaRefreshAlbumList.UseVisualStyleBackColor = true;
this.btnPicasaRefreshAlbumList.Click += new System.EventHandler(this.btnPicasaRefreshAlbumList_Click);
//
// oauth2Picasa
//
resources.ApplyResources(this.oauth2Picasa, "oauth2Picasa");
this.oauth2Picasa.Name = "oauth2Picasa";
this.oauth2Picasa.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Picasa_OpenButtonClicked);
this.oauth2Picasa.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Picasa_CompleteButtonClicked);
this.oauth2Picasa.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Picasa_ClearButtonClicked);
this.oauth2Picasa.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Picasa_RefreshButtonClicked);
//
// tpChevereto
//
this.tpChevereto.BackColor = System.Drawing.SystemColors.Window;
@ -5727,160 +5939,6 @@ private void InitializeComponent()
resources.ApplyResources(this.tsmiCustomUploaderExportAll, "tsmiCustomUploaderExportAll");
this.tsmiCustomUploaderExportAll.Click += new System.EventHandler(this.tsmiCustomUploaderExportAll_Click);
//
// atcImgurAccountType
//
resources.ApplyResources(this.atcImgurAccountType, "atcImgurAccountType");
this.atcImgurAccountType.Name = "atcImgurAccountType";
this.atcImgurAccountType.SelectedAccountType = ShareX.UploadersLib.AccountType.Anonymous;
this.atcImgurAccountType.AccountTypeChanged += new ShareX.UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcImgurAccountType_AccountTypeChanged);
//
// oauth2Imgur
//
resources.ApplyResources(this.oauth2Imgur, "oauth2Imgur");
this.oauth2Imgur.Name = "oauth2Imgur";
this.oauth2Imgur.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Imgur_OpenButtonClicked);
this.oauth2Imgur.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Imgur_CompleteButtonClicked);
this.oauth2Imgur.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Imgur_ClearButtonClicked);
this.oauth2Imgur.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Imgur_RefreshButtonClicked);
//
// atcTinyPicAccountType
//
resources.ApplyResources(this.atcTinyPicAccountType, "atcTinyPicAccountType");
this.atcTinyPicAccountType.Name = "atcTinyPicAccountType";
this.atcTinyPicAccountType.SelectedAccountType = ShareX.UploadersLib.AccountType.Anonymous;
this.atcTinyPicAccountType.AccountTypeChanged += new ShareX.UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcTinyPicAccountType_AccountTypeChanged);
//
// oauthFlickr
//
this.oauthFlickr.IsRefreshable = false;
resources.ApplyResources(this.oauthFlickr, "oauthFlickr");
this.oauthFlickr.Name = "oauthFlickr";
this.oauthFlickr.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauthFlickr_OpenButtonClicked);
this.oauthFlickr.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauthFlickr_CompleteButtonClicked);
this.oauthFlickr.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauthFlickr_ClearButtonClicked);
//
// oauth2Picasa
//
resources.ApplyResources(this.oauth2Picasa, "oauth2Picasa");
this.oauth2Picasa.Name = "oauth2Picasa";
this.oauth2Picasa.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Picasa_OpenButtonClicked);
this.oauth2Picasa.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Picasa_CompleteButtonClicked);
this.oauth2Picasa.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Picasa_ClearButtonClicked);
this.oauth2Picasa.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Picasa_RefreshButtonClicked);
//
// oAuth2Gist
//
this.oAuth2Gist.IsRefreshable = false;
resources.ApplyResources(this.oAuth2Gist, "oAuth2Gist");
this.oAuth2Gist.Name = "oAuth2Gist";
this.oAuth2Gist.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuth2Gist_OpenButtonClicked);
this.oAuth2Gist.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuth2Gist_CompleteButtonClicked);
this.oAuth2Gist.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuth2Gist_ClearButtonClicked);
//
// oauth2Dropbox
//
this.oauth2Dropbox.IsRefreshable = false;
resources.ApplyResources(this.oauth2Dropbox, "oauth2Dropbox");
this.oauth2Dropbox.Name = "oauth2Dropbox";
this.oauth2Dropbox.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Dropbox_OpenButtonClicked);
this.oauth2Dropbox.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Dropbox_CompleteButtonClicked);
this.oauth2Dropbox.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Dropbox_ClearButtonClicked);
//
// oAuth2OneDrive
//
resources.ApplyResources(this.oAuth2OneDrive, "oAuth2OneDrive");
this.oAuth2OneDrive.Name = "oAuth2OneDrive";
this.oAuth2OneDrive.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuth2OneDrive_OpenButtonClicked);
this.oAuth2OneDrive.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuth2OneDrive_CompleteButtonClicked);
this.oAuth2OneDrive.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuth2OneDrive_ClearButtonClicked);
this.oAuth2OneDrive.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oAuth2OneDrive_RefreshButtonClicked);
//
// oauth2GoogleDrive
//
resources.ApplyResources(this.oauth2GoogleDrive, "oauth2GoogleDrive");
this.oauth2GoogleDrive.Name = "oauth2GoogleDrive";
this.oauth2GoogleDrive.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2GoogleDrive_OpenButtonClicked);
this.oauth2GoogleDrive.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2GoogleDrive_CompleteButtonClicked);
this.oauth2GoogleDrive.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2GoogleDrive_ClearButtonClicked);
this.oauth2GoogleDrive.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2GoogleDrive_RefreshButtonClicked);
//
// oauth2Box
//
resources.ApplyResources(this.oauth2Box, "oauth2Box");
this.oauth2Box.Name = "oauth2Box";
this.oauth2Box.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Box_OpenButtonClicked);
this.oauth2Box.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Box_CompleteButtonClicked);
this.oauth2Box.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Box_ClearButtonClicked);
this.oauth2Box.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Box_RefreshButtonClicked);
//
// oauth2GoogleCloudStorage
//
resources.ApplyResources(this.oauth2GoogleCloudStorage, "oauth2GoogleCloudStorage");
this.oauth2GoogleCloudStorage.Name = "oauth2GoogleCloudStorage";
this.oauth2GoogleCloudStorage.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2GoogleCloudStorage_OpenButtonClicked);
this.oauth2GoogleCloudStorage.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2GoogleCloudStorage_CompleteButtonClicked);
this.oauth2GoogleCloudStorage.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2GoogleCloudStorage_ClearButtonClicked);
this.oauth2GoogleCloudStorage.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2GoogleCloudStorage_RefreshButtonClicked);
//
// oauthTwitter
//
resources.ApplyResources(this.oauthTwitter, "oauthTwitter");
this.oauthTwitter.IsRefreshable = false;
this.oauthTwitter.Name = "oauthTwitter";
this.oauthTwitter.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauthTwitter_OpenButtonClicked);
this.oauthTwitter.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauthTwitter_CompleteButtonClicked);
this.oauthTwitter.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauthTwitter_ClearButtonClicked);
//
// oauth2Bitly
//
this.oauth2Bitly.IsRefreshable = false;
resources.ApplyResources(this.oauth2Bitly, "oauth2Bitly");
this.oauth2Bitly.Name = "oauth2Bitly";
this.oauth2Bitly.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Bitly_OpenButtonClicked);
this.oauth2Bitly.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Bitly_CompleteButtonClicked);
this.oauth2Bitly.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Bitly_ClearButtonClicked);
//
// atcGfycatAccountType
//
resources.ApplyResources(this.atcGfycatAccountType, "atcGfycatAccountType");
this.atcGfycatAccountType.Name = "atcGfycatAccountType";
this.atcGfycatAccountType.SelectedAccountType = ShareX.UploadersLib.AccountType.Anonymous;
this.atcGfycatAccountType.AccountTypeChanged += new ShareX.UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcGfycatAccountType_AccountTypeChanged);
//
// oauth2Gfycat
//
resources.ApplyResources(this.oauth2Gfycat, "oauth2Gfycat");
this.oauth2Gfycat.Name = "oauth2Gfycat";
this.oauth2Gfycat.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Gfycat_OpenButtonClicked);
this.oauth2Gfycat.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Gfycat_CompleteButtonClicked);
this.oauth2Gfycat.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Gfycat_ClearButtonClicked);
this.oauth2Gfycat.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Gfycat_RefreshButtonClicked);
//
// atcSendSpaceAccountType
//
resources.ApplyResources(this.atcSendSpaceAccountType, "atcSendSpaceAccountType");
this.atcSendSpaceAccountType.Name = "atcSendSpaceAccountType";
this.atcSendSpaceAccountType.SelectedAccountType = ShareX.UploadersLib.AccountType.Anonymous;
this.atcSendSpaceAccountType.AccountTypeChanged += new ShareX.UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcSendSpaceAccountType_AccountTypeChanged);
//
// oAuthJira
//
resources.ApplyResources(this.oAuthJira, "oAuthJira");
this.oAuthJira.Name = "oAuthJira";
this.oAuthJira.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuthJira_OpenButtonClicked);
this.oAuthJira.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuthJira_CompleteButtonClicked);
this.oAuthJira.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuthJira_ClearButtonClicked);
this.oAuthJira.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oAuthJira_RefreshButtonClicked);
//
// oauth2YouTube
//
resources.ApplyResources(this.oauth2YouTube, "oauth2YouTube");
this.oauth2YouTube.Name = "oauth2YouTube";
this.oauth2YouTube.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2YouTube_OpenButtonClicked);
this.oauth2YouTube.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2YouTube_CompleteButtonClicked);
this.oauth2YouTube.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2YouTube_ClearButtonClicked);
this.oauth2YouTube.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2YouTube_RefreshButtonClicked);
//
// actRapidShareAccountType
//
resources.ApplyResources(this.actRapidShareAccountType, "actRapidShareAccountType");
@ -5901,6 +5959,14 @@ private void InitializeComponent()
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
this.Shown += new System.EventHandler(this.UploadersConfigForm_Shown);
this.Resize += new System.EventHandler(this.UploadersConfigForm_Resize);
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.tpOtherUploaders.ResumeLayout(false);
this.tcOtherUploaders.ResumeLayout(false);
this.tpTwitter.ResumeLayout(false);
@ -5937,7 +6003,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);
@ -6771,5 +6836,10 @@ 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;
private System.Windows.Forms.ToolStripButton tsbCustomUploaderCopyResponseText;
}
}

View file

@ -3560,7 +3560,18 @@ private void rtbCustomUploaderData_TextChanged(object sender, EventArgs e)
private void btnCustomUploaderDataBeautify_Click(object sender, EventArgs e)
{
CustomUploaderFormatJsonData(Formatting.Indented);
CustomUploaderItem uploader = CustomUploaderGetSelected();
if (uploader != null)
{
if (uploader.Body == CustomUploaderBody.JSON)
{
CustomUploaderFormatJsonData(Formatting.Indented);
}
else if (uploader.Body == CustomUploaderBody.XML)
{
CustomUploaderFormatXMLData();
}
}
}
private void btnCustomUploaderDataMinify_Click(object sender, EventArgs e)
@ -4062,6 +4073,54 @@ private void AddTextToActiveURLField(string text)
rtb.AppendText(text);
}
private void txtCustomUploaderLog_LinkClicked(object sender, LinkClickedEventArgs e)
{
URLHelpers.OpenURL(e.LinkText);
}
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 tsbCustomUploaderCopyResponseText_Click(object sender, EventArgs e)
{
string response = txtCustomUploaderResponse.Text;
if (!string.IsNullOrEmpty(response))
{
ClipboardHelpers.CopyText(response);
}
}
private void cbCustomUploaderImageUploader_SelectedIndexChanged(object sender, EventArgs e)
{
Config.CustomImageUploaderSelected = cbCustomUploaderImageUploader.SelectedIndex;
@ -4127,11 +4186,6 @@ private async void btnCustomUploaderURLSharingServiceTest_Click(object sender, E
}
}
private void txtCustomUploaderLog_LinkClicked(object sender, LinkClickedEventArgs e)
{
URLHelpers.OpenURL(e.LinkText);
}
#endregion Custom uploaders
#endregion Other uploaders

View file

@ -117,14 +117,186 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="&gt;&gt;tscCustomUploaderResponseText.BottomToolStripPanel.Name" xml:space="preserve">
<value>tscCustomUploaderResponseText.BottomToolStripPanel</value>
</data>
<data name="&gt;&gt;tscCustomUploaderResponseText.BottomToolStripPanel.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tscCustomUploaderResponseText.BottomToolStripPanel.Parent" xml:space="preserve">
<value>tscCustomUploaderResponseText</value>
</data>
<data name="&gt;&gt;tscCustomUploaderResponseText.BottomToolStripPanel.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="txtCustomUploaderResponse.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="txtCustomUploaderResponse.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="txtCustomUploaderResponse.Multiline" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="txtCustomUploaderResponse.Size" type="System.Drawing.Size, System.Drawing">
<value>492, 415</value>
</data>
<data name="txtCustomUploaderResponse.TabIndex" type="System.Int32, mscorlib">
<value>43</value>
</data>
<data name="&gt;&gt;txtCustomUploaderResponse.Name" xml:space="preserve">
<value>txtCustomUploaderResponse</value>
</data>
<data name="&gt;&gt;txtCustomUploaderResponse.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;txtCustomUploaderResponse.Parent" xml:space="preserve">
<value>tscCustomUploaderResponseText.ContentPanel</value>
</data>
<data name="&gt;&gt;txtCustomUploaderResponse.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="tscCustomUploaderResponseText.ContentPanel.Size" type="System.Drawing.Size, System.Drawing">
<value>492, 415</value>
</data>
<data name="&gt;&gt;tscCustomUploaderResponseText.ContentPanel.Name" xml:space="preserve">
<value>tscCustomUploaderResponseText.ContentPanel</value>
</data>
<data name="&gt;&gt;tscCustomUploaderResponseText.ContentPanel.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripContentPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tscCustomUploaderResponseText.ContentPanel.Parent" xml:space="preserve">
<value>tscCustomUploaderResponseText</value>
</data>
<data name="&gt;&gt;tscCustomUploaderResponseText.ContentPanel.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="tscCustomUploaderResponseText.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="&gt;&gt;tscCustomUploaderResponseText.LeftToolStripPanel.Name" xml:space="preserve">
<value>tscCustomUploaderResponseText.LeftToolStripPanel</value>
</data>
<data name="&gt;&gt;tscCustomUploaderResponseText.LeftToolStripPanel.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tscCustomUploaderResponseText.LeftToolStripPanel.Parent" xml:space="preserve">
<value>tscCustomUploaderResponseText</value>
</data>
<data name="&gt;&gt;tscCustomUploaderResponseText.LeftToolStripPanel.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="tscCustomUploaderResponseText.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 3</value>
</data>
<data name="&gt;&gt;tscCustomUploaderResponseText.RightToolStripPanel.Name" xml:space="preserve">
<value>tscCustomUploaderResponseText.RightToolStripPanel</value>
</data>
<data name="&gt;&gt;tscCustomUploaderResponseText.RightToolStripPanel.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tscCustomUploaderResponseText.RightToolStripPanel.Parent" xml:space="preserve">
<value>tscCustomUploaderResponseText</value>
</data>
<data name="&gt;&gt;tscCustomUploaderResponseText.RightToolStripPanel.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="tscCustomUploaderResponseText.Size" type="System.Drawing.Size, System.Drawing">
<value>492, 440</value>
</data>
<data name="tscCustomUploaderResponseText.TabIndex" type="System.Int32, mscorlib">
<value>44</value>
</data>
<data name="tscCustomUploaderResponseText.Text" xml:space="preserve">
<value>toolStripContainer1</value>
</data>
<metadata name="tsCustomUploaderResponseText.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>564, 17</value>
</metadata>
<data name="tsCustomUploaderResponseText.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>None</value>
</data>
<data name="tsbCustomUploaderJSONFormat.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsbCustomUploaderJSONFormat.Size" type="System.Drawing.Size, System.Drawing">
<value>78, 22</value>
</data>
<data name="tsbCustomUploaderJSONFormat.Text" xml:space="preserve">
<value>JSON format</value>
</data>
<data name="tsbCustomUploaderXMLFormat.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsbCustomUploaderXMLFormat.Size" type="System.Drawing.Size, System.Drawing">
<value>74, 22</value>
</data>
<data name="tsbCustomUploaderXMLFormat.Text" xml:space="preserve">
<value>XML format</value>
</data>
<data name="tsbCustomUploaderCopyResponseText.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsbCustomUploaderCopyResponseText.Size" type="System.Drawing.Size, System.Drawing">
<value>89, 22</value>
</data>
<data name="tsbCustomUploaderCopyResponseText.Text" xml:space="preserve">
<value>Copy response</value>
</data>
<data name="tsCustomUploaderResponseText.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 0</value>
</data>
<data name="tsCustomUploaderResponseText.Size" type="System.Drawing.Size, System.Drawing">
<value>250, 25</value>
</data>
<data name="tsCustomUploaderResponseText.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;tsCustomUploaderResponseText.Name" xml:space="preserve">
<value>tsCustomUploaderResponseText</value>
</data>
<data name="&gt;&gt;tsCustomUploaderResponseText.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsCustomUploaderResponseText.Parent" xml:space="preserve">
<value>tscCustomUploaderResponseText.TopToolStripPanel</value>
</data>
<data name="&gt;&gt;tsCustomUploaderResponseText.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;tscCustomUploaderResponseText.TopToolStripPanel.Name" xml:space="preserve">
<value>tscCustomUploaderResponseText.TopToolStripPanel</value>
</data>
<data name="&gt;&gt;tscCustomUploaderResponseText.TopToolStripPanel.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tscCustomUploaderResponseText.TopToolStripPanel.Parent" xml:space="preserve">
<value>tscCustomUploaderResponseText</value>
</data>
<data name="&gt;&gt;tscCustomUploaderResponseText.TopToolStripPanel.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="&gt;&gt;tscCustomUploaderResponseText.Name" xml:space="preserve">
<value>tscCustomUploaderResponseText</value>
</data>
<data name="&gt;&gt;tscCustomUploaderResponseText.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tscCustomUploaderResponseText.Parent" xml:space="preserve">
<value>tpCustomUploaderResponseText</value>
</data>
<data name="&gt;&gt;tscCustomUploaderResponseText.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="txtRapidSharePremiumUserName.Location" type="System.Drawing.Point, System.Drawing">
<value>88, 84</value>
</data>
<data name="txtRapidSharePremiumUserName.Size" type="System.Drawing.Size, System.Drawing">
<value>120, 20</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="txtRapidSharePremiumUserName.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
</data>
@ -140,7 +312,6 @@
<data name="cbAmazonS3CustomCNAME.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="cbAmazonS3CustomCNAME.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
@ -2759,33 +2930,6 @@ store.book[0].title</value>
<data name="&gt;&gt;tpCustomUploaderResult.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="txtCustomUploaderResponse.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="txtCustomUploaderResponse.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 3</value>
</data>
<data name="txtCustomUploaderResponse.Multiline" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="txtCustomUploaderResponse.Size" type="System.Drawing.Size, System.Drawing">
<value>492, 440</value>
</data>
<data name="txtCustomUploaderResponse.TabIndex" type="System.Int32, mscorlib">
<value>43</value>
</data>
<data name="&gt;&gt;txtCustomUploaderResponse.Name" xml:space="preserve">
<value>txtCustomUploaderResponse</value>
</data>
<data name="&gt;&gt;txtCustomUploaderResponse.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;txtCustomUploaderResponse.Parent" xml:space="preserve">
<value>tpCustomUploaderResponseText</value>
</data>
<data name="&gt;&gt;txtCustomUploaderResponse.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="tpCustomUploaderResponseText.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
</data>
@ -3921,7 +4065,7 @@ store.book[0].title</value>
<value>3, 3, 3, 3</value>
</data>
<data name="tpYourls.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 569</value>
<value>178, 42</value>
</data>
<data name="tpYourls.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@ -4080,7 +4224,7 @@ store.book[0].title</value>
<value>3, 3, 3, 3</value>
</data>
<data name="tpAdFly.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 569</value>
<value>178, 42</value>
</data>
<data name="tpAdFly.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@ -4266,7 +4410,7 @@ store.book[0].title</value>
<value>4, 22</value>
</data>
<data name="tpPolr.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 569</value>
<value>178, 42</value>
</data>
<data name="tpPolr.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@ -4455,7 +4599,7 @@ store.book[0].title</value>
<value>3, 3, 3, 3</value>
</data>
<data name="tpFirebaseDynamicLinks.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 569</value>
<value>178, 42</value>
</data>
<data name="tpFirebaseDynamicLinks.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
@ -4665,7 +4809,7 @@ store.book[0].title</value>
<value>3, 3, 3, 3</value>
</data>
<data name="tpKutt.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 569</value>
<value>178, 42</value>
</data>
<data name="tpKutt.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
@ -6183,13 +6327,13 @@ store.book[0].title</value>
<value>11</value>
</data>
<data name="tpFTP.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
<value>4, 40</value>
</data>
<data name="tpFTP.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpFTP.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 569</value>
<value>972, 551</value>
</data>
<data name="tpFTP.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@ -6342,13 +6486,13 @@ store.book[0].title</value>
<value>4</value>
</data>
<data name="tpDropbox.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
<value>4, 220</value>
</data>
<data name="tpDropbox.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpDropbox.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 569</value>
<value>178, 0</value>
</data>
<data name="tpDropbox.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -6474,13 +6618,13 @@ store.book[0].title</value>
<value>3</value>
</data>
<data name="tpOneDrive.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
<value>4, 220</value>
</data>
<data name="tpOneDrive.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpOneDrive.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 569</value>
<value>178, 0</value>
</data>
<data name="tpOneDrive.TabIndex" type="System.Int32, mscorlib">
<value>17</value>
@ -6726,13 +6870,13 @@ store.book[0].title</value>
<value>7</value>
</data>
<data name="tpGoogleDrive.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
<value>4, 220</value>
</data>
<data name="tpGoogleDrive.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpGoogleDrive.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 569</value>
<value>178, 0</value>
</data>
<data name="tpGoogleDrive.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@ -6963,13 +7107,13 @@ store.book[0].title</value>
<value>7</value>
</data>
<data name="tpPuush.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
<value>4, 220</value>
</data>
<data name="tpPuush.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpPuush.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 569</value>
<value>178, 0</value>
</data>
<data name="tpPuush.TabIndex" type="System.Int32, mscorlib">
<value>26</value>
@ -7158,13 +7302,13 @@ store.book[0].title</value>
<value>5</value>
</data>
<data name="tpBox.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
<value>4, 220</value>
</data>
<data name="tpBox.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpBox.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 569</value>
<value>178, 0</value>
</data>
<data name="tpBox.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@ -7989,13 +8133,13 @@ store.book[0].title</value>
<value>20</value>
</data>
<data name="tpAmazonS3.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
<value>4, 220</value>
</data>
<data name="tpAmazonS3.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpAmazonS3.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 569</value>
<value>178, 0</value>
</data>
<data name="tpAmazonS3.TabIndex" type="System.Int32, mscorlib">
<value>13</value>
@ -8370,13 +8514,13 @@ store.book[0].title</value>
<value>12</value>
</data>
<data name="tpGoogleCloudStorage.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 40</value>
<value>4, 220</value>
</data>
<data name="tpGoogleCloudStorage.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpGoogleCloudStorage.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 551</value>
<value>178, 0</value>
</data>
<data name="tpGoogleCloudStorage.TabIndex" type="System.Int32, mscorlib">
<value>32</value>
@ -8808,13 +8952,13 @@ store.book[0].title</value>
<value>14</value>
</data>
<data name="tpAzureStorage.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
<value>4, 220</value>
</data>
<data name="tpAzureStorage.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpAzureStorage.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 569</value>
<value>178, 0</value>
</data>
<data name="tpAzureStorage.TabIndex" type="System.Int32, mscorlib">
<value>28</value>
@ -9036,13 +9180,13 @@ store.book[0].title</value>
<value>11</value>
</data>
<data name="tpBackblazeB2.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
<value>4, 220</value>
</data>
<data name="tpBackblazeB2.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpBackblazeB2.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 569</value>
<value>178, 0</value>
</data>
<data name="tpBackblazeB2.TabIndex" type="System.Int32, mscorlib">
<value>33</value>
@ -9135,13 +9279,13 @@ store.book[0].title</value>
<value>2</value>
</data>
<data name="tpGfycat.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
<value>4, 220</value>
</data>
<data name="tpGfycat.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpGfycat.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 569</value>
<value>178, 0</value>
</data>
<data name="tpGfycat.TabIndex" type="System.Int32, mscorlib">
<value>30</value>
@ -9456,10 +9600,10 @@ store.book[0].title</value>
<value>10</value>
</data>
<data name="tpMega.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
<value>4, 220</value>
</data>
<data name="tpMega.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 569</value>
<value>178, 0</value>
</data>
<data name="tpMega.TabIndex" type="System.Int32, mscorlib">
<value>12</value>
@ -9915,13 +10059,13 @@ store.book[0].title</value>
<value>15</value>
</data>
<data name="tpOwnCloud.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
<value>4, 220</value>
</data>
<data name="tpOwnCloud.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpOwnCloud.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 569</value>
<value>178, 0</value>
</data>
<data name="tpOwnCloud.TabIndex" type="System.Int32, mscorlib">
<value>15</value>
@ -10125,13 +10269,13 @@ store.book[0].title</value>
<value>6</value>
</data>
<data name="tpMediaFire.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
<value>4, 220</value>
</data>
<data name="tpMediaFire.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpMediaFire.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 569</value>
<value>178, 0</value>
</data>
<data name="tpMediaFire.TabIndex" type="System.Int32, mscorlib">
<value>16</value>
@ -10287,13 +10431,13 @@ store.book[0].title</value>
<value>4</value>
</data>
<data name="tpPushbullet.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 40</value>
<value>4, 220</value>
</data>
<data name="tpPushbullet.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpPushbullet.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 551</value>
<value>178, 0</value>
</data>
<data name="tpPushbullet.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
@ -10464,13 +10608,13 @@ store.book[0].title</value>
<value>5</value>
</data>
<data name="tpSendSpace.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 40</value>
<value>4, 220</value>
</data>
<data name="tpSendSpace.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpSendSpace.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 551</value>
<value>178, 0</value>
</data>
<data name="tpSendSpace.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@ -10650,13 +10794,13 @@ store.book[0].title</value>
<value>5</value>
</data>
<data name="tpGe_tt.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 40</value>
<value>4, 220</value>
</data>
<data name="tpGe_tt.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpGe_tt.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 551</value>
<value>178, 0</value>
</data>
<data name="tpGe_tt.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
@ -10809,13 +10953,13 @@ store.book[0].title</value>
<value>4</value>
</data>
<data name="tpHostr.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 40</value>
<value>4, 220</value>
</data>
<data name="tpHostr.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpHostr.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 551</value>
<value>178, 0</value>
</data>
<data name="tpHostr.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
@ -11019,10 +11163,10 @@ store.book[0].title</value>
<value>3</value>
</data>
<data name="tpJira.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 40</value>
<value>4, 220</value>
</data>
<data name="tpJira.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 551</value>
<value>178, 0</value>
</data>
<data name="tpJira.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
@ -11175,13 +11319,13 @@ store.book[0].title</value>
<value>4</value>
</data>
<data name="tpLambda.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 40</value>
<value>4, 220</value>
</data>
<data name="tpLambda.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpLambda.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 551</value>
<value>178, 0</value>
</data>
<data name="tpLambda.TabIndex" type="System.Int32, mscorlib">
<value>20</value>
@ -11385,13 +11529,13 @@ store.book[0].title</value>
<value>6</value>
</data>
<data name="tpPomf.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 40</value>
<value>4, 220</value>
</data>
<data name="tpPomf.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpPomf.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 551</value>
<value>178, 0</value>
</data>
<data name="tpPomf.TabIndex" type="System.Int32, mscorlib">
<value>22</value>
@ -12346,13 +12490,13 @@ Using an encrypted library disables sharing.</value>
<value>20</value>
</data>
<data name="tpSeafile.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 40</value>
<value>4, 220</value>
</data>
<data name="tpSeafile.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpSeafile.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 551</value>
<value>178, 0</value>
</data>
<data name="tpSeafile.TabIndex" type="System.Int32, mscorlib">
<value>23</value>
@ -12550,10 +12694,10 @@ Using an encrypted library disables sharing.</value>
<value>5</value>
</data>
<data name="tpStreamable.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 40</value>
<value>4, 220</value>
</data>
<data name="tpStreamable.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 551</value>
<value>178, 0</value>
</data>
<data name="tpStreamable.TabIndex" type="System.Int32, mscorlib">
<value>24</value>
@ -12652,13 +12796,13 @@ Using an encrypted library disables sharing.</value>
<value>2</value>
</data>
<data name="tpSul.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 40</value>
<value>4, 220</value>
</data>
<data name="tpSul.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpSul.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 551</value>
<value>178, 0</value>
</data>
<data name="tpSul.TabIndex" type="System.Int32, mscorlib">
<value>25</value>
@ -12886,13 +13030,13 @@ Using an encrypted library disables sharing.</value>
<value>7</value>
</data>
<data name="tpLithiio.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 40</value>
<value>4, 220</value>
</data>
<data name="tpLithiio.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpLithiio.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 551</value>
<value>178, 0</value>
</data>
<data name="tpLithiio.TabIndex" type="System.Int32, mscorlib">
<value>20</value>
@ -13393,13 +13537,13 @@ Using an encrypted library disables sharing.</value>
<value>1</value>
</data>
<data name="tpPlik.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 40</value>
<value>4, 220</value>
</data>
<data name="tpPlik.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpPlik.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 551</value>
<value>178, 0</value>
</data>
<data name="tpPlik.TabIndex" type="System.Int32, mscorlib">
<value>29</value>
@ -13522,10 +13666,10 @@ Using an encrypted library disables sharing.</value>
<value>3</value>
</data>
<data name="tpYouTube.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 40</value>
<value>4, 220</value>
</data>
<data name="tpYouTube.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 551</value>
<value>178, 0</value>
</data>
<data name="tpYouTube.TabIndex" type="System.Int32, mscorlib">
<value>31</value>
@ -13825,13 +13969,13 @@ Using an encrypted library disables sharing.</value>
<value>10</value>
</data>
<data name="tpSharedFolder.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 40</value>
<value>4, 220</value>
</data>
<data name="tpSharedFolder.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpSharedFolder.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 551</value>
<value>178, 0</value>
</data>
<data name="tpSharedFolder.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
@ -14245,13 +14389,13 @@ Using an encrypted library disables sharing.</value>
<value>14</value>
</data>
<data name="tpEmail.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 40</value>
<value>4, 220</value>
</data>
<data name="tpEmail.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpEmail.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 551</value>
<value>178, 0</value>
</data>
<data name="tpEmail.TabIndex" type="System.Int32, mscorlib">
<value>10</value>
@ -14872,7 +15016,7 @@ Using an encrypted library disables sharing.</value>
<value>3, 3, 3, 3</value>
</data>
<data name="tpPaste_ee.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 569</value>
<value>178, 42</value>
</data>
<data name="tpPaste_ee.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@ -15088,7 +15232,7 @@ Using an encrypted library disables sharing.</value>
<value>4, 22</value>
</data>
<data name="tpGist.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 569</value>
<value>178, 42</value>
</data>
<data name="tpGist.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@ -15196,7 +15340,7 @@ Using an encrypted library disables sharing.</value>
<value>3, 3, 3, 3</value>
</data>
<data name="tpUpaste.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 569</value>
<value>178, 42</value>
</data>
<data name="tpUpaste.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@ -15355,7 +15499,7 @@ Using an encrypted library disables sharing.</value>
<value>3, 3, 3, 3</value>
</data>
<data name="tpHastebin.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 569</value>
<value>178, 42</value>
</data>
<data name="tpHastebin.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@ -15484,7 +15628,7 @@ Using an encrypted library disables sharing.</value>
<value>3, 3, 3, 3</value>
</data>
<data name="tpOneTimeSecret.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 569</value>
<value>178, 42</value>
</data>
<data name="tpOneTimeSecret.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@ -15541,7 +15685,7 @@ Using an encrypted library disables sharing.</value>
<value>3, 3, 3, 3</value>
</data>
<data name="tpPastie.Size" type="System.Drawing.Size, System.Drawing">
<value>972, 569</value>
<value>178, 42</value>
</data>
<data name="tpPastie.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@ -17554,7 +17698,7 @@ Using an encrypted library disables sharing.</value>
<value>$this</value>
</data>
<data name="&gt;&gt;lblWidthHint.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<data name="ttlvMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@ -17652,6 +17796,24 @@ Using an encrypted library disables sharing.</value>
<data name="$this.Text" xml:space="preserve">
<value>ShareX - Destination settings</value>
</data>
<data name="&gt;&gt;tsbCustomUploaderJSONFormat.Name" xml:space="preserve">
<value>tsbCustomUploaderJSONFormat</value>
</data>
<data name="&gt;&gt;tsbCustomUploaderJSONFormat.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsbCustomUploaderXMLFormat.Name" xml:space="preserve">
<value>tsbCustomUploaderXMLFormat</value>
</data>
<data name="&gt;&gt;tsbCustomUploaderXMLFormat.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsbCustomUploaderCopyResponseText.Name" xml:space="preserve">
<value>tsbCustomUploaderCopyResponseText</value>
</data>
<data name="&gt;&gt;tsbCustomUploaderCopyResponseText.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;ttHelpTip.Name" xml:space="preserve">
<value>ttHelpTip</value>
</data>

View file

@ -40,6 +40,7 @@ You should have received a copy of the GNU General Public License
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using System.Xml.Linq;
namespace ShareX.UploadersLib
{
@ -1059,8 +1060,9 @@ private void CustomUploaderUpdateRequestFormatState()
{
pCustomUploaderBodyArguments.Visible = uploader.Body == CustomUploaderBody.MultipartFormData ||
uploader.Body == CustomUploaderBody.FormURLEncoded;
pCustomUploaderBodyData.Visible = uploader.Body == CustomUploaderBody.JSON;
lblCustomUploaderFileFormName.Visible = txtCustomUploaderFileFormName.Visible = uploader.Body == CustomUploaderBody.MultipartFormData;
pCustomUploaderBodyData.Visible = uploader.Body == CustomUploaderBody.JSON || uploader.Body == CustomUploaderBody.XML;
btnCustomUploaderDataMinify.Visible = uploader.Body == CustomUploaderBody.JSON;
}
}
@ -1487,7 +1489,24 @@ private void CustomUploaderFormatJsonData(Formatting formatting)
{
try
{
rtbCustomUploaderData.Text = JToken.Parse(json).ToString(formatting);
rtbCustomUploaderData.Text = Helpers.JSONFormat(json, formatting);
}
catch (Exception e)
{
MessageBox.Show(e.Message, "ShareX - Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
private void CustomUploaderFormatXMLData()
{
string xml = rtbCustomUploaderData.Text;
if (!string.IsNullOrEmpty(xml))
{
try
{
rtbCustomUploaderData.Text = Helpers.XMLFormat(xml);
}
catch (Exception e)
{

View file

@ -39,6 +39,7 @@ internal static class UploadHelpers
{
public const string ContentTypeMultipartFormData = "multipart/form-data";
public const string ContentTypeJSON = "application/json";
public const string ContentTypeXML = "application/xml";
public const string ContentTypeURLEncoded = "application/x-www-form-urlencoded";
public const string ContentTypeOctetStream = "application/octet-stream";

View file

@ -88,16 +88,16 @@ public override UploadResult ShareURL(string url)
result.Response = SendRequestMultiPart(uploader.GetRequestURL(input), uploader.GetArguments(input), uploader.GetHeaders(input), null,
uploader.ResponseType, uploader.RequestMethod);
}
else if (uploader.Body == CustomUploaderBody.JSON)
{
result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetData(input), UploadHelpers.ContentTypeJSON,
null, uploader.GetHeaders(input), null, uploader.ResponseType);
}
else if (uploader.Body == CustomUploaderBody.FormURLEncoded)
{
result.Response = SendRequestURLEncoded(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetArguments(input),
uploader.GetHeaders(input), null, uploader.ResponseType);
}
else if (uploader.Body == CustomUploaderBody.JSON || uploader.Body == CustomUploaderBody.XML)
{
result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetData(input), uploader.GetContentType(),
null, uploader.GetHeaders(input), null, uploader.ResponseType);
}
else
{
throw new Exception("Unsupported request format: " + uploader.Body);

View file

@ -104,9 +104,14 @@ public override UploadResult UploadText(string text, string fileName)
}
}
}
else if (uploader.Body == CustomUploaderBody.JSON)
else if (uploader.Body == CustomUploaderBody.FormURLEncoded)
{
result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetData(input), UploadHelpers.ContentTypeJSON,
result.Response = SendRequestURLEncoded(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetArguments(input),
uploader.GetHeaders(input), null, uploader.ResponseType);
}
else if (uploader.Body == CustomUploaderBody.JSON || uploader.Body == CustomUploaderBody.XML)
{
result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetData(input), uploader.GetContentType(),
null, uploader.GetHeaders(input), null, uploader.ResponseType);
}
else if (uploader.Body == CustomUploaderBody.Binary)
@ -118,11 +123,6 @@ public override UploadResult UploadText(string text, string fileName)
null, uploader.GetHeaders(input), null, uploader.ResponseType);
}
}
else if (uploader.Body == CustomUploaderBody.FormURLEncoded)
{
result.Response = SendRequestURLEncoded(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetArguments(input),
uploader.GetHeaders(input), null, uploader.ResponseType);
}
else
{
throw new Exception("Unsupported request format: " + uploader.Body);

View file

@ -87,16 +87,16 @@ public override UploadResult ShortenURL(string url)
result.Response = SendRequestMultiPart(uploader.GetRequestURL(input), uploader.GetArguments(input), uploader.GetHeaders(input), null,
uploader.ResponseType, uploader.RequestMethod);
}
else if (uploader.Body == CustomUploaderBody.JSON)
{
result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetData(input), UploadHelpers.ContentTypeJSON,
null, uploader.GetHeaders(input), null, uploader.ResponseType);
}
else if (uploader.Body == CustomUploaderBody.FormURLEncoded)
{
result.Response = SendRequestURLEncoded(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetArguments(input),
uploader.GetHeaders(input), null, uploader.ResponseType);
}
else if (uploader.Body == CustomUploaderBody.JSON || uploader.Body == CustomUploaderBody.XML)
{
result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetData(input), uploader.GetContentType(),
null, uploader.GetHeaders(input), null, uploader.ResponseType);
}
else
{
throw new Exception("Unsupported request format: " + uploader.Body);