From c1ff163cc8d7619d8a74ea34daa1a52cc9322714 Mon Sep 17 00:00:00 2001 From: Jaex Date: Sun, 20 Apr 2014 04:16:51 +0300 Subject: [PATCH] Added HttpHomePathAutoAddSubFolderPath ftp setting instead using @ in beginning of HttpHomePath Fixed space encoding --- ShareX/Forms/MainForm.cs | 6 +- ShareX/Forms/UploadTestForm.cs | 3 +- ShareX/Properties/Resources.Designer.cs | 12 +- ShareX/Properties/Resources.resx | 8 +- ShareX/Resources/Test.png | Bin 0 -> 4251 bytes ShareX/ShareX.csproj | 1 + UploadersLib/FileUploaders/FTP/FTPAccount.cs | 66 ++- .../GUI/UploadersConfigForm.Designer.cs | 418 +++++++++--------- UploadersLib/GUI/UploadersConfigForm.resx | 3 - 9 files changed, 279 insertions(+), 238 deletions(-) create mode 100644 ShareX/Resources/Test.png diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 4843d8e62..7351a9a24 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -724,17 +724,17 @@ private void tsmiShowDebugLog_Click(object sender, EventArgs e) private void tsmiTestImageUpload_Click(object sender, EventArgs e) { - UploadManager.RunImageTask(ShareXResources.Logo); + UploadManager.RunImageTask(Resources.Test); } private void tsmiTestTextUpload_Click(object sender, EventArgs e) { - UploadManager.UploadText(Program.ApplicationName + " text upload test"); + UploadManager.UploadText("Text upload test"); } private void tsmiTestFileUpload_Click(object sender, EventArgs e) { - UploadManager.UploadImage(ShareXResources.Logo, ImageDestination.FileUploader); + UploadManager.UploadImage(Resources.Test, ImageDestination.FileUploader); } private void tsmiTestURLShortener_Click(object sender, EventArgs e) diff --git a/ShareX/Forms/UploadTestForm.cs b/ShareX/Forms/UploadTestForm.cs index 2ffe93b37..b50561b69 100644 --- a/ShareX/Forms/UploadTestForm.cs +++ b/ShareX/Forms/UploadTestForm.cs @@ -24,6 +24,7 @@ #endregion License Information (GPL v3) using HelpersLib; +using ShareX.Properties; using System; using System.Collections.Generic; using System.ComponentModel; @@ -72,7 +73,7 @@ public UploadTestForm() if (TestImage == null) { - TestImage = ShareXResources.Logo; + TestImage = Resources.Test; } if (string.IsNullOrEmpty(TestText)) diff --git a/ShareX/Properties/Resources.Designer.cs b/ShareX/Properties/Resources.Designer.cs index 2de857b5e..00682d05b 100644 --- a/ShareX/Properties/Resources.Designer.cs +++ b/ShareX/Properties/Resources.Designer.cs @@ -754,7 +754,7 @@ public class Resources { /// public static System.Drawing.Bitmap ruler_triangle { get { - object obj = ResourceManager.GetObject("ruler-triangle", resourceCulture); + object obj = ResourceManager.GetObject("ruler_triangle", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -769,6 +769,16 @@ public class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap Test { + get { + object obj = ResourceManager.GetObject("Test", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/ShareX/Properties/Resources.resx b/ShareX/Properties/Resources.resx index 4f039ea2b..272d21c0e 100644 --- a/ShareX/Properties/Resources.resx +++ b/ShareX/Properties/Resources.resx @@ -117,7 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + ..\Resources\layer.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -346,8 +346,10 @@ ..\Resources\application-task.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - + ..\Resources\ruler-triangle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Test.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/ShareX/Resources/Test.png b/ShareX/Resources/Test.png new file mode 100644 index 0000000000000000000000000000000000000000..d423657b5be3007d1ed818e0aa1f85d61db82901 GIT binary patch literal 4251 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 literal 0 HcmV?d00001 diff --git a/ShareX/ShareX.csproj b/ShareX/ShareX.csproj index cb8188c60..12e6bcf85 100644 --- a/ShareX/ShareX.csproj +++ b/ShareX/ShareX.csproj @@ -458,6 +458,7 @@ + diff --git a/UploadersLib/FileUploaders/FTP/FTPAccount.cs b/UploadersLib/FileUploaders/FTP/FTPAccount.cs index 8aa04a511..a279a8b6b 100644 --- a/UploadersLib/FileUploaders/FTP/FTPAccount.cs +++ b/UploadersLib/FileUploaders/FTP/FTPAccount.cs @@ -28,13 +28,14 @@ using System.ComponentModel; using System.Drawing.Design; using System.IO; +using System.Windows.Forms; using UploadersLib.HelperClasses; namespace UploadersLib { public class FTPAccount : ICloneable { - [Category("Account"), Description("Connection Protocol"), DefaultValue(FTPProtocol.FTP)] + [Category("Account"), Description("Connection protocol"), DefaultValue(FTPProtocol.FTP)] public FTPProtocol Protocol { get; set; } [Category("FTP"), Description("Shown in the list as: Name - Server:Port")] @@ -43,7 +44,7 @@ public class FTPAccount : ICloneable [Category("FTP"), Description("Host, e.g. google.com")] public string Host { get; set; } - [Category("FTP"), Description("Port Number"), DefaultValue(21)] + [Category("FTP"), Description("Port number"), DefaultValue(21)] public int Port { get; set; } [Category("FTP")] @@ -55,15 +56,18 @@ public class FTPAccount : ICloneable [Category("FTP"), Description("Choose an appropriate protocol to be accessed by the server. This affects the server address."), DefaultValue(ServerProtocol.Ftp)] public ServerProtocol ServerProtocol { get; set; } - [Category("FTP"), Description("FTP/HTTP Sub-folder Path, e.g. screenshots, %y = year, %mo = month. SubFolderPath will be automatically appended to HttpHomePath if HttpHomePath does not start with @"), DefaultValue("")] + [Category("FTP"), Description("FTP sub folder path, example: Screenshots.\r\nYou can use name parsing: %y = year, %mo = month."), DefaultValue("")] public string SubFolderPath { get; set; } [Category("FTP"), Description("Choose an appropriate protocol to be accessed by the browser"), DefaultValue(BrowserProtocol.Http)] public BrowserProtocol BrowserProtocol { get; set; } - [Category("FTP"), Description("URL = HttpHomePath + SubFolderPath + FileName\r\nIf HttpHomePath is empty: URL = Host + SubFolderPath + FileName\r\n%host = Host, @ = Ignore auto SubFolderPath"), DefaultValue("")] + [Category("FTP"), Description("URL = HttpHomePath + SubFolderPath + FileName\r\nIf HttpHomePath is empty then URL = Host + SubFolderPath + FileName\r\n%host = Host"), DefaultValue("")] public string HttpHomePath { get; set; } + [Category("FTP"), Description("Automatically add sub folder path to end of http home path"), DefaultValue(true)] + public bool HttpHomePathAutoAddSubFolderPath { get; set; } + [Category("FTP"), Description("Don't add file extension to URL"), DefaultValue(false)] public bool HttpHomePathNoExtension { get; set; } @@ -86,7 +90,7 @@ public string FTPAddress private string exampleFilename = "screenshot.jpg"; - [Category("FTP"), Description("Preview of the FTP Path based on the settings above")] + [Category("FTP"), Description("Preview of the FTP path based on the settings above")] public string PreviewFtpPath { get @@ -95,7 +99,7 @@ public string PreviewFtpPath } } - [Category("FTP"), Description("Preview of the HTTP Path based on the settings above")] + [Category("FTP"), Description("Preview of the HTTP path based on the settings above")] public string PreviewHttpPath { get @@ -104,20 +108,22 @@ public string PreviewHttpPath } } - [Category("FTPS"), Description("Certification Location")] + [Category("FTPS"), Description("Certification location")] [Editor(typeof(CertFileNameEditor), typeof(UITypeEditor))] public string FtpsCertLocation { get; set; } - [Category("FTPS"), Description("Security Protocol"), DefaultValue(FtpSecurityProtocol.Ssl2Explicit)] + [Category("FTPS"), Description("Security protocol"), DefaultValue(FtpSecurityProtocol.Ssl2Explicit)] public FtpSecurityProtocol FtpsSecurityProtocol { get; set; } - [Category("SFTP"), Description("OpenSSH key Passphrase"), PasswordPropertyText(true)] + [Category("SFTP"), Description("OpenSSH key passphrase"), PasswordPropertyText(true)] public string Passphrase { get; set; } - [Category("SFTP"), Description("Key Location")] + [Category("SFTP"), Description("Key location")] [Editor(typeof(KeyFileNameEditor), typeof(UITypeEditor))] public string Keypath { get; set; } + private static bool warning1Showed = false; + public FTPAccount() { Protocol = FTPProtocol.FTP; @@ -152,6 +158,13 @@ public string GetSubFolderPath(string filename) return Helpers.CombineURL(GetSubFolderPath(), filename); } + public string GetHttpHomePath() + { + HttpHomePath = FTPHelpers.RemovePrefixes(HttpHomePath); + NameParser nameParser = new NameParser(NameParserType.URL); + return nameParser.Parse(HttpHomePath.Replace("%host", Host)); + } + public string GetUriPath(string filename) { if (string.IsNullOrEmpty(Host)) @@ -164,14 +177,29 @@ public string GetUriPath(string filename) filename = Path.GetFileNameWithoutExtension(filename); } - string path; - - HttpHomePath = FTPHelpers.RemovePrefixes(HttpHomePath); - NameParser nameParser = new NameParser(NameParserType.URL); - string httpHomePath = nameParser.Parse(HttpHomePath.Replace("%host", Host)); + filename = Helpers.URLEncode(filename); string subFolderPath = GetSubFolderPath(); - string browserProtocol = BrowserProtocol.GetDescription(); + subFolderPath = Helpers.URLPathEncode(subFolderPath); + + string httpHomePath = GetHttpHomePath(); + + if (httpHomePath.StartsWith("@")) + { + if (!warning1Showed) + { + // TODO: Remove this warning 2 release later. + MessageBox.Show("Please use 'HttpHomePathAutoAddSubFolderPath' setting instead adding @ character in beginning of 'HttpHomePath' setting.", "ShareX - FTP account problem", + MessageBoxButtons.OK, MessageBoxIcon.Warning); + warning1Showed = true; + } + + httpHomePath = httpHomePath.Substring(1); + } + + httpHomePath = Helpers.URLPathEncode(httpHomePath); + + string path; if (string.IsNullOrEmpty(httpHomePath)) { @@ -186,13 +214,13 @@ public string GetUriPath(string filename) } else { - if (!httpHomePath.StartsWith("@")) + if (HttpHomePathAutoAddSubFolderPath) { path = Helpers.CombineURL(httpHomePath, subFolderPath); } else { - path = httpHomePath.Substring(1); + path = httpHomePath; } if (path.EndsWith("=")) @@ -205,6 +233,8 @@ public string GetUriPath(string filename) } } + string browserProtocol = BrowserProtocol.GetDescription(); + if (!path.StartsWith(browserProtocol)) { path = browserProtocol + path; diff --git a/UploadersLib/GUI/UploadersConfigForm.Designer.cs b/UploadersLib/GUI/UploadersConfigForm.Designer.cs index 421c75edb..34ce00cd8 100644 --- a/UploadersLib/GUI/UploadersConfigForm.Designer.cs +++ b/UploadersLib/GUI/UploadersConfigForm.Designer.cs @@ -34,7 +34,6 @@ 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.oauth2Imgur = new UploadersLib.GUI.OAuth2Control(); this.txtImgurAlbumID = new System.Windows.Forms.TextBox(); this.lblImgurAlbumID = new System.Windows.Forms.Label(); this.lvImgurAlbumList = new System.Windows.Forms.ListView(); @@ -44,9 +43,7 @@ private void InitializeComponent() this.btnImgurRefreshAlbumList = new System.Windows.Forms.Button(); this.cbImgurThumbnailType = new System.Windows.Forms.ComboBox(); this.lblImgurThumbnailType = new System.Windows.Forms.Label(); - this.atcImgurAccountType = new UploadersLib.GUI.AccountTypeControl(); this.tpImageShack = new System.Windows.Forms.TabPage(); - this.atcImageShackAccountType = new UploadersLib.GUI.AccountTypeControl(); this.btnImageShackLogin = new System.Windows.Forms.Button(); this.btnImageShackOpenPublicProfile = new System.Windows.Forms.Button(); this.cbImageShackIsPublic = new System.Windows.Forms.CheckBox(); @@ -56,7 +53,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.GUI.AccountTypeControl(); this.btnTinyPicLogin = new System.Windows.Forms.Button(); this.txtTinyPicPassword = new System.Windows.Forms.TextBox(); this.lblTinyPicPassword = new System.Windows.Forms.Label(); @@ -109,7 +105,6 @@ private void InitializeComponent() this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader5 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.btnPicasaRefreshAlbumList = new System.Windows.Forms.Button(); - this.oauth2Picasa = new UploadersLib.GUI.OAuth2Control(); this.tpTextUploaders = new System.Windows.Forms.TabPage(); this.tcTextUploaders = new System.Windows.Forms.TabControl(); this.tpPastebin = new System.Windows.Forms.TabPage(); @@ -120,8 +115,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.GUI.OAuth2Control(); - this.atcGistAccountType = new UploadersLib.GUI.AccountTypeControl(); this.tpUpaste = new System.Windows.Forms.TabPage(); this.cbUpasteIsPublic = new System.Windows.Forms.CheckBox(); this.lblUpasteUserKey = new System.Windows.Forms.Label(); @@ -145,7 +138,6 @@ private void InitializeComponent() this.btnFtpClient = new System.Windows.Forms.Button(); this.btnFTPExport = new System.Windows.Forms.Button(); this.btnFTPImport = new System.Windows.Forms.Button(); - this.ucFTPAccounts = new UploadersLib.AccountsControl(); this.gbFtpSettings = new System.Windows.Forms.GroupBox(); this.lblFtpFiles = new System.Windows.Forms.Label(); this.lblFtpText = new System.Windows.Forms.Label(); @@ -189,13 +181,11 @@ private void InitializeComponent() this.txtPushbulletUserKey = new System.Windows.Forms.TextBox(); this.tpGoogleDrive = new System.Windows.Forms.TabPage(); this.cbGoogleDriveIsPublic = new System.Windows.Forms.CheckBox(); - this.oauth2GoogleDrive = new UploadersLib.GUI.OAuth2Control(); 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.oauth2Box = new UploadersLib.GUI.OAuth2Control(); this.lblBoxFolderID = new System.Windows.Forms.Label(); this.btnBoxRefreshFolders = new System.Windows.Forms.Button(); this.tpRapidShare = new System.Windows.Forms.TabPage(); @@ -213,7 +203,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.GUI.AccountTypeControl(); this.tpGe_tt = new System.Windows.Forms.TabPage(); this.lblGe_ttAccessToken = new System.Windows.Forms.Label(); this.lblGe_ttPassword = new System.Windows.Forms.Label(); @@ -251,7 +240,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.GUI.OAuth2Control(); this.tpEmail = new System.Windows.Forms.TabPage(); this.chkEmailConfirm = new System.Windows.Forms.CheckBox(); this.lblEmailSmtpServer = new System.Windows.Forms.Label(); @@ -269,7 +257,6 @@ private void InitializeComponent() this.txtEmailDefaultSubject = new System.Windows.Forms.TextBox(); this.tpSharedFolder = new System.Windows.Forms.TabPage(); this.tlpSharedFolders = new System.Windows.Forms.TableLayoutPanel(); - this.ucLocalhostAccounts = new UploadersLib.AccountsControl(); this.gbSharedFolder = new System.Windows.Forms.GroupBox(); this.lblSharedFolderFiles = new System.Windows.Forms.Label(); this.lblSharedFolderText = new System.Windows.Forms.Label(); @@ -280,10 +267,7 @@ private void InitializeComponent() this.tpURLShorteners = new System.Windows.Forms.TabPage(); this.tcURLShorteners = new System.Windows.Forms.TabControl(); this.tpBitly = new System.Windows.Forms.TabPage(); - this.oauth2Bitly = new UploadersLib.GUI.OAuth2Control(); this.tpGoogleURLShortener = new System.Windows.Forms.TabPage(); - this.oauth2GoogleURLShortener = new UploadersLib.GUI.OAuth2Control(); - this.atcGoogleURLShortenerAccountType = new UploadersLib.GUI.AccountTypeControl(); this.tpYourls = new System.Windows.Forms.TabPage(); this.txtYourlsPassword = new System.Windows.Forms.TextBox(); this.txtYourlsUsername = new System.Windows.Forms.TextBox(); @@ -298,7 +282,6 @@ private void InitializeComponent() this.tcSocialNetworkingServices = new System.Windows.Forms.TabControl(); this.tpTwitter = new System.Windows.Forms.TabPage(); this.btnTwitterLogin = new System.Windows.Forms.Button(); - this.ucTwitterAccounts = new UploadersLib.AccountsControl(); this.tpCustomUploaders = new System.Windows.Forms.TabPage(); this.btnCustomUploaderHelp = new System.Windows.Forms.Button(); this.lblCustomUploaderImageUploader = new System.Windows.Forms.Label(); @@ -357,8 +340,25 @@ private void InitializeComponent() this.txtCustomUploaderArgName = new System.Windows.Forms.TextBox(); this.txtRapidSharePremiumUserName = new System.Windows.Forms.TextBox(); this.ttHelpTip = new System.Windows.Forms.ToolTip(this.components); - this.actRapidShareAccountType = new UploadersLib.GUI.AccountTypeControl(); this.cbDropboxURLType = new System.Windows.Forms.ComboBox(); + this.oauth2Imgur = new UploadersLib.GUI.OAuth2Control(); + this.atcImgurAccountType = new UploadersLib.GUI.AccountTypeControl(); + this.atcImageShackAccountType = new UploadersLib.GUI.AccountTypeControl(); + this.atcTinyPicAccountType = new UploadersLib.GUI.AccountTypeControl(); + this.oauth2Picasa = new UploadersLib.GUI.OAuth2Control(); + this.oAuth2Gist = new UploadersLib.GUI.OAuth2Control(); + this.atcGistAccountType = new UploadersLib.GUI.AccountTypeControl(); + this.ucFTPAccounts = new UploadersLib.AccountsControl(); + this.oauth2GoogleDrive = new UploadersLib.GUI.OAuth2Control(); + this.oauth2Box = new UploadersLib.GUI.OAuth2Control(); + this.atcSendSpaceAccountType = new UploadersLib.GUI.AccountTypeControl(); + this.oAuthJira = new UploadersLib.GUI.OAuth2Control(); + this.ucLocalhostAccounts = new UploadersLib.AccountsControl(); + this.oauth2Bitly = new UploadersLib.GUI.OAuth2Control(); + this.oauth2GoogleURLShortener = new UploadersLib.GUI.OAuth2Control(); + this.atcGoogleURLShortenerAccountType = new UploadersLib.GUI.AccountTypeControl(); + this.ucTwitterAccounts = new UploadersLib.AccountsControl(); + this.actRapidShareAccountType = new UploadersLib.GUI.AccountTypeControl(); this.tcUploaders.SuspendLayout(); this.tpImageUploaders.SuspendLayout(); this.tcImageUploaders.SuspendLayout(); @@ -485,18 +485,6 @@ private void InitializeComponent() this.tpImgur.Text = "Imgur"; this.tpImgur.UseVisualStyleBackColor = true; // - // oauth2Imgur - // - this.oauth2Imgur.Location = new System.Drawing.Point(16, 16); - this.oauth2Imgur.LoginStatus = false; - this.oauth2Imgur.Name = "oauth2Imgur"; - this.oauth2Imgur.Size = new System.Drawing.Size(328, 207); - this.oauth2Imgur.Status = "Status: Login required."; - this.oauth2Imgur.TabIndex = 6; - this.oauth2Imgur.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oauth2Imgur_OpenButtonClicked); - this.oauth2Imgur.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oauth2Imgur_CompleteButtonClicked); - this.oauth2Imgur.RefreshButtonClicked += new UploadersLib.GUI.OAuth2Control.RefreshButtonClickedEventHandler(this.oauth2Imgur_RefreshButtonClicked); - // // txtImgurAlbumID // this.txtImgurAlbumID.Location = new System.Drawing.Point(592, 28); @@ -575,15 +563,6 @@ private void InitializeComponent() this.lblImgurThumbnailType.TabIndex = 1; this.lblImgurThumbnailType.Text = "Thumbnail type:"; // - // atcImgurAccountType - // - this.atcImgurAccountType.Location = new System.Drawing.Point(8, 232); - this.atcImgurAccountType.Name = "atcImgurAccountType"; - this.atcImgurAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; - this.atcImgurAccountType.Size = new System.Drawing.Size(272, 29); - this.atcImgurAccountType.TabIndex = 0; - this.atcImgurAccountType.AccountTypeChanged += new UploadersLib.GUI.AccountTypeControl.AccountTypeChangedEventHandler(this.atcImgurAccountType_AccountTypeChanged); - // // tpImageShack // this.tpImageShack.Controls.Add(this.atcImageShackAccountType); @@ -603,15 +582,6 @@ private void InitializeComponent() this.tpImageShack.Text = "ImageShack"; this.tpImageShack.UseVisualStyleBackColor = true; // - // atcImageShackAccountType - // - this.atcImageShackAccountType.Location = new System.Drawing.Point(8, 16); - this.atcImageShackAccountType.Name = "atcImageShackAccountType"; - this.atcImageShackAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; - this.atcImageShackAccountType.Size = new System.Drawing.Size(272, 29); - this.atcImageShackAccountType.TabIndex = 10; - this.atcImageShackAccountType.AccountTypeChanged += new UploadersLib.GUI.AccountTypeControl.AccountTypeChangedEventHandler(this.atcImageShackAccountType_AccountTypeChanged); - // // btnImageShackLogin // this.btnImageShackLogin.Location = new System.Drawing.Point(296, 82); @@ -705,15 +675,6 @@ private void InitializeComponent() this.tpTinyPic.Text = "TinyPic"; this.tpTinyPic.UseVisualStyleBackColor = true; // - // atcTinyPicAccountType - // - this.atcTinyPicAccountType.Location = new System.Drawing.Point(8, 16); - 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.GUI.AccountTypeControl.AccountTypeChangedEventHandler(this.atcTinyPicAccountType_AccountTypeChanged); - // // btnTinyPicLogin // this.btnTinyPicLogin.Location = new System.Drawing.Point(296, 82); @@ -1245,18 +1206,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.LoginStatus = false; - this.oauth2Picasa.Name = "oauth2Picasa"; - this.oauth2Picasa.Size = new System.Drawing.Size(328, 207); - this.oauth2Picasa.Status = "Login required."; - this.oauth2Picasa.TabIndex = 0; - this.oauth2Picasa.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oauth2Picasa_OpenButtonClicked); - this.oauth2Picasa.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oauth2Picasa_CompleteButtonClicked); - this.oauth2Picasa.RefreshButtonClicked += new UploadersLib.GUI.OAuth2Control.RefreshButtonClickedEventHandler(this.oauth2Picasa_RefreshButtonClicked); - // // tpTextUploaders // this.tpTextUploaders.Controls.Add(this.tcTextUploaders); @@ -1364,28 +1313,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.LoginStatus = false; - this.oAuth2Gist.Name = "oAuth2Gist"; - this.oAuth2Gist.Size = new System.Drawing.Size(328, 173); - this.oAuth2Gist.Status = "Status: Login required."; - this.oAuth2Gist.TabIndex = 16; - this.oAuth2Gist.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oAuth2Gist_OpenButtonClicked); - this.oAuth2Gist.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oAuth2Gist_CompleteButtonClicked); - // - // 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 = 15; - this.atcGistAccountType.AccountTypeChanged += new UploadersLib.GUI.AccountTypeControl.AccountTypeChangedEventHandler(this.atcGistAccountType_AccountTypeChanged); - // // tpUpaste // this.tpUpaste.Controls.Add(this.cbUpasteIsPublic); @@ -1487,7 +1414,7 @@ private void InitializeComponent() // cbDropboxAutoCreateShareableLink // this.cbDropboxAutoCreateShareableLink.AutoSize = true; - this.cbDropboxAutoCreateShareableLink.Location = new System.Drawing.Point(19, 176); + this.cbDropboxAutoCreateShareableLink.Location = new System.Drawing.Point(19, 177); this.cbDropboxAutoCreateShareableLink.Name = "cbDropboxAutoCreateShareableLink"; this.cbDropboxAutoCreateShareableLink.Size = new System.Drawing.Size(134, 17); this.cbDropboxAutoCreateShareableLink.TabIndex = 7; @@ -1608,7 +1535,7 @@ private void InitializeComponent() this.tlpFtp.RowCount = 2; this.tlpFtp.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 75F)); this.tlpFtp.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); - this.tlpFtp.Size = new System.Drawing.Size(798, 451); + this.tlpFtp.Size = new System.Drawing.Size(798, 469); this.tlpFtp.TabIndex = 0; // // panelFtp @@ -1620,7 +1547,7 @@ private void InitializeComponent() this.panelFtp.Dock = System.Windows.Forms.DockStyle.Fill; this.panelFtp.Location = new System.Drawing.Point(3, 3); this.panelFtp.Name = "panelFtp"; - this.panelFtp.Size = new System.Drawing.Size(792, 332); + this.panelFtp.Size = new System.Drawing.Size(792, 345); this.panelFtp.TabIndex = 0; // // btnFtpClient @@ -1661,15 +1588,6 @@ private void InitializeComponent() this.btnFTPImport.UseVisualStyleBackColor = true; this.btnFTPImport.Click += new System.EventHandler(this.btnFTPImport_Click); // - // ucFTPAccounts - // - this.ucFTPAccounts.Dock = System.Windows.Forms.DockStyle.Fill; - this.ucFTPAccounts.Location = new System.Drawing.Point(0, 0); - this.ucFTPAccounts.Margin = new System.Windows.Forms.Padding(4); - this.ucFTPAccounts.Name = "ucFTPAccounts"; - this.ucFTPAccounts.Size = new System.Drawing.Size(792, 332); - this.ucFTPAccounts.TabIndex = 0; - // // gbFtpSettings // this.gbFtpSettings.Controls.Add(this.lblFtpFiles); @@ -1679,9 +1597,9 @@ private void InitializeComponent() this.gbFtpSettings.Controls.Add(this.cboFtpText); this.gbFtpSettings.Controls.Add(this.cboFtpImages); this.gbFtpSettings.Dock = System.Windows.Forms.DockStyle.Fill; - this.gbFtpSettings.Location = new System.Drawing.Point(3, 341); + this.gbFtpSettings.Location = new System.Drawing.Point(3, 354); this.gbFtpSettings.Name = "gbFtpSettings"; - this.gbFtpSettings.Size = new System.Drawing.Size(792, 107); + this.gbFtpSettings.Size = new System.Drawing.Size(792, 112); this.gbFtpSettings.TabIndex = 1; this.gbFtpSettings.TabStop = false; this.gbFtpSettings.Text = "FTP Settings"; @@ -2128,26 +2046,14 @@ 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.LoginStatus = false; - this.oauth2GoogleDrive.Name = "oauth2GoogleDrive"; - this.oauth2GoogleDrive.Size = new System.Drawing.Size(328, 207); - this.oauth2GoogleDrive.Status = "Status: Login required."; - this.oauth2GoogleDrive.TabIndex = 0; - this.oauth2GoogleDrive.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oauth2GoogleDrive_OpenButtonClicked); - this.oauth2GoogleDrive.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oauth2GoogleDrive_CompleteButtonClicked); - this.oauth2GoogleDrive.RefreshButtonClicked += new UploadersLib.GUI.OAuth2Control.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.oauth2Box); 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); @@ -2196,18 +2102,6 @@ private void InitializeComponent() this.chBoxFoldersName.Text = "Folder name"; this.chBoxFoldersName.Width = 435; // - // oauth2Box - // - this.oauth2Box.Location = new System.Drawing.Point(16, 16); - this.oauth2Box.LoginStatus = false; - this.oauth2Box.Name = "oauth2Box"; - this.oauth2Box.Size = new System.Drawing.Size(328, 207); - this.oauth2Box.Status = "Status: Login required."; - this.oauth2Box.TabIndex = 7; - this.oauth2Box.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oauth2Box_OpenButtonClicked); - this.oauth2Box.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oauth2Box_CompleteButtonClicked); - this.oauth2Box.RefreshButtonClicked += new UploadersLib.GUI.OAuth2Control.RefreshButtonClickedEventHandler(this.oauth2Box_RefreshButtonClicked); - // // lblBoxFolderID // this.lblBoxFolderID.AutoSize = true; @@ -2377,15 +2271,6 @@ private void InitializeComponent() this.txtSendSpaceUserName.TabIndex = 3; 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.GUI.AccountTypeControl.AccountTypeChangedEventHandler(this.atcSendSpaceAccountType_AccountTypeChanged); - // // tpGe_tt // this.tpGe_tt.Controls.Add(this.lblGe_ttAccessToken); @@ -2764,18 +2649,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.LoginStatus = false; - this.oAuthJira.Name = "oAuthJira"; - this.oAuthJira.Size = new System.Drawing.Size(328, 207); - this.oAuthJira.Status = "Status: Login required."; - this.oAuthJira.TabIndex = 1; - this.oAuthJira.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oAuthJira_OpenButtonClicked); - this.oAuthJira.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oAuthJira_CompleteButtonClicked); - this.oAuthJira.RefreshButtonClicked += new UploadersLib.GUI.OAuth2Control.RefreshButtonClickedEventHandler(this.oAuthJira_RefreshButtonClicked); - // // tpEmail // this.tpEmail.Controls.Add(this.chkEmailConfirm); @@ -2968,15 +2841,6 @@ private void InitializeComponent() this.tlpSharedFolders.Size = new System.Drawing.Size(798, 451); this.tlpSharedFolders.TabIndex = 0; // - // ucLocalhostAccounts - // - this.ucLocalhostAccounts.Dock = System.Windows.Forms.DockStyle.Fill; - this.ucLocalhostAccounts.Location = new System.Drawing.Point(4, 4); - this.ucLocalhostAccounts.Margin = new System.Windows.Forms.Padding(4); - this.ucLocalhostAccounts.Name = "ucLocalhostAccounts"; - this.ucLocalhostAccounts.Size = new System.Drawing.Size(790, 330); - this.ucLocalhostAccounts.TabIndex = 0; - // // gbSharedFolder // this.gbSharedFolder.Controls.Add(this.lblSharedFolderFiles); @@ -3084,18 +2948,6 @@ private void InitializeComponent() this.tpBitly.Text = "bit.ly"; this.tpBitly.UseVisualStyleBackColor = true; // - // oauth2Bitly - // - this.oauth2Bitly.IsRefreshable = false; - this.oauth2Bitly.Location = new System.Drawing.Point(16, 16); - this.oauth2Bitly.LoginStatus = false; - this.oauth2Bitly.Name = "oauth2Bitly"; - this.oauth2Bitly.Size = new System.Drawing.Size(328, 168); - this.oauth2Bitly.Status = "Login required."; - this.oauth2Bitly.TabIndex = 0; - this.oauth2Bitly.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oauth2Bitly_OpenButtonClicked); - this.oauth2Bitly.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oauth2Bitly_CompleteButtonClicked); - // // tpGoogleURLShortener // this.tpGoogleURLShortener.Controls.Add(this.oauth2GoogleURLShortener); @@ -3108,27 +2960,6 @@ private void InitializeComponent() this.tpGoogleURLShortener.Text = "Google"; this.tpGoogleURLShortener.UseVisualStyleBackColor = true; // - // oauth2GoogleURLShortener - // - this.oauth2GoogleURLShortener.Location = new System.Drawing.Point(16, 56); - this.oauth2GoogleURLShortener.LoginStatus = false; - this.oauth2GoogleURLShortener.Name = "oauth2GoogleURLShortener"; - this.oauth2GoogleURLShortener.Size = new System.Drawing.Size(328, 207); - this.oauth2GoogleURLShortener.Status = "Status: Login required."; - this.oauth2GoogleURLShortener.TabIndex = 1; - this.oauth2GoogleURLShortener.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oauth2GoogleURLShortener_OpenButtonClicked); - this.oauth2GoogleURLShortener.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oauth2GoogleURLShortener_CompleteButtonClicked); - this.oauth2GoogleURLShortener.RefreshButtonClicked += new UploadersLib.GUI.OAuth2Control.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.GUI.AccountTypeControl.AccountTypeChangedEventHandler(this.atcGoogleURLShortenerAccountType_AccountTypeChanged); - // // tpYourls // this.tpYourls.Controls.Add(this.txtYourlsPassword); @@ -3269,14 +3100,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(3, 3); - this.ucTwitterAccounts.Name = "ucTwitterAccounts"; - this.ucTwitterAccounts.Size = new System.Drawing.Size(798, 469); - this.ucTwitterAccounts.TabIndex = 0; - // // tpCustomUploaders // this.tpCustomUploaders.Controls.Add(this.btnCustomUploaderHelp); @@ -3868,14 +3691,6 @@ private void InitializeComponent() this.ttHelpTip.UseAnimation = false; this.ttHelpTip.UseFading = false; // - // actRapidShareAccountType - // - this.actRapidShareAccountType.Location = new System.Drawing.Point(8, 16); - this.actRapidShareAccountType.Name = "actRapidShareAccountType"; - this.actRapidShareAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; - this.actRapidShareAccountType.Size = new System.Drawing.Size(214, 29); - this.actRapidShareAccountType.TabIndex = 16; - // // cbDropboxURLType // this.cbDropboxURLType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -3886,6 +3701,191 @@ private void InitializeComponent() this.cbDropboxURLType.TabIndex = 20; this.cbDropboxURLType.SelectedIndexChanged += new System.EventHandler(this.cbDropboxURLType_SelectedIndexChanged); // + // oauth2Imgur + // + this.oauth2Imgur.Location = new System.Drawing.Point(16, 16); + this.oauth2Imgur.LoginStatus = false; + this.oauth2Imgur.Name = "oauth2Imgur"; + this.oauth2Imgur.Size = new System.Drawing.Size(328, 207); + this.oauth2Imgur.Status = "Status: Login required."; + this.oauth2Imgur.TabIndex = 6; + this.oauth2Imgur.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oauth2Imgur_OpenButtonClicked); + this.oauth2Imgur.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oauth2Imgur_CompleteButtonClicked); + this.oauth2Imgur.RefreshButtonClicked += new UploadersLib.GUI.OAuth2Control.RefreshButtonClickedEventHandler(this.oauth2Imgur_RefreshButtonClicked); + // + // atcImgurAccountType + // + this.atcImgurAccountType.Location = new System.Drawing.Point(8, 232); + this.atcImgurAccountType.Name = "atcImgurAccountType"; + this.atcImgurAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; + this.atcImgurAccountType.Size = new System.Drawing.Size(272, 29); + this.atcImgurAccountType.TabIndex = 0; + this.atcImgurAccountType.AccountTypeChanged += new UploadersLib.GUI.AccountTypeControl.AccountTypeChangedEventHandler(this.atcImgurAccountType_AccountTypeChanged); + // + // atcImageShackAccountType + // + this.atcImageShackAccountType.Location = new System.Drawing.Point(8, 16); + this.atcImageShackAccountType.Name = "atcImageShackAccountType"; + this.atcImageShackAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; + this.atcImageShackAccountType.Size = new System.Drawing.Size(272, 29); + this.atcImageShackAccountType.TabIndex = 10; + this.atcImageShackAccountType.AccountTypeChanged += new UploadersLib.GUI.AccountTypeControl.AccountTypeChangedEventHandler(this.atcImageShackAccountType_AccountTypeChanged); + // + // atcTinyPicAccountType + // + this.atcTinyPicAccountType.Location = new System.Drawing.Point(8, 16); + 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.GUI.AccountTypeControl.AccountTypeChangedEventHandler(this.atcTinyPicAccountType_AccountTypeChanged); + // + // oauth2Picasa + // + this.oauth2Picasa.Location = new System.Drawing.Point(16, 16); + this.oauth2Picasa.LoginStatus = false; + this.oauth2Picasa.Name = "oauth2Picasa"; + this.oauth2Picasa.Size = new System.Drawing.Size(328, 207); + this.oauth2Picasa.Status = "Login required."; + this.oauth2Picasa.TabIndex = 0; + this.oauth2Picasa.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oauth2Picasa_OpenButtonClicked); + this.oauth2Picasa.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oauth2Picasa_CompleteButtonClicked); + this.oauth2Picasa.RefreshButtonClicked += new UploadersLib.GUI.OAuth2Control.RefreshButtonClickedEventHandler(this.oauth2Picasa_RefreshButtonClicked); + // + // oAuth2Gist + // + this.oAuth2Gist.Enabled = false; + this.oAuth2Gist.IsRefreshable = false; + this.oAuth2Gist.Location = new System.Drawing.Point(16, 51); + this.oAuth2Gist.LoginStatus = false; + this.oAuth2Gist.Name = "oAuth2Gist"; + this.oAuth2Gist.Size = new System.Drawing.Size(328, 173); + this.oAuth2Gist.Status = "Status: Login required."; + this.oAuth2Gist.TabIndex = 16; + this.oAuth2Gist.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oAuth2Gist_OpenButtonClicked); + this.oAuth2Gist.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oAuth2Gist_CompleteButtonClicked); + // + // 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 = 15; + this.atcGistAccountType.AccountTypeChanged += new UploadersLib.GUI.AccountTypeControl.AccountTypeChangedEventHandler(this.atcGistAccountType_AccountTypeChanged); + // + // ucFTPAccounts + // + this.ucFTPAccounts.Dock = System.Windows.Forms.DockStyle.Fill; + this.ucFTPAccounts.Location = new System.Drawing.Point(0, 0); + this.ucFTPAccounts.Margin = new System.Windows.Forms.Padding(4); + this.ucFTPAccounts.Name = "ucFTPAccounts"; + this.ucFTPAccounts.Size = new System.Drawing.Size(792, 345); + this.ucFTPAccounts.TabIndex = 0; + // + // oauth2GoogleDrive + // + this.oauth2GoogleDrive.Location = new System.Drawing.Point(16, 16); + this.oauth2GoogleDrive.LoginStatus = false; + this.oauth2GoogleDrive.Name = "oauth2GoogleDrive"; + this.oauth2GoogleDrive.Size = new System.Drawing.Size(328, 207); + this.oauth2GoogleDrive.Status = "Status: Login required."; + this.oauth2GoogleDrive.TabIndex = 0; + this.oauth2GoogleDrive.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oauth2GoogleDrive_OpenButtonClicked); + this.oauth2GoogleDrive.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oauth2GoogleDrive_CompleteButtonClicked); + this.oauth2GoogleDrive.RefreshButtonClicked += new UploadersLib.GUI.OAuth2Control.RefreshButtonClickedEventHandler(this.oauth2GoogleDrive_RefreshButtonClicked); + // + // oauth2Box + // + this.oauth2Box.Location = new System.Drawing.Point(16, 16); + this.oauth2Box.LoginStatus = false; + this.oauth2Box.Name = "oauth2Box"; + this.oauth2Box.Size = new System.Drawing.Size(328, 207); + this.oauth2Box.Status = "Status: Login required."; + this.oauth2Box.TabIndex = 7; + this.oauth2Box.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oauth2Box_OpenButtonClicked); + this.oauth2Box.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oauth2Box_CompleteButtonClicked); + this.oauth2Box.RefreshButtonClicked += new UploadersLib.GUI.OAuth2Control.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.GUI.AccountTypeControl.AccountTypeChangedEventHandler(this.atcSendSpaceAccountType_AccountTypeChanged); + // + // oAuthJira + // + this.oAuthJira.Location = new System.Drawing.Point(473, 13); + this.oAuthJira.LoginStatus = false; + this.oAuthJira.Name = "oAuthJira"; + this.oAuthJira.Size = new System.Drawing.Size(328, 207); + this.oAuthJira.Status = "Status: Login required."; + this.oAuthJira.TabIndex = 1; + this.oAuthJira.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oAuthJira_OpenButtonClicked); + this.oAuthJira.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oAuthJira_CompleteButtonClicked); + this.oAuthJira.RefreshButtonClicked += new UploadersLib.GUI.OAuth2Control.RefreshButtonClickedEventHandler(this.oAuthJira_RefreshButtonClicked); + // + // ucLocalhostAccounts + // + this.ucLocalhostAccounts.Dock = System.Windows.Forms.DockStyle.Fill; + this.ucLocalhostAccounts.Location = new System.Drawing.Point(4, 4); + this.ucLocalhostAccounts.Margin = new System.Windows.Forms.Padding(4); + this.ucLocalhostAccounts.Name = "ucLocalhostAccounts"; + this.ucLocalhostAccounts.Size = new System.Drawing.Size(790, 330); + this.ucLocalhostAccounts.TabIndex = 0; + // + // oauth2Bitly + // + this.oauth2Bitly.IsRefreshable = false; + this.oauth2Bitly.Location = new System.Drawing.Point(16, 16); + this.oauth2Bitly.LoginStatus = false; + this.oauth2Bitly.Name = "oauth2Bitly"; + this.oauth2Bitly.Size = new System.Drawing.Size(328, 168); + this.oauth2Bitly.Status = "Login required."; + this.oauth2Bitly.TabIndex = 0; + this.oauth2Bitly.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oauth2Bitly_OpenButtonClicked); + this.oauth2Bitly.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oauth2Bitly_CompleteButtonClicked); + // + // oauth2GoogleURLShortener + // + this.oauth2GoogleURLShortener.Location = new System.Drawing.Point(16, 56); + this.oauth2GoogleURLShortener.LoginStatus = false; + this.oauth2GoogleURLShortener.Name = "oauth2GoogleURLShortener"; + this.oauth2GoogleURLShortener.Size = new System.Drawing.Size(328, 207); + this.oauth2GoogleURLShortener.Status = "Status: Login required."; + this.oauth2GoogleURLShortener.TabIndex = 1; + this.oauth2GoogleURLShortener.OpenButtonClicked += new UploadersLib.GUI.OAuth2Control.OpenButtonClickedEventHandler(this.oauth2GoogleURLShortener_OpenButtonClicked); + this.oauth2GoogleURLShortener.CompleteButtonClicked += new UploadersLib.GUI.OAuth2Control.CompleteButtonClickedEventHandler(this.oauth2GoogleURLShortener_CompleteButtonClicked); + this.oauth2GoogleURLShortener.RefreshButtonClicked += new UploadersLib.GUI.OAuth2Control.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.GUI.AccountTypeControl.AccountTypeChangedEventHandler(this.atcGoogleURLShortenerAccountType_AccountTypeChanged); + // + // ucTwitterAccounts + // + this.ucTwitterAccounts.Dock = System.Windows.Forms.DockStyle.Fill; + this.ucTwitterAccounts.Location = new System.Drawing.Point(3, 3); + this.ucTwitterAccounts.Name = "ucTwitterAccounts"; + this.ucTwitterAccounts.Size = new System.Drawing.Size(798, 469); + this.ucTwitterAccounts.TabIndex = 0; + // + // actRapidShareAccountType + // + this.actRapidShareAccountType.Location = new System.Drawing.Point(8, 16); + this.actRapidShareAccountType.Name = "actRapidShareAccountType"; + this.actRapidShareAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; + this.actRapidShareAccountType.Size = new System.Drawing.Size(214, 29); + this.actRapidShareAccountType.TabIndex = 16; + // // UploadersConfigForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/UploadersLib/GUI/UploadersConfigForm.resx b/UploadersLib/GUI/UploadersConfigForm.resx index 8986f98c7..729e9c971 100644 --- a/UploadersLib/GUI/UploadersConfigForm.resx +++ b/UploadersLib/GUI/UploadersConfigForm.resx @@ -242,9 +242,6 @@ With this option, objects are cheaper to store, but have 99.99% durability, instead of 99.999999999%. This means that they may be lost from Amazon S3 at some point. - - 17, 17 - 72