diff --git a/ShareX/UploadTask.cs b/ShareX/UploadTask.cs index d56cd7c60..7e229f8aa 100644 --- a/ShareX/UploadTask.cs +++ b/ShareX/UploadTask.cs @@ -947,8 +947,11 @@ public UploadResult UploadFile(Stream stream, string fileName) fileUploader = new MediaCrushUploader(); break; case FileDestination.MediaFire: - fileUploader = new MediaFire(APIKeys.MediaFireAppId, APIKeys.MediaFireApiKey, Program.UploadersConfig.MediaFireUsername, Program.UploadersConfig.MediaFirePassword, - NameParser.Parse(NameParserType.URL, Program.UploadersConfig.MediaFirePath)); + fileUploader = new MediaFire(APIKeys.MediaFireAppId, APIKeys.MediaFireApiKey, Program.UploadersConfig.MediaFireUsername, Program.UploadersConfig.MediaFirePassword) + { + UploadPath = NameParser.Parse(NameParserType.URL, Program.UploadersConfig.MediaFirePath), + UseLongLink = Program.UploadersConfig.MediaFireUseLongLink + }; break; } diff --git a/UploadersLib/FileUploaders/MediaFire.cs b/UploadersLib/FileUploaders/MediaFire.cs index 8b75302bf..bc7601873 100644 --- a/UploadersLib/FileUploaders/MediaFire.cs +++ b/UploadersLib/FileUploaders/MediaFire.cs @@ -43,17 +43,19 @@ public sealed class MediaFire : FileUploader { private static readonly string _apiUrl = "https://www.mediafire.com/api/"; private static readonly int _pollInterval = 1000; - private readonly string _appId, _apiKey, _user, _pasw, _path; + private readonly string _appId, _apiKey, _user, _pasw; private string _sessionToken, _signatureTime; private int _signatureKey; - public MediaFire(string appId, string apiKey, string user, string pasw, string path) + public string UploadPath { get; set; } + public bool UseLongLink { get; set; } + + public MediaFire(string appId, string apiKey, string user, string pasw) { _appId = appId; _apiKey = apiKey; _user = user; _pasw = pasw; - _path = path; } public override UploadResult Upload(Stream stream, string fileName) @@ -91,7 +93,7 @@ private string SimpleUpload(Stream stream, string fileName) { var args = new Dictionary(); args.Add("session_token", _sessionToken); - args.Add("path", _path); + args.Add("path", UploadPath); args.Add("response_format", "json"); args.Add("signature", GetSignature("upload/simple.php", args)); string url = CreateQuery(_apiUrl + "upload/simple.php", args); @@ -122,7 +124,10 @@ private string PollUpload(string uploadKey, string fileName) if (resp.doupload.status == 99) { if (resp.doupload.quickkey == null) throw new IOException("Invalid response"); - return string.Format("http://www.mediafire.com/view/{0}/{1}", resp.doupload.quickkey, URLHelpers.URLEncode(resp.doupload.filename)); + + string url = URLHelpers.CombineURL("http://www.mediafire.com/view", resp.doupload.quickkey); + if (UseLongLink) url = URLHelpers.CombineURL(url, URLHelpers.URLEncode(resp.doupload.filename)); + return url; } return null; } diff --git a/UploadersLib/Forms/UploadersConfigForm.Designer.cs b/UploadersLib/Forms/UploadersConfigForm.Designer.cs index 866b66c6e..0d539b34c 100644 --- a/UploadersLib/Forms/UploadersConfigForm.Designer.cs +++ b/UploadersLib/Forms/UploadersConfigForm.Designer.cs @@ -94,12 +94,16 @@ private void InitializeComponent() this.txtCustomUploaderArgName = new System.Windows.Forms.TextBox(); this.tpTwitter = new System.Windows.Forms.TabPage(); this.btnTwitterLogin = new System.Windows.Forms.Button(); + this.ucTwitterAccounts = new UploadersLib.AccountsControl(); this.tpURLShorteners = new System.Windows.Forms.TabPage(); this.tcURLShorteners = new System.Windows.Forms.TabControl(); this.tpBitly = new System.Windows.Forms.TabPage(); this.txtBitlyDomain = new System.Windows.Forms.TextBox(); this.lblBitlyDomain = new System.Windows.Forms.Label(); + this.oauth2Bitly = new UploadersLib.OAuthControl(); this.tpGoogleURLShortener = new System.Windows.Forms.TabPage(); + this.oauth2GoogleURLShortener = new UploadersLib.OAuthControl(); + this.atcGoogleURLShortenerAccountType = new UploadersLib.AccountTypeControl(); this.tpYourls = new System.Windows.Forms.TabPage(); this.txtYourlsPassword = new System.Windows.Forms.TextBox(); this.txtYourlsUsername = new System.Windows.Forms.TextBox(); @@ -119,6 +123,7 @@ private void InitializeComponent() this.tpFileUploaders = new System.Windows.Forms.TabPage(); this.tcFileUploaders = new System.Windows.Forms.TabControl(); this.tpDropbox = new System.Windows.Forms.TabPage(); + this.oauth2Dropbox = new UploadersLib.OAuthControl(); this.cbDropboxURLType = new System.Windows.Forms.ComboBox(); this.cbDropboxAutoCreateShareableLink = new System.Windows.Forms.CheckBox(); this.btnDropboxShowFiles = new System.Windows.Forms.Button(); @@ -136,6 +141,7 @@ private void InitializeComponent() this.lblCopyStatus = new System.Windows.Forms.Label(); this.lblCopyPath = new System.Windows.Forms.Label(); this.txtCopyPath = new System.Windows.Forms.TextBox(); + this.oAuthCopy = new UploadersLib.OAuthControl(); this.tpFTP = new System.Windows.Forms.TabPage(); this.eiFTP = new HelpersLib.ExportImportControl(); this.btnFtpClient = new System.Windows.Forms.Button(); @@ -145,6 +151,7 @@ private void InitializeComponent() this.cboFtpImages = new System.Windows.Forms.ComboBox(); this.cboFtpFiles = new System.Windows.Forms.ComboBox(); this.cboFtpText = new System.Windows.Forms.ComboBox(); + this.ucFTPAccounts = new UploadersLib.AccountsControl(); this.tpMega = new System.Windows.Forms.TabPage(); this.btnMegaRefreshFolders = new System.Windows.Forms.Button(); this.lblMegaStatus = new System.Windows.Forms.Label(); @@ -182,6 +189,15 @@ 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 UploadersLib.OAuthControl(); + this.tpBox = new System.Windows.Forms.TabPage(); + this.lblBoxFolderTip = new System.Windows.Forms.Label(); + this.cbBoxShare = new System.Windows.Forms.CheckBox(); + this.lvBoxFolders = new HelpersLib.MyListView(); + 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 UploadersLib.OAuthControl(); this.tpOwnCloud = new System.Windows.Forms.TabPage(); this.cbOwnCloudDirectLink = new System.Windows.Forms.CheckBox(); this.cbOwnCloudCreateShare = new System.Windows.Forms.CheckBox(); @@ -193,19 +209,19 @@ private void InitializeComponent() this.lblOwnCloudPassword = new System.Windows.Forms.Label(); this.lblOwnCloudUsername = new System.Windows.Forms.Label(); this.lblOwnCloudHost = new System.Windows.Forms.Label(); + this.tpMediaFire = new System.Windows.Forms.TabPage(); + this.txtMediaFirePath = new System.Windows.Forms.TextBox(); + this.lblMediaFirePath = new System.Windows.Forms.Label(); + this.txtMediaFirePassword = new System.Windows.Forms.TextBox(); + this.txtMediaFireEmail = new System.Windows.Forms.TextBox(); + this.lblMediaFirePassword = new System.Windows.Forms.Label(); + this.lblMediaFireEmail = new System.Windows.Forms.Label(); this.tpPushbullet = new System.Windows.Forms.TabPage(); this.lblPushbulletDevices = new System.Windows.Forms.Label(); this.cboPushbulletDevices = new System.Windows.Forms.ComboBox(); this.btnPushbulletGetDeviceList = new System.Windows.Forms.Button(); this.lblPushbulletUserKey = new System.Windows.Forms.Label(); this.txtPushbulletUserKey = new System.Windows.Forms.TextBox(); - this.tpBox = new System.Windows.Forms.TabPage(); - this.lblBoxFolderTip = new System.Windows.Forms.Label(); - this.cbBoxShare = new System.Windows.Forms.CheckBox(); - this.lvBoxFolders = new HelpersLib.MyListView(); - 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.tpRapidShare = new System.Windows.Forms.TabPage(); this.txtRapidShareFolderID = new System.Windows.Forms.TextBox(); this.lblRapidShareFolderID = new System.Windows.Forms.Label(); @@ -221,6 +237,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 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(); @@ -258,6 +275,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 UploadersLib.OAuthControl(); this.tpEmail = new System.Windows.Forms.TabPage(); this.chkEmailConfirm = new System.Windows.Forms.CheckBox(); this.lblEmailSmtpServer = new System.Windows.Forms.Label(); @@ -280,13 +298,7 @@ private void InitializeComponent() this.lblSharedFolderImages = new System.Windows.Forms.Label(); this.cboSharedFolderText = new System.Windows.Forms.ComboBox(); this.cboSharedFolderImages = new System.Windows.Forms.ComboBox(); - this.tpMediaFire = new System.Windows.Forms.TabPage(); - this.txtMediaFirePath = new System.Windows.Forms.TextBox(); - this.lblMediaFirePath = new System.Windows.Forms.Label(); - this.txtMediaFirePassword = new System.Windows.Forms.TextBox(); - this.txtMediaFireEmail = new System.Windows.Forms.TextBox(); - this.lblMediaFirePassword = new System.Windows.Forms.Label(); - this.lblMediaFireEmail = new System.Windows.Forms.Label(); + this.ucLocalhostAccounts = new UploadersLib.AccountsControl(); this.btnCopyShowFiles = new System.Windows.Forms.Button(); this.tpTextUploaders = new System.Windows.Forms.TabPage(); this.tcTextUploaders = new System.Windows.Forms.TabControl(); @@ -298,6 +310,8 @@ private void InitializeComponent() this.txtPaste_eeUserAPIKey = new System.Windows.Forms.TextBox(); this.tpGist = new System.Windows.Forms.TabPage(); this.chkGistPublishPublic = new System.Windows.Forms.CheckBox(); + this.oAuth2Gist = new UploadersLib.OAuthControl(); + this.atcGistAccountType = new UploadersLib.AccountTypeControl(); this.tpUpaste = new System.Windows.Forms.TabPage(); this.cbUpasteIsPublic = new System.Windows.Forms.CheckBox(); this.lblUpasteUserKey = new System.Windows.Forms.Label(); @@ -306,6 +320,8 @@ private void InitializeComponent() this.tcImageUploaders = new System.Windows.Forms.TabControl(); this.tpImgur = new System.Windows.Forms.TabPage(); this.cbImgurDirectLink = new System.Windows.Forms.CheckBox(); + this.atcImgurAccountType = new UploadersLib.AccountTypeControl(); + this.oauth2Imgur = new UploadersLib.OAuthControl(); this.txtImgurAlbumID = new System.Windows.Forms.TextBox(); this.lblImgurAlbumID = new System.Windows.Forms.Label(); this.lvImgurAlbumList = new System.Windows.Forms.ListView(); @@ -325,6 +341,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 UploadersLib.AccountTypeControl(); this.btnTinyPicLogin = new System.Windows.Forms.Button(); this.txtTinyPicPassword = new System.Windows.Forms.TextBox(); this.lblTinyPicPassword = new System.Windows.Forms.Label(); @@ -365,28 +382,12 @@ 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 UploadersLib.OAuthControl(); this.tcUploaders = new System.Windows.Forms.TabControl(); this.ttlvMain = new HelpersLib.TabToListView(); this.lblWidthHint = new System.Windows.Forms.Label(); - this.atcImgurAccountType = new UploadersLib.AccountTypeControl(); - this.oauth2Imgur = new UploadersLib.OAuthControl(); - this.atcTinyPicAccountType = new UploadersLib.AccountTypeControl(); - this.oauth2Picasa = new UploadersLib.OAuthControl(); - this.oAuth2Gist = new UploadersLib.OAuthControl(); - this.atcGistAccountType = new UploadersLib.AccountTypeControl(); - this.oauth2Dropbox = new UploadersLib.OAuthControl(); - this.oAuthCopy = new UploadersLib.OAuthControl(); - this.ucFTPAccounts = new UploadersLib.AccountsControl(); - this.oauth2GoogleDrive = new UploadersLib.OAuthControl(); - this.oauth2Box = new UploadersLib.OAuthControl(); - this.atcSendSpaceAccountType = new UploadersLib.AccountTypeControl(); - this.oAuthJira = new UploadersLib.OAuthControl(); - this.ucLocalhostAccounts = new UploadersLib.AccountsControl(); - this.oauth2Bitly = new UploadersLib.OAuthControl(); - this.oauth2GoogleURLShortener = new UploadersLib.OAuthControl(); - this.atcGoogleURLShortenerAccountType = new UploadersLib.AccountTypeControl(); - this.ucTwitterAccounts = new UploadersLib.AccountsControl(); this.actRapidShareAccountType = new UploadersLib.AccountTypeControl(); + this.cbMediaFireUseLongLink = new System.Windows.Forms.CheckBox(); this.tpOtherUploaders.SuspendLayout(); this.tcOtherUploaders.SuspendLayout(); this.tpCustomUploaders.SuspendLayout(); @@ -410,9 +411,10 @@ private void InitializeComponent() this.tpMega.SuspendLayout(); this.tpAmazonS3.SuspendLayout(); this.tpGoogleDrive.SuspendLayout(); - this.tpOwnCloud.SuspendLayout(); - this.tpPushbullet.SuspendLayout(); this.tpBox.SuspendLayout(); + this.tpOwnCloud.SuspendLayout(); + this.tpMediaFire.SuspendLayout(); + this.tpPushbullet.SuspendLayout(); this.tpRapidShare.SuspendLayout(); this.tpSendSpace.SuspendLayout(); this.tpGe_tt.SuspendLayout(); @@ -425,7 +427,6 @@ private void InitializeComponent() this.tpEmail.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nudEmailSmtpPort)).BeginInit(); this.tpSharedFolder.SuspendLayout(); - this.tpMediaFire.SuspendLayout(); this.tpTextUploaders.SuspendLayout(); this.tcTextUploaders.SuspendLayout(); this.tpPastebin.SuspendLayout(); @@ -1101,6 +1102,15 @@ private void InitializeComponent() this.btnTwitterLogin.UseVisualStyleBackColor = true; this.btnTwitterLogin.Click += new System.EventHandler(this.btnTwitterLogin_Click); // + // ucTwitterAccounts + // + this.ucTwitterAccounts.Dock = System.Windows.Forms.DockStyle.Fill; + this.ucTwitterAccounts.Location = new System.Drawing.Point(0, 0); + this.ucTwitterAccounts.Margin = new System.Windows.Forms.Padding(0); + this.ucTwitterAccounts.Name = "ucTwitterAccounts"; + this.ucTwitterAccounts.Size = new System.Drawing.Size(972, 493); + this.ucTwitterAccounts.TabIndex = 0; + // // tpURLShorteners // this.tpURLShorteners.Controls.Add(this.tcURLShorteners); @@ -1155,6 +1165,17 @@ private void InitializeComponent() this.lblBitlyDomain.TabIndex = 1; this.lblBitlyDomain.Text = "Domain:"; // + // oauth2Bitly + // + this.oauth2Bitly.IsRefreshable = false; + this.oauth2Bitly.Location = new System.Drawing.Point(16, 16); + this.oauth2Bitly.Name = "oauth2Bitly"; + this.oauth2Bitly.Size = new System.Drawing.Size(328, 208); + this.oauth2Bitly.TabIndex = 0; + this.oauth2Bitly.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Bitly_OpenButtonClicked); + this.oauth2Bitly.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Bitly_CompleteButtonClicked); + this.oauth2Bitly.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Bitly_ClearButtonClicked); + // // tpGoogleURLShortener // this.tpGoogleURLShortener.Controls.Add(this.oauth2GoogleURLShortener); @@ -1167,6 +1188,26 @@ private void InitializeComponent() this.tpGoogleURLShortener.Text = "Google"; this.tpGoogleURLShortener.UseVisualStyleBackColor = true; // + // oauth2GoogleURLShortener + // + this.oauth2GoogleURLShortener.Location = new System.Drawing.Point(16, 56); + this.oauth2GoogleURLShortener.Name = "oauth2GoogleURLShortener"; + this.oauth2GoogleURLShortener.Size = new System.Drawing.Size(328, 240); + this.oauth2GoogleURLShortener.TabIndex = 1; + this.oauth2GoogleURLShortener.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2GoogleURLShortener_OpenButtonClicked); + this.oauth2GoogleURLShortener.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2GoogleURLShortener_CompleteButtonClicked); + this.oauth2GoogleURLShortener.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2GoogleURLShortener_ClearButtonClicked); + this.oauth2GoogleURLShortener.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2GoogleURLShortener_RefreshButtonClicked); + // + // atcGoogleURLShortenerAccountType + // + this.atcGoogleURLShortenerAccountType.Location = new System.Drawing.Point(8, 16); + this.atcGoogleURLShortenerAccountType.Name = "atcGoogleURLShortenerAccountType"; + this.atcGoogleURLShortenerAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; + this.atcGoogleURLShortenerAccountType.Size = new System.Drawing.Size(214, 29); + this.atcGoogleURLShortenerAccountType.TabIndex = 0; + this.atcGoogleURLShortenerAccountType.AccountTypeChanged += new UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcGoogleURLShortenerAccountType_AccountTypeChanged); + // // tpYourls // this.tpYourls.Controls.Add(this.txtYourlsPassword); @@ -1385,6 +1426,17 @@ private void InitializeComponent() this.tpDropbox.Text = "Dropbox"; this.tpDropbox.UseVisualStyleBackColor = true; // + // oauth2Dropbox + // + this.oauth2Dropbox.IsRefreshable = false; + this.oauth2Dropbox.Location = new System.Drawing.Point(16, 88); + this.oauth2Dropbox.Name = "oauth2Dropbox"; + this.oauth2Dropbox.Size = new System.Drawing.Size(328, 200); + this.oauth2Dropbox.TabIndex = 1; + this.oauth2Dropbox.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Dropbox_OpenButtonClicked); + this.oauth2Dropbox.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Dropbox_CompleteButtonClicked); + this.oauth2Dropbox.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Dropbox_ClearButtonClicked); + // // cbDropboxURLType // this.cbDropboxURLType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -1560,6 +1612,17 @@ private void InitializeComponent() this.txtCopyPath.TabIndex = 3; this.txtCopyPath.TextChanged += new System.EventHandler(this.txtCopyPath_TextChanged); // + // oAuthCopy + // + this.oAuthCopy.IsRefreshable = false; + this.oAuthCopy.Location = new System.Drawing.Point(16, 88); + this.oAuthCopy.Name = "oAuthCopy"; + this.oAuthCopy.Size = new System.Drawing.Size(328, 208); + this.oAuthCopy.TabIndex = 1; + this.oAuthCopy.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuthCopy_OpenButtonClicked); + this.oAuthCopy.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuthCopy_CompleteButtonClicked); + this.oAuthCopy.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuthCopy_ClearButtonClicked); + // // tpFTP // this.tpFTP.Controls.Add(this.eiFTP); @@ -1656,6 +1719,16 @@ private void InitializeComponent() this.cboFtpText.TabIndex = 3; this.cboFtpText.SelectedIndexChanged += new System.EventHandler(this.cboFtpText_SelectedIndexChanged); // + // ucFTPAccounts + // + this.ucFTPAccounts.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); + this.ucFTPAccounts.Location = new System.Drawing.Point(8, 40); + this.ucFTPAccounts.Margin = new System.Windows.Forms.Padding(4); + this.ucFTPAccounts.Name = "ucFTPAccounts"; + this.ucFTPAccounts.Size = new System.Drawing.Size(792, 448); + this.ucFTPAccounts.TabIndex = 6; + // // tpMega // this.tpMega.Controls.Add(this.btnMegaRefreshFolders); @@ -2042,6 +2115,104 @@ private void InitializeComponent() this.cbGoogleDriveIsPublic.UseVisualStyleBackColor = true; this.cbGoogleDriveIsPublic.CheckedChanged += new System.EventHandler(this.cbGoogleDriveIsPublic_CheckedChanged); // + // oauth2GoogleDrive + // + this.oauth2GoogleDrive.Location = new System.Drawing.Point(16, 16); + this.oauth2GoogleDrive.Name = "oauth2GoogleDrive"; + this.oauth2GoogleDrive.Size = new System.Drawing.Size(328, 240); + this.oauth2GoogleDrive.TabIndex = 0; + this.oauth2GoogleDrive.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2GoogleDrive_OpenButtonClicked); + this.oauth2GoogleDrive.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2GoogleDrive_CompleteButtonClicked); + this.oauth2GoogleDrive.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2GoogleDrive_ClearButtonClicked); + this.oauth2GoogleDrive.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2GoogleDrive_RefreshButtonClicked); + // + // tpBox + // + this.tpBox.Controls.Add(this.lblBoxFolderTip); + this.tpBox.Controls.Add(this.cbBoxShare); + this.tpBox.Controls.Add(this.lvBoxFolders); + this.tpBox.Controls.Add(this.lblBoxFolderID); + this.tpBox.Controls.Add(this.btnBoxRefreshFolders); + this.tpBox.Controls.Add(this.oauth2Box); + this.tpBox.Location = new System.Drawing.Point(4, 40); + this.tpBox.Name = "tpBox"; + this.tpBox.Padding = new System.Windows.Forms.Padding(3); + this.tpBox.Size = new System.Drawing.Size(972, 475); + this.tpBox.TabIndex = 2; + this.tpBox.Text = "Box"; + this.tpBox.UseVisualStyleBackColor = true; + // + // lblBoxFolderTip + // + this.lblBoxFolderTip.AutoSize = true; + this.lblBoxFolderTip.Location = new System.Drawing.Point(352, 424); + this.lblBoxFolderTip.Name = "lblBoxFolderTip"; + this.lblBoxFolderTip.Size = new System.Drawing.Size(304, 13); + this.lblBoxFolderTip.TabIndex = 5; + this.lblBoxFolderTip.Text = "Note: You can double click folder name to go inside that folder."; + // + // cbBoxShare + // + this.cbBoxShare.AutoSize = true; + this.cbBoxShare.Location = new System.Drawing.Point(16, 264); + this.cbBoxShare.Name = "cbBoxShare"; + this.cbBoxShare.Size = new System.Drawing.Size(125, 17); + this.cbBoxShare.TabIndex = 1; + this.cbBoxShare.Text = "Create shareable link"; + this.cbBoxShare.UseVisualStyleBackColor = true; + this.cbBoxShare.CheckedChanged += new System.EventHandler(this.cbBoxShare_CheckedChanged); + // + // lvBoxFolders + // + this.lvBoxFolders.AutoFillColumn = true; + this.lvBoxFolders.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.chBoxFoldersName}); + this.lvBoxFolders.FullRowSelect = true; + this.lvBoxFolders.Location = new System.Drawing.Point(352, 48); + this.lvBoxFolders.Name = "lvBoxFolders"; + this.lvBoxFolders.Size = new System.Drawing.Size(440, 368); + this.lvBoxFolders.TabIndex = 4; + this.lvBoxFolders.UseCompatibleStateImageBehavior = false; + this.lvBoxFolders.View = System.Windows.Forms.View.Details; + this.lvBoxFolders.SelectedIndexChanged += new System.EventHandler(this.lvBoxFolders_SelectedIndexChanged); + this.lvBoxFolders.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.lvBoxFolders_MouseDoubleClick); + // + // chBoxFoldersName + // + this.chBoxFoldersName.Text = "Folder name"; + this.chBoxFoldersName.Width = 435; + // + // lblBoxFolderID + // + this.lblBoxFolderID.AutoSize = true; + this.lblBoxFolderID.Location = new System.Drawing.Point(488, 21); + this.lblBoxFolderID.Name = "lblBoxFolderID"; + this.lblBoxFolderID.Size = new System.Drawing.Size(81, 13); + this.lblBoxFolderID.TabIndex = 3; + this.lblBoxFolderID.Text = "Selected folder:"; + // + // btnBoxRefreshFolders + // + this.btnBoxRefreshFolders.Enabled = false; + this.btnBoxRefreshFolders.Location = new System.Drawing.Point(352, 16); + this.btnBoxRefreshFolders.Name = "btnBoxRefreshFolders"; + this.btnBoxRefreshFolders.Size = new System.Drawing.Size(128, 23); + this.btnBoxRefreshFolders.TabIndex = 2; + this.btnBoxRefreshFolders.Text = "Refresh folders list"; + this.btnBoxRefreshFolders.UseVisualStyleBackColor = true; + this.btnBoxRefreshFolders.Click += new System.EventHandler(this.btnBoxRefreshFolders_Click); + // + // oauth2Box + // + this.oauth2Box.Location = new System.Drawing.Point(16, 16); + this.oauth2Box.Name = "oauth2Box"; + this.oauth2Box.Size = new System.Drawing.Size(328, 240); + this.oauth2Box.TabIndex = 0; + this.oauth2Box.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Box_OpenButtonClicked); + this.oauth2Box.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Box_CompleteButtonClicked); + this.oauth2Box.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Box_ClearButtonClicked); + this.oauth2Box.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Box_RefreshButtonClicked); + // // tpOwnCloud // this.tpOwnCloud.Controls.Add(this.cbOwnCloudDirectLink); @@ -2153,6 +2324,75 @@ private void InitializeComponent() this.lblOwnCloudHost.TabIndex = 0; this.lblOwnCloudHost.Text = "Host:"; // + // tpMediaFire + // + this.tpMediaFire.Controls.Add(this.cbMediaFireUseLongLink); + this.tpMediaFire.Controls.Add(this.txtMediaFirePath); + this.tpMediaFire.Controls.Add(this.lblMediaFirePath); + this.tpMediaFire.Controls.Add(this.txtMediaFirePassword); + this.tpMediaFire.Controls.Add(this.txtMediaFireEmail); + this.tpMediaFire.Controls.Add(this.lblMediaFirePassword); + this.tpMediaFire.Controls.Add(this.lblMediaFireEmail); + this.tpMediaFire.Location = new System.Drawing.Point(4, 40); + this.tpMediaFire.Name = "tpMediaFire"; + this.tpMediaFire.Padding = new System.Windows.Forms.Padding(3); + this.tpMediaFire.Size = new System.Drawing.Size(972, 475); + this.tpMediaFire.TabIndex = 16; + this.tpMediaFire.Text = "MediaFire"; + this.tpMediaFire.UseVisualStyleBackColor = true; + // + // txtMediaFirePath + // + this.txtMediaFirePath.Location = new System.Drawing.Point(88, 85); + this.txtMediaFirePath.Name = "txtMediaFirePath"; + this.txtMediaFirePath.Size = new System.Drawing.Size(248, 20); + this.txtMediaFirePath.TabIndex = 5; + this.txtMediaFirePath.TextChanged += new System.EventHandler(this.txtMediaFirePath_TextChanged); + // + // lblMediaFirePath + // + this.lblMediaFirePath.AutoSize = true; + this.lblMediaFirePath.Location = new System.Drawing.Point(16, 88); + this.lblMediaFirePath.Name = "lblMediaFirePath"; + this.lblMediaFirePath.Size = new System.Drawing.Size(68, 13); + this.lblMediaFirePath.TabIndex = 4; + this.lblMediaFirePath.Text = "Upload path:"; + // + // txtMediaFirePassword + // + this.txtMediaFirePassword.Location = new System.Drawing.Point(88, 52); + this.txtMediaFirePassword.Name = "txtMediaFirePassword"; + this.txtMediaFirePassword.PasswordChar = '*'; + this.txtMediaFirePassword.Size = new System.Drawing.Size(248, 20); + this.txtMediaFirePassword.TabIndex = 3; + this.txtMediaFirePassword.TextChanged += new System.EventHandler(this.txtMediaFirePassword_TextChanged); + // + // txtMediaFireEmail + // + this.txtMediaFireEmail.Location = new System.Drawing.Point(88, 20); + this.txtMediaFireEmail.Name = "txtMediaFireEmail"; + this.txtMediaFireEmail.Size = new System.Drawing.Size(248, 20); + this.txtMediaFireEmail.TabIndex = 2; + this.txtMediaFireEmail.TextChanged += new System.EventHandler(this.txtMediaFireUsername_TextChanged); + // + // lblMediaFirePassword + // + this.lblMediaFirePassword.AutoSize = true; + this.lblMediaFirePassword.Location = new System.Drawing.Point(16, 56); + this.lblMediaFirePassword.Name = "lblMediaFirePassword"; + this.lblMediaFirePassword.Size = new System.Drawing.Size(56, 13); + this.lblMediaFirePassword.TabIndex = 1; + this.lblMediaFirePassword.Text = "Password:"; + // + // lblMediaFireEmail + // + this.lblMediaFireEmail.AutoSize = true; + this.lblMediaFireEmail.Location = new System.Drawing.Point(16, 24); + this.lblMediaFireEmail.Name = "lblMediaFireEmail"; + this.lblMediaFireEmail.Size = new System.Drawing.Size(35, 13); + this.lblMediaFireEmail.TabIndex = 0; + this.lblMediaFireEmail.Text = "Email:"; + // // tpPushbullet // this.tpPushbullet.Controls.Add(this.lblPushbulletDevices); @@ -2217,82 +2457,6 @@ private void InitializeComponent() this.txtPushbulletUserKey.UseSystemPasswordChar = true; this.txtPushbulletUserKey.TextChanged += new System.EventHandler(this.txtPushbulletUserKey_TextChanged); // - // tpBox - // - this.tpBox.Controls.Add(this.lblBoxFolderTip); - this.tpBox.Controls.Add(this.cbBoxShare); - this.tpBox.Controls.Add(this.lvBoxFolders); - this.tpBox.Controls.Add(this.lblBoxFolderID); - this.tpBox.Controls.Add(this.btnBoxRefreshFolders); - this.tpBox.Controls.Add(this.oauth2Box); - this.tpBox.Location = new System.Drawing.Point(4, 40); - this.tpBox.Name = "tpBox"; - this.tpBox.Padding = new System.Windows.Forms.Padding(3); - this.tpBox.Size = new System.Drawing.Size(972, 475); - this.tpBox.TabIndex = 2; - this.tpBox.Text = "Box"; - this.tpBox.UseVisualStyleBackColor = true; - // - // lblBoxFolderTip - // - this.lblBoxFolderTip.AutoSize = true; - this.lblBoxFolderTip.Location = new System.Drawing.Point(352, 424); - this.lblBoxFolderTip.Name = "lblBoxFolderTip"; - this.lblBoxFolderTip.Size = new System.Drawing.Size(304, 13); - this.lblBoxFolderTip.TabIndex = 5; - this.lblBoxFolderTip.Text = "Note: You can double click folder name to go inside that folder."; - // - // cbBoxShare - // - this.cbBoxShare.AutoSize = true; - this.cbBoxShare.Location = new System.Drawing.Point(16, 264); - this.cbBoxShare.Name = "cbBoxShare"; - this.cbBoxShare.Size = new System.Drawing.Size(125, 17); - this.cbBoxShare.TabIndex = 1; - this.cbBoxShare.Text = "Create shareable link"; - this.cbBoxShare.UseVisualStyleBackColor = true; - this.cbBoxShare.CheckedChanged += new System.EventHandler(this.cbBoxShare_CheckedChanged); - // - // lvBoxFolders - // - this.lvBoxFolders.AutoFillColumn = true; - this.lvBoxFolders.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.chBoxFoldersName}); - this.lvBoxFolders.FullRowSelect = true; - this.lvBoxFolders.Location = new System.Drawing.Point(352, 48); - this.lvBoxFolders.Name = "lvBoxFolders"; - this.lvBoxFolders.Size = new System.Drawing.Size(440, 368); - this.lvBoxFolders.TabIndex = 4; - this.lvBoxFolders.UseCompatibleStateImageBehavior = false; - this.lvBoxFolders.View = System.Windows.Forms.View.Details; - this.lvBoxFolders.SelectedIndexChanged += new System.EventHandler(this.lvBoxFolders_SelectedIndexChanged); - this.lvBoxFolders.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.lvBoxFolders_MouseDoubleClick); - // - // chBoxFoldersName - // - this.chBoxFoldersName.Text = "Folder name"; - this.chBoxFoldersName.Width = 435; - // - // lblBoxFolderID - // - this.lblBoxFolderID.AutoSize = true; - this.lblBoxFolderID.Location = new System.Drawing.Point(488, 21); - this.lblBoxFolderID.Name = "lblBoxFolderID"; - this.lblBoxFolderID.Size = new System.Drawing.Size(81, 13); - this.lblBoxFolderID.TabIndex = 3; - this.lblBoxFolderID.Text = "Selected folder:"; - // - // btnBoxRefreshFolders - // - this.btnBoxRefreshFolders.Enabled = false; - this.btnBoxRefreshFolders.Location = new System.Drawing.Point(352, 16); - this.btnBoxRefreshFolders.Name = "btnBoxRefreshFolders"; - this.btnBoxRefreshFolders.Size = new System.Drawing.Size(128, 23); - this.btnBoxRefreshFolders.TabIndex = 2; - this.btnBoxRefreshFolders.Text = "Refresh folders list"; - this.btnBoxRefreshFolders.UseVisualStyleBackColor = true; - this.btnBoxRefreshFolders.Click += new System.EventHandler(this.btnBoxRefreshFolders_Click); - // // tpRapidShare // this.tpRapidShare.Controls.Add(this.txtRapidShareFolderID); @@ -2442,6 +2606,15 @@ private void InitializeComponent() this.txtSendSpaceUserName.TabIndex = 2; this.txtSendSpaceUserName.TextChanged += new System.EventHandler(this.txtSendSpaceUserName_TextChanged); // + // atcSendSpaceAccountType + // + this.atcSendSpaceAccountType.Location = new System.Drawing.Point(8, 16); + this.atcSendSpaceAccountType.Name = "atcSendSpaceAccountType"; + this.atcSendSpaceAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; + this.atcSendSpaceAccountType.Size = new System.Drawing.Size(214, 29); + this.atcSendSpaceAccountType.TabIndex = 0; + this.atcSendSpaceAccountType.AccountTypeChanged += new UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcSendSpaceAccountType_AccountTypeChanged); + // // tpGe_tt // this.tpGe_tt.Controls.Add(this.lblGe_ttStatus); @@ -2820,6 +2993,17 @@ private void InitializeComponent() this.lblJiraHost.TabIndex = 0; this.lblJiraHost.Text = "Jira host: "; // + // oAuthJira + // + this.oAuthJira.Location = new System.Drawing.Point(473, 13); + this.oAuthJira.Name = "oAuthJira"; + this.oAuthJira.Size = new System.Drawing.Size(328, 243); + this.oAuthJira.TabIndex = 1; + this.oAuthJira.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuthJira_OpenButtonClicked); + this.oAuthJira.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuthJira_CompleteButtonClicked); + this.oAuthJira.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuthJira_ClearButtonClicked); + this.oAuthJira.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oAuthJira_RefreshButtonClicked); + // // tpEmail // this.tpEmail.Controls.Add(this.chkEmailConfirm); @@ -3055,73 +3239,15 @@ private void InitializeComponent() this.cboSharedFolderImages.TabIndex = 1; this.cboSharedFolderImages.SelectedIndexChanged += new System.EventHandler(this.cboSharedFolderImages_SelectedIndexChanged); // - // tpMediaFire + // ucLocalhostAccounts // - this.tpMediaFire.Controls.Add(this.txtMediaFirePath); - this.tpMediaFire.Controls.Add(this.lblMediaFirePath); - this.tpMediaFire.Controls.Add(this.txtMediaFirePassword); - this.tpMediaFire.Controls.Add(this.txtMediaFireEmail); - this.tpMediaFire.Controls.Add(this.lblMediaFirePassword); - this.tpMediaFire.Controls.Add(this.lblMediaFireEmail); - this.tpMediaFire.Location = new System.Drawing.Point(4, 40); - this.tpMediaFire.Name = "tpMediaFire"; - this.tpMediaFire.Padding = new System.Windows.Forms.Padding(3); - this.tpMediaFire.Size = new System.Drawing.Size(972, 475); - this.tpMediaFire.TabIndex = 16; - this.tpMediaFire.Text = "MediaFire"; - this.tpMediaFire.UseVisualStyleBackColor = true; - // - // txtMediaFirePath - // - this.txtMediaFirePath.Location = new System.Drawing.Point(88, 85); - this.txtMediaFirePath.Name = "txtMediaFirePath"; - this.txtMediaFirePath.Size = new System.Drawing.Size(248, 20); - this.txtMediaFirePath.TabIndex = 5; - this.txtMediaFirePath.TextChanged += new System.EventHandler(this.txtMediaFirePath_TextChanged); - // - // lblMediaFirePath - // - this.lblMediaFirePath.AutoSize = true; - this.lblMediaFirePath.Location = new System.Drawing.Point(16, 88); - this.lblMediaFirePath.Name = "lblMediaFirePath"; - this.lblMediaFirePath.Size = new System.Drawing.Size(68, 13); - this.lblMediaFirePath.TabIndex = 4; - this.lblMediaFirePath.Text = "Upload path:"; - // - // txtMediaFirePassword - // - this.txtMediaFirePassword.Location = new System.Drawing.Point(88, 52); - this.txtMediaFirePassword.Name = "txtMediaFirePassword"; - this.txtMediaFirePassword.PasswordChar = '*'; - this.txtMediaFirePassword.Size = new System.Drawing.Size(248, 20); - this.txtMediaFirePassword.TabIndex = 3; - this.txtMediaFirePassword.TextChanged += new System.EventHandler(this.txtMediaFirePassword_TextChanged); - // - // txtMediaFireEmail - // - this.txtMediaFireEmail.Location = new System.Drawing.Point(88, 20); - this.txtMediaFireEmail.Name = "txtMediaFireEmail"; - this.txtMediaFireEmail.Size = new System.Drawing.Size(248, 20); - this.txtMediaFireEmail.TabIndex = 2; - this.txtMediaFireEmail.TextChanged += new System.EventHandler(this.txtMediaFireUsername_TextChanged); - // - // lblMediaFirePassword - // - this.lblMediaFirePassword.AutoSize = true; - this.lblMediaFirePassword.Location = new System.Drawing.Point(16, 56); - this.lblMediaFirePassword.Name = "lblMediaFirePassword"; - this.lblMediaFirePassword.Size = new System.Drawing.Size(56, 13); - this.lblMediaFirePassword.TabIndex = 1; - this.lblMediaFirePassword.Text = "Password:"; - // - // lblMediaFireEmail - // - this.lblMediaFireEmail.AutoSize = true; - this.lblMediaFireEmail.Location = new System.Drawing.Point(16, 24); - this.lblMediaFireEmail.Name = "lblMediaFireEmail"; - this.lblMediaFireEmail.Size = new System.Drawing.Size(35, 13); - this.lblMediaFireEmail.TabIndex = 0; - this.lblMediaFireEmail.Text = "Email:"; + this.ucLocalhostAccounts.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); + this.ucLocalhostAccounts.Location = new System.Drawing.Point(8, 40); + this.ucLocalhostAccounts.Margin = new System.Windows.Forms.Padding(4); + this.ucLocalhostAccounts.Name = "ucLocalhostAccounts"; + this.ucLocalhostAccounts.Size = new System.Drawing.Size(792, 430); + this.ucLocalhostAccounts.TabIndex = 6; // // btnCopyShowFiles // @@ -3239,6 +3365,27 @@ private void InitializeComponent() this.chkGistPublishPublic.UseVisualStyleBackColor = true; this.chkGistPublishPublic.CheckedChanged += new System.EventHandler(this.chkGistPublishPublic_CheckedChanged); // + // oAuth2Gist + // + this.oAuth2Gist.Enabled = false; + this.oAuth2Gist.IsRefreshable = false; + this.oAuth2Gist.Location = new System.Drawing.Point(16, 51); + this.oAuth2Gist.Name = "oAuth2Gist"; + this.oAuth2Gist.Size = new System.Drawing.Size(328, 205); + this.oAuth2Gist.TabIndex = 2; + this.oAuth2Gist.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuth2Gist_OpenButtonClicked); + this.oAuth2Gist.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuth2Gist_CompleteButtonClicked); + this.oAuth2Gist.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuth2Gist_ClearButtonClicked); + // + // atcGistAccountType + // + this.atcGistAccountType.Location = new System.Drawing.Point(15, 16); + this.atcGistAccountType.Name = "atcGistAccountType"; + this.atcGistAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; + this.atcGistAccountType.Size = new System.Drawing.Size(214, 29); + this.atcGistAccountType.TabIndex = 0; + this.atcGistAccountType.AccountTypeChanged += new UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcGistAccountType_AccountTypeChanged); + // // tpUpaste // this.tpUpaste.Controls.Add(this.cbUpasteIsPublic); @@ -3338,6 +3485,26 @@ private void InitializeComponent() this.cbImgurDirectLink.UseVisualStyleBackColor = true; this.cbImgurDirectLink.CheckedChanged += new System.EventHandler(this.cbImgurDirectLink_CheckedChanged); // + // atcImgurAccountType + // + this.atcImgurAccountType.Location = new System.Drawing.Point(8, 260); + this.atcImgurAccountType.Name = "atcImgurAccountType"; + this.atcImgurAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; + this.atcImgurAccountType.Size = new System.Drawing.Size(208, 32); + this.atcImgurAccountType.TabIndex = 1; + this.atcImgurAccountType.AccountTypeChanged += new UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcImgurAccountType_AccountTypeChanged); + // + // oauth2Imgur + // + this.oauth2Imgur.Location = new System.Drawing.Point(16, 16); + this.oauth2Imgur.Name = "oauth2Imgur"; + this.oauth2Imgur.Size = new System.Drawing.Size(328, 240); + this.oauth2Imgur.TabIndex = 0; + this.oauth2Imgur.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Imgur_OpenButtonClicked); + this.oauth2Imgur.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Imgur_CompleteButtonClicked); + this.oauth2Imgur.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Imgur_ClearButtonClicked); + this.oauth2Imgur.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Imgur_RefreshButtonClicked); + // // txtImgurAlbumID // this.txtImgurAlbumID.Location = new System.Drawing.Point(592, 13); @@ -3527,6 +3694,15 @@ private void InitializeComponent() this.tpTinyPic.Text = "TinyPic"; this.tpTinyPic.UseVisualStyleBackColor = true; // + // atcTinyPicAccountType + // + this.atcTinyPicAccountType.Location = new System.Drawing.Point(8, 8); + this.atcTinyPicAccountType.Name = "atcTinyPicAccountType"; + this.atcTinyPicAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; + this.atcTinyPicAccountType.Size = new System.Drawing.Size(272, 29); + this.atcTinyPicAccountType.TabIndex = 0; + this.atcTinyPicAccountType.AccountTypeChanged += new UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcTinyPicAccountType_AccountTypeChanged); + // // btnTinyPicLogin // this.btnTinyPicLogin.Location = new System.Drawing.Point(296, 74); @@ -3923,6 +4099,17 @@ private void InitializeComponent() this.btnPicasaRefreshAlbumList.UseVisualStyleBackColor = true; this.btnPicasaRefreshAlbumList.Click += new System.EventHandler(this.btnPicasaRefreshAlbumList_Click); // + // oauth2Picasa + // + this.oauth2Picasa.Location = new System.Drawing.Point(16, 16); + this.oauth2Picasa.Name = "oauth2Picasa"; + this.oauth2Picasa.Size = new System.Drawing.Size(328, 240); + this.oauth2Picasa.TabIndex = 0; + this.oauth2Picasa.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Picasa_OpenButtonClicked); + this.oauth2Picasa.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Picasa_CompleteButtonClicked); + this.oauth2Picasa.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Picasa_ClearButtonClicked); + this.oauth2Picasa.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Picasa_RefreshButtonClicked); + // // tcUploaders // this.tcUploaders.Controls.Add(this.tpImageUploaders); @@ -3959,191 +4146,6 @@ private void InitializeComponent() this.lblWidthHint.TabIndex = 1; this.lblWidthHint.Visible = false; // - // atcImgurAccountType - // - this.atcImgurAccountType.Location = new System.Drawing.Point(8, 260); - this.atcImgurAccountType.Name = "atcImgurAccountType"; - this.atcImgurAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; - this.atcImgurAccountType.Size = new System.Drawing.Size(208, 32); - this.atcImgurAccountType.TabIndex = 1; - this.atcImgurAccountType.AccountTypeChanged += new UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcImgurAccountType_AccountTypeChanged); - // - // oauth2Imgur - // - this.oauth2Imgur.Location = new System.Drawing.Point(16, 16); - this.oauth2Imgur.Name = "oauth2Imgur"; - this.oauth2Imgur.Size = new System.Drawing.Size(328, 240); - this.oauth2Imgur.TabIndex = 0; - this.oauth2Imgur.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Imgur_OpenButtonClicked); - this.oauth2Imgur.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Imgur_CompleteButtonClicked); - this.oauth2Imgur.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Imgur_ClearButtonClicked); - this.oauth2Imgur.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Imgur_RefreshButtonClicked); - // - // atcTinyPicAccountType - // - this.atcTinyPicAccountType.Location = new System.Drawing.Point(8, 8); - this.atcTinyPicAccountType.Name = "atcTinyPicAccountType"; - this.atcTinyPicAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; - this.atcTinyPicAccountType.Size = new System.Drawing.Size(272, 29); - this.atcTinyPicAccountType.TabIndex = 0; - this.atcTinyPicAccountType.AccountTypeChanged += new UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcTinyPicAccountType_AccountTypeChanged); - // - // oauth2Picasa - // - this.oauth2Picasa.Location = new System.Drawing.Point(16, 16); - this.oauth2Picasa.Name = "oauth2Picasa"; - this.oauth2Picasa.Size = new System.Drawing.Size(328, 240); - this.oauth2Picasa.TabIndex = 0; - this.oauth2Picasa.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Picasa_OpenButtonClicked); - this.oauth2Picasa.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Picasa_CompleteButtonClicked); - this.oauth2Picasa.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Picasa_ClearButtonClicked); - this.oauth2Picasa.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Picasa_RefreshButtonClicked); - // - // oAuth2Gist - // - this.oAuth2Gist.Enabled = false; - this.oAuth2Gist.IsRefreshable = false; - this.oAuth2Gist.Location = new System.Drawing.Point(16, 51); - this.oAuth2Gist.Name = "oAuth2Gist"; - this.oAuth2Gist.Size = new System.Drawing.Size(328, 205); - this.oAuth2Gist.TabIndex = 2; - this.oAuth2Gist.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuth2Gist_OpenButtonClicked); - this.oAuth2Gist.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuth2Gist_CompleteButtonClicked); - this.oAuth2Gist.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuth2Gist_ClearButtonClicked); - // - // atcGistAccountType - // - this.atcGistAccountType.Location = new System.Drawing.Point(15, 16); - this.atcGistAccountType.Name = "atcGistAccountType"; - this.atcGistAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; - this.atcGistAccountType.Size = new System.Drawing.Size(214, 29); - this.atcGistAccountType.TabIndex = 0; - this.atcGistAccountType.AccountTypeChanged += new UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcGistAccountType_AccountTypeChanged); - // - // oauth2Dropbox - // - this.oauth2Dropbox.IsRefreshable = false; - this.oauth2Dropbox.Location = new System.Drawing.Point(16, 88); - this.oauth2Dropbox.Name = "oauth2Dropbox"; - this.oauth2Dropbox.Size = new System.Drawing.Size(328, 200); - this.oauth2Dropbox.TabIndex = 1; - this.oauth2Dropbox.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Dropbox_OpenButtonClicked); - this.oauth2Dropbox.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Dropbox_CompleteButtonClicked); - this.oauth2Dropbox.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Dropbox_ClearButtonClicked); - // - // oAuthCopy - // - this.oAuthCopy.IsRefreshable = false; - this.oAuthCopy.Location = new System.Drawing.Point(16, 88); - this.oAuthCopy.Name = "oAuthCopy"; - this.oAuthCopy.Size = new System.Drawing.Size(328, 208); - this.oAuthCopy.TabIndex = 1; - this.oAuthCopy.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuthCopy_OpenButtonClicked); - this.oAuthCopy.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuthCopy_CompleteButtonClicked); - this.oAuthCopy.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuthCopy_ClearButtonClicked); - // - // ucFTPAccounts - // - this.ucFTPAccounts.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.ucFTPAccounts.Location = new System.Drawing.Point(8, 40); - this.ucFTPAccounts.Margin = new System.Windows.Forms.Padding(4); - this.ucFTPAccounts.Name = "ucFTPAccounts"; - this.ucFTPAccounts.Size = new System.Drawing.Size(792, 448); - this.ucFTPAccounts.TabIndex = 6; - // - // oauth2GoogleDrive - // - this.oauth2GoogleDrive.Location = new System.Drawing.Point(16, 16); - this.oauth2GoogleDrive.Name = "oauth2GoogleDrive"; - this.oauth2GoogleDrive.Size = new System.Drawing.Size(328, 240); - this.oauth2GoogleDrive.TabIndex = 0; - this.oauth2GoogleDrive.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2GoogleDrive_OpenButtonClicked); - this.oauth2GoogleDrive.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2GoogleDrive_CompleteButtonClicked); - this.oauth2GoogleDrive.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2GoogleDrive_ClearButtonClicked); - this.oauth2GoogleDrive.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2GoogleDrive_RefreshButtonClicked); - // - // oauth2Box - // - this.oauth2Box.Location = new System.Drawing.Point(16, 16); - this.oauth2Box.Name = "oauth2Box"; - this.oauth2Box.Size = new System.Drawing.Size(328, 240); - this.oauth2Box.TabIndex = 0; - this.oauth2Box.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Box_OpenButtonClicked); - this.oauth2Box.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Box_CompleteButtonClicked); - this.oauth2Box.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Box_ClearButtonClicked); - this.oauth2Box.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Box_RefreshButtonClicked); - // - // atcSendSpaceAccountType - // - this.atcSendSpaceAccountType.Location = new System.Drawing.Point(8, 16); - this.atcSendSpaceAccountType.Name = "atcSendSpaceAccountType"; - this.atcSendSpaceAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; - this.atcSendSpaceAccountType.Size = new System.Drawing.Size(214, 29); - this.atcSendSpaceAccountType.TabIndex = 0; - this.atcSendSpaceAccountType.AccountTypeChanged += new UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcSendSpaceAccountType_AccountTypeChanged); - // - // oAuthJira - // - this.oAuthJira.Location = new System.Drawing.Point(473, 13); - this.oAuthJira.Name = "oAuthJira"; - this.oAuthJira.Size = new System.Drawing.Size(328, 243); - this.oAuthJira.TabIndex = 1; - this.oAuthJira.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuthJira_OpenButtonClicked); - this.oAuthJira.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuthJira_CompleteButtonClicked); - this.oAuthJira.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuthJira_ClearButtonClicked); - this.oAuthJira.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oAuthJira_RefreshButtonClicked); - // - // ucLocalhostAccounts - // - this.ucLocalhostAccounts.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.ucLocalhostAccounts.Location = new System.Drawing.Point(8, 40); - this.ucLocalhostAccounts.Margin = new System.Windows.Forms.Padding(4); - this.ucLocalhostAccounts.Name = "ucLocalhostAccounts"; - this.ucLocalhostAccounts.Size = new System.Drawing.Size(792, 430); - this.ucLocalhostAccounts.TabIndex = 6; - // - // oauth2Bitly - // - this.oauth2Bitly.IsRefreshable = false; - this.oauth2Bitly.Location = new System.Drawing.Point(16, 16); - this.oauth2Bitly.Name = "oauth2Bitly"; - this.oauth2Bitly.Size = new System.Drawing.Size(328, 208); - this.oauth2Bitly.TabIndex = 0; - this.oauth2Bitly.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Bitly_OpenButtonClicked); - this.oauth2Bitly.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Bitly_CompleteButtonClicked); - this.oauth2Bitly.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Bitly_ClearButtonClicked); - // - // oauth2GoogleURLShortener - // - this.oauth2GoogleURLShortener.Location = new System.Drawing.Point(16, 56); - this.oauth2GoogleURLShortener.Name = "oauth2GoogleURLShortener"; - this.oauth2GoogleURLShortener.Size = new System.Drawing.Size(328, 240); - this.oauth2GoogleURLShortener.TabIndex = 1; - this.oauth2GoogleURLShortener.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2GoogleURLShortener_OpenButtonClicked); - this.oauth2GoogleURLShortener.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2GoogleURLShortener_CompleteButtonClicked); - this.oauth2GoogleURLShortener.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2GoogleURLShortener_ClearButtonClicked); - this.oauth2GoogleURLShortener.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2GoogleURLShortener_RefreshButtonClicked); - // - // atcGoogleURLShortenerAccountType - // - this.atcGoogleURLShortenerAccountType.Location = new System.Drawing.Point(8, 16); - this.atcGoogleURLShortenerAccountType.Name = "atcGoogleURLShortenerAccountType"; - this.atcGoogleURLShortenerAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; - this.atcGoogleURLShortenerAccountType.Size = new System.Drawing.Size(214, 29); - this.atcGoogleURLShortenerAccountType.TabIndex = 0; - this.atcGoogleURLShortenerAccountType.AccountTypeChanged += new UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcGoogleURLShortenerAccountType_AccountTypeChanged); - // - // ucTwitterAccounts - // - this.ucTwitterAccounts.Dock = System.Windows.Forms.DockStyle.Fill; - this.ucTwitterAccounts.Location = new System.Drawing.Point(0, 0); - this.ucTwitterAccounts.Margin = new System.Windows.Forms.Padding(0); - this.ucTwitterAccounts.Name = "ucTwitterAccounts"; - this.ucTwitterAccounts.Size = new System.Drawing.Size(972, 493); - this.ucTwitterAccounts.TabIndex = 0; - // // actRapidShareAccountType // this.actRapidShareAccountType.Location = new System.Drawing.Point(8, 16); @@ -4152,6 +4154,17 @@ private void InitializeComponent() this.actRapidShareAccountType.Size = new System.Drawing.Size(214, 29); this.actRapidShareAccountType.TabIndex = 16; // + // cbMediaFireUseLongLink + // + this.cbMediaFireUseLongLink.AutoSize = true; + this.cbMediaFireUseLongLink.Location = new System.Drawing.Point(16, 120); + this.cbMediaFireUseLongLink.Name = "cbMediaFireUseLongLink"; + this.cbMediaFireUseLongLink.Size = new System.Drawing.Size(205, 17); + this.cbMediaFireUseLongLink.TabIndex = 6; + this.cbMediaFireUseLongLink.Text = "Use long link which includes file name"; + this.cbMediaFireUseLongLink.UseVisualStyleBackColor = true; + this.cbMediaFireUseLongLink.CheckedChanged += new System.EventHandler(this.cbMediaFireUseLongLink_CheckedChanged); + // // UploadersConfigForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -4205,12 +4218,14 @@ private void InitializeComponent() this.tpAmazonS3.PerformLayout(); this.tpGoogleDrive.ResumeLayout(false); this.tpGoogleDrive.PerformLayout(); - this.tpOwnCloud.ResumeLayout(false); - this.tpOwnCloud.PerformLayout(); - this.tpPushbullet.ResumeLayout(false); - this.tpPushbullet.PerformLayout(); this.tpBox.ResumeLayout(false); this.tpBox.PerformLayout(); + this.tpOwnCloud.ResumeLayout(false); + this.tpOwnCloud.PerformLayout(); + this.tpMediaFire.ResumeLayout(false); + this.tpMediaFire.PerformLayout(); + this.tpPushbullet.ResumeLayout(false); + this.tpPushbullet.PerformLayout(); this.tpRapidShare.ResumeLayout(false); this.tpRapidShare.PerformLayout(); this.tpSendSpace.ResumeLayout(false); @@ -4234,8 +4249,6 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.nudEmailSmtpPort)).EndInit(); this.tpSharedFolder.ResumeLayout(false); this.tpSharedFolder.PerformLayout(); - this.tpMediaFire.ResumeLayout(false); - this.tpMediaFire.PerformLayout(); this.tpTextUploaders.ResumeLayout(false); this.tcTextUploaders.ResumeLayout(false); this.tpPastebin.ResumeLayout(false); @@ -4628,6 +4641,7 @@ private void InitializeComponent() private System.Windows.Forms.Label lblMediaFirePassword; private System.Windows.Forms.Label lblMediaFireEmail; private System.Windows.Forms.TextBox txtMediaFirePath; - private System.Windows.Forms.Label lblMediaFirePath; + private System.Windows.Forms.Label lblMediaFirePath; + private System.Windows.Forms.CheckBox cbMediaFireUseLongLink; } } \ No newline at end of file diff --git a/UploadersLib/Forms/UploadersConfigForm.cs b/UploadersLib/Forms/UploadersConfigForm.cs index f13fc5672..5697868ee 100644 --- a/UploadersLib/Forms/UploadersConfigForm.cs +++ b/UploadersLib/Forms/UploadersConfigForm.cs @@ -496,6 +496,7 @@ public void LoadSettings(UploadersConfig uploadersConfig) txtMediaFireEmail.Text = Config.MediaFireUsername; txtMediaFirePassword.Text = Config.MediaFirePassword; txtMediaFirePath.Text = Config.MediaFirePath; + cbMediaFireUseLongLink.Checked = Config.MediaFireUseLongLink; #endregion File uploaders @@ -1804,7 +1805,12 @@ private void txtMediaFirePath_TextChanged(object sender, EventArgs e) Config.MediaFirePath = txtMediaFirePath.Text; } - #endregion + private void cbMediaFireUseLongLink_CheckedChanged(object sender, EventArgs e) + { + Config.MediaFireUseLongLink = cbMediaFireUseLongLink.Checked; + } + + #endregion MediaFire #endregion File Uploaders diff --git a/UploadersLib/UploadersConfig.cs b/UploadersLib/UploadersConfig.cs index b3c537b71..2a21c3162 100644 --- a/UploadersLib/UploadersConfig.cs +++ b/UploadersLib/UploadersConfig.cs @@ -223,6 +223,7 @@ public class UploadersConfig : SettingsBase public string MediaFireUsername = ""; public string MediaFirePassword = ""; public string MediaFirePath = ""; + public bool MediaFireUseLongLink = false; #endregion File uploaders