CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-28 03:00:22 +12:00
Code Issues Packages Projects Releases Wiki Activity

Added ocr option to close OCR window after opening browser for translation

Browse source
This commit is contained in:
gregorygregio 2024-01-02 19:07:03 -03:00
parent 52a71c8b8d
commit 1ef60d982e
6 changed files with 62 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ShareX/Forms/TaskSettingsForm.Designer.cs generated
View file

@ -118,6 +118,7 @@ private void InitializeComponent()
this.cbImageGIFQuality = new System.Windows.Forms.ComboBox();
this.cbOverrideImageSettings = new System.Windows.Forms.CheckBox();
this.tpEffects = new System.Windows.Forms.TabPage();
this.cbUseRandomImageEffect = new System.Windows.Forms.CheckBox();
this.lblImageEffectsNote = new System.Windows.Forms.Label();
this.cbShowImageEffectsWindowAfterCapture = new System.Windows.Forms.CheckBox();
this.cbImageEffectOnlyRegionCapture = new System.Windows.Forms.CheckBox();
@ -219,6 +220,7 @@ private void InitializeComponent()
this.tpOCR = new System.Windows.Forms.TabPage();
this.btnCaptureOCRHelp = new System.Windows.Forms.Button();
this.cbCaptureOCRAutoCopy = new System.Windows.Forms.CheckBox();
this.cbCloseWindowAfterOpenServiceLink = new System.Windows.Forms.CheckBox();
this.cbCaptureOCRSilent = new System.Windows.Forms.CheckBox();
this.lblOCRDefaultLanguage = new System.Windows.Forms.Label();
this.cbCaptureOCRDefaultLanguage = new System.Windows.Forms.ComboBox();
@ -298,7 +300,6 @@ private void InitializeComponent()
this.pgTaskSettings = new System.Windows.Forms.PropertyGrid();
this.cbOverrideAdvancedSettings = new System.Windows.Forms.CheckBox();
this.tttvMain = new ShareX.HelpersLib.TabToTreeView();
this.cbUseRandomImageEffect = new System.Windows.Forms.CheckBox();
this.tcTaskSettings.SuspendLayout();
this.tpTask.SuspendLayout();
this.cmsDestinations.SuspendLayout();
@ -1080,6 +1081,13 @@ private void InitializeComponent()
resources.ApplyResources(this.tpEffects, "tpEffects");
this.tpEffects.Name = "tpEffects";
//
// cbUseRandomImageEffect
//
resources.ApplyResources(this.cbUseRandomImageEffect, "cbUseRandomImageEffect");
this.cbUseRandomImageEffect.Name = "cbUseRandomImageEffect";
this.cbUseRandomImageEffect.UseVisualStyleBackColor = true;
this.cbUseRandomImageEffect.CheckedChanged += new System.EventHandler(this.cbUseRandomImageEffect_CheckedChanged);
//
// lblImageEffectsNote
//
resources.ApplyResources(this.lblImageEffectsNote, "lblImageEffectsNote");
@ -1990,6 +1998,7 @@ private void InitializeComponent()
//
this.tpOCR.Controls.Add(this.btnCaptureOCRHelp);
this.tpOCR.Controls.Add(this.cbCaptureOCRAutoCopy);
this.tpOCR.Controls.Add(this.cbCloseWindowAfterOpenServiceLink);
this.tpOCR.Controls.Add(this.cbCaptureOCRSilent);
this.tpOCR.Controls.Add(this.lblOCRDefaultLanguage);
this.tpOCR.Controls.Add(this.cbCaptureOCRDefaultLanguage);
@ -2012,6 +2021,13 @@ private void InitializeComponent()
this.cbCaptureOCRAutoCopy.UseVisualStyleBackColor = true;
this.cbCaptureOCRAutoCopy.CheckedChanged += new System.EventHandler(this.cbCaptureOCRAutoCopy_CheckedChanged);
//
// cbCloseWindowAfterOpenServiceLink
//
resources.ApplyResources(this.cbCloseWindowAfterOpenServiceLink, "cbCloseWindowAfterOpenServiceLink");
this.cbCloseWindowAfterOpenServiceLink.Name = "cbCloseWindowAfterOpenServiceLink";
this.cbCloseWindowAfterOpenServiceLink.UseVisualStyleBackColor = true;
this.cbCloseWindowAfterOpenServiceLink.CheckedChanged += new System.EventHandler(this.cbCloseWindowAfterOpenServiceLink_CheckedChanged);
//
// cbCaptureOCRSilent
//
resources.ApplyResources(this.cbCaptureOCRSilent, "cbCaptureOCRSilent");
@ -2595,13 +2611,6 @@ private void InitializeComponent()
this.tttvMain.TreeViewSize = 190;
this.tttvMain.TabChanged += new ShareX.HelpersLib.TabToTreeView.TabChangedEventHandler(this.tttvMain_TabChanged);
//
// cbUseRandomImageEffect
//
resources.ApplyResources(this.cbUseRandomImageEffect, "cbUseRandomImageEffect");
this.cbUseRandomImageEffect.Name = "cbUseRandomImageEffect";
this.cbUseRandomImageEffect.UseVisualStyleBackColor = true;
this.cbUseRandomImageEffect.CheckedChanged += new System.EventHandler(this.cbUseRandomImageEffect_CheckedChanged);
//
// TaskSettingsForm
//
resources.ApplyResources(this, "$this");
@ -2912,6 +2921,7 @@ private void InitializeComponent()
private System.Windows.Forms.ComboBox cbCaptureOCRDefaultLanguage;
private System.Windows.Forms.CheckBox cbCaptureOCRSilent;
private System.Windows.Forms.CheckBox cbCaptureOCRAutoCopy;
private System.Windows.Forms.CheckBox cbCloseWindowAfterOpenServiceLink;
private System.Windows.Forms.Label lblScreenshotDelay;
private System.Windows.Forms.Label lblAutoIncrementNumber;
private System.Windows.Forms.NumericUpDown nudAutoIncrementNumber;

5
ShareX/Forms/TaskSettingsForm.cs
View file

@ -387,6 +387,7 @@ public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false)
cbCaptureOCRSilent.Checked = ocrOptions.Silent;
cbCaptureOCRAutoCopy.Enabled = !ocrOptions.Silent;
cbCaptureOCRAutoCopy.Checked = ocrOptions.AutoCopy;
cbCloseWindowAfterOpenServiceLink.Checked = ocrOptions.CloseWindowAfterOpeningServiceLink;
#endregion OCR
@ -1365,6 +1366,10 @@ private void cbCaptureOCRAutoCopy_CheckedChanged(object sender, EventArgs e)
{
TaskSettings.CaptureSettings.OCROptions.AutoCopy = cbCaptureOCRAutoCopy.Checked;
}
private void cbCloseWindowAfterOpenServiceLink_CheckedChanged(object sender, EventArgs e)
{
TaskSettings.CaptureSettings.OCROptions.CloseWindowAfterOpeningServiceLink = cbCloseWindowAfterOpenServiceLink.Checked;
}
#endregion OCR

3
ShareX/Forms/TaskSettingsForm.pt-BR.resx
View file

@ -645,4 +645,7 @@
<data name="lblImageSizeLimitHint.Text" xml:space="preserve">
<value>kB</value>
</data>
<data name="cbCloseWindowAfterOpenServiceLink.Text" xml:space="preserve">
<value>Fechar janela após abrir link de serviço</value>
</data>
</root>

33
ShareX/Forms/TaskSettingsForm.resx
View file

@ -5040,6 +5040,33 @@
<data name="&gt;&gt;cbCaptureOCRAutoCopy.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="cbCloseWindowAfterOpenServiceLink.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbCloseWindowAfterOpenServiceLink.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 103</value>
</data>
<data name="cbCloseWindowAfterOpenServiceLink.Size" type="System.Drawing.Size, System.Drawing">
<value>231, 17</value>
</data>
<data name="cbCloseWindowAfterOpenServiceLink.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
</data>
<data name="cbCloseWindowAfterOpenServiceLink.Text" xml:space="preserve">
<value>Close this window after opening service link</value>
</data>
<data name="&gt;&gt;cbCloseWindowAfterOpenServiceLink.Name" xml:space="preserve">
<value>cbCloseWindowAfterOpenServiceLink</value>
</data>
<data name="&gt;&gt;cbCloseWindowAfterOpenServiceLink.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;cbCloseWindowAfterOpenServiceLink.Parent" xml:space="preserve">
<value>tpOCR</value>
</data>
<data name="&gt;&gt;cbCloseWindowAfterOpenServiceLink.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="cbCaptureOCRSilent.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -5068,7 +5095,7 @@
<value>tpOCR</value>
</data>
<data name="&gt;&gt;cbCaptureOCRSilent.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<data name="lblOCRDefaultLanguage.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -5098,7 +5125,7 @@
<value>tpOCR</value>
</data>
<data name="&gt;&gt;lblOCRDefaultLanguage.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<data name="cbCaptureOCRDefaultLanguage.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 24</value>
@ -5119,7 +5146,7 @@
<value>tpOCR</value>
</data>
<data name="&gt;&gt;cbCaptureOCRDefaultLanguage.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<data name="tpOCR.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>

6
ShareX/Tools/OCR/OCRForm.cs
View file

@ -222,7 +222,7 @@ private async void cbSingleLine_CheckedChanged(object sender, EventArgs e)
await OCR(bmpSource);
}
}
private void cbServices_SelectedIndexChanged(object sender, EventArgs e)
{
Options.SelectedServiceLink = cbServices.SelectedIndex;
@ -233,6 +233,10 @@ private void btnOpenServiceLink_Click(object sender, EventArgs e)
if (!string.IsNullOrEmpty(Result) && cbServices.SelectedItem is ServiceLink serviceLink)
{
serviceLink.OpenLink(Result);
if(Options.CloseWindowAfterOpeningServiceLink)
{
this.Close();
}
}
}

1
ShareX/Tools/OCR/OCROptions.cs
View file

@ -35,6 +35,7 @@ public class OCROptions
public bool Silent { get; set; } = false;
public bool AutoCopy { get; set; } = false;
public List<ServiceLink> ServiceLinks { get; set; } = DefaultServiceLinks;
public bool CloseWindowAfterOpeningServiceLink { get; set; } = false;
public int SelectedServiceLink { get; set; } = 0;
public static List<ServiceLink> DefaultServiceLinks => new List<ServiceLink>()