From e6ed90c09fbdcc25428cddebfc09bad15f84e22f Mon Sep 17 00:00:00 2001 From: Jaex Date: Sun, 25 Aug 2019 05:10:25 +0300 Subject: [PATCH] Removed TinyPic --- ShareX.UploadersLib/APIKeys/APIKeys.cs | 2 - ShareX.UploadersLib/Enums.cs | 2 - ShareX.UploadersLib/Favicons/TinyPic.ico | Bin 1406 -> 0 bytes .../Forms/UploadersConfigForm.Designer.cs | 425 +++++++----------- .../Forms/UploadersConfigForm.cs | 62 --- .../Forms/UploadersConfigForm.resx | 407 +++++------------ .../ImageUploaders/TinyPicUploader.cs | 252 ----------- .../Properties/Resources.Designer.cs | 12 +- ShareX.UploadersLib/Properties/Resources.resx | 3 - .../ShareX.UploadersLib.csproj | 2 - ShareX.UploadersLib/UploadersConfig.cs | 9 - 11 files changed, 275 insertions(+), 901 deletions(-) delete mode 100644 ShareX.UploadersLib/Favicons/TinyPic.ico delete mode 100644 ShareX.UploadersLib/ImageUploaders/TinyPicUploader.cs diff --git a/ShareX.UploadersLib/APIKeys/APIKeys.cs b/ShareX.UploadersLib/APIKeys/APIKeys.cs index 9f83363a8..e3d35a3e8 100644 --- a/ShareX.UploadersLib/APIKeys/APIKeys.cs +++ b/ShareX.UploadersLib/APIKeys/APIKeys.cs @@ -31,8 +31,6 @@ internal static partial class APIKeys public static readonly string ImgurClientID = ""; public static readonly string ImgurClientSecret = ""; public static readonly string ImageShackKey = ""; - public static readonly string TinyPicID = ""; - public static readonly string TinyPicKey = ""; public static readonly string FlickrKey = ""; public static readonly string FlickrSecret = ""; public static readonly string PhotobucketConsumerKey = ""; diff --git a/ShareX.UploadersLib/Enums.cs b/ShareX.UploadersLib/Enums.cs index 1e4feb90f..25542fb0d 100644 --- a/ShareX.UploadersLib/Enums.cs +++ b/ShareX.UploadersLib/Enums.cs @@ -35,8 +35,6 @@ public enum ImageDestination Imgur, [Description("ImageShack")] ImageShack, - [Description("TinyPic")] - TinyPic, [Description("Flickr")] Flickr, [Description("Photobucket")] diff --git a/ShareX.UploadersLib/Favicons/TinyPic.ico b/ShareX.UploadersLib/Favicons/TinyPic.ico deleted file mode 100644 index c1a9424d3d0d63e774a0654fa21f28ca586af68d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1406 zcmeIwc~FdT9LMpG`$&p%Th>iPOY6+l=13*6YaNxO5=o>}3Z?WI;~K_H(IqoT$52$1 zmYr=7y6_oXK#JDh!&+4xWT?ka~`T^e_&dg*)PDxEnGf zUBJ6yi>xSDyuG>;{Ok4*+;Bk7H812|_eRz=KNR2P;MGkZyuNiBdAH9X|BgR|362mZ zI-(#Z1iaV~R3?ggb&J|-$QxkeUxS z1*s76o}z}AhMKqO`1~#dbw%0u@;(>!C9mt~`LLsSy zLMnn%S`B4;HM-lH&@E|(QdSFPhfW<)kDm5c^vc9gb~QlN^&LMuB~W!YqOYqR>Yg7^ z^|nAwsCvav_er4sC4*Yt0gb$qv>O_QP7hRyUr;N1q3QRNv=3TBrIbUX>LWW_0?pH0_|TgG65EvdJWjfrj^Gm$xN0x6fa&Gd3~bTpWYhbqtW4YxEmxAZ@GYUE7j(y_CAea~%Jx5WCihsUVd%w>i% zj-Loxxp|S@F=v<6Lzc}Oz2k^mpy@Um_t5?W2j&kQKiAR8Dagde$b0XuUAuR0owI!p zhZ90)>z}_680h13!rk5J;J%B-UaRyc)9DPxS}QAit}A5_Oi@SKY!+*ynb`u`6ulMH H-+sQ|)KQLw diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs index b8738cad7..9326ebdba 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs @@ -71,6 +71,7 @@ private void InitializeComponent() this.lblTwitterDefaultMessage = new System.Windows.Forms.Label(); this.txtTwitterDefaultMessage = new System.Windows.Forms.TextBox(); this.cbTwitterSkipMessageBox = new System.Windows.Forms.CheckBox(); + this.oauthTwitter = new ShareX.UploadersLib.OAuthControl(); this.txtTwitterDescription = new System.Windows.Forms.TextBox(); this.lblTwitterDescription = new System.Windows.Forms.Label(); this.btnTwitterRemove = new System.Windows.Forms.Button(); @@ -80,6 +81,7 @@ private void InitializeComponent() this.tpBitly = new System.Windows.Forms.TabPage(); this.txtBitlyDomain = new System.Windows.Forms.TextBox(); this.lblBitlyDomain = new System.Windows.Forms.Label(); + this.oauth2Bitly = new ShareX.UploadersLib.OAuthControl(); this.tpYourls = new System.Windows.Forms.TabPage(); this.txtYourlsPassword = new System.Windows.Forms.TextBox(); this.txtYourlsUsername = new System.Windows.Forms.TextBox(); @@ -180,10 +182,12 @@ private void InitializeComponent() this.cbDropboxAutoCreateShareableLink = new System.Windows.Forms.CheckBox(); this.lblDropboxPath = new System.Windows.Forms.Label(); this.txtDropboxPath = new System.Windows.Forms.TextBox(); + this.oauth2Dropbox = new ShareX.UploadersLib.OAuthControl(); this.tpOneDrive = new System.Windows.Forms.TabPage(); this.tvOneDrive = new System.Windows.Forms.TreeView(); this.lblOneDriveFolderID = new System.Windows.Forms.Label(); this.cbOneDriveCreateShareableLink = new System.Windows.Forms.CheckBox(); + this.oAuth2OneDrive = new ShareX.UploadersLib.OAuthControl(); this.tpGoogleDrive = new System.Windows.Forms.TabPage(); this.cbGoogleDriveDirectLink = new System.Windows.Forms.CheckBox(); this.cbGoogleDriveUseFolder = new System.Windows.Forms.CheckBox(); @@ -194,6 +198,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 ShareX.UploadersLib.OAuthControl(); this.tpPuush = new System.Windows.Forms.TabPage(); this.lblPuushAPIKey = new System.Windows.Forms.Label(); this.txtPuushAPIKey = new System.Windows.Forms.TextBox(); @@ -210,6 +215,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 ShareX.UploadersLib.OAuthControl(); this.tpAmazonS3 = new System.Windows.Forms.TabPage(); this.gbAmazonS3Advanced = new System.Windows.Forms.GroupBox(); this.cbAmazonS3SignedPayload = new System.Windows.Forms.CheckBox(); @@ -256,6 +262,7 @@ private void InitializeComponent() this.txtGoogleCloudStorageDomain = new System.Windows.Forms.TextBox(); this.lblGoogleCloudStorageBucket = new System.Windows.Forms.Label(); this.txtGoogleCloudStorageBucket = new System.Windows.Forms.TextBox(); + this.oauth2GoogleCloudStorage = new ShareX.UploadersLib.OAuthControl(); this.tpAzureStorage = new System.Windows.Forms.TabPage(); this.lblAzureStorageURLPreview = new System.Windows.Forms.Label(); this.lblAzureStorageURLPreviewLabel = new System.Windows.Forms.Label(); @@ -283,6 +290,8 @@ private void InitializeComponent() this.tpGfycat = new System.Windows.Forms.TabPage(); this.cbGfycatKeepAudio = new System.Windows.Forms.CheckBox(); this.cbGfycatIsPublic = new System.Windows.Forms.CheckBox(); + this.atcGfycatAccountType = new ShareX.UploadersLib.AccountTypeControl(); + this.oauth2Gfycat = new ShareX.UploadersLib.OAuthControl(); this.tpMega = new System.Windows.Forms.TabPage(); this.btnMegaRefreshFolders = new System.Windows.Forms.Button(); this.lblMegaStatus = new System.Windows.Forms.Label(); @@ -332,6 +341,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 ShareX.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(); @@ -352,6 +362,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 ShareX.UploadersLib.OAuthControl(); this.tpLambda = new System.Windows.Forms.TabPage(); this.lblLambdaInfo = new System.Windows.Forms.Label(); this.lblLambdaApiKey = new System.Windows.Forms.Label(); @@ -372,6 +383,7 @@ private void InitializeComponent() this.cbTeknikEncrypt = new System.Windows.Forms.CheckBox(); this.lblTeknikUploadAPIUrl = new System.Windows.Forms.Label(); this.tbTeknikUploadAPIUrl = new System.Windows.Forms.TextBox(); + this.oauthTeknik = new ShareX.UploadersLib.OAuthControl(); this.tpPomf = new System.Windows.Forms.TabPage(); this.txtPomfResultURL = new System.Windows.Forms.TextBox(); this.txtPomfUploadURL = new System.Windows.Forms.TextBox(); @@ -459,6 +471,7 @@ private void InitializeComponent() this.cbYouTubeUseShortenedLink = new System.Windows.Forms.CheckBox(); this.cbYouTubePrivacyType = new System.Windows.Forms.ComboBox(); this.lblYouTubePrivacyType = new System.Windows.Forms.Label(); + this.oauth2YouTube = new ShareX.UploadersLib.OAuthControl(); this.tpSharedFolder = new System.Windows.Forms.TabPage(); this.lbSharedFolderAccounts = new System.Windows.Forms.ListBox(); this.pgSharedFolderAccount = new System.Windows.Forms.PropertyGrid(); @@ -518,6 +531,7 @@ private void InitializeComponent() this.txtGistCustomURL = new System.Windows.Forms.TextBox(); this.cbGistUseRawURL = new System.Windows.Forms.CheckBox(); this.cbGistPublishPublic = new System.Windows.Forms.CheckBox(); + this.oAuth2Gist = new ShareX.UploadersLib.OAuthControl(); this.tpUpaste = new System.Windows.Forms.TabPage(); this.cbUpasteIsPublic = new System.Windows.Forms.CheckBox(); this.lblUpasteUserKey = new System.Windows.Forms.Label(); @@ -541,6 +555,8 @@ private void InitializeComponent() this.cbImgurUseGIFV = new System.Windows.Forms.CheckBox(); this.cbImgurUploadSelectedAlbum = new System.Windows.Forms.CheckBox(); this.cbImgurDirectLink = new System.Windows.Forms.CheckBox(); + this.atcImgurAccountType = new ShareX.UploadersLib.AccountTypeControl(); + this.oauth2Imgur = new ShareX.UploadersLib.OAuthControl(); this.lvImgurAlbumList = new System.Windows.Forms.ListView(); this.chImgurID = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.chImgurTitle = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); @@ -557,15 +573,9 @@ private void InitializeComponent() this.txtImageShackUsername = new System.Windows.Forms.TextBox(); this.txtImageShackPassword = new System.Windows.Forms.TextBox(); this.lblImageShackPassword = new System.Windows.Forms.Label(); - this.tpTinyPic = new System.Windows.Forms.TabPage(); - this.btnTinyPicLogin = new System.Windows.Forms.Button(); - this.txtTinyPicPassword = new System.Windows.Forms.TextBox(); - this.lblTinyPicPassword = new System.Windows.Forms.Label(); - this.txtTinyPicUsername = new System.Windows.Forms.TextBox(); - this.lblTinyPicUsername = new System.Windows.Forms.Label(); - this.btnTinyPicOpenMyImages = new System.Windows.Forms.Button(); this.tpFlickr = new System.Windows.Forms.TabPage(); this.cbFlickrDirectLink = new System.Windows.Forms.CheckBox(); + this.oauthFlickr = new ShareX.UploadersLib.OAuthControl(); this.tpPhotobucket = new System.Windows.Forms.TabPage(); this.gbPhotobucketAlbumPath = new System.Windows.Forms.GroupBox(); this.btnPhotobucketAddAlbum = new System.Windows.Forms.Button(); @@ -597,6 +607,7 @@ 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 ShareX.UploadersLib.OAuthControl(); this.tpChevereto = new System.Windows.Forms.TabPage(); this.lblCheveretoUploadURLExample = new System.Windows.Forms.Label(); this.cbCheveretoDirectURL = new System.Windows.Forms.CheckBox(); @@ -611,25 +622,6 @@ private void InitializeComponent() this.tcUploaders = new System.Windows.Forms.TabControl(); this.lblWidthHint = new System.Windows.Forms.Label(); this.ttlvMain = new ShareX.HelpersLib.TabToListView(); - this.atcImgurAccountType = new ShareX.UploadersLib.AccountTypeControl(); - this.oauth2Imgur = new ShareX.UploadersLib.OAuthControl(); - this.atcTinyPicAccountType = new ShareX.UploadersLib.AccountTypeControl(); - this.oauthFlickr = new ShareX.UploadersLib.OAuthControl(); - this.oauth2Picasa = new ShareX.UploadersLib.OAuthControl(); - this.oAuth2Gist = new ShareX.UploadersLib.OAuthControl(); - this.oauth2Dropbox = new ShareX.UploadersLib.OAuthControl(); - this.oAuth2OneDrive = new ShareX.UploadersLib.OAuthControl(); - this.oauth2GoogleDrive = new ShareX.UploadersLib.OAuthControl(); - this.oauth2Box = new ShareX.UploadersLib.OAuthControl(); - this.oauth2GoogleCloudStorage = new ShareX.UploadersLib.OAuthControl(); - this.oauthTwitter = new ShareX.UploadersLib.OAuthControl(); - this.oauth2Bitly = new ShareX.UploadersLib.OAuthControl(); - this.atcGfycatAccountType = new ShareX.UploadersLib.AccountTypeControl(); - this.oauth2Gfycat = new ShareX.UploadersLib.OAuthControl(); - this.atcSendSpaceAccountType = new ShareX.UploadersLib.AccountTypeControl(); - this.oAuthJira = new ShareX.UploadersLib.OAuthControl(); - this.oauthTeknik = new ShareX.UploadersLib.OAuthControl(); - this.oauth2YouTube = new ShareX.UploadersLib.OAuthControl(); this.actRapidShareAccountType = new ShareX.UploadersLib.AccountTypeControl(); this.tpOtherUploaders.SuspendLayout(); this.tcOtherUploaders.SuspendLayout(); @@ -706,7 +698,6 @@ private void InitializeComponent() this.tcImageUploaders.SuspendLayout(); this.tpImgur.SuspendLayout(); this.tpImageShack.SuspendLayout(); - this.tpTinyPic.SuspendLayout(); this.tpFlickr.SuspendLayout(); this.tpPhotobucket.SuspendLayout(); this.gbPhotobucketAlbumPath.SuspendLayout(); @@ -848,6 +839,15 @@ private void InitializeComponent() this.cbTwitterSkipMessageBox.UseVisualStyleBackColor = true; this.cbTwitterSkipMessageBox.CheckedChanged += new System.EventHandler(this.cbTwitterSkipMessageBox_CheckedChanged); // + // oauthTwitter + // + resources.ApplyResources(this.oauthTwitter, "oauthTwitter"); + this.oauthTwitter.IsRefreshable = false; + this.oauthTwitter.Name = "oauthTwitter"; + this.oauthTwitter.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauthTwitter_OpenButtonClicked); + this.oauthTwitter.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauthTwitter_CompleteButtonClicked); + this.oauthTwitter.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauthTwitter_ClearButtonClicked); + // // txtTwitterDescription // resources.ApplyResources(this.txtTwitterDescription, "txtTwitterDescription"); @@ -911,6 +911,15 @@ private void InitializeComponent() resources.ApplyResources(this.lblBitlyDomain, "lblBitlyDomain"); this.lblBitlyDomain.Name = "lblBitlyDomain"; // + // oauth2Bitly + // + this.oauth2Bitly.IsRefreshable = false; + resources.ApplyResources(this.oauth2Bitly, "oauth2Bitly"); + this.oauth2Bitly.Name = "oauth2Bitly"; + this.oauth2Bitly.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Bitly_OpenButtonClicked); + this.oauth2Bitly.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Bitly_CompleteButtonClicked); + this.oauth2Bitly.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Bitly_ClearButtonClicked); + // // tpYourls // this.tpYourls.BackColor = System.Drawing.SystemColors.Window; @@ -1660,6 +1669,15 @@ private void InitializeComponent() this.txtDropboxPath.Name = "txtDropboxPath"; this.txtDropboxPath.TextChanged += new System.EventHandler(this.txtDropboxPath_TextChanged); // + // oauth2Dropbox + // + this.oauth2Dropbox.IsRefreshable = false; + resources.ApplyResources(this.oauth2Dropbox, "oauth2Dropbox"); + this.oauth2Dropbox.Name = "oauth2Dropbox"; + this.oauth2Dropbox.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Dropbox_OpenButtonClicked); + this.oauth2Dropbox.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Dropbox_CompleteButtonClicked); + this.oauth2Dropbox.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Dropbox_ClearButtonClicked); + // // tpOneDrive // this.tpOneDrive.BackColor = System.Drawing.SystemColors.Window; @@ -1689,6 +1707,15 @@ private void InitializeComponent() this.cbOneDriveCreateShareableLink.UseVisualStyleBackColor = true; this.cbOneDriveCreateShareableLink.CheckedChanged += new System.EventHandler(this.cbOneDriveCreateShareableLink_CheckedChanged); // + // oAuth2OneDrive + // + resources.ApplyResources(this.oAuth2OneDrive, "oAuth2OneDrive"); + this.oAuth2OneDrive.Name = "oAuth2OneDrive"; + this.oAuth2OneDrive.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuth2OneDrive_OpenButtonClicked); + this.oAuth2OneDrive.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuth2OneDrive_CompleteButtonClicked); + this.oAuth2OneDrive.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuth2OneDrive_ClearButtonClicked); + this.oAuth2OneDrive.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oAuth2OneDrive_RefreshButtonClicked); + // // tpGoogleDrive // this.tpGoogleDrive.BackColor = System.Drawing.SystemColors.Window; @@ -1765,6 +1792,15 @@ private void InitializeComponent() this.cbGoogleDriveIsPublic.UseVisualStyleBackColor = true; this.cbGoogleDriveIsPublic.CheckedChanged += new System.EventHandler(this.cbGoogleDriveIsPublic_CheckedChanged); // + // oauth2GoogleDrive + // + resources.ApplyResources(this.oauth2GoogleDrive, "oauth2GoogleDrive"); + this.oauth2GoogleDrive.Name = "oauth2GoogleDrive"; + this.oauth2GoogleDrive.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2GoogleDrive_OpenButtonClicked); + this.oauth2GoogleDrive.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2GoogleDrive_CompleteButtonClicked); + this.oauth2GoogleDrive.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2GoogleDrive_ClearButtonClicked); + this.oauth2GoogleDrive.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2GoogleDrive_RefreshButtonClicked); + // // tpPuush // this.tpPuush.BackColor = System.Drawing.SystemColors.Window; @@ -1880,6 +1916,15 @@ private void InitializeComponent() this.btnBoxRefreshFolders.UseVisualStyleBackColor = true; this.btnBoxRefreshFolders.Click += new System.EventHandler(this.btnBoxRefreshFolders_Click); // + // oauth2Box + // + resources.ApplyResources(this.oauth2Box, "oauth2Box"); + this.oauth2Box.Name = "oauth2Box"; + this.oauth2Box.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Box_OpenButtonClicked); + this.oauth2Box.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Box_CompleteButtonClicked); + this.oauth2Box.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Box_ClearButtonClicked); + this.oauth2Box.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Box_RefreshButtonClicked); + // // tpAmazonS3 // this.tpAmazonS3.BackColor = System.Drawing.SystemColors.Window; @@ -2203,6 +2248,15 @@ private void InitializeComponent() this.txtGoogleCloudStorageBucket.Name = "txtGoogleCloudStorageBucket"; this.txtGoogleCloudStorageBucket.TextChanged += new System.EventHandler(this.txtGoogleCloudStorageBucket_TextChanged); // + // oauth2GoogleCloudStorage + // + resources.ApplyResources(this.oauth2GoogleCloudStorage, "oauth2GoogleCloudStorage"); + this.oauth2GoogleCloudStorage.Name = "oauth2GoogleCloudStorage"; + this.oauth2GoogleCloudStorage.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2GoogleCloudStorage_OpenButtonClicked); + this.oauth2GoogleCloudStorage.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2GoogleCloudStorage_CompleteButtonClicked); + this.oauth2GoogleCloudStorage.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2GoogleCloudStorage_ClearButtonClicked); + this.oauth2GoogleCloudStorage.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2GoogleCloudStorage_RefreshButtonClicked); + // // tpAzureStorage // this.tpAzureStorage.BackColor = System.Drawing.SystemColors.Window; @@ -2396,6 +2450,22 @@ private void InitializeComponent() this.cbGfycatIsPublic.UseVisualStyleBackColor = true; this.cbGfycatIsPublic.CheckedChanged += new System.EventHandler(this.cbGfycatIsPublic_CheckedChanged); // + // atcGfycatAccountType + // + resources.ApplyResources(this.atcGfycatAccountType, "atcGfycatAccountType"); + this.atcGfycatAccountType.Name = "atcGfycatAccountType"; + this.atcGfycatAccountType.SelectedAccountType = ShareX.UploadersLib.AccountType.Anonymous; + this.atcGfycatAccountType.AccountTypeChanged += new ShareX.UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcGfycatAccountType_AccountTypeChanged); + // + // oauth2Gfycat + // + resources.ApplyResources(this.oauth2Gfycat, "oauth2Gfycat"); + this.oauth2Gfycat.Name = "oauth2Gfycat"; + this.oauth2Gfycat.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Gfycat_OpenButtonClicked); + this.oauth2Gfycat.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Gfycat_CompleteButtonClicked); + this.oauth2Gfycat.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Gfycat_ClearButtonClicked); + this.oauth2Gfycat.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Gfycat_RefreshButtonClicked); + // // tpMega // this.tpMega.BackColor = System.Drawing.SystemColors.Window; @@ -2753,6 +2823,13 @@ private void InitializeComponent() this.txtSendSpaceUserName.Name = "txtSendSpaceUserName"; this.txtSendSpaceUserName.TextChanged += new System.EventHandler(this.txtSendSpaceUserName_TextChanged); // + // atcSendSpaceAccountType + // + resources.ApplyResources(this.atcSendSpaceAccountType, "atcSendSpaceAccountType"); + this.atcSendSpaceAccountType.Name = "atcSendSpaceAccountType"; + this.atcSendSpaceAccountType.SelectedAccountType = ShareX.UploadersLib.AccountType.Anonymous; + this.atcSendSpaceAccountType.AccountTypeChanged += new ShareX.UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcSendSpaceAccountType_AccountTypeChanged); + // // tpGe_tt // this.tpGe_tt.BackColor = System.Drawing.SystemColors.Window; @@ -2887,6 +2964,15 @@ private void InitializeComponent() resources.ApplyResources(this.lblJiraHost, "lblJiraHost"); this.lblJiraHost.Name = "lblJiraHost"; // + // oAuthJira + // + resources.ApplyResources(this.oAuthJira, "oAuthJira"); + this.oAuthJira.Name = "oAuthJira"; + this.oAuthJira.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuthJira_OpenButtonClicked); + this.oAuthJira.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuthJira_CompleteButtonClicked); + this.oAuthJira.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuthJira_ClearButtonClicked); + this.oAuthJira.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oAuthJira_RefreshButtonClicked); + // // tpLambda // this.tpLambda.BackColor = System.Drawing.SystemColors.Window; @@ -3031,6 +3117,15 @@ private void InitializeComponent() this.tbTeknikUploadAPIUrl.Name = "tbTeknikUploadAPIUrl"; this.tbTeknikUploadAPIUrl.TextChanged += new System.EventHandler(this.tbTeknikUploadAPIUrl_TextChanged); // + // oauthTeknik + // + this.oauthTeknik.IsRefreshable = false; + resources.ApplyResources(this.oauthTeknik, "oauthTeknik"); + this.oauthTeknik.Name = "oauthTeknik"; + this.oauthTeknik.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauthTeknik_OpenButtonClicked); + this.oauthTeknik.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauthTeknik_CompleteButtonClicked); + this.oauthTeknik.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauthTeknik_ClearButtonClicked); + // // tpPomf // this.tpPomf.BackColor = System.Drawing.SystemColors.Window; @@ -3675,6 +3770,15 @@ private void InitializeComponent() resources.ApplyResources(this.lblYouTubePrivacyType, "lblYouTubePrivacyType"); this.lblYouTubePrivacyType.Name = "lblYouTubePrivacyType"; // + // oauth2YouTube + // + resources.ApplyResources(this.oauth2YouTube, "oauth2YouTube"); + this.oauth2YouTube.Name = "oauth2YouTube"; + this.oauth2YouTube.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2YouTube_OpenButtonClicked); + this.oauth2YouTube.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2YouTube_CompleteButtonClicked); + this.oauth2YouTube.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2YouTube_ClearButtonClicked); + this.oauth2YouTube.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2YouTube_RefreshButtonClicked); + // // tpSharedFolder // this.tpSharedFolder.BackColor = System.Drawing.SystemColors.Window; @@ -4107,6 +4211,15 @@ private void InitializeComponent() this.cbGistPublishPublic.UseVisualStyleBackColor = true; this.cbGistPublishPublic.CheckedChanged += new System.EventHandler(this.chkGistPublishPublic_CheckedChanged); // + // oAuth2Gist + // + this.oAuth2Gist.IsRefreshable = false; + resources.ApplyResources(this.oAuth2Gist, "oAuth2Gist"); + this.oAuth2Gist.Name = "oAuth2Gist"; + this.oAuth2Gist.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuth2Gist_OpenButtonClicked); + this.oAuth2Gist.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuth2Gist_CompleteButtonClicked); + this.oAuth2Gist.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuth2Gist_ClearButtonClicked); + // // tpUpaste // this.tpUpaste.BackColor = System.Drawing.SystemColors.Window; @@ -4233,7 +4346,6 @@ private void InitializeComponent() // this.tcImageUploaders.Controls.Add(this.tpImgur); this.tcImageUploaders.Controls.Add(this.tpImageShack); - this.tcImageUploaders.Controls.Add(this.tpTinyPic); this.tcImageUploaders.Controls.Add(this.tpFlickr); this.tcImageUploaders.Controls.Add(this.tpPhotobucket); this.tcImageUploaders.Controls.Add(this.tpGooglePhotos); @@ -4279,6 +4391,22 @@ private void InitializeComponent() this.cbImgurDirectLink.UseVisualStyleBackColor = true; this.cbImgurDirectLink.CheckedChanged += new System.EventHandler(this.cbImgurDirectLink_CheckedChanged); // + // atcImgurAccountType + // + resources.ApplyResources(this.atcImgurAccountType, "atcImgurAccountType"); + this.atcImgurAccountType.Name = "atcImgurAccountType"; + this.atcImgurAccountType.SelectedAccountType = ShareX.UploadersLib.AccountType.Anonymous; + this.atcImgurAccountType.AccountTypeChanged += new ShareX.UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcImgurAccountType_AccountTypeChanged); + // + // oauth2Imgur + // + resources.ApplyResources(this.oauth2Imgur, "oauth2Imgur"); + this.oauth2Imgur.Name = "oauth2Imgur"; + this.oauth2Imgur.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Imgur_OpenButtonClicked); + this.oauth2Imgur.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Imgur_CompleteButtonClicked); + this.oauth2Imgur.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Imgur_ClearButtonClicked); + this.oauth2Imgur.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Imgur_RefreshButtonClicked); + // // lvImgurAlbumList // this.lvImgurAlbumList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { @@ -4392,56 +4520,6 @@ private void InitializeComponent() resources.ApplyResources(this.lblImageShackPassword, "lblImageShackPassword"); this.lblImageShackPassword.Name = "lblImageShackPassword"; // - // tpTinyPic - // - this.tpTinyPic.BackColor = System.Drawing.SystemColors.Window; - this.tpTinyPic.Controls.Add(this.atcTinyPicAccountType); - this.tpTinyPic.Controls.Add(this.btnTinyPicLogin); - this.tpTinyPic.Controls.Add(this.txtTinyPicPassword); - this.tpTinyPic.Controls.Add(this.lblTinyPicPassword); - this.tpTinyPic.Controls.Add(this.txtTinyPicUsername); - this.tpTinyPic.Controls.Add(this.lblTinyPicUsername); - this.tpTinyPic.Controls.Add(this.btnTinyPicOpenMyImages); - resources.ApplyResources(this.tpTinyPic, "tpTinyPic"); - this.tpTinyPic.Name = "tpTinyPic"; - // - // btnTinyPicLogin - // - resources.ApplyResources(this.btnTinyPicLogin, "btnTinyPicLogin"); - this.btnTinyPicLogin.Name = "btnTinyPicLogin"; - this.btnTinyPicLogin.UseVisualStyleBackColor = true; - this.btnTinyPicLogin.Click += new System.EventHandler(this.btnTinyPicLogin_Click); - // - // txtTinyPicPassword - // - resources.ApplyResources(this.txtTinyPicPassword, "txtTinyPicPassword"); - this.txtTinyPicPassword.Name = "txtTinyPicPassword"; - this.txtTinyPicPassword.UseSystemPasswordChar = true; - this.txtTinyPicPassword.TextChanged += new System.EventHandler(this.txtTinyPicPassword_TextChanged); - // - // lblTinyPicPassword - // - resources.ApplyResources(this.lblTinyPicPassword, "lblTinyPicPassword"); - this.lblTinyPicPassword.Name = "lblTinyPicPassword"; - // - // txtTinyPicUsername - // - resources.ApplyResources(this.txtTinyPicUsername, "txtTinyPicUsername"); - this.txtTinyPicUsername.Name = "txtTinyPicUsername"; - this.txtTinyPicUsername.TextChanged += new System.EventHandler(this.txtTinyPicUsername_TextChanged); - // - // lblTinyPicUsername - // - resources.ApplyResources(this.lblTinyPicUsername, "lblTinyPicUsername"); - this.lblTinyPicUsername.Name = "lblTinyPicUsername"; - // - // btnTinyPicOpenMyImages - // - resources.ApplyResources(this.btnTinyPicOpenMyImages, "btnTinyPicOpenMyImages"); - this.btnTinyPicOpenMyImages.Name = "btnTinyPicOpenMyImages"; - this.btnTinyPicOpenMyImages.UseVisualStyleBackColor = true; - this.btnTinyPicOpenMyImages.Click += new System.EventHandler(this.btnTinyPicOpenMyImages_Click); - // // tpFlickr // this.tpFlickr.BackColor = System.Drawing.SystemColors.Window; @@ -4457,6 +4535,15 @@ private void InitializeComponent() this.cbFlickrDirectLink.UseVisualStyleBackColor = true; this.cbFlickrDirectLink.CheckedChanged += new System.EventHandler(this.cbFlickrDirectLink_CheckedChanged); // + // oauthFlickr + // + this.oauthFlickr.IsRefreshable = false; + resources.ApplyResources(this.oauthFlickr, "oauthFlickr"); + this.oauthFlickr.Name = "oauthFlickr"; + this.oauthFlickr.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauthFlickr_OpenButtonClicked); + this.oauthFlickr.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauthFlickr_CompleteButtonClicked); + this.oauthFlickr.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauthFlickr_ClearButtonClicked); + // // tpPhotobucket // this.tpPhotobucket.BackColor = System.Drawing.SystemColors.Window; @@ -4671,6 +4758,15 @@ private void InitializeComponent() this.btnPicasaRefreshAlbumList.UseVisualStyleBackColor = true; this.btnPicasaRefreshAlbumList.Click += new System.EventHandler(this.btnPicasaRefreshAlbumList_Click); // + // oauth2Picasa + // + resources.ApplyResources(this.oauth2Picasa, "oauth2Picasa"); + this.oauth2Picasa.Name = "oauth2Picasa"; + this.oauth2Picasa.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Picasa_OpenButtonClicked); + this.oauth2Picasa.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Picasa_CompleteButtonClicked); + this.oauth2Picasa.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Picasa_ClearButtonClicked); + this.oauth2Picasa.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Picasa_RefreshButtonClicked); + // // tpChevereto // this.tpChevereto.BackColor = System.Drawing.SystemColors.Window; @@ -4771,169 +4867,6 @@ private void InitializeComponent() this.ttlvMain.MainTabControl = null; this.ttlvMain.Name = "ttlvMain"; // - // atcImgurAccountType - // - resources.ApplyResources(this.atcImgurAccountType, "atcImgurAccountType"); - this.atcImgurAccountType.Name = "atcImgurAccountType"; - this.atcImgurAccountType.SelectedAccountType = ShareX.UploadersLib.AccountType.Anonymous; - this.atcImgurAccountType.AccountTypeChanged += new ShareX.UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcImgurAccountType_AccountTypeChanged); - // - // oauth2Imgur - // - resources.ApplyResources(this.oauth2Imgur, "oauth2Imgur"); - this.oauth2Imgur.Name = "oauth2Imgur"; - this.oauth2Imgur.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Imgur_OpenButtonClicked); - this.oauth2Imgur.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Imgur_CompleteButtonClicked); - this.oauth2Imgur.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Imgur_ClearButtonClicked); - this.oauth2Imgur.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Imgur_RefreshButtonClicked); - // - // atcTinyPicAccountType - // - resources.ApplyResources(this.atcTinyPicAccountType, "atcTinyPicAccountType"); - this.atcTinyPicAccountType.Name = "atcTinyPicAccountType"; - this.atcTinyPicAccountType.SelectedAccountType = ShareX.UploadersLib.AccountType.Anonymous; - this.atcTinyPicAccountType.AccountTypeChanged += new ShareX.UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcTinyPicAccountType_AccountTypeChanged); - // - // oauthFlickr - // - this.oauthFlickr.IsRefreshable = false; - resources.ApplyResources(this.oauthFlickr, "oauthFlickr"); - this.oauthFlickr.Name = "oauthFlickr"; - this.oauthFlickr.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauthFlickr_OpenButtonClicked); - this.oauthFlickr.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauthFlickr_CompleteButtonClicked); - this.oauthFlickr.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauthFlickr_ClearButtonClicked); - // - // oauth2Picasa - // - resources.ApplyResources(this.oauth2Picasa, "oauth2Picasa"); - this.oauth2Picasa.Name = "oauth2Picasa"; - this.oauth2Picasa.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Picasa_OpenButtonClicked); - this.oauth2Picasa.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Picasa_CompleteButtonClicked); - this.oauth2Picasa.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Picasa_ClearButtonClicked); - this.oauth2Picasa.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Picasa_RefreshButtonClicked); - // - // oAuth2Gist - // - this.oAuth2Gist.IsRefreshable = false; - resources.ApplyResources(this.oAuth2Gist, "oAuth2Gist"); - this.oAuth2Gist.Name = "oAuth2Gist"; - this.oAuth2Gist.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuth2Gist_OpenButtonClicked); - this.oAuth2Gist.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuth2Gist_CompleteButtonClicked); - this.oAuth2Gist.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuth2Gist_ClearButtonClicked); - // - // oauth2Dropbox - // - this.oauth2Dropbox.IsRefreshable = false; - resources.ApplyResources(this.oauth2Dropbox, "oauth2Dropbox"); - this.oauth2Dropbox.Name = "oauth2Dropbox"; - this.oauth2Dropbox.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Dropbox_OpenButtonClicked); - this.oauth2Dropbox.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Dropbox_CompleteButtonClicked); - this.oauth2Dropbox.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Dropbox_ClearButtonClicked); - // - // oAuth2OneDrive - // - resources.ApplyResources(this.oAuth2OneDrive, "oAuth2OneDrive"); - this.oAuth2OneDrive.Name = "oAuth2OneDrive"; - this.oAuth2OneDrive.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuth2OneDrive_OpenButtonClicked); - this.oAuth2OneDrive.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuth2OneDrive_CompleteButtonClicked); - this.oAuth2OneDrive.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuth2OneDrive_ClearButtonClicked); - this.oAuth2OneDrive.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oAuth2OneDrive_RefreshButtonClicked); - // - // oauth2GoogleDrive - // - resources.ApplyResources(this.oauth2GoogleDrive, "oauth2GoogleDrive"); - this.oauth2GoogleDrive.Name = "oauth2GoogleDrive"; - this.oauth2GoogleDrive.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2GoogleDrive_OpenButtonClicked); - this.oauth2GoogleDrive.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2GoogleDrive_CompleteButtonClicked); - this.oauth2GoogleDrive.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2GoogleDrive_ClearButtonClicked); - this.oauth2GoogleDrive.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2GoogleDrive_RefreshButtonClicked); - // - // oauth2Box - // - resources.ApplyResources(this.oauth2Box, "oauth2Box"); - this.oauth2Box.Name = "oauth2Box"; - this.oauth2Box.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Box_OpenButtonClicked); - this.oauth2Box.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Box_CompleteButtonClicked); - this.oauth2Box.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Box_ClearButtonClicked); - this.oauth2Box.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Box_RefreshButtonClicked); - // - // oauth2GoogleCloudStorage - // - resources.ApplyResources(this.oauth2GoogleCloudStorage, "oauth2GoogleCloudStorage"); - this.oauth2GoogleCloudStorage.Name = "oauth2GoogleCloudStorage"; - this.oauth2GoogleCloudStorage.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2GoogleCloudStorage_OpenButtonClicked); - this.oauth2GoogleCloudStorage.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2GoogleCloudStorage_CompleteButtonClicked); - this.oauth2GoogleCloudStorage.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2GoogleCloudStorage_ClearButtonClicked); - this.oauth2GoogleCloudStorage.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2GoogleCloudStorage_RefreshButtonClicked); - // - // oauthTwitter - // - resources.ApplyResources(this.oauthTwitter, "oauthTwitter"); - this.oauthTwitter.IsRefreshable = false; - this.oauthTwitter.Name = "oauthTwitter"; - this.oauthTwitter.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauthTwitter_OpenButtonClicked); - this.oauthTwitter.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauthTwitter_CompleteButtonClicked); - this.oauthTwitter.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauthTwitter_ClearButtonClicked); - // - // oauth2Bitly - // - this.oauth2Bitly.IsRefreshable = false; - resources.ApplyResources(this.oauth2Bitly, "oauth2Bitly"); - this.oauth2Bitly.Name = "oauth2Bitly"; - this.oauth2Bitly.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Bitly_OpenButtonClicked); - this.oauth2Bitly.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Bitly_CompleteButtonClicked); - this.oauth2Bitly.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Bitly_ClearButtonClicked); - // - // atcGfycatAccountType - // - resources.ApplyResources(this.atcGfycatAccountType, "atcGfycatAccountType"); - this.atcGfycatAccountType.Name = "atcGfycatAccountType"; - this.atcGfycatAccountType.SelectedAccountType = ShareX.UploadersLib.AccountType.Anonymous; - this.atcGfycatAccountType.AccountTypeChanged += new ShareX.UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcGfycatAccountType_AccountTypeChanged); - // - // oauth2Gfycat - // - resources.ApplyResources(this.oauth2Gfycat, "oauth2Gfycat"); - this.oauth2Gfycat.Name = "oauth2Gfycat"; - this.oauth2Gfycat.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2Gfycat_OpenButtonClicked); - this.oauth2Gfycat.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2Gfycat_CompleteButtonClicked); - this.oauth2Gfycat.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2Gfycat_ClearButtonClicked); - this.oauth2Gfycat.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2Gfycat_RefreshButtonClicked); - // - // atcSendSpaceAccountType - // - resources.ApplyResources(this.atcSendSpaceAccountType, "atcSendSpaceAccountType"); - this.atcSendSpaceAccountType.Name = "atcSendSpaceAccountType"; - this.atcSendSpaceAccountType.SelectedAccountType = ShareX.UploadersLib.AccountType.Anonymous; - this.atcSendSpaceAccountType.AccountTypeChanged += new ShareX.UploadersLib.AccountTypeControl.AccountTypeChangedEventHandler(this.atcSendSpaceAccountType_AccountTypeChanged); - // - // oAuthJira - // - resources.ApplyResources(this.oAuthJira, "oAuthJira"); - this.oAuthJira.Name = "oAuthJira"; - this.oAuthJira.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuthJira_OpenButtonClicked); - this.oAuthJira.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuthJira_CompleteButtonClicked); - this.oAuthJira.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuthJira_ClearButtonClicked); - this.oAuthJira.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oAuthJira_RefreshButtonClicked); - // - // oauthTeknik - // - this.oauthTeknik.IsRefreshable = false; - resources.ApplyResources(this.oauthTeknik, "oauthTeknik"); - this.oauthTeknik.Name = "oauthTeknik"; - this.oauthTeknik.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauthTeknik_OpenButtonClicked); - this.oauthTeknik.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauthTeknik_CompleteButtonClicked); - this.oauthTeknik.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauthTeknik_ClearButtonClicked); - // - // oauth2YouTube - // - resources.ApplyResources(this.oauth2YouTube, "oauth2YouTube"); - this.oauth2YouTube.Name = "oauth2YouTube"; - this.oauth2YouTube.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oauth2YouTube_OpenButtonClicked); - this.oauth2YouTube.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oauth2YouTube_CompleteButtonClicked); - this.oauth2YouTube.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oauth2YouTube_ClearButtonClicked); - this.oauth2YouTube.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oauth2YouTube_RefreshButtonClicked); - // // actRapidShareAccountType // resources.ApplyResources(this.actRapidShareAccountType, "actRapidShareAccountType"); @@ -5087,8 +5020,6 @@ private void InitializeComponent() this.tpImgur.PerformLayout(); this.tpImageShack.ResumeLayout(false); this.tpImageShack.PerformLayout(); - this.tpTinyPic.ResumeLayout(false); - this.tpTinyPic.PerformLayout(); this.tpFlickr.ResumeLayout(false); this.tpFlickr.PerformLayout(); this.tpPhotobucket.ResumeLayout(false); @@ -5255,13 +5186,6 @@ private void InitializeComponent() private System.Windows.Forms.TextBox txtImageShackUsername; private System.Windows.Forms.TextBox txtImageShackPassword; private System.Windows.Forms.Label lblImageShackPassword; - private AccountTypeControl atcTinyPicAccountType; - private System.Windows.Forms.Button btnTinyPicLogin; - private System.Windows.Forms.TextBox txtTinyPicPassword; - private System.Windows.Forms.Label lblTinyPicPassword; - private System.Windows.Forms.TextBox txtTinyPicUsername; - private System.Windows.Forms.Label lblTinyPicUsername; - private System.Windows.Forms.Button btnTinyPicOpenMyImages; private System.Windows.Forms.GroupBox gbPhotobucketAlbumPath; private System.Windows.Forms.Button btnPhotobucketAddAlbum; private System.Windows.Forms.Button btnPhotobucketRemoveAlbum; @@ -5437,7 +5361,6 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox cbStreamableUseDirectURL; internal System.Windows.Forms.TabPage tpImgur; internal System.Windows.Forms.TabPage tpImageShack; - internal System.Windows.Forms.TabPage tpTinyPic; internal System.Windows.Forms.TabPage tpFlickr; internal System.Windows.Forms.TabPage tpPhotobucket; internal System.Windows.Forms.TabPage tpGooglePhotos; diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs index 6d47746ff..ab2e1a718 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs @@ -187,14 +187,6 @@ private void LoadImageUploaderSettings() #endregion ImageShack - #region TinyPic - - atcTinyPicAccountType.SelectedAccountType = Config.TinyPicAccountType; - txtTinyPicUsername.Text = Config.TinyPicUsername; - txtTinyPicPassword.Text = Config.TinyPicPassword; - - #endregion TinyPic - #region Flickr if (OAuthInfo.CheckOAuth(Config.FlickrOAuthInfo)) @@ -975,60 +967,6 @@ private void btnImageShackOpenMyImages_Click(object sender, EventArgs e) #endregion ImageShack - #region TinyPic - - private void atcTinyPicAccountType_AccountTypeChanged(AccountType accountType) - { - Config.TinyPicAccountType = accountType; - } - - private void txtTinyPicUsername_TextChanged(object sender, EventArgs e) - { - Config.TinyPicUsername = txtTinyPicUsername.Text; - } - - private void txtTinyPicPassword_TextChanged(object sender, EventArgs e) - { - Config.TinyPicPassword = txtTinyPicPassword.Text; - } - - private void btnTinyPicLogin_Click(object sender, EventArgs e) - { - string username = txtTinyPicUsername.Text; - string password = txtTinyPicPassword.Text; - - if (!string.IsNullOrEmpty(username) && !string.IsNullOrEmpty(password)) - { - try - { - TinyPicUploader tpu = new TinyPicUploader(APIKeys.TinyPicID, APIKeys.TinyPicKey); - string registrationCode = tpu.UserAuth(username, password); - - if (!string.IsNullOrEmpty(registrationCode)) - { - Config.TinyPicRegistrationCode = registrationCode; - MessageBox.Show(Resources.UploadersConfigForm_Login_successful, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Information); - } - else - { - MessageBox.Show(Resources.UploadersConfigForm_Login_failed, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - catch (Exception ex) - { - DebugHelper.WriteException(ex); - ex.ShowError(); - } - } - } - - private void btnTinyPicOpenMyImages_Click(object sender, EventArgs e) - { - URLHelpers.OpenURL("http://tinypic.com/yourstuff.php"); - } - - #endregion TinyPic - #region Flickr private void oauthFlickr_OpenButtonClicked() diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.resx index 2062c80e4..1a5668131 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.resx @@ -489,7 +489,7 @@ when you made the application key. oauthTwitter - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=13.0.1.0, Culture=neutral, PublicKeyToken=null tpTwitter @@ -744,7 +744,7 @@ when you made the application key. oauth2Bitly - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=13.0.1.0, Culture=neutral, PublicKeyToken=null tpBitly @@ -1020,7 +1020,7 @@ when you made the application key. 3, 3, 3, 3 - 972, 537 + 178, 42 2 @@ -1179,7 +1179,7 @@ when you made the application key. 3, 3, 3, 3 - 972, 537 + 178, 42 3 @@ -1365,7 +1365,7 @@ when you made the application key. 4, 22 - 972, 537 + 178, 42 6 @@ -1554,7 +1554,7 @@ when you made the application key. 3, 3, 3, 3 - 972, 537 + 178, 42 7 @@ -1764,7 +1764,7 @@ when you made the application key. 3, 3, 3, 3 - 972, 537 + 178, 42 8 @@ -2199,7 +2199,7 @@ when you made the application key. eiFTP - ShareX.HelpersLib.ExportImportControl, ShareX.HelpersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.ExportImportControl, ShareX.HelpersLib, Version=13.0.1.0, Culture=neutral, PublicKeyToken=null gbFTPAccount @@ -3255,13 +3255,13 @@ when you made the application key. 11 - 4, 22 + 4, 40 3, 3, 3, 3 - 972, 537 + 972, 519 4 @@ -3405,7 +3405,7 @@ when you made the application key. oauth2Dropbox - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=13.0.1.0, Culture=neutral, PublicKeyToken=null tpDropbox @@ -3414,13 +3414,13 @@ when you made the application key. 4 - 4, 22 + 4, 238 3, 3, 3, 3 - 972, 537 + 178, 0 0 @@ -3537,7 +3537,7 @@ when you made the application key. oAuth2OneDrive - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=13.0.1.0, Culture=neutral, PublicKeyToken=null tpOneDrive @@ -3546,13 +3546,13 @@ when you made the application key. 3 - 4, 22 + 4, 238 3, 3, 3, 3 - 972, 537 + 178, 0 17 @@ -3708,7 +3708,7 @@ when you made the application key. lvGoogleDriveFoldersList - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.0.1.0, Culture=neutral, PublicKeyToken=null tpGoogleDrive @@ -3789,7 +3789,7 @@ when you made the application key. oauth2GoogleDrive - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=13.0.1.0, Culture=neutral, PublicKeyToken=null tpGoogleDrive @@ -3798,13 +3798,13 @@ when you made the application key. 7 - 4, 22 + 4, 238 3, 3, 3, 3 - 972, 537 + 178, 0 1 @@ -4035,13 +4035,13 @@ when you made the application key. 7 - 4, 22 + 4, 238 3, 3, 3, 3 - 972, 537 + 178, 0 26 @@ -4140,7 +4140,7 @@ when you made the application key. lvBoxFolders - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.0.1.0, Culture=neutral, PublicKeyToken=null tpBox @@ -4221,7 +4221,7 @@ when you made the application key. oauth2Box - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=13.0.1.0, Culture=neutral, PublicKeyToken=null tpBox @@ -4230,13 +4230,13 @@ when you made the application key. 5 - 4, 22 + 4, 238 3, 3, 3, 3 - 972, 537 + 178, 0 2 @@ -5061,13 +5061,13 @@ when you made the application key. 20 - 4, 22 + 4, 238 3, 3, 3, 3 - 972, 537 + 178, 0 13 @@ -5487,7 +5487,7 @@ when you made the application key. oauth2GoogleCloudStorage - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=13.0.1.0, Culture=neutral, PublicKeyToken=null tpGoogleCloudStorage @@ -5496,13 +5496,13 @@ when you made the application key. 9 - 4, 40 + 4, 238 3, 3, 3, 3 - 972, 519 + 178, 0 32 @@ -5934,13 +5934,13 @@ when you made the application key. 14 - 4, 22 + 4, 238 3, 3, 3, 3 - 972, 537 + 178, 0 28 @@ -6162,13 +6162,13 @@ when you made the application key. 11 - 4, 22 + 4, 238 3, 3, 3, 3 - 972, 537 + 178, 0 33 @@ -6261,7 +6261,7 @@ when you made the application key. atcGfycatAccountType - ShareX.UploadersLib.AccountTypeControl, ShareX.UploadersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.AccountTypeControl, ShareX.UploadersLib, Version=13.0.1.0, Culture=neutral, PublicKeyToken=null tpGfycat @@ -6282,7 +6282,7 @@ when you made the application key. oauth2Gfycat - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=13.0.1.0, Culture=neutral, PublicKeyToken=null tpGfycat @@ -6291,13 +6291,13 @@ when you made the application key. 3 - 4, 22 + 4, 238 3, 3, 3, 3 - 972, 537 + 178, 0 30 @@ -6612,10 +6612,10 @@ when you made the application key. 10 - 4, 22 + 4, 238 - 972, 537 + 178, 0 12 @@ -7071,13 +7071,13 @@ when you made the application key. 15 - 4, 22 + 4, 238 3, 3, 3, 3 - 972, 537 + 178, 0 15 @@ -7281,13 +7281,13 @@ when you made the application key. 6 - 4, 22 + 4, 238 3, 3, 3, 3 - 972, 537 + 178, 0 16 @@ -7443,13 +7443,13 @@ when you made the application key. 4 - 4, 40 + 4, 238 3, 3, 3, 3 - 972, 519 + 178, 0 14 @@ -7611,7 +7611,7 @@ when you made the application key. atcSendSpaceAccountType - ShareX.UploadersLib.AccountTypeControl, ShareX.UploadersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.AccountTypeControl, ShareX.UploadersLib, Version=13.0.1.0, Culture=neutral, PublicKeyToken=null tpSendSpace @@ -7620,13 +7620,13 @@ when you made the application key. 5 - 4, 40 + 4, 238 3, 3, 3, 3 - 972, 519 + 178, 0 6 @@ -7806,13 +7806,13 @@ when you made the application key. 5 - 4, 40 + 4, 238 3, 3, 3, 3 - 972, 519 + 178, 0 7 @@ -7965,13 +7965,13 @@ when you made the application key. 4 - 4, 40 + 4, 238 3, 3, 3, 3 - 972, 519 + 178, 0 8 @@ -8166,7 +8166,7 @@ when you made the application key. oAuthJira - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=13.0.1.0, Culture=neutral, PublicKeyToken=null tpJira @@ -8175,10 +8175,10 @@ when you made the application key. 3 - 4, 40 + 4, 238 - 972, 519 + 178, 0 11 @@ -8331,13 +8331,13 @@ when you made the application key. 4 - 4, 40 + 4, 238 3, 3, 3, 3 - 972, 519 + 178, 0 20 @@ -8709,7 +8709,7 @@ when you made the application key. oauthTeknik - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=13.0.1.0, Culture=neutral, PublicKeyToken=null tpTeknik @@ -8718,13 +8718,13 @@ when you made the application key. 13 - 4, 40 + 4, 238 3, 3, 3, 3 - 972, 519 + 178, 0 34 @@ -8847,13 +8847,13 @@ when you made the application key. 3 - 4, 40 + 4, 238 3, 3, 3, 3 - 972, 519 + 178, 0 22 @@ -9132,7 +9132,7 @@ when you made the application key. lvSeafileLibraries - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.0.1.0, Culture=neutral, PublicKeyToken=null tpSeafile @@ -9808,13 +9808,13 @@ Using an encrypted library disables sharing. 20 - 4, 40 + 4, 238 3, 3, 3, 3 - 972, 519 + 178, 0 23 @@ -10012,10 +10012,10 @@ Using an encrypted library disables sharing. 5 - 4, 40 + 4, 238 - 972, 519 + 178, 0 24 @@ -10114,13 +10114,13 @@ Using an encrypted library disables sharing. 2 - 4, 40 + 4, 238 3, 3, 3, 3 - 972, 519 + 178, 0 25 @@ -10348,13 +10348,13 @@ Using an encrypted library disables sharing. 7 - 4, 40 + 4, 238 3, 3, 3, 3 - 972, 519 + 178, 0 20 @@ -10855,13 +10855,13 @@ Using an encrypted library disables sharing. 1 - 4, 40 + 4, 238 3, 3, 3, 3 - 972, 519 + 178, 0 29 @@ -10975,7 +10975,7 @@ Using an encrypted library disables sharing. oauth2YouTube - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=13.0.1.0, Culture=neutral, PublicKeyToken=null tpYouTube @@ -10984,10 +10984,10 @@ Using an encrypted library disables sharing. 3 - 4, 40 + 4, 238 - 972, 519 + 178, 0 31 @@ -11287,13 +11287,13 @@ Using an encrypted library disables sharing. 10 - 4, 40 + 4, 238 3, 3, 3, 3 - 972, 519 + 178, 0 9 @@ -11707,13 +11707,13 @@ Using an encrypted library disables sharing. 14 - 4, 40 + 4, 238 3, 3, 3, 3 - 972, 519 + 178, 0 10 @@ -12334,7 +12334,7 @@ Using an encrypted library disables sharing. 3, 3, 3, 3 - 972, 537 + 178, 42 1 @@ -12538,7 +12538,7 @@ Using an encrypted library disables sharing. oAuth2Gist - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=13.0.1.0, Culture=neutral, PublicKeyToken=null tpGist @@ -12550,7 +12550,7 @@ Using an encrypted library disables sharing. 4, 22 - 972, 537 + 178, 42 2 @@ -12658,7 +12658,7 @@ Using an encrypted library disables sharing. 3, 3, 3, 3 - 972, 537 + 178, 42 3 @@ -12817,7 +12817,7 @@ Using an encrypted library disables sharing. 3, 3, 3, 3 - 972, 537 + 178, 42 4 @@ -12946,7 +12946,7 @@ Using an encrypted library disables sharing. 3, 3, 3, 3 - 972, 537 + 178, 42 5 @@ -13003,7 +13003,7 @@ Using an encrypted library disables sharing. 3, 3, 3, 3 - 972, 537 + 178, 42 6 @@ -13177,7 +13177,7 @@ Using an encrypted library disables sharing. atcImgurAccountType - ShareX.UploadersLib.AccountTypeControl, ShareX.UploadersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.AccountTypeControl, ShareX.UploadersLib, Version=13.0.1.0, Culture=neutral, PublicKeyToken=null tpImgur @@ -13198,7 +13198,7 @@ Using an encrypted library disables sharing. oauth2Imgur - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=13.0.1.0, Culture=neutral, PublicKeyToken=null tpImgur @@ -13590,210 +13590,6 @@ Using an encrypted library disables sharing. 1 - - 16, 16 - - - 136, 40 - - - 0 - - - atcTinyPicAccountType - - - ShareX.UploadersLib.AccountTypeControl, ShareX.UploadersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null - - - tpTinyPic - - - 0 - - - NoControl - - - 232, 128 - - - 96, 24 - - - 5 - - - Login - - - btnTinyPicLogin - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpTinyPic - - - 1 - - - 16, 130 - - - 208, 20 - - - 4 - - - txtTinyPicPassword - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpTinyPic - - - 2 - - - True - - - NoControl - - - 13, 114 - - - 56, 13 - - - 3 - - - Password: - - - lblTinyPicPassword - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpTinyPic - - - 3 - - - 16, 80 - - - 208, 20 - - - 2 - - - txtTinyPicUsername - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpTinyPic - - - 4 - - - True - - - NoControl - - - 13, 64 - - - 35, 13 - - - 1 - - - Email: - - - lblTinyPicUsername - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpTinyPic - - - 5 - - - NoControl - - - 16, 160 - - - 208, 24 - - - 6 - - - Open my images page... - - - btnTinyPicOpenMyImages - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpTinyPic - - - 6 - - - 4, 22 - - - 3, 3, 3, 3 - - - 972, 537 - - - 1 - - - TinyPic - - - tpTinyPic - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcImageUploaders - - - 2 - True @@ -13837,7 +13633,7 @@ Using an encrypted library disables sharing. oauthFlickr - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=13.0.1.0, Culture=neutral, PublicKeyToken=null tpFlickr @@ -13870,7 +13666,7 @@ Using an encrypted library disables sharing. tcImageUploaders - 3 + 2 NoControl @@ -14362,7 +14158,7 @@ Using an encrypted library disables sharing. tcImageUploaders - 4 + 3 True @@ -14605,7 +14401,7 @@ Using an encrypted library disables sharing. oauth2Picasa - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=13.0.1.0, Culture=neutral, PublicKeyToken=null tpGooglePhotos @@ -14638,7 +14434,7 @@ Using an encrypted library disables sharing. tcImageUploaders - 5 + 4 True @@ -14827,7 +14623,7 @@ Using an encrypted library disables sharing. tcImageUploaders - 6 + 5 True @@ -14935,7 +14731,7 @@ Using an encrypted library disables sharing. tcImageUploaders - 7 + 6 Fill @@ -15064,7 +14860,7 @@ Using an encrypted library disables sharing. ttlvMain - ShareX.HelpersLib.TabToListView, ShareX.HelpersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.TabToListView, ShareX.HelpersLib, Version=13.0.1.0, Culture=neutral, PublicKeyToken=null $this @@ -15085,7 +14881,7 @@ Using an encrypted library disables sharing. actRapidShareAccountType - ShareX.UploadersLib.AccountTypeControl, ShareX.UploadersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.AccountTypeControl, ShareX.UploadersLib, Version=13.0.1.0, Culture=neutral, PublicKeyToken=null True @@ -15099,9 +14895,6 @@ Using an encrypted library disables sharing. 1000, 601 - - NoControl - 840, 572 diff --git a/ShareX.UploadersLib/ImageUploaders/TinyPicUploader.cs b/ShareX.UploadersLib/ImageUploaders/TinyPicUploader.cs deleted file mode 100644 index e6f291eb1..000000000 --- a/ShareX.UploadersLib/ImageUploaders/TinyPicUploader.cs +++ /dev/null @@ -1,252 +0,0 @@ -#region License Information (GPL v3) - -/* - ShareX - A program that allows you to take screenshots and share any file type - Copyright (c) 2007-2019 ShareX Team - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - Optionally you can also view the license at . -*/ - -#endregion License Information (GPL v3) - -using ShareX.HelpersLib; -using ShareX.UploadersLib.Properties; -using System.Collections.Generic; -using System.Drawing; -using System.IO; -using System.Web; -using System.Windows.Forms; -using System.Xml.Linq; - -namespace ShareX.UploadersLib.ImageUploaders -{ - public class TinyPicImageUploaderService : ImageUploaderService - { - public override ImageDestination EnumValue { get; } = ImageDestination.TinyPic; - - public override Icon ServiceIcon => Resources.TinyPic; - - public override bool CheckConfig(UploadersConfig config) - { - return config.TinyPicAccountType == AccountType.Anonymous || !string.IsNullOrEmpty(config.TinyPicRegistrationCode); - } - - public override GenericUploader CreateUploader(UploadersConfig config, TaskReferenceHelper taskInfo) - { - return new TinyPicUploader(APIKeys.TinyPicID, APIKeys.TinyPicKey, config.TinyPicAccountType, config.TinyPicRegistrationCode); - } - - public override TabPage GetUploadersConfigTabPage(UploadersConfigForm form) => form.tpTinyPic; - } - - public sealed class TinyPicUploader : ImageUploader - { - public AccountType AccountType { get; private set; } - public string TinyPicID { get; set; } - public string TinyPicKey { get; set; } - public string Shuk { get; set; } - - private const string URLAPI = "http://api.tinypic.com/api.php"; - - public TinyPicUploader(string id, string key, AccountType accountType = AccountType.Anonymous, string shuk = null) - { - TinyPicID = id; - TinyPicKey = key; - AccountType = accountType; - Shuk = shuk; - } - - public override UploadResult Upload(Stream stream, string fileName) - { - UploadResult result = null; - - string action = "getuploadkey", tpid = TinyPicID, tpk = TinyPicKey; - string upk = GetUploadKey(action, tpid, tpk); - - if (!string.IsNullOrEmpty(upk)) - { - Dictionary arguments = new Dictionary(); - - if (AccountType == AccountType.User && !string.IsNullOrEmpty(Shuk)) - { - action = "userupload"; - arguments.Add("shuk", Shuk); - } - else - { - action = "upload"; - } - - arguments.Add("action", action); - arguments.Add("tpid", tpid); - arguments.Add("sig", TranslatorHelper.TextToHash(action + tpid + tpk, HashType.MD5)); - arguments.Add("responsetype", "XML"); - arguments.Add("upk", upk); - arguments.Add("type", "image"); - arguments.Add("tags", ""); - - result = SendRequestFile(URLAPI, stream, fileName, "uploadfile", arguments); - - if (result.IsSuccess && CheckResponse(result.Response)) - { - result.URL = Helpers.GetXMLValue(result.Response, "fullsize"); - result.ThumbnailURL = Helpers.GetXMLValue(result.Response, "thumbnail"); - } - } - - return result; - } - - public string UserAuth(string email, string password) - { - string action = "userauth", tpid = TinyPicID, tpk = TinyPicKey; - - Dictionary args = new Dictionary - { - { "action", action }, - { "tpid", tpid }, - { "sig", TranslatorHelper.TextToHash(action + tpid + tpk, HashType.MD5) }, - { "email", email }, - { "pass", password } - }; - - string response = SendRequestMultiPart(URLAPI, args); - - if (!string.IsNullOrEmpty(response)) - { - string result = Helpers.GetXMLValue(response, "shuk"); - - return HttpUtility.HtmlEncode(result); - } - - return ""; - } - - private string GetUploadKey(string action, string tpid, string tpk) - { - Dictionary args = new Dictionary(); - args.Add("action", action); - args.Add("tpid", tpid); - args.Add("sig", TranslatorHelper.TextToHash(action + tpid + tpk, HashType.MD5)); - args.Add("responsetype", "XML"); - - string response = SendRequest(HttpMethod.GET, URLAPI, args); - - if (!string.IsNullOrEmpty(response) && CheckResponse(response)) - { - string upk = Helpers.GetXMLValue(response, "uploadkey"); - - if (string.IsNullOrEmpty(upk)) - { - Errors.Add("Upload key is empty."); - } - - return upk; - } - - Errors.Add("Unable to get upload key."); - - return null; - } - - private bool CheckResponse(string response) - { - bool result = false; - - XDocument xDoc = XDocument.Parse(response); - XElement xEle = xDoc.Element("response"); - string status = xEle.GetElementValue("status"); - - if (!string.IsNullOrEmpty(status)) - { - if (status == "OK") - { - result = true; - } - else if (status == "FAIL") - { - string errorcode = xEle.GetElementValue("errorcode"); - if (!string.IsNullOrEmpty(errorcode)) - { - int code; - if (int.TryParse(errorcode, out code)) - { - Errors.Add(GetErrorMessage(code)); - } - } - } - } - - return result; - } - - private string GetErrorMessage(int errorCode) - { - switch (errorCode) - { - case 1: - return "Bad Authorization: Missing or invalid authentication parameter (tpid, tpk, sig, upk)."; - case 2: - return "Bad Action: Invalid or no action passed."; - case 3: - return "Bad Type: Invalid or no type passed."; - case 4: - return "Bad File: No upload file included in POST when required."; - case 5: - return "Bad Term: No search term included with search request."; - case 6: - return "Bad Media Key: Media key not included in a request that required a media key."; - case 7: - return "Bad Upload Key: Invalid or no upload key in a request that required an upload key."; - case 8: - return "Bad User Credentials: Invalid or no user credentials (username or pass) in a request that required username/pass to be valid."; - case 9: - return "Insufficient Permission: Action called that the specific tpid does not have permission to perform."; - case 10: - return "Image Processing Error: Uploaded image fails to process correctly."; - case 11: - return "Video Encoding Error: Unable to encode video."; - case 12: - return "Bad Album: Invalid or no albumid is passed when required."; - case 20: - return "Bad Email: Invalid or no email passed in register action."; - case 21: - return "Duplicate Email: Email passed in register action is already in use by another registered user."; - case 22: - return "Bad Password: Password passed in register action is less than six characters."; - case 23: - return "Bad Birth Date: Birth date fields passed in register action combine to make an invalid date (e.g., February 30, 1990)."; - case 24: - return "User too Young: Birth date fields passed in register action place a user below the minimum age of 14 years."; - case 25: - return "Terms Agreement: Terms parameter for register action is either blank, non-existent, or does not say \"yes\""; - case 26: - return "Terms of Service Violation: originatingip parameter contains an IP address on the TinyPic banned list, or is in a nation that is banned from registering."; - case 27: - return "Bad IP: originationip parameter contains an invalid IP address."; - case 28: - return "Bad Album Name: Album name that is passed in a user album action is too short (less than two characters)."; - case 99: - return "Internal Error: An internal error occurred in processing request."; - case 100: - return "No File: mediakey is passed in an action, but the media is not found/no longer available."; - default: - return "No error message was provided."; - } - } - } -} \ No newline at end of file diff --git a/ShareX.UploadersLib/Properties/Resources.Designer.cs b/ShareX.UploadersLib/Properties/Resources.Designer.cs index 412a9590b..f23673b73 100644 --- a/ShareX.UploadersLib/Properties/Resources.Designer.cs +++ b/ShareX.UploadersLib/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace ShareX.UploadersLib.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -657,16 +657,6 @@ internal static System.Drawing.Icon Teknik { } } - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon TinyPic { - get { - object obj = ResourceManager.GetObject("TinyPic", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// diff --git a/ShareX.UploadersLib/Properties/Resources.resx b/ShareX.UploadersLib/Properties/Resources.resx index 0bcabeef7..207015bf4 100644 --- a/ShareX.UploadersLib/Properties/Resources.resx +++ b/ShareX.UploadersLib/Properties/Resources.resx @@ -257,9 +257,6 @@ Created folders: ..\Favicons\Polr.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Favicons\TinyPic.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Refresh authorization is not supported. diff --git a/ShareX.UploadersLib/ShareX.UploadersLib.csproj b/ShareX.UploadersLib/ShareX.UploadersLib.csproj index ddeac4195..ac087e681 100644 --- a/ShareX.UploadersLib/ShareX.UploadersLib.csproj +++ b/ShareX.UploadersLib/ShareX.UploadersLib.csproj @@ -326,7 +326,6 @@ - @@ -879,7 +878,6 @@ - diff --git a/ShareX.UploadersLib/UploadersConfig.cs b/ShareX.UploadersLib/UploadersConfig.cs index a2fe94f35..16709429f 100644 --- a/ShareX.UploadersLib/UploadersConfig.cs +++ b/ShareX.UploadersLib/UploadersConfig.cs @@ -56,15 +56,6 @@ public class UploadersConfig : SettingsBase #endregion ImageShack - #region TinyPic - - public AccountType TinyPicAccountType = AccountType.Anonymous; - public string TinyPicRegistrationCode = ""; - public string TinyPicUsername = ""; - public string TinyPicPassword = ""; - - #endregion TinyPic - #region Flickr public OAuthInfo FlickrOAuthInfo = null;