From a76926cf5897849202e39a77ec1cb7262ff37f2f Mon Sep 17 00:00:00 2001 From: Jaex Date: Sun, 7 Sep 2014 04:11:55 +0300 Subject: [PATCH] Imgur album improvements --- ShareX/UploadTask.cs | 9 +- .../Forms/UploadersConfigForm.Designer.cs | 520 +++++++++--------- UploadersLib/Forms/UploadersConfigForm.cs | 54 +- .../Forms/UploadersConfigFormHelper.cs | 33 +- UploadersLib/ImageUploaders/Imgur_v3.cs | 4 +- UploadersLib/UploadersConfig.cs | 4 +- 6 files changed, 318 insertions(+), 306 deletions(-) diff --git a/ShareX/UploadTask.cs b/ShareX/UploadTask.cs index ab803350a..5f2adbd89 100644 --- a/ShareX/UploadTask.cs +++ b/ShareX/UploadTask.cs @@ -678,12 +678,19 @@ public UploadResult UploadImage(Stream stream, string fileName) Program.UploadersConfig.ImgurOAuth2Info = new OAuth2Info(APIKeys.ImgurClientID, APIKeys.ImgurClientSecret); } + string albumID = null; + + if (Program.UploadersConfig.ImgurUploadSelectedAlbum && Program.UploadersConfig.ImgurSelectedAlbum != null) + { + albumID = Program.UploadersConfig.ImgurSelectedAlbum.id; + } + imageUploader = new Imgur_v3(Program.UploadersConfig.ImgurOAuth2Info) { UploadMethod = Program.UploadersConfig.ImgurAccountType, DirectLink = Program.UploadersConfig.ImgurDirectLink, ThumbnailType = Program.UploadersConfig.ImgurThumbnailType, - UploadAlbumID = Program.UploadersConfig.ImgurAlbumID + UploadAlbumID = albumID }; break; case ImageDestination.ImageShack: diff --git a/UploadersLib/Forms/UploadersConfigForm.Designer.cs b/UploadersLib/Forms/UploadersConfigForm.Designer.cs index d0dee4ae5..ef0870024 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(); @@ -131,9 +127,7 @@ private void InitializeComponent() this.cboFtpImages = new System.Windows.Forms.ComboBox(); this.cboFtpFiles = new System.Windows.Forms.ComboBox(); this.cboFtpText = new System.Windows.Forms.ComboBox(); - this.ucFTPAccounts = new UploadersLib.AccountsControl(); this.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(); @@ -152,7 +146,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.tpBox = new System.Windows.Forms.TabPage(); this.lblBoxFolderTip = new System.Windows.Forms.Label(); this.cbBoxShare = new System.Windows.Forms.CheckBox(); @@ -160,7 +153,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.tpCopy = new System.Windows.Forms.TabPage(); this.pbCopyLogo = new System.Windows.Forms.PictureBox(); this.lblCopyURLType = new System.Windows.Forms.Label(); @@ -169,9 +161,7 @@ private void InitializeComponent() this.lblCopyStatus = new System.Windows.Forms.Label(); this.lblCopyPath = new System.Windows.Forms.Label(); this.txtCopyPath = new System.Windows.Forms.TextBox(); - this.oAuthCopy = new UploadersLib.OAuthControl(); this.tpOneDrive = new System.Windows.Forms.TabPage(); - this.oAuth2OneDrive = new UploadersLib.OAuthControl(); this.tpAmazonS3 = new System.Windows.Forms.TabPage(); this.txtAmazonS3CustomDomain = new System.Windows.Forms.TextBox(); this.lblAmazonS3PathPreviewLabel = new System.Windows.Forms.Label(); @@ -201,6 +191,7 @@ private void InitializeComponent() this.txtMegaPassword = new System.Windows.Forms.TextBox(); this.lblMegaPassword = new System.Windows.Forms.Label(); this.tpOwnCloud = new System.Windows.Forms.TabPage(); + this.cbOwnCloudIgnoreInvalidCert = new System.Windows.Forms.CheckBox(); this.cbOwnCloudDirectLink = new System.Windows.Forms.CheckBox(); this.cbOwnCloudCreateShare = new System.Windows.Forms.CheckBox(); this.txtOwnCloudPath = new System.Windows.Forms.TextBox(); @@ -240,7 +231,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.tpMediaCrush = new System.Windows.Forms.TabPage(); this.cbMediaCrushDirectLink = new System.Windows.Forms.CheckBox(); this.tpGe_tt = new System.Windows.Forms.TabPage(); @@ -280,7 +270,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(); @@ -303,7 +292,6 @@ 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.btnCopyShowFiles = new System.Windows.Forms.Button(); this.tpTextUploaders = new System.Windows.Forms.TabPage(); this.tcTextUploaders = new System.Windows.Forms.TabControl(); @@ -315,8 +303,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(); @@ -324,11 +310,8 @@ 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.cbImgurUploadSelectedAlbum = new System.Windows.Forms.CheckBox(); this.cbImgurDirectLink = new System.Windows.Forms.CheckBox(); - this.atcImgurAccountType = new UploadersLib.AccountTypeControl(); - this.oauth2Imgur = new UploadersLib.OAuthControl(); - this.txtImgurAlbumID = new System.Windows.Forms.TextBox(); - this.lblImgurAlbumID = new System.Windows.Forms.Label(); this.lvImgurAlbumList = new System.Windows.Forms.ListView(); this.chImgurID = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.chImgurTitle = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); @@ -346,7 +329,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(); @@ -387,12 +369,29 @@ 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.ttlvMain = new HelpersLib.TabToListView(); + 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.ucFTPAccounts = new UploadersLib.AccountsControl(); + this.oauth2Dropbox = new UploadersLib.OAuthControl(); + this.oauth2GoogleDrive = new UploadersLib.OAuthControl(); + this.oauth2Box = new UploadersLib.OAuthControl(); + this.oAuthCopy = new UploadersLib.OAuthControl(); + this.oAuth2OneDrive = 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.cbOwnCloudIgnoreInvalidCert = new System.Windows.Forms.CheckBox(); this.tpOtherUploaders.SuspendLayout(); this.tcOtherUploaders.SuspendLayout(); this.tpCustomUploaders.SuspendLayout(); @@ -1109,15 +1108,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); @@ -1172,17 +1162,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); @@ -1195,26 +1174,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); @@ -1511,16 +1470,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; - // // tpDropbox // this.tpDropbox.Controls.Add(this.oauth2Dropbox); @@ -1541,17 +1490,6 @@ private void InitializeComponent() this.tpDropbox.Text = "Dropbox"; this.tpDropbox.UseVisualStyleBackColor = true; // - // oauth2Dropbox - // - this.oauth2Dropbox.IsRefreshable = false; - this.oauth2Dropbox.Location = new System.Drawing.Point(16, 88); - this.oauth2Dropbox.Name = "oauth2Dropbox"; - this.oauth2Dropbox.Size = new System.Drawing.Size(328, 200); - this.oauth2Dropbox.TabIndex = 1; - this.oauth2Dropbox.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Dropbox_OpenButtonClicked); - this.oauth2Dropbox.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Dropbox_CompleteButtonClicked); - this.oauth2Dropbox.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Dropbox_ClearButtonClicked); - // // cbDropboxURLType // this.cbDropboxURLType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -1735,17 +1673,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); - // // tpBox // this.tpBox.Controls.Add(this.lblBoxFolderTip); @@ -1822,17 +1749,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); - // // tpCopy // this.tpCopy.Controls.Add(this.pbCopyLogo); @@ -1918,17 +1834,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); - // // tpOneDrive // this.tpOneDrive.Controls.Add(this.oAuth2OneDrive); @@ -1940,17 +1845,6 @@ private void InitializeComponent() this.tpOneDrive.Text = "OneDrive"; this.tpOneDrive.UseVisualStyleBackColor = true; // - // oAuth2OneDrive - // - this.oAuth2OneDrive.IsRefreshable = false; - this.oAuth2OneDrive.Location = new System.Drawing.Point(16, 16); - this.oAuth2OneDrive.Name = "oAuth2OneDrive"; - this.oAuth2OneDrive.Size = new System.Drawing.Size(328, 200); - this.oAuth2OneDrive.TabIndex = 2; - this.oAuth2OneDrive.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuth2OneDrive_OpenButtonClicked); - this.oAuth2OneDrive.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuth2OneDrive_CompleteButtonClicked); - this.oAuth2OneDrive.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuth2OneDrive_ClearButtonClicked); - // // tpAmazonS3 // this.tpAmazonS3.Controls.Add(this.txtAmazonS3CustomDomain); @@ -2265,6 +2159,17 @@ private void InitializeComponent() this.tpOwnCloud.Text = "ownCloud"; this.tpOwnCloud.UseVisualStyleBackColor = true; // + // cbOwnCloudIgnoreInvalidCert + // + this.cbOwnCloudIgnoreInvalidCert.AutoSize = true; + this.cbOwnCloudIgnoreInvalidCert.Location = new System.Drawing.Point(19, 159); + this.cbOwnCloudIgnoreInvalidCert.Name = "cbOwnCloudIgnoreInvalidCert"; + this.cbOwnCloudIgnoreInvalidCert.Size = new System.Drawing.Size(161, 17); + this.cbOwnCloudIgnoreInvalidCert.TabIndex = 10; + this.cbOwnCloudIgnoreInvalidCert.Text = "Ignore invalid SSL certificate"; + this.cbOwnCloudIgnoreInvalidCert.UseVisualStyleBackColor = true; + this.cbOwnCloudIgnoreInvalidCert.CheckedChanged += new System.EventHandler(this.cbOwnCloudIgnoreInvalidCert_CheckedChanged); + // // cbOwnCloudDirectLink // this.cbOwnCloudDirectLink.AutoSize = true; @@ -2649,15 +2554,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); - // // tpMediaCrush // this.tpMediaCrush.Controls.Add(this.cbMediaCrushDirectLink); @@ -3058,17 +2954,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); @@ -3304,16 +3189,6 @@ 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, 430); - this.ucLocalhostAccounts.TabIndex = 6; - // // btnCopyShowFiles // this.btnCopyShowFiles.Location = new System.Drawing.Point(0, 0); @@ -3430,27 +3305,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); @@ -3522,11 +3376,10 @@ private void InitializeComponent() // // tpImgur // + this.tpImgur.Controls.Add(this.cbImgurUploadSelectedAlbum); this.tpImgur.Controls.Add(this.cbImgurDirectLink); this.tpImgur.Controls.Add(this.atcImgurAccountType); this.tpImgur.Controls.Add(this.oauth2Imgur); - this.tpImgur.Controls.Add(this.txtImgurAlbumID); - this.tpImgur.Controls.Add(this.lblImgurAlbumID); this.tpImgur.Controls.Add(this.lvImgurAlbumList); this.tpImgur.Controls.Add(this.btnImgurRefreshAlbumList); this.tpImgur.Controls.Add(this.cbImgurThumbnailType); @@ -3539,6 +3392,17 @@ private void InitializeComponent() this.tpImgur.Text = "Imgur"; this.tpImgur.UseVisualStyleBackColor = true; // + // cbImgurUploadSelectedAlbum + // + this.cbImgurUploadSelectedAlbum.AutoSize = true; + this.cbImgurUploadSelectedAlbum.Location = new System.Drawing.Point(352, 19); + this.cbImgurUploadSelectedAlbum.Name = "cbImgurUploadSelectedAlbum"; + this.cbImgurUploadSelectedAlbum.Size = new System.Drawing.Size(182, 17); + this.cbImgurUploadSelectedAlbum.TabIndex = 9; + this.cbImgurUploadSelectedAlbum.Text = "Upload images to selected album"; + this.cbImgurUploadSelectedAlbum.UseVisualStyleBackColor = true; + this.cbImgurUploadSelectedAlbum.CheckedChanged += new System.EventHandler(this.cbImgurUploadSelectedAlbum_CheckedChanged); + // // cbImgurDirectLink // this.cbImgurDirectLink.AutoSize = true; @@ -3550,43 +3414,6 @@ private void InitializeComponent() this.cbImgurDirectLink.UseVisualStyleBackColor = true; this.cbImgurDirectLink.CheckedChanged += new System.EventHandler(this.cbImgurDirectLink_CheckedChanged); // - // atcImgurAccountType - // - this.atcImgurAccountType.Location = new System.Drawing.Point(8, 260); - this.atcImgurAccountType.Name = "atcImgurAccountType"; - this.atcImgurAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; - this.atcImgurAccountType.Size = new System.Drawing.Size(208, 32); - this.atcImgurAccountType.TabIndex = 1; - this.atcImgurAccountType.AccountTypeChanged += new UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcImgurAccountType_AccountTypeChanged); - // - // oauth2Imgur - // - this.oauth2Imgur.Location = new System.Drawing.Point(16, 16); - this.oauth2Imgur.Name = "oauth2Imgur"; - this.oauth2Imgur.Size = new System.Drawing.Size(328, 240); - this.oauth2Imgur.TabIndex = 0; - this.oauth2Imgur.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Imgur_OpenButtonClicked); - this.oauth2Imgur.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Imgur_CompleteButtonClicked); - this.oauth2Imgur.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Imgur_ClearButtonClicked); - this.oauth2Imgur.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Imgur_RefreshButtonClicked); - // - // txtImgurAlbumID - // - this.txtImgurAlbumID.Location = new System.Drawing.Point(592, 13); - this.txtImgurAlbumID.Name = "txtImgurAlbumID"; - this.txtImgurAlbumID.Size = new System.Drawing.Size(192, 20); - this.txtImgurAlbumID.TabIndex = 5; - this.txtImgurAlbumID.TextChanged += new System.EventHandler(this.txtImgurAlbumID_TextChanged); - // - // lblImgurAlbumID - // - this.lblImgurAlbumID.AutoSize = true; - this.lblImgurAlbumID.Location = new System.Drawing.Point(352, 16); - this.lblImgurAlbumID.Name = "lblImgurAlbumID"; - this.lblImgurAlbumID.Size = new System.Drawing.Size(233, 13); - this.lblImgurAlbumID.TabIndex = 4; - this.lblImgurAlbumID.Text = "Album ID for upload (Empty = No album upload):"; - // // lvImgurAlbumList // this.lvImgurAlbumList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { @@ -3594,10 +3421,12 @@ private void InitializeComponent() this.chImgurTitle, this.chImgurDescription}); this.lvImgurAlbumList.FullRowSelect = true; - this.lvImgurAlbumList.Location = new System.Drawing.Point(352, 72); + this.lvImgurAlbumList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; + this.lvImgurAlbumList.HideSelection = false; + this.lvImgurAlbumList.Location = new System.Drawing.Point(352, 48); this.lvImgurAlbumList.MultiSelect = false; this.lvImgurAlbumList.Name = "lvImgurAlbumList"; - this.lvImgurAlbumList.Size = new System.Drawing.Size(432, 368); + this.lvImgurAlbumList.Size = new System.Drawing.Size(440, 432); this.lvImgurAlbumList.TabIndex = 7; this.lvImgurAlbumList.UseCompatibleStateImageBehavior = false; this.lvImgurAlbumList.View = System.Windows.Forms.View.Details; @@ -3606,7 +3435,6 @@ private void InitializeComponent() // chImgurID // this.chImgurID.Text = "ID"; - this.chImgurID.Width = 70; // // chImgurTitle // @@ -3616,12 +3444,12 @@ private void InitializeComponent() // chImgurDescription // this.chImgurDescription.Text = "Description"; - this.chImgurDescription.Width = 208; + this.chImgurDescription.Width = 226; // // btnImgurRefreshAlbumList // this.btnImgurRefreshAlbumList.Enabled = false; - this.btnImgurRefreshAlbumList.Location = new System.Drawing.Point(352, 40); + this.btnImgurRefreshAlbumList.Location = new System.Drawing.Point(592, 16); this.btnImgurRefreshAlbumList.Name = "btnImgurRefreshAlbumList"; this.btnImgurRefreshAlbumList.Size = new System.Drawing.Size(200, 23); this.btnImgurRefreshAlbumList.TabIndex = 6; @@ -3759,15 +3587,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); @@ -4164,17 +3983,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); @@ -4190,6 +3998,15 @@ private void InitializeComponent() this.tcUploaders.TabIndex = 0; this.tcUploaders.Visible = false; // + // lblWidthHint + // + this.lblWidthHint.BackColor = System.Drawing.Color.Black; + this.lblWidthHint.Location = new System.Drawing.Point(820, 0); + this.lblWidthHint.Name = "lblWidthHint"; + this.lblWidthHint.Size = new System.Drawing.Size(1, 600); + this.lblWidthHint.TabIndex = 1; + this.lblWidthHint.Visible = false; + // // ttlvMain // this.ttlvMain.Dock = System.Windows.Forms.DockStyle.Fill; @@ -4202,14 +4019,201 @@ private void InitializeComponent() this.ttlvMain.Size = new System.Drawing.Size(994, 551); this.ttlvMain.TabIndex = 0; // - // lblWidthHint + // atcImgurAccountType // - this.lblWidthHint.BackColor = System.Drawing.Color.Black; - this.lblWidthHint.Location = new System.Drawing.Point(820, 0); - this.lblWidthHint.Name = "lblWidthHint"; - this.lblWidthHint.Size = new System.Drawing.Size(1, 600); - this.lblWidthHint.TabIndex = 1; - this.lblWidthHint.Visible = false; + 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); + // + // 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; + // + // 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); + // + // 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); + // + // 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); + // + // oAuth2OneDrive + // + this.oAuth2OneDrive.IsRefreshable = false; + this.oAuth2OneDrive.Location = new System.Drawing.Point(16, 16); + this.oAuth2OneDrive.Name = "oAuth2OneDrive"; + this.oAuth2OneDrive.Size = new System.Drawing.Size(328, 200); + this.oAuth2OneDrive.TabIndex = 2; + this.oAuth2OneDrive.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuth2OneDrive_OpenButtonClicked); + this.oAuth2OneDrive.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuth2OneDrive_CompleteButtonClicked); + this.oAuth2OneDrive.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuth2OneDrive_ClearButtonClicked); + // + // 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 // @@ -4219,17 +4223,6 @@ private void InitializeComponent() this.actRapidShareAccountType.Size = new System.Drawing.Size(214, 29); this.actRapidShareAccountType.TabIndex = 16; // - // cbOwnCloudIgnoreInvalidCert - // - this.cbOwnCloudIgnoreInvalidCert.AutoSize = true; - this.cbOwnCloudIgnoreInvalidCert.Location = new System.Drawing.Point(19, 159); - this.cbOwnCloudIgnoreInvalidCert.Name = "cbOwnCloudIgnoreInvalidCert"; - this.cbOwnCloudIgnoreInvalidCert.Size = new System.Drawing.Size(161, 17); - this.cbOwnCloudIgnoreInvalidCert.TabIndex = 10; - this.cbOwnCloudIgnoreInvalidCert.Text = "Ignore invalid SSL certificate"; - this.cbOwnCloudIgnoreInvalidCert.UseVisualStyleBackColor = true; - this.cbOwnCloudIgnoreInvalidCert.CheckedChanged += new System.EventHandler(this.cbOwnCloudIgnoreInvalidCert_CheckedChanged); - // // UploadersConfigForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -4608,8 +4601,6 @@ private void InitializeComponent() private System.Windows.Forms.TabControl tcImageUploaders; private System.Windows.Forms.TabPage tpImgur; private OAuthControl oauth2Imgur; - private System.Windows.Forms.TextBox txtImgurAlbumID; - private System.Windows.Forms.Label lblImgurAlbumID; private System.Windows.Forms.ListView lvImgurAlbumList; private System.Windows.Forms.ColumnHeader chImgurID; private System.Windows.Forms.ColumnHeader chImgurTitle; @@ -4715,6 +4706,7 @@ private void InitializeComponent() private OAuthControl oAuth2OneDrive; private System.Windows.Forms.TabPage tpMediaCrush; private System.Windows.Forms.CheckBox cbMediaCrushDirectLink; - private System.Windows.Forms.CheckBox cbOwnCloudIgnoreInvalidCert; + private System.Windows.Forms.CheckBox cbOwnCloudIgnoreInvalidCert; + private System.Windows.Forms.CheckBox cbImgurUploadSelectedAlbum; } } \ No newline at end of file diff --git a/UploadersLib/Forms/UploadersConfigForm.cs b/UploadersLib/Forms/UploadersConfigForm.cs index fc1961635..c0a0ac3a9 100644 --- a/UploadersLib/Forms/UploadersConfigForm.cs +++ b/UploadersLib/Forms/UploadersConfigForm.cs @@ -168,7 +168,8 @@ public void LoadSettings(UploadersConfig uploadersConfig) cbImgurThumbnailType.Items.Clear(); cbImgurThumbnailType.Items.AddRange(Helpers.GetEnumDescriptions()); cbImgurThumbnailType.SelectedIndex = (int)Config.ImgurThumbnailType; - txtImgurAlbumID.Text = Config.ImgurAlbumID; + cbImgurUploadSelectedAlbum.Checked = Config.ImgurUploadSelectedAlbum; + ImgurFillAlbumList(); if (OAuth2Info.CheckOAuth(Config.ImgurOAuth2Info)) { @@ -543,6 +544,26 @@ public void LoadSettings(UploadersConfig uploadersConfig) #region Imgur + private void oauth2Imgur_OpenButtonClicked() + { + ImgurAuthOpen(); + } + + private void oauth2Imgur_CompleteButtonClicked(string code) + { + ImgurAuthComplete(code); + } + + private void oauth2Imgur_RefreshButtonClicked() + { + ImgurAuthRefresh(); + } + + private void oauth2Imgur_ClearButtonClicked() + { + Config.ImgurOAuth2Info = null; + } + private void atcImgurAccountType_AccountTypeChanged(AccountType accountType) { Config.ImgurAccountType = accountType; @@ -558,14 +579,9 @@ private void cbImgurThumbnailType_SelectedIndexChanged(object sender, EventArgs Config.ImgurThumbnailType = (ImgurThumbnailType)cbImgurThumbnailType.SelectedIndex; } - private void txtImgurAlbumID_TextChanged(object sender, EventArgs e) + private void cbImgurUploadSelectedAlbum_CheckedChanged(object sender, EventArgs e) { - Config.ImgurAlbumID = txtImgurAlbumID.Text; - } - - private void oauth2Imgur_ClearButtonClicked() - { - Config.ImgurOAuth2Info = null; + Config.ImgurUploadSelectedAlbum = cbImgurUploadSelectedAlbum.Checked; } private void btnImgurRefreshAlbumList_Click(object sender, EventArgs e) @@ -580,25 +596,13 @@ private void lvImgurAlbumList_SelectedIndexChanged(object sender, EventArgs e) ListViewItem lvi = lvImgurAlbumList.SelectedItems[0]; if (lvi.Tag is ImgurAlbumData) { - ImgurAlbumData album = (ImgurAlbumData)lvi.Tag; - txtImgurAlbumID.Text = album.id; + Config.ImgurSelectedAlbum = (ImgurAlbumData)lvi.Tag; } } - } - - private void oauth2Imgur_OpenButtonClicked() - { - ImgurAuthOpen(); - } - - private void oauth2Imgur_CompleteButtonClicked(string code) - { - ImgurAuthComplete(code); - } - - private void oauth2Imgur_RefreshButtonClicked() - { - ImgurAuthRefresh(); + else + { + Config.ImgurSelectedAlbum = null; + } } #endregion Imgur diff --git a/UploadersLib/Forms/UploadersConfigFormHelper.cs b/UploadersLib/Forms/UploadersConfigFormHelper.cs index 6b62a8cfc..1ad239ef8 100644 --- a/UploadersLib/Forms/UploadersConfigFormHelper.cs +++ b/UploadersLib/Forms/UploadersConfigFormHelper.cs @@ -135,19 +135,9 @@ public void ImgurRefreshAlbumList() if (OAuth2Info.CheckOAuth(Config.ImgurOAuth2Info)) { - List albums = new Imgur_v3(Config.ImgurOAuth2Info).GetAlbums(); - - if (albums != null && albums.Count > 0) - { - foreach (ImgurAlbumData album in albums) - { - ListViewItem lvi = new ListViewItem(album.id); - lvi.SubItems.Add(album.title ?? ""); - lvi.SubItems.Add(album.description ?? ""); - lvi.Tag = album; - lvImgurAlbumList.Items.Add(lvi); - } - } + Config.ImgurAlbumList = new Imgur_v3(Config.ImgurOAuth2Info).GetAlbums(); + ImgurFillAlbumList(); + lvImgurAlbumList.Focus(); } } catch (Exception ex) @@ -156,6 +146,23 @@ public void ImgurRefreshAlbumList() } } + private void ImgurFillAlbumList() + { + if (Config.ImgurAlbumList != null) + { + foreach (ImgurAlbumData album in Config.ImgurAlbumList) + { + ListViewItem lvi = new ListViewItem(album.id ?? ""); + lvi.SubItems.Add(album.title ?? ""); + lvi.SubItems.Add(album.description ?? ""); + lvi.Selected = Config.ImgurSelectedAlbum != null && !string.IsNullOrEmpty(Config.ImgurSelectedAlbum.id) && + album.id.Equals(Config.ImgurSelectedAlbum.id, StringComparison.InvariantCultureIgnoreCase); + lvi.Tag = album; + lvImgurAlbumList.Items.Add(lvi); + } + } + } + #endregion Imgur #region Flickr diff --git a/UploadersLib/ImageUploaders/Imgur_v3.cs b/UploadersLib/ImageUploaders/Imgur_v3.cs index 500fc87ba..3b1727715 100644 --- a/UploadersLib/ImageUploaders/Imgur_v3.cs +++ b/UploadersLib/ImageUploaders/Imgur_v3.cs @@ -284,7 +284,7 @@ public class ImgurAlbumData public string id { get; set; } public string title { get; set; } public string description { get; set; } - public int datetime { get; set; } + /*public int datetime { get; set; } public object cover { get; set; } public string account_url { get; set; } public string privacy { get; set; } @@ -292,7 +292,7 @@ public class ImgurAlbumData public int views { get; set; } public string link { get; set; } public bool favorite { get; set; } - public int order { get; set; } + public int order { get; set; }*/ } public class ImgurErrorData diff --git a/UploadersLib/UploadersConfig.cs b/UploadersLib/UploadersConfig.cs index 13fe657dc..13a029750 100644 --- a/UploadersLib/UploadersConfig.cs +++ b/UploadersLib/UploadersConfig.cs @@ -45,7 +45,9 @@ public class UploadersConfig : SettingsBase public bool ImgurDirectLink = true; public ImgurThumbnailType ImgurThumbnailType = ImgurThumbnailType.Large_Thumbnail; public OAuth2Info ImgurOAuth2Info = null; - public string ImgurAlbumID = string.Empty; + public bool ImgurUploadSelectedAlbum = false; + public ImgurAlbumData ImgurSelectedAlbum = null; + public List ImgurAlbumList = null; // ImageShack