diff --git a/ShareX/Forms/AboutForm.resx b/ShareX/Forms/AboutForm.resx index 7dd0b42c0..474db4746 100644 --- a/ShareX/Forms/AboutForm.resx +++ b/ShareX/Forms/AboutForm.resx @@ -128,6 +128,7 @@ Amazon S3 and DreamObjects support: https://github.com/alanedwardes Gfycat support: https://github.com/Dinnerbone Copy support: https://github.com/KamilKZ AdFly support: https://github.com/LRNAB +MediaFire support: https://github.com/michalx2 External libraries: diff --git a/UploadersLib/Enums.cs b/UploadersLib/Enums.cs index dd2e413b7..932cc664d 100644 --- a/UploadersLib/Enums.cs +++ b/UploadersLib/Enums.cs @@ -94,6 +94,8 @@ public enum FileDestination AmazonS3, [Description("ownCloud")] OwnCloud, + [Description("MediaFire")] + MediaFire, [Description("Gfycat")] Gfycat, [Description("Pushbullet")] @@ -117,9 +119,7 @@ public enum FileDestination [Description("Email")] Email, [Description("Custom file uploader")] - CustomFileUploader, - [Description("MediaFire")] - MediaFire + CustomFileUploader } [Description("URL shorteners"), DefaultValue(UrlShortenerType.BITLY)] diff --git a/UploadersLib/FileUploaders/MediaFire.cs b/UploadersLib/FileUploaders/MediaFire.cs index 29f23a320..b225a3018 100644 --- a/UploadersLib/FileUploaders/MediaFire.cs +++ b/UploadersLib/FileUploaders/MediaFire.cs @@ -41,8 +41,7 @@ namespace UploadersLib.FileUploaders public sealed class MediaFire : FileUploader { private static readonly string _apiUrl = "https://www.mediafire.com/api/"; - private static readonly string _viewUrl = "http://www.mediafire.com/view/?"; - private static readonly int _pollInterval = 3000; + private static readonly int _pollInterval = 1000; private readonly string _appId, _apiKey, _user, _pasw, _path; private string _sessionToken, _signatureTime; private int _signatureKey; @@ -60,9 +59,9 @@ public override UploadResult Upload(Stream stream, string fileName) { GetSessionToken(); string key = SimpleUpload(stream, fileName); - string quickKey = null; - while ((quickKey = PollUpload(key, fileName)) == null) Thread.Sleep(_pollInterval); - return new UploadResult() { IsSuccess = true, URL = _viewUrl + quickKey }; + string url = null; + while ((url = PollUpload(key, fileName)) == null) Thread.Sleep(_pollInterval); + return new UploadResult() { IsSuccess = true, URL = url }; } private void GetSessionToken() @@ -119,7 +118,7 @@ private string PollUpload(string uploadKey, string fileName) if (resp.doupload.status == 99) { if (resp.doupload.quickkey == null) throw new IOException("Invalid response"); - return resp.doupload.quickkey; + return string.Format("http://www.mediafire.com/view/{0}/{1}", resp.doupload.quickkey, resp.doupload.filename); } return null; } @@ -224,6 +223,7 @@ public class DoUpload public string description { get; set; } public int? fileerror { get; set; } public string quickkey { get; set; } + public string filename { get; set; } } } } diff --git a/UploadersLib/Forms/UploadersConfigForm.Designer.cs b/UploadersLib/Forms/UploadersConfigForm.Designer.cs index 82412aafc..866b66c6e 100644 --- a/UploadersLib/Forms/UploadersConfigForm.Designer.cs +++ b/UploadersLib/Forms/UploadersConfigForm.Designer.cs @@ -94,16 +94,12 @@ 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(); @@ -123,7 +119,6 @@ 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(); @@ -141,7 +136,6 @@ 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(); @@ -151,7 +145,6 @@ 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(); @@ -189,7 +182,6 @@ 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.tpOwnCloud = new System.Windows.Forms.TabPage(); this.cbOwnCloudDirectLink = new System.Windows.Forms.CheckBox(); this.cbOwnCloudCreateShare = new System.Windows.Forms.CheckBox(); @@ -214,7 +206,6 @@ 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 UploadersLib.OAuthControl(); this.tpRapidShare = new System.Windows.Forms.TabPage(); this.txtRapidShareFolderID = new System.Windows.Forms.TextBox(); this.lblRapidShareFolderID = new System.Windows.Forms.Label(); @@ -230,7 +221,6 @@ 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(); @@ -268,7 +258,6 @@ 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(); @@ -291,7 +280,13 @@ 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.ucLocalhostAccounts = new UploadersLib.AccountsControl(); + 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.btnCopyShowFiles = new System.Windows.Forms.Button(); this.tpTextUploaders = new System.Windows.Forms.TabPage(); this.tcTextUploaders = new System.Windows.Forms.TabControl(); @@ -303,8 +298,6 @@ 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(); @@ -312,8 +305,7 @@ private void InitializeComponent() this.tpImageUploaders = new System.Windows.Forms.TabPage(); this.tcImageUploaders = new System.Windows.Forms.TabControl(); this.tpImgur = new System.Windows.Forms.TabPage(); - this.atcImgurAccountType = new UploadersLib.AccountTypeControl(); - this.oauth2Imgur = new UploadersLib.OAuthControl(); + this.cbImgurDirectLink = new System.Windows.Forms.CheckBox(); this.txtImgurAlbumID = new System.Windows.Forms.TextBox(); this.lblImgurAlbumID = new System.Windows.Forms.Label(); this.lvImgurAlbumList = new System.Windows.Forms.ListView(); @@ -333,7 +325,6 @@ 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(); @@ -374,19 +365,28 @@ 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.cbImgurDirectLink = new System.Windows.Forms.CheckBox(); - this.tpMediaFire = new System.Windows.Forms.TabPage(); - this.txtMediaFirePassword = new System.Windows.Forms.TextBox(); - this.txtMediaFireUsername = new System.Windows.Forms.TextBox(); - this.lblMediaFirePassword = new System.Windows.Forms.Label(); - this.lblMediaFireUsername = new System.Windows.Forms.Label(); - this.lblMediaFirePath = new System.Windows.Forms.Label(); - this.txtMediaFirePath = new System.Windows.Forms.TextBox(); this.tpOtherUploaders.SuspendLayout(); this.tcOtherUploaders.SuspendLayout(); this.tpCustomUploaders.SuspendLayout(); @@ -425,6 +425,7 @@ 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(); @@ -442,7 +443,6 @@ private void InitializeComponent() this.gbPhotobucketAlbums.SuspendLayout(); this.gbPhotobucketUserAccount.SuspendLayout(); this.tpPicasa.SuspendLayout(); - this.tpMediaFire.SuspendLayout(); this.tcUploaders.SuspendLayout(); this.SuspendLayout(); // @@ -1101,15 +1101,6 @@ 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); @@ -1164,17 +1155,6 @@ 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); @@ -1187,26 +1167,6 @@ 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,9 +1345,10 @@ private void InitializeComponent() this.tcFileUploaders.Controls.Add(this.tpMega); this.tcFileUploaders.Controls.Add(this.tpAmazonS3); this.tcFileUploaders.Controls.Add(this.tpGoogleDrive); - this.tcFileUploaders.Controls.Add(this.tpOwnCloud); - this.tcFileUploaders.Controls.Add(this.tpPushbullet); this.tcFileUploaders.Controls.Add(this.tpBox); + this.tcFileUploaders.Controls.Add(this.tpOwnCloud); + this.tcFileUploaders.Controls.Add(this.tpMediaFire); + this.tcFileUploaders.Controls.Add(this.tpPushbullet); this.tcFileUploaders.Controls.Add(this.tpRapidShare); this.tcFileUploaders.Controls.Add(this.tpSendSpace); this.tcFileUploaders.Controls.Add(this.tpGe_tt); @@ -1396,7 +1357,6 @@ private void InitializeComponent() this.tcFileUploaders.Controls.Add(this.tpJira); this.tcFileUploaders.Controls.Add(this.tpEmail); this.tcFileUploaders.Controls.Add(this.tpSharedFolder); - this.tcFileUploaders.Controls.Add(this.tpMediaFire); this.tcFileUploaders.Dock = System.Windows.Forms.DockStyle.Fill; this.tcFileUploaders.Location = new System.Drawing.Point(3, 3); this.tcFileUploaders.Multiline = true; @@ -1417,25 +1377,14 @@ private void InitializeComponent() this.tpDropbox.Controls.Add(this.lblDropboxPathTip); this.tpDropbox.Controls.Add(this.lblDropboxPath); this.tpDropbox.Controls.Add(this.txtDropboxPath); - this.tpDropbox.Location = new System.Drawing.Point(4, 22); + this.tpDropbox.Location = new System.Drawing.Point(4, 40); this.tpDropbox.Name = "tpDropbox"; this.tpDropbox.Padding = new System.Windows.Forms.Padding(3); - this.tpDropbox.Size = new System.Drawing.Size(972, 493); + this.tpDropbox.Size = new System.Drawing.Size(972, 475); this.tpDropbox.TabIndex = 0; 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; @@ -1536,10 +1485,10 @@ private void InitializeComponent() this.tpCopy.Controls.Add(this.lblCopyPath); this.tpCopy.Controls.Add(this.txtCopyPath); this.tpCopy.Controls.Add(this.oAuthCopy); - this.tpCopy.Location = new System.Drawing.Point(4, 22); + this.tpCopy.Location = new System.Drawing.Point(4, 40); this.tpCopy.Name = "tpCopy"; this.tpCopy.Padding = new System.Windows.Forms.Padding(3); - this.tpCopy.Size = new System.Drawing.Size(972, 493); + this.tpCopy.Size = new System.Drawing.Size(972, 475); this.tpCopy.TabIndex = 0; this.tpCopy.Text = "Copy"; this.tpCopy.UseVisualStyleBackColor = true; @@ -1611,17 +1560,6 @@ 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); @@ -1633,10 +1571,10 @@ private void InitializeComponent() this.tpFTP.Controls.Add(this.cboFtpFiles); this.tpFTP.Controls.Add(this.cboFtpText); this.tpFTP.Controls.Add(this.ucFTPAccounts); - this.tpFTP.Location = new System.Drawing.Point(4, 22); + this.tpFTP.Location = new System.Drawing.Point(4, 40); this.tpFTP.Name = "tpFTP"; this.tpFTP.Padding = new System.Windows.Forms.Padding(3); - this.tpFTP.Size = new System.Drawing.Size(972, 493); + this.tpFTP.Size = new System.Drawing.Size(972, 475); this.tpFTP.TabIndex = 4; this.tpFTP.Text = "FTP"; this.tpFTP.UseVisualStyleBackColor = true; @@ -1718,16 +1656,6 @@ 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); @@ -1741,9 +1669,9 @@ private void InitializeComponent() this.tpMega.Controls.Add(this.txtMegaEmail); this.tpMega.Controls.Add(this.txtMegaPassword); this.tpMega.Controls.Add(this.lblMegaPassword); - this.tpMega.Location = new System.Drawing.Point(4, 22); + this.tpMega.Location = new System.Drawing.Point(4, 40); this.tpMega.Name = "tpMega"; - this.tpMega.Size = new System.Drawing.Size(972, 493); + this.tpMega.Size = new System.Drawing.Size(972, 475); this.tpMega.TabIndex = 12; this.tpMega.Text = "Mega"; this.tpMega.UseVisualStyleBackColor = true; @@ -1869,10 +1797,10 @@ private void InitializeComponent() this.tpAmazonS3.Controls.Add(this.lblAmazonS3SecretKey); this.tpAmazonS3.Controls.Add(this.lblAmazonS3AccessKey); this.tpAmazonS3.Controls.Add(this.txtAmazonS3AccessKey); - this.tpAmazonS3.Location = new System.Drawing.Point(4, 22); + this.tpAmazonS3.Location = new System.Drawing.Point(4, 40); this.tpAmazonS3.Name = "tpAmazonS3"; this.tpAmazonS3.Padding = new System.Windows.Forms.Padding(3); - this.tpAmazonS3.Size = new System.Drawing.Size(972, 493); + this.tpAmazonS3.Size = new System.Drawing.Size(972, 475); this.tpAmazonS3.TabIndex = 13; this.tpAmazonS3.Text = "Amazon S3"; this.tpAmazonS3.UseVisualStyleBackColor = true; @@ -2030,10 +1958,10 @@ private void InitializeComponent() this.tpGoogleDrive.Controls.Add(this.btnGoogleDriveRefreshFolders); this.tpGoogleDrive.Controls.Add(this.cbGoogleDriveIsPublic); this.tpGoogleDrive.Controls.Add(this.oauth2GoogleDrive); - this.tpGoogleDrive.Location = new System.Drawing.Point(4, 22); + this.tpGoogleDrive.Location = new System.Drawing.Point(4, 40); this.tpGoogleDrive.Name = "tpGoogleDrive"; this.tpGoogleDrive.Padding = new System.Windows.Forms.Padding(3); - this.tpGoogleDrive.Size = new System.Drawing.Size(972, 493); + this.tpGoogleDrive.Size = new System.Drawing.Size(972, 475); this.tpGoogleDrive.TabIndex = 1; this.tpGoogleDrive.Text = "Google Drive"; this.tpGoogleDrive.UseVisualStyleBackColor = true; @@ -2114,17 +2042,6 @@ 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); - // // tpOwnCloud // this.tpOwnCloud.Controls.Add(this.cbOwnCloudDirectLink); @@ -2137,10 +2054,10 @@ private void InitializeComponent() this.tpOwnCloud.Controls.Add(this.lblOwnCloudPassword); this.tpOwnCloud.Controls.Add(this.lblOwnCloudUsername); this.tpOwnCloud.Controls.Add(this.lblOwnCloudHost); - this.tpOwnCloud.Location = new System.Drawing.Point(4, 22); + this.tpOwnCloud.Location = new System.Drawing.Point(4, 40); this.tpOwnCloud.Name = "tpOwnCloud"; this.tpOwnCloud.Padding = new System.Windows.Forms.Padding(3); - this.tpOwnCloud.Size = new System.Drawing.Size(972, 493); + this.tpOwnCloud.Size = new System.Drawing.Size(972, 475); this.tpOwnCloud.TabIndex = 15; this.tpOwnCloud.Text = "ownCloud"; this.tpOwnCloud.UseVisualStyleBackColor = true; @@ -2243,10 +2160,10 @@ private void InitializeComponent() this.tpPushbullet.Controls.Add(this.btnPushbulletGetDeviceList); this.tpPushbullet.Controls.Add(this.lblPushbulletUserKey); this.tpPushbullet.Controls.Add(this.txtPushbulletUserKey); - this.tpPushbullet.Location = new System.Drawing.Point(4, 22); + this.tpPushbullet.Location = new System.Drawing.Point(4, 40); this.tpPushbullet.Name = "tpPushbullet"; this.tpPushbullet.Padding = new System.Windows.Forms.Padding(3); - this.tpPushbullet.Size = new System.Drawing.Size(972, 493); + this.tpPushbullet.Size = new System.Drawing.Size(972, 475); this.tpPushbullet.TabIndex = 14; this.tpPushbullet.Text = "Pushbullet"; this.tpPushbullet.UseVisualStyleBackColor = true; @@ -2308,10 +2225,10 @@ private void InitializeComponent() 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, 22); + 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, 493); + this.tpBox.Size = new System.Drawing.Size(972, 475); this.tpBox.TabIndex = 2; this.tpBox.Text = "Box"; this.tpBox.UseVisualStyleBackColor = true; @@ -2376,17 +2293,6 @@ private void InitializeComponent() 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); - // // tpRapidShare // this.tpRapidShare.Controls.Add(this.txtRapidShareFolderID); @@ -2397,10 +2303,10 @@ private void InitializeComponent() this.tpRapidShare.Controls.Add(this.lblRapidSharePremiumUsername); this.tpRapidShare.Controls.Add(this.txtRapidSharePassword); this.tpRapidShare.Controls.Add(this.txtRapidShareUsername); - this.tpRapidShare.Location = new System.Drawing.Point(4, 22); + this.tpRapidShare.Location = new System.Drawing.Point(4, 40); this.tpRapidShare.Name = "tpRapidShare"; this.tpRapidShare.Padding = new System.Windows.Forms.Padding(3); - this.tpRapidShare.Size = new System.Drawing.Size(972, 493); + this.tpRapidShare.Size = new System.Drawing.Size(972, 475); this.tpRapidShare.TabIndex = 5; this.tpRapidShare.Text = "RapidShare"; this.tpRapidShare.UseVisualStyleBackColor = true; @@ -2483,10 +2389,10 @@ private void InitializeComponent() this.tpSendSpace.Controls.Add(this.txtSendSpacePassword); this.tpSendSpace.Controls.Add(this.txtSendSpaceUserName); this.tpSendSpace.Controls.Add(this.atcSendSpaceAccountType); - this.tpSendSpace.Location = new System.Drawing.Point(4, 22); + this.tpSendSpace.Location = new System.Drawing.Point(4, 40); this.tpSendSpace.Name = "tpSendSpace"; this.tpSendSpace.Padding = new System.Windows.Forms.Padding(3); - this.tpSendSpace.Size = new System.Drawing.Size(972, 493); + this.tpSendSpace.Size = new System.Drawing.Size(972, 475); this.tpSendSpace.TabIndex = 6; this.tpSendSpace.Text = "SendSpace"; this.tpSendSpace.UseVisualStyleBackColor = true; @@ -2536,15 +2442,6 @@ 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); @@ -2553,10 +2450,10 @@ private void InitializeComponent() this.tpGe_tt.Controls.Add(this.btnGe_ttLogin); this.tpGe_tt.Controls.Add(this.txtGe_ttPassword); this.tpGe_tt.Controls.Add(this.txtGe_ttEmail); - this.tpGe_tt.Location = new System.Drawing.Point(4, 22); + this.tpGe_tt.Location = new System.Drawing.Point(4, 40); this.tpGe_tt.Name = "tpGe_tt"; this.tpGe_tt.Padding = new System.Windows.Forms.Padding(3); - this.tpGe_tt.Size = new System.Drawing.Size(972, 493); + this.tpGe_tt.Size = new System.Drawing.Size(972, 475); this.tpGe_tt.TabIndex = 7; this.tpGe_tt.Text = "Ge.tt"; this.tpGe_tt.UseVisualStyleBackColor = true; @@ -2620,10 +2517,10 @@ private void InitializeComponent() this.tpHostr.Controls.Add(this.lblLocalhostrEmail); this.tpHostr.Controls.Add(this.txtLocalhostrPassword); this.tpHostr.Controls.Add(this.txtLocalhostrEmail); - this.tpHostr.Location = new System.Drawing.Point(4, 22); + this.tpHostr.Location = new System.Drawing.Point(4, 40); this.tpHostr.Name = "tpHostr"; this.tpHostr.Padding = new System.Windows.Forms.Padding(3); - this.tpHostr.Size = new System.Drawing.Size(972, 493); + this.tpHostr.Size = new System.Drawing.Size(972, 475); this.tpHostr.TabIndex = 8; this.tpHostr.Text = "Hostr"; this.tpHostr.UseVisualStyleBackColor = true; @@ -2680,10 +2577,10 @@ private void InitializeComponent() this.tpMinus.Controls.Add(this.cbMinusURLType); this.tpMinus.Controls.Add(this.gbMinusUserPass); this.tpMinus.Controls.Add(this.gbMinusUpload); - this.tpMinus.Location = new System.Drawing.Point(4, 22); + this.tpMinus.Location = new System.Drawing.Point(4, 40); this.tpMinus.Name = "tpMinus"; this.tpMinus.Padding = new System.Windows.Forms.Padding(3); - this.tpMinus.Size = new System.Drawing.Size(972, 493); + this.tpMinus.Size = new System.Drawing.Size(972, 475); this.tpMinus.TabIndex = 3; this.tpMinus.Text = "Minus"; this.tpMinus.UseVisualStyleBackColor = true; @@ -2856,9 +2753,9 @@ private void InitializeComponent() this.tpJira.Controls.Add(this.lblJiraIssuePrefix); this.tpJira.Controls.Add(this.gpJiraServer); this.tpJira.Controls.Add(this.oAuthJira); - this.tpJira.Location = new System.Drawing.Point(4, 22); + this.tpJira.Location = new System.Drawing.Point(4, 40); this.tpJira.Name = "tpJira"; - this.tpJira.Size = new System.Drawing.Size(972, 493); + this.tpJira.Size = new System.Drawing.Size(972, 475); this.tpJira.TabIndex = 11; this.tpJira.Text = "Atlassian Jira"; this.tpJira.UseVisualStyleBackColor = true; @@ -2923,17 +2820,6 @@ 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); @@ -2950,10 +2836,10 @@ private void InitializeComponent() this.tpEmail.Controls.Add(this.nudEmailSmtpPort); this.tpEmail.Controls.Add(this.lblEmailSmtpPort); this.tpEmail.Controls.Add(this.txtEmailDefaultSubject); - this.tpEmail.Location = new System.Drawing.Point(4, 22); + this.tpEmail.Location = new System.Drawing.Point(4, 40); this.tpEmail.Name = "tpEmail"; this.tpEmail.Padding = new System.Windows.Forms.Padding(3); - this.tpEmail.Size = new System.Drawing.Size(972, 493); + this.tpEmail.Size = new System.Drawing.Size(972, 475); this.tpEmail.TabIndex = 10; this.tpEmail.Text = "Email"; this.tpEmail.UseVisualStyleBackColor = true; @@ -3104,10 +2990,10 @@ private void InitializeComponent() this.tpSharedFolder.Controls.Add(this.cboSharedFolderText); this.tpSharedFolder.Controls.Add(this.cboSharedFolderImages); this.tpSharedFolder.Controls.Add(this.ucLocalhostAccounts); - this.tpSharedFolder.Location = new System.Drawing.Point(4, 22); + this.tpSharedFolder.Location = new System.Drawing.Point(4, 40); this.tpSharedFolder.Name = "tpSharedFolder"; this.tpSharedFolder.Padding = new System.Windows.Forms.Padding(3); - this.tpSharedFolder.Size = new System.Drawing.Size(972, 493); + this.tpSharedFolder.Size = new System.Drawing.Size(972, 475); this.tpSharedFolder.TabIndex = 9; this.tpSharedFolder.Text = "Shared folder"; this.tpSharedFolder.UseVisualStyleBackColor = true; @@ -3169,24 +3055,14 @@ private void InitializeComponent() this.cboSharedFolderImages.TabIndex = 1; this.cboSharedFolderImages.SelectedIndexChanged += new System.EventHandler(this.cboSharedFolderImages_SelectedIndexChanged); // - // 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, 448); - this.ucLocalhostAccounts.TabIndex = 6; - // // tpMediaFire // this.tpMediaFire.Controls.Add(this.txtMediaFirePath); this.tpMediaFire.Controls.Add(this.lblMediaFirePath); this.tpMediaFire.Controls.Add(this.txtMediaFirePassword); - this.tpMediaFire.Controls.Add(this.txtMediaFireUsername); + this.tpMediaFire.Controls.Add(this.txtMediaFireEmail); this.tpMediaFire.Controls.Add(this.lblMediaFirePassword); - this.tpMediaFire.Controls.Add(this.lblMediaFireUsername); + 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); @@ -3195,22 +3071,39 @@ private void InitializeComponent() 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(80, 52); + this.txtMediaFirePassword.Location = new System.Drawing.Point(88, 52); this.txtMediaFirePassword.Name = "txtMediaFirePassword"; this.txtMediaFirePassword.PasswordChar = '*'; - this.txtMediaFirePassword.Size = new System.Drawing.Size(136, 20); + this.txtMediaFirePassword.Size = new System.Drawing.Size(248, 20); this.txtMediaFirePassword.TabIndex = 3; this.txtMediaFirePassword.TextChanged += new System.EventHandler(this.txtMediaFirePassword_TextChanged); // - // txtMediaFireUsername + // txtMediaFireEmail // - this.txtMediaFireUsername.Location = new System.Drawing.Point(80, 20); - this.txtMediaFireUsername.Name = "txtMediaFireUsername"; - this.txtMediaFireUsername.Size = new System.Drawing.Size(136, 20); - this.txtMediaFireUsername.TabIndex = 2; - this.txtMediaFireUsername.TextChanged += new System.EventHandler(this.txtMediaFireUsername_TextChanged); + 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 // @@ -3221,31 +3114,14 @@ private void InitializeComponent() this.lblMediaFirePassword.TabIndex = 1; this.lblMediaFirePassword.Text = "Password:"; // - // lblMediaFireUsername + // lblMediaFireEmail // - this.lblMediaFireUsername.AutoSize = true; - this.lblMediaFireUsername.Location = new System.Drawing.Point(16, 24); - this.lblMediaFireUsername.Name = "lblMediaFireUsername"; - this.lblMediaFireUsername.Size = new System.Drawing.Size(58, 13); - this.lblMediaFireUsername.TabIndex = 0; - this.lblMediaFireUsername.Text = "Username:"; - // - // 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:"; - // - // 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); + 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:"; // // btnCopyShowFiles // @@ -3363,27 +3239,6 @@ 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); @@ -3472,25 +3327,16 @@ private void InitializeComponent() this.tpImgur.Text = "Imgur"; this.tpImgur.UseVisualStyleBackColor = true; // - // atcImgurAccountType + // cbImgurDirectLink // - 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); + this.cbImgurDirectLink.AutoSize = true; + this.cbImgurDirectLink.Location = new System.Drawing.Point(19, 296); + this.cbImgurDirectLink.Name = "cbImgurDirectLink"; + this.cbImgurDirectLink.Size = new System.Drawing.Size(93, 17); + this.cbImgurDirectLink.TabIndex = 8; + this.cbImgurDirectLink.Text = "Use direct link"; + this.cbImgurDirectLink.UseVisualStyleBackColor = true; + this.cbImgurDirectLink.CheckedChanged += new System.EventHandler(this.cbImgurDirectLink_CheckedChanged); // // txtImgurAlbumID // @@ -3681,15 +3527,6 @@ 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); @@ -4086,17 +3923,6 @@ 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); @@ -4133,6 +3959,191 @@ 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); @@ -4141,17 +4152,6 @@ private void InitializeComponent() this.actRapidShareAccountType.Size = new System.Drawing.Size(214, 29); this.actRapidShareAccountType.TabIndex = 16; // - // cbImgurDirectLink - // - this.cbImgurDirectLink.AutoSize = true; - this.cbImgurDirectLink.Location = new System.Drawing.Point(19, 296); - this.cbImgurDirectLink.Name = "cbImgurDirectLink"; - this.cbImgurDirectLink.Size = new System.Drawing.Size(93, 17); - this.cbImgurDirectLink.TabIndex = 8; - this.cbImgurDirectLink.Text = "Use direct link"; - this.cbImgurDirectLink.UseVisualStyleBackColor = true; - this.cbImgurDirectLink.CheckedChanged += new System.EventHandler(this.cbImgurDirectLink_CheckedChanged); - // // UploadersConfigForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -4235,7 +4235,7 @@ private void InitializeComponent() this.tpSharedFolder.ResumeLayout(false); this.tpSharedFolder.PerformLayout(); this.tpMediaFire.ResumeLayout(false); - this.tpMediaFire.PerformLayout(); + this.tpMediaFire.PerformLayout(); this.tpTextUploaders.ResumeLayout(false); this.tcTextUploaders.ResumeLayout(false); this.tpPastebin.ResumeLayout(false); @@ -4624,9 +4624,9 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox cbImgurDirectLink; private System.Windows.Forms.TabPage tpMediaFire; private System.Windows.Forms.TextBox txtMediaFirePassword; - private System.Windows.Forms.TextBox txtMediaFireUsername; + private System.Windows.Forms.TextBox txtMediaFireEmail; private System.Windows.Forms.Label lblMediaFirePassword; - private System.Windows.Forms.Label lblMediaFireUsername; + private System.Windows.Forms.Label lblMediaFireEmail; private System.Windows.Forms.TextBox txtMediaFirePath; private System.Windows.Forms.Label lblMediaFirePath; } diff --git a/UploadersLib/Forms/UploadersConfigForm.cs b/UploadersLib/Forms/UploadersConfigForm.cs index 28b36b039..f13fc5672 100644 --- a/UploadersLib/Forms/UploadersConfigForm.cs +++ b/UploadersLib/Forms/UploadersConfigForm.cs @@ -493,7 +493,7 @@ public void LoadSettings(UploadersConfig uploadersConfig) // MediaFire - txtMediaFireUsername.Text = Config.MediaFireUsername; + txtMediaFireEmail.Text = Config.MediaFireUsername; txtMediaFirePassword.Text = Config.MediaFirePassword; txtMediaFirePath.Text = Config.MediaFirePath; @@ -1791,7 +1791,7 @@ private void SettingsGrid_LocalhostPropertyValueChanged(object s, PropertyValueC private void txtMediaFireUsername_TextChanged(object sender, EventArgs e) { - Config.MediaFireUsername = txtMediaFireUsername.Text; + Config.MediaFireUsername = txtMediaFireEmail.Text; } private void txtMediaFirePassword_TextChanged(object sender, EventArgs e)