From dbe38d59827bd6a75886fd45a8fce9318cd74a95 Mon Sep 17 00:00:00 2001 From: Ralph Drake Date: Thu, 29 Jul 2021 19:45:46 -0400 Subject: [PATCH 1/2] refactor(FileUploaders): remove ge.tt destination as of 2021/02/28, ge.tt is no longer in service. see https://web.archive.org/web/20210226070101/http://ge.tt/ for more information. Fixes #5011 --- ShareX.UploadersLib/APIKeys/APIKeys.cs | 1 - ShareX.UploadersLib/Enums.cs | 2 - ShareX.UploadersLib/FileUploaders/Ge_tt.cs | 167 ---------------- .../Forms/UploadersConfigForm.Designer.cs | 63 ------ .../Forms/UploadersConfigForm.cs | 17 -- .../Forms/UploadersConfigForm.de.resx | 12 -- .../Forms/UploadersConfigForm.es-MX.resx | 15 -- .../Forms/UploadersConfigForm.es.resx | 12 -- .../Forms/UploadersConfigForm.fa-IR.resx | 6 - .../Forms/UploadersConfigForm.fr.resx | 15 -- .../Forms/UploadersConfigForm.hu.resx | 12 -- .../Forms/UploadersConfigForm.id-ID.resx | 15 -- .../Forms/UploadersConfigForm.it-IT.resx | 12 -- .../Forms/UploadersConfigForm.ja-JP.resx | 12 -- .../Forms/UploadersConfigForm.ko-KR.resx | 15 -- .../Forms/UploadersConfigForm.nl-NL.resx | 12 -- .../Forms/UploadersConfigForm.pt-BR.resx | 15 -- .../Forms/UploadersConfigForm.pt-PT.resx | 12 -- .../Forms/UploadersConfigForm.resx | 186 ------------------ .../Forms/UploadersConfigForm.ru.resx | 12 -- .../Forms/UploadersConfigForm.tr.resx | 12 -- .../Forms/UploadersConfigForm.uk.resx | 12 -- .../Forms/UploadersConfigForm.vi-VN.resx | 15 -- .../Forms/UploadersConfigForm.zh-CN.resx | 15 -- .../Forms/UploadersConfigForm.zh-TW.resx | 12 -- .../Forms/UploadersConfigFormHelper.cs | 21 -- .../ShareX.UploadersLib.csproj | 1 - ShareX.UploadersLib/UploadersConfig.cs | 6 - 28 files changed, 707 deletions(-) delete mode 100644 ShareX.UploadersLib/FileUploaders/Ge_tt.cs diff --git a/ShareX.UploadersLib/APIKeys/APIKeys.cs b/ShareX.UploadersLib/APIKeys/APIKeys.cs index 118f52806..150a3bc97 100644 --- a/ShareX.UploadersLib/APIKeys/APIKeys.cs +++ b/ShareX.UploadersLib/APIKeys/APIKeys.cs @@ -48,7 +48,6 @@ internal static partial class APIKeys public static readonly string BoxClientID = ""; public static readonly string BoxClientSecret = ""; public static readonly string SendSpaceKey = ""; - public static readonly string Ge_ttKey = ""; public static readonly string JiraConsumerKey = ""; public static readonly string MediaFireAppId = ""; public static readonly string MediaFireApiKey = ""; diff --git a/ShareX.UploadersLib/Enums.cs b/ShareX.UploadersLib/Enums.cs index 5f9911247..d5647e121 100644 --- a/ShareX.UploadersLib/Enums.cs +++ b/ShareX.UploadersLib/Enums.cs @@ -113,8 +113,6 @@ public enum FileDestination Pushbullet, [Description("SendSpace")] SendSpace, - [Description("Ge.tt")] - Ge_tt, [Description("Hostr")] Localhostr, [Description("JIRA")] diff --git a/ShareX.UploadersLib/FileUploaders/Ge_tt.cs b/ShareX.UploadersLib/FileUploaders/Ge_tt.cs deleted file mode 100644 index 0eaf8b361..000000000 --- a/ShareX.UploadersLib/FileUploaders/Ge_tt.cs +++ /dev/null @@ -1,167 +0,0 @@ -#region License Information (GPL v3) - -/* - ShareX - A program that allows you to take screenshots and share any file type - Copyright (c) 2007-2021 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 Newtonsoft.Json; -using ShareX.HelpersLib; -using ShareX.UploadersLib.Properties; -using System.Collections.Generic; -using System.Drawing; -using System.IO; -using System.Windows.Forms; - -namespace ShareX.UploadersLib.FileUploaders -{ - public class Ge_ttFileUploaderService : FileUploaderService - { - public override FileDestination EnumValue { get; } = FileDestination.Ge_tt; - - public override Icon ServiceIcon => Resources.Gett; - - public override bool CheckConfig(UploadersConfig config) - { - return config.Ge_ttLogin != null && !string.IsNullOrEmpty(config.Ge_ttLogin.AccessToken); - } - - public override GenericUploader CreateUploader(UploadersConfig config, TaskReferenceHelper taskInfo) - { - return new Ge_tt(APIKeys.Ge_ttKey) - { - AccessToken = config.Ge_ttLogin.AccessToken - }; - } - - public override TabPage GetUploadersConfigTabPage(UploadersConfigForm form) => form.tpGe_tt; - } - - public sealed class Ge_tt : FileUploader - { - private const string APIURL = "http://api.ge.tt/1"; - - public string APIKey { get; private set; } - public string AccessToken { get; set; } - - public Ge_tt(string apiKey) - { - APIKey = apiKey; - } - - public Ge_ttLogin Login(string email, string password) - { - Dictionary args = new Dictionary(); - args.Add("apikey", APIKey); - args.Add("email", email); - args.Add("password", password); - - string json = JsonConvert.SerializeObject(args); - - string url = URLHelpers.CombineURL(APIURL, "users/login"); - string response = SendRequest(HttpMethod.POST, url, json, RequestHelpers.ContentTypeJSON); - - return JsonConvert.DeserializeObject(response); - } - - public Ge_ttShare CreateShare(string accessToken) - { - Dictionary args = new Dictionary(); - args.Add("accesstoken", accessToken); - - string url = URLHelpers.CreateQueryString(URLHelpers.CombineURL(APIURL, "shares/create"), args); - string response = SendRequest(HttpMethod.POST, url); - - return JsonConvert.DeserializeObject(response); - } - - public Ge_ttFile CreateFile(string accessToken, string shareName, string fileName) - { - Dictionary args = new Dictionary(); - args.Add("accesstoken", accessToken); - - Dictionary args2 = new Dictionary(); - args2.Add("filename", fileName); - - string json = JsonConvert.SerializeObject(args2); - - string response = SendRequest(HttpMethod.POST, URLHelpers.CombineURL(APIURL, "files", shareName, "create"), json, RequestHelpers.ContentTypeJSON, args); - - return JsonConvert.DeserializeObject(response); - } - - public override UploadResult Upload(Stream stream, string fileName) - { - UploadResult result = null; - - Ge_ttShare share = CreateShare(AccessToken); - - if (share != null) - { - Ge_ttFile file = CreateFile(AccessToken, share.ShareName, fileName); - - if (file != null) - { - result = SendRequestFile(file.Upload.PostURL, stream, fileName, "file"); - - if (result.IsSuccess) - { - result.URL = file.GettURL; - } - } - } - - return result; - } - } - - public class Ge_ttLogin - { - public string Expires { get; set; } - [JsonEncrypt] - public string AccessToken { get; set; } - [JsonEncrypt] - public string RefreshToken { get; set; } - } - - public class Ge_ttShare - { - public string Created { get; set; } - public string UserID { get; set; } - public string ShareName { get; set; } - public string ReadyState { get; set; } - public string FullName { get; set; } - public string Type { get; set; } - public string GettURL { get; set; } - } - - public class Ge_ttFile - { - public string GettURL { get; set; } - public Ge_ttUpload Upload { get; set; } - } - - public class Ge_ttUpload - { - public string PostURL { get; set; } - public string PutURL { get; set; } - } -} \ No newline at end of file diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs index ff83b88ae..1ecc2be5e 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs @@ -333,13 +333,6 @@ private void InitializeComponent() this.lblSendSpaceUsername = new System.Windows.Forms.Label(); this.txtSendSpacePassword = new System.Windows.Forms.TextBox(); this.txtSendSpaceUserName = new System.Windows.Forms.TextBox(); - this.tpGe_tt = new System.Windows.Forms.TabPage(); - this.lblGe_ttStatus = new System.Windows.Forms.Label(); - this.lblGe_ttPassword = new System.Windows.Forms.Label(); - this.lblGe_ttEmail = new System.Windows.Forms.Label(); - this.btnGe_ttLogin = new System.Windows.Forms.Button(); - this.txtGe_ttPassword = new System.Windows.Forms.TextBox(); - this.txtGe_ttEmail = new System.Windows.Forms.TextBox(); this.tpHostr = new System.Windows.Forms.TabPage(); this.cbLocalhostrDirectURL = new System.Windows.Forms.CheckBox(); this.lblLocalhostrPassword = new System.Windows.Forms.Label(); @@ -673,7 +666,6 @@ private void InitializeComponent() this.tpMediaFire.SuspendLayout(); this.tpPushbullet.SuspendLayout(); this.tpSendSpace.SuspendLayout(); - this.tpGe_tt.SuspendLayout(); this.tpHostr.SuspendLayout(); this.tpJira.SuspendLayout(); this.gbJiraServer.SuspendLayout(); @@ -1211,7 +1203,6 @@ private void InitializeComponent() this.tcFileUploaders.Controls.Add(this.tpMediaFire); this.tcFileUploaders.Controls.Add(this.tpPushbullet); this.tcFileUploaders.Controls.Add(this.tpSendSpace); - this.tcFileUploaders.Controls.Add(this.tpGe_tt); this.tcFileUploaders.Controls.Add(this.tpHostr); this.tcFileUploaders.Controls.Add(this.tpJira); this.tcFileUploaders.Controls.Add(this.tpLambda); @@ -2757,51 +2748,6 @@ private void InitializeComponent() this.txtSendSpaceUserName.Name = "txtSendSpaceUserName"; this.txtSendSpaceUserName.TextChanged += new System.EventHandler(this.txtSendSpaceUserName_TextChanged); // - // tpGe_tt - // - this.tpGe_tt.BackColor = System.Drawing.SystemColors.Window; - this.tpGe_tt.Controls.Add(this.lblGe_ttStatus); - this.tpGe_tt.Controls.Add(this.lblGe_ttPassword); - this.tpGe_tt.Controls.Add(this.lblGe_ttEmail); - this.tpGe_tt.Controls.Add(this.btnGe_ttLogin); - this.tpGe_tt.Controls.Add(this.txtGe_ttPassword); - this.tpGe_tt.Controls.Add(this.txtGe_ttEmail); - resources.ApplyResources(this.tpGe_tt, "tpGe_tt"); - this.tpGe_tt.Name = "tpGe_tt"; - // - // lblGe_ttStatus - // - resources.ApplyResources(this.lblGe_ttStatus, "lblGe_ttStatus"); - this.lblGe_ttStatus.Name = "lblGe_ttStatus"; - // - // lblGe_ttPassword - // - resources.ApplyResources(this.lblGe_ttPassword, "lblGe_ttPassword"); - this.lblGe_ttPassword.Name = "lblGe_ttPassword"; - // - // lblGe_ttEmail - // - resources.ApplyResources(this.lblGe_ttEmail, "lblGe_ttEmail"); - this.lblGe_ttEmail.Name = "lblGe_ttEmail"; - // - // btnGe_ttLogin - // - resources.ApplyResources(this.btnGe_ttLogin, "btnGe_ttLogin"); - this.btnGe_ttLogin.Name = "btnGe_ttLogin"; - this.btnGe_ttLogin.UseVisualStyleBackColor = true; - this.btnGe_ttLogin.Click += new System.EventHandler(this.btnGe_ttLogin_Click); - // - // txtGe_ttPassword - // - resources.ApplyResources(this.txtGe_ttPassword, "txtGe_ttPassword"); - this.txtGe_ttPassword.Name = "txtGe_ttPassword"; - this.txtGe_ttPassword.UseSystemPasswordChar = true; - // - // txtGe_ttEmail - // - resources.ApplyResources(this.txtGe_ttEmail, "txtGe_ttEmail"); - this.txtGe_ttEmail.Name = "txtGe_ttEmail"; - // // tpHostr // this.tpHostr.BackColor = System.Drawing.SystemColors.Window; @@ -5071,8 +5017,6 @@ private void InitializeComponent() this.tpPushbullet.PerformLayout(); this.tpSendSpace.ResumeLayout(false); this.tpSendSpace.PerformLayout(); - this.tpGe_tt.ResumeLayout(false); - this.tpGe_tt.PerformLayout(); this.tpHostr.ResumeLayout(false); this.tpHostr.PerformLayout(); this.tpJira.ResumeLayout(false); @@ -5238,12 +5182,6 @@ private void InitializeComponent() private System.Windows.Forms.TextBox txtSendSpacePassword; private System.Windows.Forms.TextBox txtSendSpaceUserName; private AccountTypeControl atcSendSpaceAccountType; - private System.Windows.Forms.Label lblGe_ttStatus; - private System.Windows.Forms.Label lblGe_ttPassword; - private System.Windows.Forms.Label lblGe_ttEmail; - private System.Windows.Forms.Button btnGe_ttLogin; - private System.Windows.Forms.TextBox txtGe_ttPassword; - private System.Windows.Forms.TextBox txtGe_ttEmail; private System.Windows.Forms.CheckBox cbLocalhostrDirectURL; private System.Windows.Forms.Label lblLocalhostrPassword; private System.Windows.Forms.Label lblLocalhostrEmail; @@ -5500,7 +5438,6 @@ private void InitializeComponent() internal System.Windows.Forms.TabPage tpMediaFire; internal System.Windows.Forms.TabPage tpPushbullet; internal System.Windows.Forms.TabPage tpSendSpace; - internal System.Windows.Forms.TabPage tpGe_tt; internal System.Windows.Forms.TabPage tpHostr; internal System.Windows.Forms.TabPage tpJira; internal System.Windows.Forms.TabPage tpLambda; diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs index 9f2971502..20929a0ce 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs @@ -432,15 +432,6 @@ private void LoadFileUploaderSettings() #endregion Box - #region Ge.tt - - if (Config.Ge_ttLogin != null && !string.IsNullOrEmpty(Config.Ge_ttLogin.AccessToken)) - { - lblGe_ttStatus.Text = Resources.UploadersConfigForm_Login_successful; - } - - #endregion Ge.tt - #region Localhostr txtLocalhostrEmail.Text = Config.LocalhostrEmail; @@ -2006,14 +1997,6 @@ private void txtSendSpacePassword_TextChanged(object sender, EventArgs e) #endregion SendSpace - #region Ge.tt - - private void btnGe_ttLogin_Click(object sender, EventArgs e) - { - Ge_ttLogin(); - } - - #endregion Ge.tt #region Localhostr diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.de.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.de.resx index 58c992197..277bd7eb9 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.de.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.de.resx @@ -390,18 +390,6 @@ Das Benutzen einer verschlüsselten Bibliothek deaktiviert das Teilen. Benutze direkte URL, wenn sie existiert - - Einloggen - - - E-Mail: - - - Passwort: - - - Login erforderlich. - Benutzername: diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.es-MX.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.es-MX.resx index ffdd5fd63..2dffdb620 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.es-MX.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.es-MX.resx @@ -243,9 +243,6 @@ Correo electrónico: - - Correo electrónico: - Correo electrónico: @@ -300,9 +297,6 @@ Acceder - - Acceder - Acceder @@ -318,9 +312,6 @@ Acceso requerido. - - Acceso requerido. - minutos @@ -360,9 +351,6 @@ Contraseña: - - Contraseña: - Contraseña: @@ -1061,9 +1049,6 @@ Por ejemplo, si el bucket se llama bucket.example.com, la URL será http://bucke FTP / FTPS / SFTP - - Ge.tt - Gfycat diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.es.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.es.resx index eade943a0..e54b8657f 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.es.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.es.resx @@ -356,18 +356,6 @@ Por ejemplo, si el balde se llama balde.ejemplo.com entonces URL será http://ba Utilice URL directa si existe - - Login - - - Email: - - - Contraseña: - - - Inicio de sesión necesario. - Nombre de usuario: diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.fa-IR.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.fa-IR.resx index 121fda18e..70075dfb3 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.fa-IR.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.fa-IR.resx @@ -402,9 +402,6 @@ کلمه عبور: - - کلمه عبور: - کلمه عبور: @@ -468,9 +465,6 @@ ایمیل: - - ایمیل: - ایمیل: diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.fr.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.fr.resx index ef128a631..5861a4fa4 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.fr.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.fr.resx @@ -336,18 +336,6 @@ Utiliser une bibliothèque chiffrée désactive le partage. Utiliser l'URL directe si elle existe - - Connexion - - - Adresse e-mail : - - - Mot de passe : - - - Connexion requise. - Nom d'utilisateur : @@ -1041,9 +1029,6 @@ Utiliser une bibliothèque chiffrée désactive le partage. blob.core.usgovcloudapi.net - - Ge.tt - http:// diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.hu.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.hu.resx index 775c6d1a1..bf9f58302 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.hu.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.hu.resx @@ -350,18 +350,6 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ Közvetlen URL használata ha létezik - - Bejelentkezés - - - Email: - - - Jelszó: - - - Bejelentkezés szükséges. - Felhasználónév: diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.id-ID.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.id-ID.resx index b67936d4a..054a02b97 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.id-ID.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.id-ID.resx @@ -261,9 +261,6 @@ Email: - - Email: - Email: @@ -402,9 +399,6 @@ Sandi: - - Sandi: - Sandi: @@ -465,9 +459,6 @@ Lanjutan - - Ge.tt - Flickr @@ -960,9 +951,6 @@ Login - - Login - Login @@ -1068,9 +1056,6 @@ Tautan URL: - - Login diperlukan. - Dapatkan token otentikasi diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.it-IT.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.it-IT.resx index 4ee983529..cd900f4f3 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.it-IT.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.it-IT.resx @@ -228,9 +228,6 @@ Email: - - Email: - Email: @@ -360,9 +357,6 @@ Accedi - - Accedi - Accedi @@ -372,9 +366,6 @@ Accesso richiesto. - - Accesso richiesto. - minuti @@ -411,9 +402,6 @@ Password: - - Password: - Password: diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.ja-JP.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.ja-JP.resx index 51b3e460a..dcf0762d3 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.ja-JP.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.ja-JP.resx @@ -476,18 +476,6 @@ ユーザー名: - - ログインが必要です。 - - - パスワード: - - - Eメール: - - - ログイン - 存在する場合はダイレクト リンクを使用 diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.ko-KR.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.ko-KR.resx index c3858ea51..e97975fdd 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.ko-KR.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.ko-KR.resx @@ -356,18 +356,6 @@ 존재한다면 핫링크 사용하기 - - 로그인 - - - 이메일: - - - 비밀번호: - - - 로그인 필요. - 사용자 ID: @@ -830,9 +818,6 @@ SendSpace - - Ge.tt - Hostr diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.nl-NL.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.nl-NL.resx index 3a18eb1cc..b1d92e06a 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.nl-NL.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.nl-NL.resx @@ -378,18 +378,6 @@ Een versleutelde bibliotheek gebruiken schakelt delen uit. Gebruik een directe link als hij bestaat - - Inloggen - - - E-mail: - - - Wachtwoord: - - - Inloggen vereist. - Gebruikersnaam: diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.pt-BR.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.pt-BR.resx index f642c1df9..bc681299a 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.pt-BR.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.pt-BR.resx @@ -161,9 +161,6 @@ Por exemplo, se o seu bucket é chamado bucket.example.com então o URL será ht SendSpace - - Ge.tt - Hostr @@ -420,18 +417,6 @@ Usar uma biblioteca encriptada desabilita o compartilhamento. Usar URL direto se existir - - Logar - - - Email: - - - Senha: - - - Login exigido. - Usuário: diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.pt-PT.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.pt-PT.resx index c832c1da0..df0567788 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.pt-PT.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.pt-PT.resx @@ -617,18 +617,6 @@ Isto apenas têm efeito se não tiver permitido acesso ao B2.Bucket quando foi c Utilizador: - - Necessário iniciar sessão. - - - Palavra-passe: - - - Email: - - - Iniciar sessão - Utilizar hiperligação directa se disponível diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.resx index 35e81682a..49960fcd0 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.resx @@ -7961,192 +7961,6 @@ when you made the application key. 15 - - True - - - NoControl - - - 120, 117 - - - 77, 13 - - - 4 - - - Login required. - - - lblGe_ttStatus - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGe_tt - - - 0 - - - True - - - NoControl - - - 13, 64 - - - 56, 13 - - - 2 - - - Password: - - - lblGe_ttPassword - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGe_tt - - - 1 - - - True - - - NoControl - - - 13, 16 - - - 35, 13 - - - 0 - - - Email: - - - lblGe_ttEmail - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGe_tt - - - 2 - - - NoControl - - - 16, 112 - - - 96, 23 - - - 5 - - - Login - - - btnGe_ttLogin - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGe_tt - - - 3 - - - 16, 80 - - - 168, 20 - - - 3 - - - txtGe_ttPassword - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGe_tt - - - 4 - - - 16, 32 - - - 168, 20 - - - 1 - - - txtGe_ttEmail - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGe_tt - - - 5 - - - 4, 40 - - - 3, 3, 3, 3 - - - 803, 525 - - - 7 - - - Ge.tt - - - tpGe_tt - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFileUploaders - - - 16 - True diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.ru.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.ru.resx index 109f54a00..f120860bc 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.ru.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.ru.resx @@ -339,18 +339,6 @@ Использовать прямой URL, если он существует - - Войти - - - Email: - - - Пароль: - - - Необходимо войти. - Имя пользователя: diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.tr.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.tr.resx index 1750fcc4a..708da722d 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.tr.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.tr.resx @@ -337,18 +337,6 @@ Varsa direkt adres kullan - - Giriş - - - Eposta: - - - Şifre: - - - Giriş gereklidir. - Kullanıcı adı: diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.uk.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.uk.resx index 710524baa..b7e103167 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.uk.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.uk.resx @@ -510,18 +510,6 @@ Ім’я користувача: - - Треба увійти. - - - Пароль: - - - Ел. пошта: - - - Вхід - Пароль: diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.vi-VN.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.vi-VN.resx index 05e1a583d..bb6ba0632 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.vi-VN.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.vi-VN.resx @@ -302,18 +302,6 @@ Ví dụ: nếu tên bucket là bucket.example.com thì URL sẽ là http://buck Sử dụng URL trực tiếp nếu tồn tại - - Đăng nhập - - - Email: - - - Mật khẩu: - - - Đăng nhập được yêu cầu. - Tên người dùng: @@ -806,9 +794,6 @@ Ví dụ: nếu tên bucket là bucket.example.com thì URL sẽ là http://buck FTPS - - Ge.tt - YOURLS diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.zh-CN.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.zh-CN.resx index 68197ec84..d7443e831 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.zh-CN.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.zh-CN.resx @@ -378,18 +378,6 @@ 如果存在则使用直链 - - 登录 - - - 邮箱： - - - 密码： - - - 需要登录。 - 用户名： @@ -1202,9 +1190,6 @@ Flickr - - Ge.tt - Gfycat diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.zh-TW.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.zh-TW.resx index 1be2d15b6..798bd9385 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.zh-TW.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.zh-TW.resx @@ -380,18 +380,6 @@ 如果存在則使用直接網址 - - 登入 - - - 電子信箱： - - - 密碼： - - - 需要登入。 - 使用者名稱： diff --git a/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs b/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs index 9c016775e..89122bc23 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs @@ -718,27 +718,6 @@ public UserPassBox SendSpaceRegister() #endregion SendSpace - #region Ge.tt - - public void Ge_ttLogin() - { - try - { - Ge_tt gett = new Ge_tt(APIKeys.Ge_ttKey); - Ge_ttLogin login = gett.Login(txtGe_ttEmail.Text, txtGe_ttPassword.Text); - Config.Ge_ttLogin = login; - lblGe_ttStatus.Text = Resources.UploadersConfigForm_Login_successful; - } - catch (Exception ex) - { - Config.Ge_ttLogin = null; - lblGe_ttStatus.Text = Resources.UploadersConfigForm_Login_failed; - ex.ShowError(); - } - } - - #endregion Ge.tt - #region Pastebin public void PastebinLogin() diff --git a/ShareX.UploadersLib/ShareX.UploadersLib.csproj b/ShareX.UploadersLib/ShareX.UploadersLib.csproj index 20d996f44..ea12c2935 100644 --- a/ShareX.UploadersLib/ShareX.UploadersLib.csproj +++ b/ShareX.UploadersLib/ShareX.UploadersLib.csproj @@ -141,7 +141,6 @@ - diff --git a/ShareX.UploadersLib/UploadersConfig.cs b/ShareX.UploadersLib/UploadersConfig.cs index ad6800bce..f8672ed60 100644 --- a/ShareX.UploadersLib/UploadersConfig.cs +++ b/ShareX.UploadersLib/UploadersConfig.cs @@ -228,12 +228,6 @@ public class UploadersConfig : SettingsBase #endregion Box - #region Ge.tt - - public Ge_ttLogin Ge_ttLogin { get; set; } = null; - - #endregion Ge.tt - #region Localhostr public string LocalhostrEmail { get; set; } = ""; From 0c14731f78c9c408037dc29f2a6de01315e92f5e Mon Sep 17 00:00:00 2001 From: Ralph Drake Date: Thu, 29 Jul 2021 20:04:45 -0400 Subject: [PATCH 2/2] refactor(UploadersConfigForm): fix code style --- ShareX.UploadersLib/Forms/UploadersConfigForm.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs index 20929a0ce..99f7941a6 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs @@ -1997,7 +1997,6 @@ private void txtSendSpacePassword_TextChanged(object sender, EventArgs e) #endregion SendSpace - #region Localhostr private void txtLocalhostrEmail_TextChanged(object sender, EventArgs e) @@ -3382,4 +3381,4 @@ private void txtTwitterDefaultMessage_TextChanged(object sender, EventArgs e) #endregion Other uploaders } -} \ No newline at end of file +}