diff --git a/UploadersLib/Controls/OAuthControl.cs b/UploadersLib/Controls/OAuthControl.cs index 1cace3e68..fa6319a90 100644 --- a/UploadersLib/Controls/OAuthControl.cs +++ b/UploadersLib/Controls/OAuthControl.cs @@ -70,6 +70,7 @@ public OAuthLoginStatus Status break; } + txtVerificationCode.ResetText(); btnClearAuthorization.Enabled = btnRefreshAuthorization.Enabled = status == OAuthLoginStatus.LoginSuccessful; } } diff --git a/UploadersLib/FileUploaders/GoogleDrive.cs b/UploadersLib/FileUploaders/GoogleDrive.cs index a987b8053..ca34ac2e0 100644 --- a/UploadersLib/FileUploaders/GoogleDrive.cs +++ b/UploadersLib/FileUploaders/GoogleDrive.cs @@ -131,7 +131,7 @@ public bool CheckAuthorization() return true; } - public void SetMetadata(string fileID, string title, string parentID = null) + private void SetMetadata(string fileID, string title, string parentID = null) { string url = string.Format("https://www.googleapis.com/drive/v2/files/{0}", fileID); @@ -164,7 +164,7 @@ public void SetMetadata(string fileID, string title, string parentID = null) string response = SendRequestJSON(url, json, headers: GetAuthHeaders(), method: HttpMethod.PUT); } - public void SetPermissions(string fileID, GoogleDrivePermissionRole role, GoogleDrivePermissionType type, string value, bool withLink) + private void SetPermissions(string fileID, GoogleDrivePermissionRole role, GoogleDrivePermissionType type, string value, bool withLink) { string url = string.Format("https://www.googleapis.com/drive/v2/files/{0}/permissions", fileID); @@ -179,10 +179,24 @@ public void SetPermissions(string fileID, GoogleDrivePermissionRole role, Google string response = SendRequestJSON(url, json, headers: GetAuthHeaders()); } - public List GetFolders() + public List GetFolders(bool trashed = false, bool writer = true) { + if (!CheckAuthorization()) return null; + + string query = "mimeType = 'application/vnd.google-apps.folder'"; + + if (!trashed) + { + query += " and trashed = false"; + } + + if (writer) + { + query += " and 'me' in writers"; + } + Dictionary args = new Dictionary(); - args.Add("q", "mimeType = 'application/vnd.google-apps.folder' and trashed = false and 'me' in writers"); + args.Add("q", query); string response = SendRequest(HttpMethod.GET, "https://www.googleapis.com/drive/v2/files", args, headers: GetAuthHeaders()); @@ -201,10 +215,7 @@ public List GetFolders() public override UploadResult Upload(Stream stream, string fileName) { - if (!CheckAuthorization()) - { - return null; - } + if (!CheckAuthorization()) return null; UploadResult result = UploadData(stream, "https://www.googleapis.com/upload/drive/v2/files", fileName, "file", headers: GetAuthHeaders()); @@ -235,6 +246,7 @@ public class GoogleDriveFile public string id { get; set; } public string alternateLink { get; set; } public string title { get; set; } + public string description { get; set; } } public class GoogleDriveFileList diff --git a/UploadersLib/Forms/UploadersConfigForm.Designer.cs b/UploadersLib/Forms/UploadersConfigForm.Designer.cs index 2cd77332f..a2d2324dd 100644 --- a/UploadersLib/Forms/UploadersConfigForm.Designer.cs +++ b/UploadersLib/Forms/UploadersConfigForm.Designer.cs @@ -93,12 +93,16 @@ private void InitializeComponent() this.txtCustomUploaderArgName = new System.Windows.Forms.TextBox(); this.tpTwitter = new System.Windows.Forms.TabPage(); this.btnTwitterLogin = new System.Windows.Forms.Button(); + this.ucTwitterAccounts = new UploadersLib.AccountsControl(); this.tpURLShorteners = new System.Windows.Forms.TabPage(); this.tcURLShorteners = new System.Windows.Forms.TabControl(); this.tpBitly = new System.Windows.Forms.TabPage(); this.txtBitlyDomain = new System.Windows.Forms.TextBox(); this.lblBitlyDomain = new System.Windows.Forms.Label(); + this.oauth2Bitly = new UploadersLib.OAuthControl(); this.tpGoogleURLShortener = new System.Windows.Forms.TabPage(); + this.oauth2GoogleURLShortener = new UploadersLib.OAuthControl(); + this.atcGoogleURLShortenerAccountType = new UploadersLib.AccountTypeControl(); this.tpYourls = new System.Windows.Forms.TabPage(); this.txtYourlsPassword = new System.Windows.Forms.TextBox(); this.txtYourlsUsername = new System.Windows.Forms.TextBox(); @@ -112,6 +116,7 @@ private void InitializeComponent() this.tpFileUploaders = new System.Windows.Forms.TabPage(); this.tcFileUploaders = new System.Windows.Forms.TabControl(); this.tpDropbox = new System.Windows.Forms.TabPage(); + this.oauth2Dropbox = new UploadersLib.OAuthControl(); this.cbDropboxURLType = new System.Windows.Forms.ComboBox(); this.cbDropboxAutoCreateShareableLink = new System.Windows.Forms.CheckBox(); this.btnDropboxShowFiles = new System.Windows.Forms.Button(); @@ -129,6 +134,7 @@ private void InitializeComponent() this.lblCopyStatus = new System.Windows.Forms.Label(); this.lblCopyPath = new System.Windows.Forms.Label(); this.txtCopyPath = new System.Windows.Forms.TextBox(); + this.oAuthCopy = new UploadersLib.OAuthControl(); this.tpFTP = new System.Windows.Forms.TabPage(); this.eiFTP = new HelpersLib.ExportImportControl(); this.btnFtpClient = new System.Windows.Forms.Button(); @@ -138,6 +144,7 @@ private void InitializeComponent() this.cboFtpImages = new System.Windows.Forms.ComboBox(); this.cboFtpFiles = new System.Windows.Forms.ComboBox(); this.cboFtpText = new System.Windows.Forms.ComboBox(); + this.ucFTPAccounts = new UploadersLib.AccountsControl(); this.tpMega = new System.Windows.Forms.TabPage(); this.btnMegaRefreshFolders = new System.Windows.Forms.Button(); this.lblMegaStatus = new System.Windows.Forms.Label(); @@ -170,9 +177,11 @@ private void InitializeComponent() this.txtGoogleDriveFolderID = new System.Windows.Forms.TextBox(); this.lblGoogleDriveFolderID = new System.Windows.Forms.Label(); this.lvGoogleDriveFoldersList = new HelpersLib.MyListView(); - this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.chGoogleDriveTitle = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + 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.tpPushbullet = new System.Windows.Forms.TabPage(); this.lblPushbulletDevices = new System.Windows.Forms.Label(); this.cboPushbulletDevices = new System.Windows.Forms.ComboBox(); @@ -186,6 +195,7 @@ private void InitializeComponent() this.chBoxFoldersName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.lblBoxFolderID = new System.Windows.Forms.Label(); this.btnBoxRefreshFolders = new System.Windows.Forms.Button(); + this.oauth2Box = new UploadersLib.OAuthControl(); this.tpRapidShare = new System.Windows.Forms.TabPage(); this.txtRapidShareFolderID = new System.Windows.Forms.TextBox(); this.lblRapidShareFolderID = new System.Windows.Forms.Label(); @@ -201,6 +211,7 @@ private void InitializeComponent() this.lblSendSpaceUsername = new System.Windows.Forms.Label(); this.txtSendSpacePassword = new System.Windows.Forms.TextBox(); this.txtSendSpaceUserName = new System.Windows.Forms.TextBox(); + this.atcSendSpaceAccountType = new UploadersLib.AccountTypeControl(); this.tpGe_tt = new System.Windows.Forms.TabPage(); this.lblGe_ttStatus = new System.Windows.Forms.Label(); this.lblGe_ttPassword = new System.Windows.Forms.Label(); @@ -238,6 +249,7 @@ private void InitializeComponent() this.txtJiraConfigHelp = new System.Windows.Forms.TextBox(); this.txtJiraHost = new System.Windows.Forms.TextBox(); this.lblJiraHost = new System.Windows.Forms.Label(); + this.oAuthJira = new UploadersLib.OAuthControl(); this.tpEmail = new System.Windows.Forms.TabPage(); this.chkEmailConfirm = new System.Windows.Forms.CheckBox(); this.lblEmailSmtpServer = new System.Windows.Forms.Label(); @@ -260,6 +272,7 @@ private void InitializeComponent() this.lblSharedFolderImages = new System.Windows.Forms.Label(); this.cboSharedFolderText = new System.Windows.Forms.ComboBox(); this.cboSharedFolderImages = new System.Windows.Forms.ComboBox(); + this.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(); @@ -271,6 +284,8 @@ private void InitializeComponent() this.txtPaste_eeUserAPIKey = new System.Windows.Forms.TextBox(); this.tpGist = new System.Windows.Forms.TabPage(); this.chkGistPublishPublic = new System.Windows.Forms.CheckBox(); + this.oAuth2Gist = new UploadersLib.OAuthControl(); + this.atcGistAccountType = new UploadersLib.AccountTypeControl(); this.tpUpaste = new System.Windows.Forms.TabPage(); this.cbUpasteIsPublic = new System.Windows.Forms.CheckBox(); this.lblUpasteUserKey = new System.Windows.Forms.Label(); @@ -278,12 +293,14 @@ private void InitializeComponent() this.tpImageUploaders = new System.Windows.Forms.TabPage(); this.tcImageUploaders = new System.Windows.Forms.TabControl(); this.tpImgur = new System.Windows.Forms.TabPage(); + this.atcImgurAccountType = new UploadersLib.AccountTypeControl(); + this.oauth2Imgur = new UploadersLib.OAuthControl(); this.txtImgurAlbumID = new System.Windows.Forms.TextBox(); this.lblImgurAlbumID = new System.Windows.Forms.Label(); this.lvImgurAlbumList = new System.Windows.Forms.ListView(); - this.chID = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.chTitle = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.chDescription = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.chImgurID = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.chImgurTitle = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.chImgurDescription = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.btnImgurRefreshAlbumList = new System.Windows.Forms.Button(); this.cbImgurThumbnailType = new System.Windows.Forms.ComboBox(); this.lblImgurThumbnailType = new System.Windows.Forms.Label(); @@ -297,6 +314,7 @@ private void InitializeComponent() this.txtImageShackPassword = new System.Windows.Forms.TextBox(); this.lblImageShackPassword = new System.Windows.Forms.Label(); this.tpTinyPic = new System.Windows.Forms.TabPage(); + this.atcTinyPicAccountType = new UploadersLib.AccountTypeControl(); this.btnTinyPicLogin = new System.Windows.Forms.Button(); this.txtTinyPicPassword = new System.Windows.Forms.TextBox(); this.lblTinyPicPassword = new System.Windows.Forms.Label(); @@ -333,30 +351,13 @@ private void InitializeComponent() this.txtPicasaAlbumID = new System.Windows.Forms.TextBox(); this.lblPicasaAlbumID = new System.Windows.Forms.Label(); this.lvPicasaAlbumList = new System.Windows.Forms.ListView(); - this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.columnHeader5 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.chPicasaID = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + 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.atcImgurAccountType = new UploadersLib.AccountTypeControl(); - this.oauth2Imgur = new UploadersLib.OAuthControl(); - this.atcTinyPicAccountType = new UploadersLib.AccountTypeControl(); - this.oauth2Picasa = new UploadersLib.OAuthControl(); - this.oAuth2Gist = new UploadersLib.OAuthControl(); - this.atcGistAccountType = new UploadersLib.AccountTypeControl(); - this.oauth2Dropbox = new UploadersLib.OAuthControl(); - this.oAuthCopy = new UploadersLib.OAuthControl(); - this.ucFTPAccounts = new UploadersLib.AccountsControl(); - this.oauth2GoogleDrive = new UploadersLib.OAuthControl(); - this.oauth2Box = new UploadersLib.OAuthControl(); - this.atcSendSpaceAccountType = new UploadersLib.AccountTypeControl(); - this.oAuthJira = new UploadersLib.OAuthControl(); - this.ucLocalhostAccounts = new UploadersLib.AccountsControl(); - this.oauth2Bitly = new UploadersLib.OAuthControl(); - this.oauth2GoogleURLShortener = new UploadersLib.OAuthControl(); - this.atcGoogleURLShortenerAccountType = new UploadersLib.AccountTypeControl(); - this.ucTwitterAccounts = new UploadersLib.AccountsControl(); this.actRapidShareAccountType = new UploadersLib.AccountTypeControl(); this.tpOtherUploaders.SuspendLayout(); this.tcOtherUploaders.SuspendLayout(); @@ -1058,6 +1059,15 @@ private void InitializeComponent() this.btnTwitterLogin.UseVisualStyleBackColor = true; this.btnTwitterLogin.Click += new System.EventHandler(this.btnTwitterLogin_Click); // + // ucTwitterAccounts + // + this.ucTwitterAccounts.Dock = System.Windows.Forms.DockStyle.Fill; + this.ucTwitterAccounts.Location = new System.Drawing.Point(0, 0); + this.ucTwitterAccounts.Margin = new System.Windows.Forms.Padding(0); + this.ucTwitterAccounts.Name = "ucTwitterAccounts"; + this.ucTwitterAccounts.Size = new System.Drawing.Size(972, 493); + this.ucTwitterAccounts.TabIndex = 0; + // // tpURLShorteners // this.tpURLShorteners.Controls.Add(this.tcURLShorteners); @@ -1111,6 +1121,17 @@ private void InitializeComponent() this.lblBitlyDomain.TabIndex = 1; this.lblBitlyDomain.Text = "Domain:"; // + // oauth2Bitly + // + this.oauth2Bitly.IsRefreshable = false; + this.oauth2Bitly.Location = new System.Drawing.Point(16, 16); + this.oauth2Bitly.Name = "oauth2Bitly"; + this.oauth2Bitly.Size = new System.Drawing.Size(328, 208); + this.oauth2Bitly.TabIndex = 0; + this.oauth2Bitly.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Bitly_OpenButtonClicked); + this.oauth2Bitly.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Bitly_CompleteButtonClicked); + this.oauth2Bitly.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Bitly_ClearButtonClicked); + // // tpGoogleURLShortener // this.tpGoogleURLShortener.Controls.Add(this.oauth2GoogleURLShortener); @@ -1123,6 +1144,26 @@ private void InitializeComponent() this.tpGoogleURLShortener.Text = "Google"; this.tpGoogleURLShortener.UseVisualStyleBackColor = true; // + // oauth2GoogleURLShortener + // + this.oauth2GoogleURLShortener.Location = new System.Drawing.Point(16, 56); + this.oauth2GoogleURLShortener.Name = "oauth2GoogleURLShortener"; + this.oauth2GoogleURLShortener.Size = new System.Drawing.Size(328, 240); + this.oauth2GoogleURLShortener.TabIndex = 1; + this.oauth2GoogleURLShortener.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2GoogleURLShortener_OpenButtonClicked); + this.oauth2GoogleURLShortener.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2GoogleURLShortener_CompleteButtonClicked); + this.oauth2GoogleURLShortener.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2GoogleURLShortener_ClearButtonClicked); + this.oauth2GoogleURLShortener.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2GoogleURLShortener_RefreshButtonClicked); + // + // atcGoogleURLShortenerAccountType + // + this.atcGoogleURLShortenerAccountType.Location = new System.Drawing.Point(8, 16); + this.atcGoogleURLShortenerAccountType.Name = "atcGoogleURLShortenerAccountType"; + this.atcGoogleURLShortenerAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; + this.atcGoogleURLShortenerAccountType.Size = new System.Drawing.Size(214, 29); + this.atcGoogleURLShortenerAccountType.TabIndex = 0; + this.atcGoogleURLShortenerAccountType.AccountTypeChanged += new UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcGoogleURLShortenerAccountType_AccountTypeChanged); + // // tpYourls // this.tpYourls.Controls.Add(this.txtYourlsPassword); @@ -1278,6 +1319,17 @@ private void InitializeComponent() this.tpDropbox.Text = "Dropbox"; this.tpDropbox.UseVisualStyleBackColor = true; // + // oauth2Dropbox + // + this.oauth2Dropbox.IsRefreshable = false; + this.oauth2Dropbox.Location = new System.Drawing.Point(16, 88); + this.oauth2Dropbox.Name = "oauth2Dropbox"; + this.oauth2Dropbox.Size = new System.Drawing.Size(328, 200); + this.oauth2Dropbox.TabIndex = 1; + this.oauth2Dropbox.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Dropbox_OpenButtonClicked); + this.oauth2Dropbox.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Dropbox_CompleteButtonClicked); + this.oauth2Dropbox.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Dropbox_ClearButtonClicked); + // // cbDropboxURLType // this.cbDropboxURLType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -1453,6 +1505,17 @@ private void InitializeComponent() this.txtCopyPath.TabIndex = 3; this.txtCopyPath.TextChanged += new System.EventHandler(this.txtCopyPath_TextChanged); // + // oAuthCopy + // + this.oAuthCopy.IsRefreshable = false; + this.oAuthCopy.Location = new System.Drawing.Point(16, 88); + this.oAuthCopy.Name = "oAuthCopy"; + this.oAuthCopy.Size = new System.Drawing.Size(328, 208); + this.oAuthCopy.TabIndex = 1; + this.oAuthCopy.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuthCopy_OpenButtonClicked); + this.oAuthCopy.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuthCopy_CompleteButtonClicked); + this.oAuthCopy.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuthCopy_ClearButtonClicked); + // // tpFTP // this.tpFTP.Controls.Add(this.eiFTP); @@ -1549,6 +1612,16 @@ private void InitializeComponent() this.cboFtpText.TabIndex = 3; this.cboFtpText.SelectedIndexChanged += new System.EventHandler(this.cboFtpText_SelectedIndexChanged); // + // ucFTPAccounts + // + this.ucFTPAccounts.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); + this.ucFTPAccounts.Location = new System.Drawing.Point(8, 40); + this.ucFTPAccounts.Margin = new System.Windows.Forms.Padding(4); + this.ucFTPAccounts.Name = "ucFTPAccounts"; + this.ucFTPAccounts.Size = new System.Drawing.Size(792, 448); + this.ucFTPAccounts.TabIndex = 6; + // // tpMega // this.tpMega.Controls.Add(this.btnMegaRefreshFolders); @@ -1879,7 +1952,8 @@ private void InitializeComponent() // this.lvGoogleDriveFoldersList.AutoFillColumn = true; this.lvGoogleDriveFoldersList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.columnHeader1}); + this.chGoogleDriveTitle, + this.chGoogleDriveDescription}); this.lvGoogleDriveFoldersList.FullRowSelect = true; this.lvGoogleDriveFoldersList.Location = new System.Drawing.Point(352, 72); this.lvGoogleDriveFoldersList.MultiSelect = false; @@ -1890,10 +1964,15 @@ private void InitializeComponent() this.lvGoogleDriveFoldersList.View = System.Windows.Forms.View.Details; this.lvGoogleDriveFoldersList.SelectedIndexChanged += new System.EventHandler(this.lvGoogleDriveFoldersList_SelectedIndexChanged); // - // columnHeader1 + // chGoogleDriveTitle // - this.columnHeader1.Text = "Folder name"; - this.columnHeader1.Width = 400; + this.chGoogleDriveTitle.Text = "Title"; + this.chGoogleDriveTitle.Width = 200; + // + // chGoogleDriveDescription + // + this.chGoogleDriveDescription.Text = "Description"; + this.chGoogleDriveDescription.Width = 228; // // btnGoogleDriveRefreshFolders // @@ -1917,6 +1996,17 @@ 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); + // // tpPushbullet // this.tpPushbullet.Controls.Add(this.lblPushbulletDevices); @@ -2057,6 +2147,17 @@ private void InitializeComponent() this.btnBoxRefreshFolders.UseVisualStyleBackColor = true; this.btnBoxRefreshFolders.Click += new System.EventHandler(this.btnBoxRefreshFolders_Click); // + // oauth2Box + // + this.oauth2Box.Location = new System.Drawing.Point(16, 16); + this.oauth2Box.Name = "oauth2Box"; + this.oauth2Box.Size = new System.Drawing.Size(328, 240); + this.oauth2Box.TabIndex = 0; + this.oauth2Box.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Box_OpenButtonClicked); + this.oauth2Box.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Box_CompleteButtonClicked); + this.oauth2Box.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Box_ClearButtonClicked); + this.oauth2Box.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Box_RefreshButtonClicked); + // // tpRapidShare // this.tpRapidShare.Controls.Add(this.txtRapidShareFolderID); @@ -2206,6 +2307,15 @@ private void InitializeComponent() this.txtSendSpaceUserName.TabIndex = 2; this.txtSendSpaceUserName.TextChanged += new System.EventHandler(this.txtSendSpaceUserName_TextChanged); // + // atcSendSpaceAccountType + // + this.atcSendSpaceAccountType.Location = new System.Drawing.Point(8, 16); + this.atcSendSpaceAccountType.Name = "atcSendSpaceAccountType"; + this.atcSendSpaceAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; + this.atcSendSpaceAccountType.Size = new System.Drawing.Size(214, 29); + this.atcSendSpaceAccountType.TabIndex = 0; + this.atcSendSpaceAccountType.AccountTypeChanged += new UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcSendSpaceAccountType_AccountTypeChanged); + // // tpGe_tt // this.tpGe_tt.Controls.Add(this.lblGe_ttStatus); @@ -2584,6 +2694,17 @@ private void InitializeComponent() this.lblJiraHost.TabIndex = 0; this.lblJiraHost.Text = "Jira host: "; // + // oAuthJira + // + this.oAuthJira.Location = new System.Drawing.Point(473, 13); + this.oAuthJira.Name = "oAuthJira"; + this.oAuthJira.Size = new System.Drawing.Size(328, 243); + this.oAuthJira.TabIndex = 1; + this.oAuthJira.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuthJira_OpenButtonClicked); + this.oAuthJira.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuthJira_CompleteButtonClicked); + this.oAuthJira.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuthJira_ClearButtonClicked); + this.oAuthJira.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oAuthJira_RefreshButtonClicked); + // // tpEmail // this.tpEmail.Controls.Add(this.chkEmailConfirm); @@ -2819,6 +2940,16 @@ private void InitializeComponent() this.cboSharedFolderImages.TabIndex = 1; this.cboSharedFolderImages.SelectedIndexChanged += new System.EventHandler(this.cboSharedFolderImages_SelectedIndexChanged); // + // ucLocalhostAccounts + // + this.ucLocalhostAccounts.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); + this.ucLocalhostAccounts.Location = new System.Drawing.Point(8, 40); + this.ucLocalhostAccounts.Margin = new System.Windows.Forms.Padding(4); + this.ucLocalhostAccounts.Name = "ucLocalhostAccounts"; + this.ucLocalhostAccounts.Size = new System.Drawing.Size(792, 448); + this.ucLocalhostAccounts.TabIndex = 6; + // // btnCopyShowFiles // this.btnCopyShowFiles.Location = new System.Drawing.Point(0, 0); @@ -2935,6 +3066,27 @@ private void InitializeComponent() this.chkGistPublishPublic.UseVisualStyleBackColor = true; this.chkGistPublishPublic.CheckedChanged += new System.EventHandler(this.chkGistPublishPublic_CheckedChanged); // + // oAuth2Gist + // + this.oAuth2Gist.Enabled = false; + this.oAuth2Gist.IsRefreshable = false; + this.oAuth2Gist.Location = new System.Drawing.Point(16, 51); + this.oAuth2Gist.Name = "oAuth2Gist"; + this.oAuth2Gist.Size = new System.Drawing.Size(328, 205); + this.oAuth2Gist.TabIndex = 2; + this.oAuth2Gist.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuth2Gist_OpenButtonClicked); + this.oAuth2Gist.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuth2Gist_CompleteButtonClicked); + this.oAuth2Gist.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuth2Gist_ClearButtonClicked); + // + // atcGistAccountType + // + this.atcGistAccountType.Location = new System.Drawing.Point(15, 16); + this.atcGistAccountType.Name = "atcGistAccountType"; + this.atcGistAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; + this.atcGistAccountType.Size = new System.Drawing.Size(214, 29); + this.atcGistAccountType.TabIndex = 0; + this.atcGistAccountType.AccountTypeChanged += new UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcGistAccountType_AccountTypeChanged); + // // tpUpaste // this.tpUpaste.Controls.Add(this.cbUpasteIsPublic); @@ -3022,6 +3174,26 @@ private void InitializeComponent() this.tpImgur.Text = "Imgur"; this.tpImgur.UseVisualStyleBackColor = true; // + // 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); @@ -3042,9 +3214,9 @@ private void InitializeComponent() // lvImgurAlbumList // this.lvImgurAlbumList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.chID, - this.chTitle, - this.chDescription}); + this.chImgurID, + this.chImgurTitle, + this.chImgurDescription}); this.lvImgurAlbumList.FullRowSelect = true; this.lvImgurAlbumList.Location = new System.Drawing.Point(352, 72); this.lvImgurAlbumList.MultiSelect = false; @@ -3055,20 +3227,20 @@ private void InitializeComponent() this.lvImgurAlbumList.View = System.Windows.Forms.View.Details; this.lvImgurAlbumList.SelectedIndexChanged += new System.EventHandler(this.lvImgurAlbumList_SelectedIndexChanged); // - // chID + // chImgurID // - this.chID.Text = "ID"; - this.chID.Width = 70; + this.chImgurID.Text = "ID"; + this.chImgurID.Width = 70; // - // chTitle + // chImgurTitle // - this.chTitle.Text = "Title"; - this.chTitle.Width = 150; + this.chImgurTitle.Text = "Title"; + this.chImgurTitle.Width = 150; // - // chDescription + // chImgurDescription // - this.chDescription.Text = "Description"; - this.chDescription.Width = 208; + this.chImgurDescription.Text = "Description"; + this.chImgurDescription.Width = 208; // // btnImgurRefreshAlbumList // @@ -3211,6 +3383,15 @@ private void InitializeComponent() this.tpTinyPic.Text = "TinyPic"; this.tpTinyPic.UseVisualStyleBackColor = true; // + // atcTinyPicAccountType + // + this.atcTinyPicAccountType.Location = new System.Drawing.Point(8, 8); + this.atcTinyPicAccountType.Name = "atcTinyPicAccountType"; + this.atcTinyPicAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; + this.atcTinyPicAccountType.Size = new System.Drawing.Size(272, 29); + this.atcTinyPicAccountType.TabIndex = 0; + this.atcTinyPicAccountType.AccountTypeChanged += new UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcTinyPicAccountType_AccountTypeChanged); + // // btnTinyPicLogin // this.btnTinyPicLogin.Location = new System.Drawing.Point(296, 74); @@ -3577,9 +3758,9 @@ private void InitializeComponent() // lvPicasaAlbumList // this.lvPicasaAlbumList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.columnHeader3, - this.columnHeader4, - this.columnHeader5}); + this.chPicasaID, + this.chPicasaName, + this.chPicasaDescription}); this.lvPicasaAlbumList.FullRowSelect = true; this.lvPicasaAlbumList.Location = new System.Drawing.Point(352, 72); this.lvPicasaAlbumList.MultiSelect = false; @@ -3590,20 +3771,20 @@ private void InitializeComponent() this.lvPicasaAlbumList.View = System.Windows.Forms.View.Details; this.lvPicasaAlbumList.SelectedIndexChanged += new System.EventHandler(this.lvPicasaAlbumList_SelectedIndexChanged); // - // columnHeader3 + // chPicasaID // - this.columnHeader3.Text = "ID"; - this.columnHeader3.Width = 135; + this.chPicasaID.Text = "ID"; + this.chPicasaID.Width = 135; // - // columnHeader4 + // chPicasaName // - this.columnHeader4.Text = "Name"; - this.columnHeader4.Width = 150; + this.chPicasaName.Text = "Name"; + this.chPicasaName.Width = 150; // - // columnHeader5 + // chPicasaDescription // - this.columnHeader5.Text = "Description"; - this.columnHeader5.Width = 143; + this.chPicasaDescription.Text = "Description"; + this.chPicasaDescription.Width = 143; // // btnPicasaRefreshAlbumList // @@ -3616,6 +3797,17 @@ private void InitializeComponent() this.btnPicasaRefreshAlbumList.UseVisualStyleBackColor = true; this.btnPicasaRefreshAlbumList.Click += new System.EventHandler(this.btnPicasaRefreshAlbumList_Click); // + // oauth2Picasa + // + this.oauth2Picasa.Location = new System.Drawing.Point(16, 16); + this.oauth2Picasa.Name = "oauth2Picasa"; + this.oauth2Picasa.Size = new System.Drawing.Size(328, 240); + this.oauth2Picasa.TabIndex = 0; + this.oauth2Picasa.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Picasa_OpenButtonClicked); + this.oauth2Picasa.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Picasa_CompleteButtonClicked); + this.oauth2Picasa.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Picasa_ClearButtonClicked); + this.oauth2Picasa.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Picasa_RefreshButtonClicked); + // // tcUploaders // this.tcUploaders.Controls.Add(this.tpImageUploaders); @@ -3643,191 +3835,6 @@ private void InitializeComponent() this.ttlvMain.Size = new System.Drawing.Size(994, 551); this.ttlvMain.TabIndex = 0; // - // atcImgurAccountType - // - this.atcImgurAccountType.Location = new System.Drawing.Point(8, 260); - this.atcImgurAccountType.Name = "atcImgurAccountType"; - this.atcImgurAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; - this.atcImgurAccountType.Size = new System.Drawing.Size(208, 32); - this.atcImgurAccountType.TabIndex = 1; - this.atcImgurAccountType.AccountTypeChanged += new UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcImgurAccountType_AccountTypeChanged); - // - // oauth2Imgur - // - this.oauth2Imgur.Location = new System.Drawing.Point(16, 16); - this.oauth2Imgur.Name = "oauth2Imgur"; - this.oauth2Imgur.Size = new System.Drawing.Size(328, 240); - this.oauth2Imgur.TabIndex = 0; - this.oauth2Imgur.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Imgur_OpenButtonClicked); - this.oauth2Imgur.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Imgur_CompleteButtonClicked); - this.oauth2Imgur.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Imgur_ClearButtonClicked); - this.oauth2Imgur.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Imgur_RefreshButtonClicked); - // - // atcTinyPicAccountType - // - this.atcTinyPicAccountType.Location = new System.Drawing.Point(8, 8); - this.atcTinyPicAccountType.Name = "atcTinyPicAccountType"; - this.atcTinyPicAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; - this.atcTinyPicAccountType.Size = new System.Drawing.Size(272, 29); - this.atcTinyPicAccountType.TabIndex = 0; - this.atcTinyPicAccountType.AccountTypeChanged += new UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcTinyPicAccountType_AccountTypeChanged); - // - // oauth2Picasa - // - this.oauth2Picasa.Location = new System.Drawing.Point(16, 16); - this.oauth2Picasa.Name = "oauth2Picasa"; - this.oauth2Picasa.Size = new System.Drawing.Size(328, 240); - this.oauth2Picasa.TabIndex = 0; - this.oauth2Picasa.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Picasa_OpenButtonClicked); - this.oauth2Picasa.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Picasa_CompleteButtonClicked); - this.oauth2Picasa.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Picasa_ClearButtonClicked); - this.oauth2Picasa.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Picasa_RefreshButtonClicked); - // - // oAuth2Gist - // - this.oAuth2Gist.Enabled = false; - this.oAuth2Gist.IsRefreshable = false; - this.oAuth2Gist.Location = new System.Drawing.Point(16, 51); - this.oAuth2Gist.Name = "oAuth2Gist"; - this.oAuth2Gist.Size = new System.Drawing.Size(328, 205); - this.oAuth2Gist.TabIndex = 2; - this.oAuth2Gist.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuth2Gist_OpenButtonClicked); - this.oAuth2Gist.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuth2Gist_CompleteButtonClicked); - this.oAuth2Gist.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuth2Gist_ClearButtonClicked); - // - // atcGistAccountType - // - this.atcGistAccountType.Location = new System.Drawing.Point(15, 16); - this.atcGistAccountType.Name = "atcGistAccountType"; - this.atcGistAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; - this.atcGistAccountType.Size = new System.Drawing.Size(214, 29); - this.atcGistAccountType.TabIndex = 0; - this.atcGistAccountType.AccountTypeChanged += new UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcGistAccountType_AccountTypeChanged); - // - // oauth2Dropbox - // - this.oauth2Dropbox.IsRefreshable = false; - this.oauth2Dropbox.Location = new System.Drawing.Point(16, 88); - this.oauth2Dropbox.Name = "oauth2Dropbox"; - this.oauth2Dropbox.Size = new System.Drawing.Size(328, 200); - this.oauth2Dropbox.TabIndex = 1; - this.oauth2Dropbox.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Dropbox_OpenButtonClicked); - this.oauth2Dropbox.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Dropbox_CompleteButtonClicked); - this.oauth2Dropbox.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Dropbox_ClearButtonClicked); - // - // oAuthCopy - // - this.oAuthCopy.IsRefreshable = false; - this.oAuthCopy.Location = new System.Drawing.Point(16, 88); - this.oAuthCopy.Name = "oAuthCopy"; - this.oAuthCopy.Size = new System.Drawing.Size(328, 208); - this.oAuthCopy.TabIndex = 1; - this.oAuthCopy.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuthCopy_OpenButtonClicked); - this.oAuthCopy.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuthCopy_CompleteButtonClicked); - this.oAuthCopy.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuthCopy_ClearButtonClicked); - // - // ucFTPAccounts - // - this.ucFTPAccounts.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.ucFTPAccounts.Location = new System.Drawing.Point(8, 40); - this.ucFTPAccounts.Margin = new System.Windows.Forms.Padding(4); - this.ucFTPAccounts.Name = "ucFTPAccounts"; - this.ucFTPAccounts.Size = new System.Drawing.Size(792, 448); - this.ucFTPAccounts.TabIndex = 6; - // - // oauth2GoogleDrive - // - this.oauth2GoogleDrive.Location = new System.Drawing.Point(16, 16); - this.oauth2GoogleDrive.Name = "oauth2GoogleDrive"; - this.oauth2GoogleDrive.Size = new System.Drawing.Size(328, 240); - this.oauth2GoogleDrive.TabIndex = 0; - this.oauth2GoogleDrive.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2GoogleDrive_OpenButtonClicked); - this.oauth2GoogleDrive.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2GoogleDrive_CompleteButtonClicked); - this.oauth2GoogleDrive.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2GoogleDrive_ClearButtonClicked); - this.oauth2GoogleDrive.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2GoogleDrive_RefreshButtonClicked); - // - // oauth2Box - // - this.oauth2Box.Location = new System.Drawing.Point(16, 16); - this.oauth2Box.Name = "oauth2Box"; - this.oauth2Box.Size = new System.Drawing.Size(328, 240); - this.oauth2Box.TabIndex = 0; - this.oauth2Box.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Box_OpenButtonClicked); - this.oauth2Box.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Box_CompleteButtonClicked); - this.oauth2Box.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Box_ClearButtonClicked); - this.oauth2Box.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Box_RefreshButtonClicked); - // - // atcSendSpaceAccountType - // - this.atcSendSpaceAccountType.Location = new System.Drawing.Point(8, 16); - this.atcSendSpaceAccountType.Name = "atcSendSpaceAccountType"; - this.atcSendSpaceAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; - this.atcSendSpaceAccountType.Size = new System.Drawing.Size(214, 29); - this.atcSendSpaceAccountType.TabIndex = 0; - this.atcSendSpaceAccountType.AccountTypeChanged += new UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcSendSpaceAccountType_AccountTypeChanged); - // - // oAuthJira - // - this.oAuthJira.Location = new System.Drawing.Point(473, 13); - this.oAuthJira.Name = "oAuthJira"; - this.oAuthJira.Size = new System.Drawing.Size(328, 243); - this.oAuthJira.TabIndex = 1; - this.oAuthJira.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuthJira_OpenButtonClicked); - this.oAuthJira.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuthJira_CompleteButtonClicked); - this.oAuthJira.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuthJira_ClearButtonClicked); - this.oAuthJira.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oAuthJira_RefreshButtonClicked); - // - // ucLocalhostAccounts - // - this.ucLocalhostAccounts.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.ucLocalhostAccounts.Location = new System.Drawing.Point(8, 40); - this.ucLocalhostAccounts.Margin = new System.Windows.Forms.Padding(4); - this.ucLocalhostAccounts.Name = "ucLocalhostAccounts"; - this.ucLocalhostAccounts.Size = new System.Drawing.Size(792, 448); - this.ucLocalhostAccounts.TabIndex = 6; - // - // oauth2Bitly - // - this.oauth2Bitly.IsRefreshable = false; - this.oauth2Bitly.Location = new System.Drawing.Point(16, 16); - this.oauth2Bitly.Name = "oauth2Bitly"; - this.oauth2Bitly.Size = new System.Drawing.Size(328, 208); - this.oauth2Bitly.TabIndex = 0; - this.oauth2Bitly.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Bitly_OpenButtonClicked); - this.oauth2Bitly.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Bitly_CompleteButtonClicked); - this.oauth2Bitly.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Bitly_ClearButtonClicked); - // - // oauth2GoogleURLShortener - // - this.oauth2GoogleURLShortener.Location = new System.Drawing.Point(16, 56); - this.oauth2GoogleURLShortener.Name = "oauth2GoogleURLShortener"; - this.oauth2GoogleURLShortener.Size = new System.Drawing.Size(328, 240); - this.oauth2GoogleURLShortener.TabIndex = 1; - this.oauth2GoogleURLShortener.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2GoogleURLShortener_OpenButtonClicked); - this.oauth2GoogleURLShortener.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2GoogleURLShortener_CompleteButtonClicked); - this.oauth2GoogleURLShortener.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2GoogleURLShortener_ClearButtonClicked); - this.oauth2GoogleURLShortener.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2GoogleURLShortener_RefreshButtonClicked); - // - // atcGoogleURLShortenerAccountType - // - this.atcGoogleURLShortenerAccountType.Location = new System.Drawing.Point(8, 16); - this.atcGoogleURLShortenerAccountType.Name = "atcGoogleURLShortenerAccountType"; - this.atcGoogleURLShortenerAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; - this.atcGoogleURLShortenerAccountType.Size = new System.Drawing.Size(214, 29); - this.atcGoogleURLShortenerAccountType.TabIndex = 0; - this.atcGoogleURLShortenerAccountType.AccountTypeChanged += new UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcGoogleURLShortenerAccountType_AccountTypeChanged); - // - // ucTwitterAccounts - // - this.ucTwitterAccounts.Dock = System.Windows.Forms.DockStyle.Fill; - this.ucTwitterAccounts.Location = new System.Drawing.Point(0, 0); - this.ucTwitterAccounts.Margin = new System.Windows.Forms.Padding(0); - this.ucTwitterAccounts.Name = "ucTwitterAccounts"; - this.ucTwitterAccounts.Size = new System.Drawing.Size(972, 493); - this.ucTwitterAccounts.TabIndex = 0; - // // actRapidShareAccountType // this.actRapidShareAccountType.Location = new System.Drawing.Point(8, 16); @@ -4207,9 +4214,9 @@ private void InitializeComponent() private System.Windows.Forms.TextBox txtImgurAlbumID; private System.Windows.Forms.Label lblImgurAlbumID; private System.Windows.Forms.ListView lvImgurAlbumList; - private System.Windows.Forms.ColumnHeader chID; - private System.Windows.Forms.ColumnHeader chTitle; - private System.Windows.Forms.ColumnHeader chDescription; + private System.Windows.Forms.ColumnHeader chImgurID; + private System.Windows.Forms.ColumnHeader chImgurTitle; + private System.Windows.Forms.ColumnHeader chImgurDescription; private System.Windows.Forms.Button btnImgurRefreshAlbumList; private System.Windows.Forms.ComboBox cbImgurThumbnailType; private System.Windows.Forms.Label lblImgurThumbnailType; @@ -4261,9 +4268,9 @@ private void InitializeComponent() private System.Windows.Forms.TextBox txtPicasaAlbumID; private System.Windows.Forms.Label lblPicasaAlbumID; private System.Windows.Forms.ListView lvPicasaAlbumList; - private System.Windows.Forms.ColumnHeader columnHeader3; - private System.Windows.Forms.ColumnHeader columnHeader4; - private System.Windows.Forms.ColumnHeader columnHeader5; + private System.Windows.Forms.ColumnHeader chPicasaID; + private System.Windows.Forms.ColumnHeader chPicasaName; + private System.Windows.Forms.ColumnHeader chPicasaDescription; private System.Windows.Forms.Button btnPicasaRefreshAlbumList; private OAuthControl oauth2Picasa; public System.Windows.Forms.TabControl tcUploaders; @@ -4275,7 +4282,8 @@ private void InitializeComponent() private System.Windows.Forms.TextBox txtGoogleDriveFolderID; private System.Windows.Forms.Label lblGoogleDriveFolderID; private HelpersLib.MyListView lvGoogleDriveFoldersList; - private System.Windows.Forms.ColumnHeader columnHeader1; + private System.Windows.Forms.ColumnHeader chGoogleDriveTitle; private System.Windows.Forms.Button btnGoogleDriveRefreshFolders; + private System.Windows.Forms.ColumnHeader chGoogleDriveDescription; } } \ No newline at end of file diff --git a/UploadersLib/Forms/UploadersConfigFormHelper.cs b/UploadersLib/Forms/UploadersConfigFormHelper.cs index 72249ff1f..f0ec2e1e0 100644 --- a/UploadersLib/Forms/UploadersConfigFormHelper.cs +++ b/UploadersLib/Forms/UploadersConfigFormHelper.cs @@ -739,6 +739,7 @@ private void GoogleDriveRefreshFolders() foreach (var folder in folders) { ListViewItem lvi = new ListViewItem(folder.title); + lvi.SubItems.Add(folder.description); lvi.Tag = folder; lvGoogleDriveFoldersList.Items.Add(lvi); } diff --git a/UploadersLib/UploadersConfig.cs b/UploadersLib/UploadersConfig.cs index c28fd9550..01a6202a8 100644 --- a/UploadersLib/UploadersConfig.cs +++ b/UploadersLib/UploadersConfig.cs @@ -122,7 +122,7 @@ public class UploadersConfig : SettingsBase // Google Drive public OAuth2Info GoogleDriveOAuth2Info = null; - public bool GoogleDriveIsPublic = false; + public bool GoogleDriveIsPublic = true; public string GoogleDriveFolderID = string.Empty; // RapidShare