From 862b14ceb5620decaf09842cd00f9fd5e506ea10 Mon Sep 17 00:00:00 2001 From: 9joao6 Date: Fri, 23 Feb 2018 15:49:04 +0000 Subject: [PATCH 1/2] - Added "Open in Google Translate and close window" button to OCRSpaceForm --- .../Forms/OCRSpaceForm.Designer.cs | 10 ++++ ShareX.UploadersLib/Forms/OCRSpaceForm.cs | 7 +++ ShareX.UploadersLib/Forms/OCRSpaceForm.resx | 50 ++++++++++++++++--- 3 files changed, 60 insertions(+), 7 deletions(-) diff --git a/ShareX.UploadersLib/Forms/OCRSpaceForm.Designer.cs b/ShareX.UploadersLib/Forms/OCRSpaceForm.Designer.cs index 89fee4dff..db7dcc5e1 100644 --- a/ShareX.UploadersLib/Forms/OCRSpaceForm.Designer.cs +++ b/ShareX.UploadersLib/Forms/OCRSpaceForm.Designer.cs @@ -36,6 +36,7 @@ private void InitializeComponent() this.llAttribution = new System.Windows.Forms.LinkLabel(); this.btnStartOCR = new System.Windows.Forms.Button(); this.pbProgress = new System.Windows.Forms.ProgressBar(); + this.llGoogleTranslate = new System.Windows.Forms.LinkLabel(); this.SuspendLayout(); // // cbLanguages @@ -82,10 +83,18 @@ private void InitializeComponent() this.pbProgress.Name = "pbProgress"; this.pbProgress.Style = System.Windows.Forms.ProgressBarStyle.Marquee; // + // llGoogleTranslate + // + resources.ApplyResources(this.llGoogleTranslate, "llGoogleTranslate"); + this.llGoogleTranslate.Name = "llGoogleTranslate"; + this.llGoogleTranslate.TabStop = true; + this.llGoogleTranslate.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.llGoogleTranslate_LinkClicked); + // // OCRSpaceForm // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.llGoogleTranslate); this.Controls.Add(this.lblResult); this.Controls.Add(this.txtResult); this.Controls.Add(this.lblLanguage); @@ -110,5 +119,6 @@ private void InitializeComponent() private System.Windows.Forms.LinkLabel llAttribution; private System.Windows.Forms.Button btnStartOCR; private System.Windows.Forms.ProgressBar pbProgress; + private System.Windows.Forms.LinkLabel llGoogleTranslate; } } \ No newline at end of file diff --git a/ShareX.UploadersLib/Forms/OCRSpaceForm.cs b/ShareX.UploadersLib/Forms/OCRSpaceForm.cs index c470e746b..4f2a0d7ae 100644 --- a/ShareX.UploadersLib/Forms/OCRSpaceForm.cs +++ b/ShareX.UploadersLib/Forms/OCRSpaceForm.cs @@ -107,6 +107,7 @@ private void StartOCR(Stream stream, string filename) cbLanguages.Enabled = btnStartOCR.Enabled = txtResult.Enabled = true; pbProgress.Visible = false; txtResult.Focus(); + llGoogleTranslate.Enabled = true; } }); } @@ -126,5 +127,11 @@ private void llAttribution_LinkClicked(object sender, LinkLabelLinkClickedEventA { URLHelpers.OpenURL("https://ocr.space"); } + + private void llGoogleTranslate_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + URLHelpers.OpenURL("https://translate.google.com/#auto/en/" + txtResult.Text); + this.Close(); + } } } \ No newline at end of file diff --git a/ShareX.UploadersLib/Forms/OCRSpaceForm.resx b/ShareX.UploadersLib/Forms/OCRSpaceForm.resx index 328fcaa69..1b08d51e4 100644 --- a/ShareX.UploadersLib/Forms/OCRSpaceForm.resx +++ b/ShareX.UploadersLib/Forms/OCRSpaceForm.resx @@ -138,7 +138,7 @@ $this - 3 + 4 True @@ -165,7 +165,7 @@ $this - 2 + 3 @@ -196,7 +196,7 @@ $this - 1 + 2 True @@ -223,7 +223,7 @@ $this - 0 + 1 Top, Right @@ -253,7 +253,7 @@ $this - 6 + 7 168, 22 @@ -277,7 +277,7 @@ $this - 5 + 6 168, 22 @@ -301,7 +301,43 @@ $this - 4 + 5 + + + Top, Right + + + True + + + False + + + 336, 56 + + + 216, 13 + + + 7 + + + Open in Google Translate and close window + + + TopRight + + + llGoogleTranslate + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 True From a40b1ad288660650f0f51c9badf4803dfea7a252 Mon Sep 17 00:00:00 2001 From: 9joao6 Date: Fri, 23 Feb 2018 16:02:10 +0000 Subject: [PATCH 2/2] - Special characters now supported --- ShareX.UploadersLib/Forms/OCRSpaceForm.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ShareX.UploadersLib/Forms/OCRSpaceForm.cs b/ShareX.UploadersLib/Forms/OCRSpaceForm.cs index 4f2a0d7ae..42e53f34e 100644 --- a/ShareX.UploadersLib/Forms/OCRSpaceForm.cs +++ b/ShareX.UploadersLib/Forms/OCRSpaceForm.cs @@ -130,8 +130,8 @@ private void llAttribution_LinkClicked(object sender, LinkLabelLinkClickedEventA private void llGoogleTranslate_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - URLHelpers.OpenURL("https://translate.google.com/#auto/en/" + txtResult.Text); + URLHelpers.OpenURL("https://translate.google.com/#auto/en/" + Uri.EscapeDataString(txtResult.Text)); this.Close(); } } -} \ No newline at end of file +}