From de3b0ba18578cf7a089ac657b1cc588bf38a5390 Mon Sep 17 00:00:00 2001 From: Luke Anderson Date: Wed, 28 Nov 2018 22:25:38 +1030 Subject: [PATCH] Actually implement the requested features --- ShareX.UploadersLib/Forms/OCRSpaceForm.cs | 1 + ShareX/Forms/TaskSettingsForm.Designer.cs | 10 ++++++++ ShareX/Forms/TaskSettingsForm.cs | 6 +++++ ShareX/Forms/TaskSettingsForm.resx | 30 +++++++++++++++++++++++ 4 files changed, 47 insertions(+) diff --git a/ShareX.UploadersLib/Forms/OCRSpaceForm.cs b/ShareX.UploadersLib/Forms/OCRSpaceForm.cs index a62f42140..51cc9ec8a 100644 --- a/ShareX.UploadersLib/Forms/OCRSpaceForm.cs +++ b/ShareX.UploadersLib/Forms/OCRSpaceForm.cs @@ -143,5 +143,6 @@ public class OCROptions { public OCRSpaceLanguages DefaultLanguage = OCRSpaceLanguages.eng; public bool Silent = false; + public bool ProcessOnLoad = true; } } \ No newline at end of file diff --git a/ShareX/Forms/TaskSettingsForm.Designer.cs b/ShareX/Forms/TaskSettingsForm.Designer.cs index 1d31053c7..478c11b27 100644 --- a/ShareX/Forms/TaskSettingsForm.Designer.cs +++ b/ShareX/Forms/TaskSettingsForm.Designer.cs @@ -244,6 +244,7 @@ private void InitializeComponent() this.pgTaskSettings = new System.Windows.Forms.PropertyGrid(); this.chkOverrideAdvancedSettings = new System.Windows.Forms.CheckBox(); this.tttvMain = new ShareX.HelpersLib.TabToTreeView(); + this.cbCaptureOCRProcessOnLoad = new System.Windows.Forms.CheckBox(); this.tcTaskSettings.SuspendLayout(); this.tpTask.SuspendLayout(); this.cmsDestinations.SuspendLayout(); @@ -1584,6 +1585,7 @@ private void InitializeComponent() // // tpOCR // + this.tpOCR.Controls.Add(this.cbCaptureOCRProcessOnLoad); this.tpOCR.Controls.Add(this.cbCaptureOCRSilent); this.tpOCR.Controls.Add(this.lblOCRDefaultLanguage); this.tpOCR.Controls.Add(this.cbCaptureOCRDefaultLanguage); @@ -2090,6 +2092,13 @@ private void InitializeComponent() this.tttvMain.TreeViewSize = 190; this.tttvMain.TabChanged += new ShareX.HelpersLib.TabToTreeView.TabChangedEventHandler(this.tttvMain_TabChanged); // + // cbCaptureOCRProcessOnLoad + // + resources.ApplyResources(this.cbCaptureOCRProcessOnLoad, "cbCaptureOCRProcessOnLoad"); + this.cbCaptureOCRProcessOnLoad.Name = "cbCaptureOCRProcessOnLoad"; + this.cbCaptureOCRProcessOnLoad.UseVisualStyleBackColor = true; + this.cbCaptureOCRProcessOnLoad.CheckedChanged += new System.EventHandler(this.cbCaptureOCRProcessOnLoad_CheckedChanged); + // // TaskSettingsForm // resources.ApplyResources(this, "$this"); @@ -2395,5 +2404,6 @@ private void InitializeComponent() private System.Windows.Forms.Label lblOCRDefaultLanguage; private System.Windows.Forms.ComboBox cbCaptureOCRDefaultLanguage; private System.Windows.Forms.CheckBox cbCaptureOCRSilent; + private System.Windows.Forms.CheckBox cbCaptureOCRProcessOnLoad; } } \ No newline at end of file diff --git a/ShareX/Forms/TaskSettingsForm.cs b/ShareX/Forms/TaskSettingsForm.cs index 83bafcea6..5607ecd1c 100644 --- a/ShareX/Forms/TaskSettingsForm.cs +++ b/ShareX/Forms/TaskSettingsForm.cs @@ -305,6 +305,7 @@ public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false) cbCaptureOCRDefaultLanguage.SelectedIndex = (int)ocrOptions.DefaultLanguage; cbCaptureOCRSilent.Checked = ocrOptions.Silent; + cbCaptureOCRProcessOnLoad.Checked = ocrOptions.ProcessOnLoad; #endregion @@ -1121,6 +1122,11 @@ private void cbCaptureOCRSilent_CheckedChanged(object sender, EventArgs e) TaskSettings.CaptureSettings.OCROptions.Silent = cbCaptureOCRSilent.Checked; } + private void cbCaptureOCRProcessOnLoad_CheckedChanged(object sender, EventArgs e) + { + TaskSettings.CaptureSettings.OCROptions.ProcessOnLoad = cbCaptureOCRProcessOnLoad.Checked; + } + #endregion #endregion Capture diff --git a/ShareX/Forms/TaskSettingsForm.resx b/ShareX/Forms/TaskSettingsForm.resx index 256ebf1c8..19d0ed914 100644 --- a/ShareX/Forms/TaskSettingsForm.resx +++ b/ShareX/Forms/TaskSettingsForm.resx @@ -3780,6 +3780,36 @@ 2 + + True + + + NoControl + + + 11, 83 + + + 163, 17 + + + 15 + + + Process OCR on dialog open + + + cbCaptureOCRProcessOnLoad + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOCR + + + 0 + True