diff --git a/HelpersLib/SettingsBase.cs b/HelpersLib/SettingsBase.cs index f223a8390..8d96d0505 100644 --- a/HelpersLib/SettingsBase.cs +++ b/HelpersLib/SettingsBase.cs @@ -27,6 +27,7 @@ You should have received a copy of the GNU General Public License using System; using System.ComponentModel; using System.IO; +using System.Windows.Forms; using System.Xml.Serialization; namespace HelpersLib @@ -39,6 +40,8 @@ namespace HelpersLib [Browsable(false), XmlIgnore, JsonIgnore] public string FilePath { get; private set; } + public string ApplicationVersion { get; set; } + public static T Load(string filePath) { T setting = SettingsHelper.Load(filePath, SerializationType); @@ -55,6 +58,7 @@ public static T Load(Stream stream) public virtual bool Save(string filePath) { FilePath = filePath; + ApplicationVersion = Application.ProductVersion; return SettingsHelper.Save(this, filePath, SerializationType); } diff --git a/ScreenCaptureLib/Screencast/FFmpegOptionsForm.cs b/ScreenCaptureLib/Screencast/FFmpegOptionsForm.cs index 41f7c058a..3da3fdb25 100644 --- a/ScreenCaptureLib/Screencast/FFmpegOptionsForm.cs +++ b/ScreenCaptureLib/Screencast/FFmpegOptionsForm.cs @@ -353,7 +353,7 @@ private void txtCommandLinePreview_TextChanged(object sender, EventArgs e) private void btnHelp_Click(object sender, EventArgs e) { - URLHelpers.OpenURL("https://docs.google.com/document/d/1aKLSqsouoeC5Tjf-Z3P880V3rpzvQU0A2Clayn9ElZo/edit?usp=sharing"); + URLHelpers.OpenURL("https://github.com/ShareX/ShareX/wiki/FFmpeg-options"); } private object eiFFmpeg_ExportRequested() diff --git a/ShareX/ApplicationConfig.cs b/ShareX/ApplicationConfig.cs index c007b7af9..767421f14 100644 --- a/ShareX/ApplicationConfig.cs +++ b/ShareX/ApplicationConfig.cs @@ -24,6 +24,7 @@ You should have received a copy of the GNU General Public License #endregion License Information (GPL v3) using HelpersLib; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Drawing; diff --git a/UploadersLib/Forms/UploadersConfigForm.Designer.cs b/UploadersLib/Forms/UploadersConfigForm.Designer.cs index 3e517fc7d..a510f0649 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(); @@ -175,6 +182,7 @@ 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.tpPushbullet = new System.Windows.Forms.TabPage(); this.lblPushbulletDevices = new System.Windows.Forms.Label(); this.cboPushbulletDevices = new System.Windows.Forms.ComboBox(); @@ -188,6 +196,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(); @@ -203,6 +212,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(); @@ -240,6 +250,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(); @@ -262,6 +273,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(); @@ -273,6 +285,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(); @@ -280,6 +294,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.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(); @@ -299,6 +315,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(); @@ -339,28 +356,12 @@ private void InitializeComponent() this.chPicasaName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.chPicasaDescription = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.btnPicasaRefreshAlbumList = new System.Windows.Forms.Button(); + this.oauth2Picasa = new UploadersLib.OAuthControl(); this.tcUploaders = new System.Windows.Forms.TabControl(); this.ttlvMain = new HelpersLib.TabToListView(); this.lblWidthHint = new System.Windows.Forms.Label(); - this.atcImgurAccountType = new UploadersLib.AccountTypeControl(); - this.oauth2Imgur = new UploadersLib.OAuthControl(); - this.atcTinyPicAccountType = new UploadersLib.AccountTypeControl(); - this.oauth2Picasa = new UploadersLib.OAuthControl(); - this.oAuth2Gist = new UploadersLib.OAuthControl(); - this.atcGistAccountType = new UploadersLib.AccountTypeControl(); - this.oauth2Dropbox = new UploadersLib.OAuthControl(); - this.oAuthCopy = new UploadersLib.OAuthControl(); - this.ucFTPAccounts = new UploadersLib.AccountsControl(); - this.oauth2GoogleDrive = new UploadersLib.OAuthControl(); - this.oauth2Box = new UploadersLib.OAuthControl(); - this.atcSendSpaceAccountType = new UploadersLib.AccountTypeControl(); - this.oAuthJira = new UploadersLib.OAuthControl(); - this.ucLocalhostAccounts = new UploadersLib.AccountsControl(); - this.oauth2Bitly = new UploadersLib.OAuthControl(); - this.oauth2GoogleURLShortener = new UploadersLib.OAuthControl(); - this.atcGoogleURLShortenerAccountType = new UploadersLib.AccountTypeControl(); - this.ucTwitterAccounts = new UploadersLib.AccountsControl(); this.actRapidShareAccountType = new UploadersLib.AccountTypeControl(); + this.btnCustomUploaderExamples = new System.Windows.Forms.Button(); this.tpOtherUploaders.SuspendLayout(); this.tcOtherUploaders.SuspendLayout(); this.tpCustomUploaders.SuspendLayout(); @@ -483,6 +484,7 @@ private void InitializeComponent() // // tpCustomUploaders // + this.tpCustomUploaders.Controls.Add(this.btnCustomUploaderExamples); this.tpCustomUploaders.Controls.Add(this.btnCustomUploaderHelp); this.tpCustomUploaders.Controls.Add(this.lblCustomUploaderImageUploader); this.tpCustomUploaders.Controls.Add(this.btnCustomUploaderFileUploaderTest); @@ -526,10 +528,10 @@ private void InitializeComponent() // // btnCustomUploaderHelp // - this.btnCustomUploaderHelp.Location = new System.Drawing.Point(576, 376); + this.btnCustomUploaderHelp.Location = new System.Drawing.Point(488, 376); this.btnCustomUploaderHelp.Name = "btnCustomUploaderHelp"; this.btnCustomUploaderHelp.Size = new System.Drawing.Size(64, 24); - this.btnCustomUploaderHelp.TabIndex = 32; + this.btnCustomUploaderHelp.TabIndex = 31; this.btnCustomUploaderHelp.Text = "Help..."; this.btnCustomUploaderHelp.UseVisualStyleBackColor = true; this.btnCustomUploaderHelp.Click += new System.EventHandler(this.btnCustomUploaderHelp_Click); @@ -540,7 +542,7 @@ private void InitializeComponent() this.lblCustomUploaderImageUploader.Location = new System.Drawing.Point(16, 392); this.lblCustomUploaderImageUploader.Name = "lblCustomUploaderImageUploader"; this.lblCustomUploaderImageUploader.Size = new System.Drawing.Size(83, 13); - this.lblCustomUploaderImageUploader.TabIndex = 18; + this.lblCustomUploaderImageUploader.TabIndex = 17; this.lblCustomUploaderImageUploader.Text = "Image uploader:"; // // btnCustomUploaderFileUploaderTest @@ -548,7 +550,7 @@ private void InitializeComponent() this.btnCustomUploaderFileUploaderTest.Location = new System.Drawing.Point(264, 436); this.btnCustomUploaderFileUploaderTest.Name = "btnCustomUploaderFileUploaderTest"; this.btnCustomUploaderFileUploaderTest.Size = new System.Drawing.Size(48, 24); - this.btnCustomUploaderFileUploaderTest.TabIndex = 26; + this.btnCustomUploaderFileUploaderTest.TabIndex = 25; this.btnCustomUploaderFileUploaderTest.Text = "Test"; this.btnCustomUploaderFileUploaderTest.UseVisualStyleBackColor = true; this.btnCustomUploaderFileUploaderTest.Click += new System.EventHandler(this.btnCustomUploaderFileUploaderTest_Click); @@ -559,7 +561,7 @@ private void InitializeComponent() this.lblCustomUploaderFileUploader.Location = new System.Drawing.Point(16, 440); this.lblCustomUploaderFileUploader.Name = "lblCustomUploaderFileUploader"; this.lblCustomUploaderFileUploader.Size = new System.Drawing.Size(70, 13); - this.lblCustomUploaderFileUploader.TabIndex = 24; + this.lblCustomUploaderFileUploader.TabIndex = 23; this.lblCustomUploaderFileUploader.Text = "File uploader:"; // // btnCustomUploaderImageUploaderTest @@ -567,7 +569,7 @@ private void InitializeComponent() this.btnCustomUploaderImageUploaderTest.Location = new System.Drawing.Point(264, 388); this.btnCustomUploaderImageUploaderTest.Name = "btnCustomUploaderImageUploaderTest"; this.btnCustomUploaderImageUploaderTest.Size = new System.Drawing.Size(48, 24); - this.btnCustomUploaderImageUploaderTest.TabIndex = 20; + this.btnCustomUploaderImageUploaderTest.TabIndex = 19; this.btnCustomUploaderImageUploaderTest.Text = "Test"; this.btnCustomUploaderImageUploaderTest.UseVisualStyleBackColor = true; this.btnCustomUploaderImageUploaderTest.Click += new System.EventHandler(this.btnCustomUploaderImageUploaderTest_Click); @@ -578,7 +580,7 @@ private void InitializeComponent() this.lblCustomUploaderTestResult.Location = new System.Drawing.Point(328, 384); this.lblCustomUploaderTestResult.Name = "lblCustomUploaderTestResult"; this.lblCustomUploaderTestResult.Size = new System.Drawing.Size(59, 13); - this.lblCustomUploaderTestResult.TabIndex = 30; + this.lblCustomUploaderTestResult.TabIndex = 29; this.lblCustomUploaderTestResult.Text = "Test result:"; // // txtCustomUploaderDeletionURL @@ -586,7 +588,7 @@ private void InitializeComponent() this.txtCustomUploaderDeletionURL.Location = new System.Drawing.Point(536, 344); this.txtCustomUploaderDeletionURL.Name = "txtCustomUploaderDeletionURL"; this.txtCustomUploaderDeletionURL.Size = new System.Drawing.Size(248, 20); - this.txtCustomUploaderDeletionURL.TabIndex = 17; + this.txtCustomUploaderDeletionURL.TabIndex = 16; // // cbCustomUploaderFileUploader // @@ -595,7 +597,7 @@ private void InitializeComponent() this.cbCustomUploaderFileUploader.Location = new System.Drawing.Point(104, 436); this.cbCustomUploaderFileUploader.Name = "cbCustomUploaderFileUploader"; this.cbCustomUploaderFileUploader.Size = new System.Drawing.Size(152, 21); - this.cbCustomUploaderFileUploader.TabIndex = 25; + this.cbCustomUploaderFileUploader.TabIndex = 24; this.cbCustomUploaderFileUploader.SelectedIndexChanged += new System.EventHandler(this.cbCustomUploaderFileUploader_SelectedIndexChanged); // // lblCustomUploaderDeletionURL @@ -604,7 +606,7 @@ private void InitializeComponent() this.lblCustomUploaderDeletionURL.Location = new System.Drawing.Point(536, 328); this.lblCustomUploaderDeletionURL.Name = "lblCustomUploaderDeletionURL"; this.lblCustomUploaderDeletionURL.Size = new System.Drawing.Size(74, 13); - this.lblCustomUploaderDeletionURL.TabIndex = 16; + this.lblCustomUploaderDeletionURL.TabIndex = 15; this.lblCustomUploaderDeletionURL.Text = "Deletion URL:"; // // btnCustomUploaderShowLastResponse @@ -613,8 +615,8 @@ private void InitializeComponent() this.btnCustomUploaderShowLastResponse.Location = new System.Drawing.Point(648, 376); this.btnCustomUploaderShowLastResponse.Name = "btnCustomUploaderShowLastResponse"; this.btnCustomUploaderShowLastResponse.Size = new System.Drawing.Size(136, 23); - this.btnCustomUploaderShowLastResponse.TabIndex = 0; - this.btnCustomUploaderShowLastResponse.Text = "Show last response"; + this.btnCustomUploaderShowLastResponse.TabIndex = 33; + this.btnCustomUploaderShowLastResponse.Text = "Show last response..."; this.btnCustomUploaderShowLastResponse.UseVisualStyleBackColor = true; this.btnCustomUploaderShowLastResponse.Click += new System.EventHandler(this.btnCustomUploaderShowLastResponse_Click); // @@ -624,7 +626,7 @@ private void InitializeComponent() this.lblCustomUploaderResponseType.Location = new System.Drawing.Point(536, 8); this.lblCustomUploaderResponseType.Name = "lblCustomUploaderResponseType"; this.lblCustomUploaderResponseType.Size = new System.Drawing.Size(81, 13); - this.lblCustomUploaderResponseType.TabIndex = 9; + this.lblCustomUploaderResponseType.TabIndex = 8; this.lblCustomUploaderResponseType.Text = "Response type:"; // // cbCustomUploaderURLShortener @@ -634,7 +636,7 @@ private void InitializeComponent() this.cbCustomUploaderURLShortener.Location = new System.Drawing.Point(104, 460); this.cbCustomUploaderURLShortener.Name = "cbCustomUploaderURLShortener"; this.cbCustomUploaderURLShortener.Size = new System.Drawing.Size(152, 21); - this.cbCustomUploaderURLShortener.TabIndex = 28; + this.cbCustomUploaderURLShortener.TabIndex = 27; this.cbCustomUploaderURLShortener.SelectedIndexChanged += new System.EventHandler(this.cbCustomUploaderURLShortener_SelectedIndexChanged); // // gbCustomUploaders @@ -649,7 +651,7 @@ private void InitializeComponent() this.gbCustomUploaders.Location = new System.Drawing.Point(8, 8); this.gbCustomUploaders.Name = "gbCustomUploaders"; this.gbCustomUploaders.Size = new System.Drawing.Size(248, 360); - this.gbCustomUploaders.TabIndex = 1; + this.gbCustomUploaders.TabIndex = 0; this.gbCustomUploaders.TabStop = false; this.gbCustomUploaders.Text = "Uploaders"; // @@ -726,7 +728,7 @@ private void InitializeComponent() this.lblCustomUploaderTextUploader.Location = new System.Drawing.Point(16, 416); this.lblCustomUploaderTextUploader.Name = "lblCustomUploaderTextUploader"; this.lblCustomUploaderTextUploader.Size = new System.Drawing.Size(75, 13); - this.lblCustomUploaderTextUploader.TabIndex = 21; + this.lblCustomUploaderTextUploader.TabIndex = 20; this.lblCustomUploaderTextUploader.Text = "Text uploader:"; // // lblCustomUploaderRequestURL @@ -735,7 +737,7 @@ private void InitializeComponent() this.lblCustomUploaderRequestURL.Location = new System.Drawing.Point(272, 56); this.lblCustomUploaderRequestURL.Name = "lblCustomUploaderRequestURL"; this.lblCustomUploaderRequestURL.Size = new System.Drawing.Size(75, 13); - this.lblCustomUploaderRequestURL.TabIndex = 4; + this.lblCustomUploaderRequestURL.TabIndex = 3; this.lblCustomUploaderRequestURL.Text = "Request URL:"; // // btnCustomUploaderURLShortenerTest @@ -743,7 +745,7 @@ private void InitializeComponent() this.btnCustomUploaderURLShortenerTest.Location = new System.Drawing.Point(264, 460); this.btnCustomUploaderURLShortenerTest.Name = "btnCustomUploaderURLShortenerTest"; this.btnCustomUploaderURLShortenerTest.Size = new System.Drawing.Size(48, 24); - this.btnCustomUploaderURLShortenerTest.TabIndex = 29; + this.btnCustomUploaderURLShortenerTest.TabIndex = 28; this.btnCustomUploaderURLShortenerTest.Text = "Test"; this.btnCustomUploaderURLShortenerTest.UseVisualStyleBackColor = true; this.btnCustomUploaderURLShortenerTest.Click += new System.EventHandler(this.btnCustomUploaderURLShortenerTest_Click); @@ -758,7 +760,7 @@ private void InitializeComponent() this.gbCustomUploaderRegexp.Location = new System.Drawing.Point(536, 56); this.gbCustomUploaderRegexp.Name = "gbCustomUploaderRegexp"; this.gbCustomUploaderRegexp.Size = new System.Drawing.Size(248, 184); - this.gbCustomUploaderRegexp.TabIndex = 11; + this.gbCustomUploaderRegexp.TabIndex = 10; this.gbCustomUploaderRegexp.TabStop = false; this.gbCustomUploaderRegexp.Text = "Regex from response"; // @@ -828,7 +830,7 @@ private void InitializeComponent() this.cbCustomUploaderTextUploader.Location = new System.Drawing.Point(104, 412); this.cbCustomUploaderTextUploader.Name = "cbCustomUploaderTextUploader"; this.cbCustomUploaderTextUploader.Size = new System.Drawing.Size(152, 21); - this.cbCustomUploaderTextUploader.TabIndex = 22; + this.cbCustomUploaderTextUploader.TabIndex = 21; this.cbCustomUploaderTextUploader.SelectedIndexChanged += new System.EventHandler(this.cbCustomUploaderTextUploader_SelectedIndexChanged); // // txtCustomUploaderThumbnailURL @@ -836,7 +838,7 @@ private void InitializeComponent() this.txtCustomUploaderThumbnailURL.Location = new System.Drawing.Point(536, 304); this.txtCustomUploaderThumbnailURL.Name = "txtCustomUploaderThumbnailURL"; this.txtCustomUploaderThumbnailURL.Size = new System.Drawing.Size(248, 20); - this.txtCustomUploaderThumbnailURL.TabIndex = 15; + this.txtCustomUploaderThumbnailURL.TabIndex = 14; // // lblCustomUploaderURLShortener // @@ -844,7 +846,7 @@ private void InitializeComponent() this.lblCustomUploaderURLShortener.Location = new System.Drawing.Point(16, 464); this.lblCustomUploaderURLShortener.Name = "lblCustomUploaderURLShortener"; this.lblCustomUploaderURLShortener.Size = new System.Drawing.Size(79, 13); - this.lblCustomUploaderURLShortener.TabIndex = 27; + this.lblCustomUploaderURLShortener.TabIndex = 26; this.lblCustomUploaderURLShortener.Text = "URL shortener:"; // // cbCustomUploaderResponseType @@ -854,14 +856,14 @@ private void InitializeComponent() this.cbCustomUploaderResponseType.Location = new System.Drawing.Point(536, 24); this.cbCustomUploaderResponseType.Name = "cbCustomUploaderResponseType"; this.cbCustomUploaderResponseType.Size = new System.Drawing.Size(144, 21); - this.cbCustomUploaderResponseType.TabIndex = 10; + this.cbCustomUploaderResponseType.TabIndex = 9; // // btnCustomUploaderTextUploaderTest // this.btnCustomUploaderTextUploaderTest.Location = new System.Drawing.Point(264, 412); this.btnCustomUploaderTextUploaderTest.Name = "btnCustomUploaderTextUploaderTest"; this.btnCustomUploaderTextUploaderTest.Size = new System.Drawing.Size(48, 24); - this.btnCustomUploaderTextUploaderTest.TabIndex = 23; + this.btnCustomUploaderTextUploaderTest.TabIndex = 22; this.btnCustomUploaderTextUploaderTest.Text = "Test"; this.btnCustomUploaderTextUploaderTest.UseVisualStyleBackColor = true; this.btnCustomUploaderTextUploaderTest.Click += new System.EventHandler(this.btnCustomUploaderTextUploaderTest_Click); @@ -871,7 +873,7 @@ private void InitializeComponent() this.txtCustomUploaderURL.Location = new System.Drawing.Point(536, 264); this.txtCustomUploaderURL.Name = "txtCustomUploaderURL"; this.txtCustomUploaderURL.Size = new System.Drawing.Size(248, 20); - this.txtCustomUploaderURL.TabIndex = 13; + this.txtCustomUploaderURL.TabIndex = 12; // // cbCustomUploaderImageUploader // @@ -880,7 +882,7 @@ private void InitializeComponent() this.cbCustomUploaderImageUploader.Location = new System.Drawing.Point(104, 388); this.cbCustomUploaderImageUploader.Name = "cbCustomUploaderImageUploader"; this.cbCustomUploaderImageUploader.Size = new System.Drawing.Size(152, 21); - this.cbCustomUploaderImageUploader.TabIndex = 19; + this.cbCustomUploaderImageUploader.TabIndex = 18; this.cbCustomUploaderImageUploader.SelectedIndexChanged += new System.EventHandler(this.cbCustomUploaderImageUploader_SelectedIndexChanged); // // txtCustomUploaderRequestURL @@ -888,14 +890,14 @@ private void InitializeComponent() this.txtCustomUploaderRequestURL.Location = new System.Drawing.Point(272, 72); this.txtCustomUploaderRequestURL.Name = "txtCustomUploaderRequestURL"; this.txtCustomUploaderRequestURL.Size = new System.Drawing.Size(248, 20); - this.txtCustomUploaderRequestURL.TabIndex = 5; + this.txtCustomUploaderRequestURL.TabIndex = 4; // // txtCustomUploaderLog // this.txtCustomUploaderLog.Location = new System.Drawing.Point(328, 408); this.txtCustomUploaderLog.Name = "txtCustomUploaderLog"; this.txtCustomUploaderLog.Size = new System.Drawing.Size(456, 72); - this.txtCustomUploaderLog.TabIndex = 31; + this.txtCustomUploaderLog.TabIndex = 30; this.txtCustomUploaderLog.Text = ""; this.txtCustomUploaderLog.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.txtCustomUploaderLog_LinkClicked); // @@ -905,7 +907,7 @@ private void InitializeComponent() this.lblCustomUploaderThumbnailURL.Location = new System.Drawing.Point(536, 288); this.lblCustomUploaderThumbnailURL.Name = "lblCustomUploaderThumbnailURL"; this.lblCustomUploaderThumbnailURL.Size = new System.Drawing.Size(84, 13); - this.lblCustomUploaderThumbnailURL.TabIndex = 14; + this.lblCustomUploaderThumbnailURL.TabIndex = 13; this.lblCustomUploaderThumbnailURL.Text = "Thumbnail URL:"; // // lblCustomUploaderFileForm @@ -914,7 +916,7 @@ private void InitializeComponent() this.lblCustomUploaderFileForm.Location = new System.Drawing.Point(272, 96); this.lblCustomUploaderFileForm.Name = "lblCustomUploaderFileForm"; this.lblCustomUploaderFileForm.Size = new System.Drawing.Size(78, 13); - this.lblCustomUploaderFileForm.TabIndex = 6; + this.lblCustomUploaderFileForm.TabIndex = 5; this.lblCustomUploaderFileForm.Text = "File form name:"; // // lblCustomUploaderRequestType @@ -923,7 +925,7 @@ private void InitializeComponent() this.lblCustomUploaderRequestType.Location = new System.Drawing.Point(272, 8); this.lblCustomUploaderRequestType.Name = "lblCustomUploaderRequestType"; this.lblCustomUploaderRequestType.Size = new System.Drawing.Size(73, 13); - this.lblCustomUploaderRequestType.TabIndex = 2; + this.lblCustomUploaderRequestType.TabIndex = 1; this.lblCustomUploaderRequestType.Text = "Request type:"; // // cbCustomUploaderRequestType @@ -933,7 +935,7 @@ private void InitializeComponent() this.cbCustomUploaderRequestType.Location = new System.Drawing.Point(272, 24); this.cbCustomUploaderRequestType.Name = "cbCustomUploaderRequestType"; this.cbCustomUploaderRequestType.Size = new System.Drawing.Size(144, 21); - this.cbCustomUploaderRequestType.TabIndex = 3; + this.cbCustomUploaderRequestType.TabIndex = 2; this.cbCustomUploaderRequestType.SelectedIndexChanged += new System.EventHandler(this.cbCustomUploaderRequestType_SelectedIndexChanged); // // txtCustomUploaderFileForm @@ -941,7 +943,7 @@ private void InitializeComponent() this.txtCustomUploaderFileForm.Location = new System.Drawing.Point(272, 112); this.txtCustomUploaderFileForm.Name = "txtCustomUploaderFileForm"; this.txtCustomUploaderFileForm.Size = new System.Drawing.Size(248, 20); - this.txtCustomUploaderFileForm.TabIndex = 7; + this.txtCustomUploaderFileForm.TabIndex = 6; // // lblCustomUploaderURL // @@ -949,7 +951,7 @@ private void InitializeComponent() this.lblCustomUploaderURL.Location = new System.Drawing.Point(536, 248); this.lblCustomUploaderURL.Name = "lblCustomUploaderURL"; this.lblCustomUploaderURL.Size = new System.Drawing.Size(32, 13); - this.lblCustomUploaderURL.TabIndex = 12; + this.lblCustomUploaderURL.TabIndex = 11; this.lblCustomUploaderURL.Text = "URL:"; // // gbCustomUploaderArguments @@ -963,7 +965,7 @@ private void InitializeComponent() this.gbCustomUploaderArguments.Location = new System.Drawing.Point(272, 136); this.gbCustomUploaderArguments.Name = "gbCustomUploaderArguments"; this.gbCustomUploaderArguments.Size = new System.Drawing.Size(248, 232); - this.gbCustomUploaderArguments.TabIndex = 8; + this.gbCustomUploaderArguments.TabIndex = 7; this.gbCustomUploaderArguments.TabStop = false; this.gbCustomUploaderArguments.Text = "Arguments"; // @@ -1061,6 +1063,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); @@ -1114,6 +1125,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); @@ -1126,6 +1148,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); @@ -1281,6 +1323,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; @@ -1456,6 +1509,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); @@ -1552,6 +1616,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); @@ -1938,6 +2012,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); @@ -2078,6 +2163,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); @@ -2227,6 +2323,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); @@ -2605,6 +2710,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); @@ -2840,6 +2956,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); @@ -2956,6 +3082,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); @@ -3043,6 +3190,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); @@ -3232,6 +3399,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); @@ -3628,6 +3804,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); @@ -3664,191 +3851,6 @@ private void InitializeComponent() this.lblWidthHint.TabIndex = 1; this.lblWidthHint.Visible = false; // - // atcImgurAccountType - // - this.atcImgurAccountType.Location = new System.Drawing.Point(8, 260); - this.atcImgurAccountType.Name = "atcImgurAccountType"; - this.atcImgurAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; - this.atcImgurAccountType.Size = new System.Drawing.Size(208, 32); - this.atcImgurAccountType.TabIndex = 1; - this.atcImgurAccountType.AccountTypeChanged += new UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcImgurAccountType_AccountTypeChanged); - // - // oauth2Imgur - // - this.oauth2Imgur.Location = new System.Drawing.Point(16, 16); - this.oauth2Imgur.Name = "oauth2Imgur"; - this.oauth2Imgur.Size = new System.Drawing.Size(328, 240); - this.oauth2Imgur.TabIndex = 0; - this.oauth2Imgur.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Imgur_OpenButtonClicked); - this.oauth2Imgur.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Imgur_CompleteButtonClicked); - this.oauth2Imgur.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Imgur_ClearButtonClicked); - this.oauth2Imgur.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Imgur_RefreshButtonClicked); - // - // atcTinyPicAccountType - // - this.atcTinyPicAccountType.Location = new System.Drawing.Point(8, 8); - this.atcTinyPicAccountType.Name = "atcTinyPicAccountType"; - this.atcTinyPicAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; - this.atcTinyPicAccountType.Size = new System.Drawing.Size(272, 29); - this.atcTinyPicAccountType.TabIndex = 0; - this.atcTinyPicAccountType.AccountTypeChanged += new UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcTinyPicAccountType_AccountTypeChanged); - // - // oauth2Picasa - // - this.oauth2Picasa.Location = new System.Drawing.Point(16, 16); - this.oauth2Picasa.Name = "oauth2Picasa"; - this.oauth2Picasa.Size = new System.Drawing.Size(328, 240); - this.oauth2Picasa.TabIndex = 0; - this.oauth2Picasa.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Picasa_OpenButtonClicked); - this.oauth2Picasa.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Picasa_CompleteButtonClicked); - this.oauth2Picasa.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Picasa_ClearButtonClicked); - this.oauth2Picasa.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Picasa_RefreshButtonClicked); - // - // oAuth2Gist - // - this.oAuth2Gist.Enabled = false; - this.oAuth2Gist.IsRefreshable = false; - this.oAuth2Gist.Location = new System.Drawing.Point(16, 51); - this.oAuth2Gist.Name = "oAuth2Gist"; - this.oAuth2Gist.Size = new System.Drawing.Size(328, 205); - this.oAuth2Gist.TabIndex = 2; - this.oAuth2Gist.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuth2Gist_OpenButtonClicked); - this.oAuth2Gist.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuth2Gist_CompleteButtonClicked); - this.oAuth2Gist.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuth2Gist_ClearButtonClicked); - // - // atcGistAccountType - // - this.atcGistAccountType.Location = new System.Drawing.Point(15, 16); - this.atcGistAccountType.Name = "atcGistAccountType"; - this.atcGistAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; - this.atcGistAccountType.Size = new System.Drawing.Size(214, 29); - this.atcGistAccountType.TabIndex = 0; - this.atcGistAccountType.AccountTypeChanged += new UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcGistAccountType_AccountTypeChanged); - // - // oauth2Dropbox - // - this.oauth2Dropbox.IsRefreshable = false; - this.oauth2Dropbox.Location = new System.Drawing.Point(16, 88); - this.oauth2Dropbox.Name = "oauth2Dropbox"; - this.oauth2Dropbox.Size = new System.Drawing.Size(328, 200); - this.oauth2Dropbox.TabIndex = 1; - this.oauth2Dropbox.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Dropbox_OpenButtonClicked); - this.oauth2Dropbox.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Dropbox_CompleteButtonClicked); - this.oauth2Dropbox.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Dropbox_ClearButtonClicked); - // - // oAuthCopy - // - this.oAuthCopy.IsRefreshable = false; - this.oAuthCopy.Location = new System.Drawing.Point(16, 88); - this.oAuthCopy.Name = "oAuthCopy"; - this.oAuthCopy.Size = new System.Drawing.Size(328, 208); - this.oAuthCopy.TabIndex = 1; - this.oAuthCopy.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuthCopy_OpenButtonClicked); - this.oAuthCopy.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuthCopy_CompleteButtonClicked); - this.oAuthCopy.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuthCopy_ClearButtonClicked); - // - // ucFTPAccounts - // - this.ucFTPAccounts.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.ucFTPAccounts.Location = new System.Drawing.Point(8, 40); - this.ucFTPAccounts.Margin = new System.Windows.Forms.Padding(4); - this.ucFTPAccounts.Name = "ucFTPAccounts"; - this.ucFTPAccounts.Size = new System.Drawing.Size(792, 448); - this.ucFTPAccounts.TabIndex = 6; - // - // oauth2GoogleDrive - // - this.oauth2GoogleDrive.Location = new System.Drawing.Point(16, 16); - this.oauth2GoogleDrive.Name = "oauth2GoogleDrive"; - this.oauth2GoogleDrive.Size = new System.Drawing.Size(328, 240); - this.oauth2GoogleDrive.TabIndex = 0; - this.oauth2GoogleDrive.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2GoogleDrive_OpenButtonClicked); - this.oauth2GoogleDrive.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2GoogleDrive_CompleteButtonClicked); - this.oauth2GoogleDrive.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2GoogleDrive_ClearButtonClicked); - this.oauth2GoogleDrive.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2GoogleDrive_RefreshButtonClicked); - // - // oauth2Box - // - this.oauth2Box.Location = new System.Drawing.Point(16, 16); - this.oauth2Box.Name = "oauth2Box"; - this.oauth2Box.Size = new System.Drawing.Size(328, 240); - this.oauth2Box.TabIndex = 0; - this.oauth2Box.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Box_OpenButtonClicked); - this.oauth2Box.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Box_CompleteButtonClicked); - this.oauth2Box.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Box_ClearButtonClicked); - this.oauth2Box.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Box_RefreshButtonClicked); - // - // atcSendSpaceAccountType - // - this.atcSendSpaceAccountType.Location = new System.Drawing.Point(8, 16); - this.atcSendSpaceAccountType.Name = "atcSendSpaceAccountType"; - this.atcSendSpaceAccountType.SelectedAccountType = UploadersLib.AccountType.Anonymous; - this.atcSendSpaceAccountType.Size = new System.Drawing.Size(214, 29); - this.atcSendSpaceAccountType.TabIndex = 0; - this.atcSendSpaceAccountType.AccountTypeChanged += new UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcSendSpaceAccountType_AccountTypeChanged); - // - // oAuthJira - // - this.oAuthJira.Location = new System.Drawing.Point(473, 13); - this.oAuthJira.Name = "oAuthJira"; - this.oAuthJira.Size = new System.Drawing.Size(328, 243); - this.oAuthJira.TabIndex = 1; - this.oAuthJira.OpenButtonClicked += new UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuthJira_OpenButtonClicked); - this.oAuthJira.CompleteButtonClicked += new UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuthJira_CompleteButtonClicked); - this.oAuthJira.ClearButtonClicked += new UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuthJira_ClearButtonClicked); - this.oAuthJira.RefreshButtonClicked += new UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oAuthJira_RefreshButtonClicked); - // - // ucLocalhostAccounts - // - this.ucLocalhostAccounts.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.ucLocalhostAccounts.Location = new System.Drawing.Point(8, 40); - this.ucLocalhostAccounts.Margin = new System.Windows.Forms.Padding(4); - this.ucLocalhostAccounts.Name = "ucLocalhostAccounts"; - this.ucLocalhostAccounts.Size = new System.Drawing.Size(792, 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); @@ -3857,6 +3859,16 @@ private void InitializeComponent() this.actRapidShareAccountType.Size = new System.Drawing.Size(214, 29); this.actRapidShareAccountType.TabIndex = 16; // + // btnCustomUploaderExamples + // + this.btnCustomUploaderExamples.Location = new System.Drawing.Point(560, 376); + this.btnCustomUploaderExamples.Name = "btnCustomUploaderExamples"; + this.btnCustomUploaderExamples.Size = new System.Drawing.Size(80, 24); + this.btnCustomUploaderExamples.TabIndex = 32; + this.btnCustomUploaderExamples.Text = "Examples..."; + this.btnCustomUploaderExamples.UseVisualStyleBackColor = true; + this.btnCustomUploaderExamples.Click += new System.EventHandler(this.btnCustomUploaderExamples_Click); + // // UploadersConfigForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -4302,5 +4314,6 @@ private void InitializeComponent() private System.Windows.Forms.ColumnHeader chGoogleDriveDescription; private System.Windows.Forms.CheckBox cbGoogleDriveUseFolder; private System.Windows.Forms.Label lblWidthHint; + private System.Windows.Forms.Button btnCustomUploaderExamples; } } \ No newline at end of file diff --git a/UploadersLib/Forms/UploadersConfigForm.cs b/UploadersLib/Forms/UploadersConfigForm.cs index 24dd615ce..2bf94b795 100644 --- a/UploadersLib/Forms/UploadersConfigForm.cs +++ b/UploadersLib/Forms/UploadersConfigForm.cs @@ -2107,7 +2107,12 @@ private void btnCustomUploaderURLShortenerTest_Click(object sender, EventArgs e) private void btnCustomUploaderHelp_Click(object sender, EventArgs e) { - URLHelpers.OpenURL("https://docs.google.com/document/d/1TSttAfH-1970JNsu3i9tl6UY0a8KNbUCeGri0Fs-jcU/edit?usp=sharing"); + URLHelpers.OpenURL("https://github.com/ShareX/ShareX/wiki/Custom-Uploader"); + } + + private void btnCustomUploaderExamples_Click(object sender, EventArgs e) + { + URLHelpers.OpenURL("https://github.com/ShareX/ShareX/wiki/Custom-Uploader-examples"); } private void btnCustomUploaderShowLastResponse_Click(object sender, EventArgs e)