From 0d41bc8b8f07fd79571e24731875302e2cb5533e Mon Sep 17 00:00:00 2001 From: Alexander Date: Fri, 29 Oct 2021 23:22:06 +0300 Subject: [PATCH] Rename OCR sites variables, add more sites Also fix sites dropdown style and enabled prop update --- .../Forms/OCRSpaceForm.Designer.cs | 30 ++++++------- ShareX.UploadersLib/Forms/OCRSpaceForm.cs | 40 +++++++++++------- ShareX.UploadersLib/Forms/OCRSpaceForm.resx | 42 +++++++++---------- ShareX.UploadersLib/Helpers/OCROptions.cs | 2 +- 4 files changed, 63 insertions(+), 51 deletions(-) diff --git a/ShareX.UploadersLib/Forms/OCRSpaceForm.Designer.cs b/ShareX.UploadersLib/Forms/OCRSpaceForm.Designer.cs index 7d44ce70b..4c9f189b1 100644 --- a/ShareX.UploadersLib/Forms/OCRSpaceForm.Designer.cs +++ b/ShareX.UploadersLib/Forms/OCRSpaceForm.Designer.cs @@ -36,8 +36,8 @@ private void InitializeComponent() this.btnStartOCR = new System.Windows.Forms.Button(); this.pbProgress = new System.Windows.Forms.ProgressBar(); this.btnOpenInBrowser = new System.Windows.Forms.Button(); - this.cbDefaultTLSite = new System.Windows.Forms.ComboBox(); - this.lblTranslatorSite = new System.Windows.Forms.Label(); + this.cbDefaultSite = new System.Windows.Forms.ComboBox(); + this.lblExternalSite = new System.Windows.Forms.Label(); this.SuspendLayout(); // // cbLanguages @@ -84,25 +84,25 @@ private void InitializeComponent() this.btnOpenInBrowser.UseVisualStyleBackColor = true; this.btnOpenInBrowser.Click += new System.EventHandler(this.btnOpenInBrowser_Click); // - // cbDefaultTLSite + // cbDefaultSite // - this.cbDefaultTLSite.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cbDefaultTLSite.FormattingEnabled = true; - resources.ApplyResources(this.cbDefaultTLSite, "cbDefaultTLSite"); - this.cbDefaultTLSite.Name = "cbDefaultTLSite"; - this.cbDefaultTLSite.SelectedIndexChanged += new System.EventHandler(this.cbDefaultTLSite_SelectedIndexChanged); + this.cbDefaultSite.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbDefaultSite.FormattingEnabled = true; + resources.ApplyResources(this.cbDefaultSite, "cbDefaultSite"); + this.cbDefaultSite.Name = "cbDefaultSite"; + this.cbDefaultSite.SelectedIndexChanged += new System.EventHandler(this.cbDefaultSite_SelectedIndexChanged); // - // lblTranslatorSite + // lblExternalSite // - resources.ApplyResources(this.lblTranslatorSite, "lblTranslatorSite"); - this.lblTranslatorSite.Name = "lblTranslatorSite"; + resources.ApplyResources(this.lblExternalSite, "lblExternalSite"); + this.lblExternalSite.Name = "lblExternalSite"; // // OCRSpaceForm // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.Controls.Add(this.lblTranslatorSite); - this.Controls.Add(this.cbDefaultTLSite); + this.Controls.Add(this.lblExternalSite); + this.Controls.Add(this.cbDefaultSite); this.Controls.Add(this.btnOpenInBrowser); this.Controls.Add(this.lblResult); this.Controls.Add(this.txtResult); @@ -127,7 +127,7 @@ private void InitializeComponent() private System.Windows.Forms.Button btnStartOCR; private System.Windows.Forms.ProgressBar pbProgress; private System.Windows.Forms.Button btnOpenInBrowser; - private System.Windows.Forms.ComboBox cbDefaultTLSite; - private System.Windows.Forms.Label lblTranslatorSite; + private System.Windows.Forms.ComboBox cbDefaultSite; + private System.Windows.Forms.Label lblExternalSite; } } \ No newline at end of file diff --git a/ShareX.UploadersLib/Forms/OCRSpaceForm.cs b/ShareX.UploadersLib/Forms/OCRSpaceForm.cs index c924d2910..45b6c2865 100644 --- a/ShareX.UploadersLib/Forms/OCRSpaceForm.cs +++ b/ShareX.UploadersLib/Forms/OCRSpaceForm.cs @@ -34,12 +34,20 @@ You should have received a copy of the GNU General Public License namespace ShareX.UploadersLib { - public enum OCRSpaceTranslatorSites + public enum OCRSpaceSites { [Description("Google Translate")] - Google, + GoogleTranslate, [Description("DeepL Translate")] - DeepL + DeepL, + [Description("Jisho")] + Jisho, + [Description("ichi.moe")] + Ichi, + [Description("Google")] + Google, + [Description("ekşi sözlük")] + Eksisozluk, } public partial class OCRSpaceForm : Form @@ -51,11 +59,15 @@ public partial class OCRSpaceForm : Form private OCROptions ocrOptions; private OCRSpaceLanguages Language { get; set; } - private Dictionary TranslatorSiteLinks = - new Dictionary() + private Dictionary SiteLinks = + new Dictionary() { - { OCRSpaceTranslatorSites.Google, "https://translate.google.com/#auto/en/" }, - { OCRSpaceTranslatorSites.DeepL, "https://www.deepl.com/translator#auto/en/" } + { OCRSpaceSites.GoogleTranslate, "https://translate.google.com/#auto/en/" }, + { OCRSpaceSites.DeepL, "https://www.deepl.com/translator#auto/en/" }, + { OCRSpaceSites.Jisho, "https://jisho.org/search/" }, + { OCRSpaceSites.Ichi, "https://ichi.moe/cl/qr/?q=" }, + { OCRSpaceSites.Google, "https://www.google.com/search?q=" }, + { OCRSpaceSites.Eksisozluk, "https://eksisozluk.com/?q=" } }; public OCRSpaceForm(OCROptions ocrOptions) @@ -67,8 +79,8 @@ public OCRSpaceForm(OCROptions ocrOptions) cbLanguages.Items.AddRange(Helpers.GetEnumDescriptions()); cbLanguages.SelectedIndex = (int)ocrOptions.DefaultLanguage; - cbDefaultTLSite.Items.AddRange(Helpers.GetEnumDescriptions()); - cbDefaultTLSite.SelectedIndex = (int)ocrOptions.DefaultTranslatorSite; + cbDefaultSite.Items.AddRange(Helpers.GetEnumDescriptions()); + cbDefaultSite.SelectedIndex = (int)ocrOptions.DefaultSite; Language = ocrOptions.DefaultLanguage; txtResult.SupportSelectAll(); @@ -106,7 +118,7 @@ public async Task StartOCR(Stream stream, string fileName) { if (stream != null && stream.Length > 0 && !string.IsNullOrEmpty(fileName)) { - cbLanguages.Enabled = btnStartOCR.Enabled = txtResult.Enabled = btnOpenInBrowser.Enabled = false; + cbLanguages.Enabled = btnStartOCR.Enabled = txtResult.Enabled = btnOpenInBrowser.Enabled = cbDefaultSite.Enabled = false; pbProgress.Visible = true; Result = await OCRSpace.DoOCRAsync(Language, stream, fileName); @@ -119,7 +131,7 @@ public async Task StartOCR(Stream stream, string fileName) if (!IsDisposed) { UpdateControls(); - cbLanguages.Enabled = btnStartOCR.Enabled = txtResult.Enabled = btnOpenInBrowser.Enabled = true; + cbLanguages.Enabled = btnStartOCR.Enabled = txtResult.Enabled = btnOpenInBrowser.Enabled = cbDefaultSite.Enabled = true; pbProgress.Visible = false; txtResult.Focus(); } @@ -138,14 +150,14 @@ private async void btnStartOCR_Click(object sender, EventArgs e) private void btnOpenInBrowser_Click(object sender, EventArgs e) { - URLHelpers.OpenURL(TranslatorSiteLinks[ocrOptions.DefaultTranslatorSite] + Uri.EscapeDataString(txtResult.Text)); + URLHelpers.OpenURL(SiteLinks[ocrOptions.DefaultSite] + Uri.EscapeDataString(txtResult.Text)); Close(); } - private void cbDefaultTLSite_SelectedIndexChanged(object sender, EventArgs e) + private void cbDefaultSite_SelectedIndexChanged(object sender, EventArgs e) { // This doesn't work - ocrOptions.DefaultTranslatorSite = (OCRSpaceTranslatorSites)cbDefaultTLSite.SelectedIndex; + ocrOptions.DefaultSite = (OCRSpaceSites)cbDefaultSite.SelectedIndex; } } } \ No newline at end of file diff --git a/ShareX.UploadersLib/Forms/OCRSpaceForm.resx b/ShareX.UploadersLib/Forms/OCRSpaceForm.resx index 9ce8a8378..580d930a9 100644 --- a/ShareX.UploadersLib/Forms/OCRSpaceForm.resx +++ b/ShareX.UploadersLib/Forms/OCRSpaceForm.resx @@ -321,55 +321,55 @@ 2 - + 371, 30 - + 4, 4, 4, 4 - + 169, 24 - + 9 - - cbDefaultTLSite + + cbDefaultSite - + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + 1 - + True - + 370, 10 - - 103, 17 + + 89, 17 - + 10 - - Translator site: + + External site: - - lblTranslatorSite + + lblExternalSite - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + 0 diff --git a/ShareX.UploadersLib/Helpers/OCROptions.cs b/ShareX.UploadersLib/Helpers/OCROptions.cs index bad2397e0..33447f331 100644 --- a/ShareX.UploadersLib/Helpers/OCROptions.cs +++ b/ShareX.UploadersLib/Helpers/OCROptions.cs @@ -31,7 +31,7 @@ public class OCROptions { public bool Permission { get; set; } = false; public OCRSpaceLanguages DefaultLanguage { get; set; } = OCRSpaceLanguages.eng; - public OCRSpaceTranslatorSites DefaultTranslatorSite { get; set; } = OCRSpaceTranslatorSites.Google; + public OCRSpaceSites DefaultSite { get; set; } = OCRSpaceSites.GoogleTranslate; public bool Silent { get; set; } = false; public bool ProcessOnLoad { get; set; } = true; public bool AutoCopy { get; set; } = false;