From cf5260807520cc840922f37e0ef0071511a5b436 Mon Sep 17 00:00:00 2001 From: NPCDW Date: Sat, 23 Apr 2022 17:36:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=AA=97=E5=8F=A3=E6=9C=80?= =?UTF-8?q?=E5=B0=8F=E5=8C=96=E6=97=B6=E6=97=A0=E6=B3=95=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WindowsFormsOCR/MainForm.cs | 18 ++---------------- WindowsFormsOCR/Properties/AssemblyInfo.cs | 4 ++-- WindowsFormsOCR/ScreenshotForm.cs | 1 + WindowsFormsOCR/SettingForm.Designer.cs | 4 ++-- .../TranslateAndOCRForm.Designer.cs | 1 + 5 files changed, 8 insertions(+), 20 deletions(-) diff --git a/WindowsFormsOCR/MainForm.cs b/WindowsFormsOCR/MainForm.cs index 36c734d..f251701 100644 --- a/WindowsFormsOCR/MainForm.cs +++ b/WindowsFormsOCR/MainForm.cs @@ -36,6 +36,7 @@ private void Setting_Click(object sender, EventArgs e) { if (form is SettingForm) { + form.WindowState = FormWindowState.Normal; form.Activate(); return; } @@ -89,6 +90,7 @@ private void Translate_HotKey_Click(object sender, EventArgs e) if (item is TranslateAndOcrForm) { form = (TranslateAndOcrForm)item; + form.WindowState = FormWindowState.Normal; form.Activate(); break; } @@ -110,14 +112,6 @@ private void Translate_HotKey_Click(object sender, EventArgs e) private void ScreenshotTranslation_Click(object sender, EventArgs e) { - foreach (Form form in Application.OpenForms) - { - if (form is ScreenshotForm) - { - form.Activate(); - return; - } - } ScreenshotForm body = new ScreenshotForm("translate"); body.Size = Screen.PrimaryScreen.Bounds.Size; body.Show(); @@ -125,14 +119,6 @@ private void ScreenshotTranslation_Click(object sender, EventArgs e) private void OcrButton_Click(object sender, EventArgs e) { - foreach (Form form in Application.OpenForms) - { - if (form is ScreenshotForm) - { - form.Activate(); - return; - } - } ScreenshotForm body = new ScreenshotForm(); body.Size = Screen.PrimaryScreen.Bounds.Size; body.Show(); diff --git a/WindowsFormsOCR/Properties/AssemblyInfo.cs b/WindowsFormsOCR/Properties/AssemblyInfo.cs index 2addf04..fb99954 100644 --- a/WindowsFormsOCR/Properties/AssemblyInfo.cs +++ b/WindowsFormsOCR/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.3.1")] -[assembly: AssemblyFileVersion("1.3.1")] +[assembly: AssemblyVersion("1.3.2")] +[assembly: AssemblyFileVersion("1.3.2")] diff --git a/WindowsFormsOCR/ScreenshotForm.cs b/WindowsFormsOCR/ScreenshotForm.cs index 5c2aa66..e747297 100644 --- a/WindowsFormsOCR/ScreenshotForm.cs +++ b/WindowsFormsOCR/ScreenshotForm.cs @@ -94,6 +94,7 @@ private void Screenshot_MouseUp(object sender, MouseEventArgs e) if (item is TranslateAndOcrForm) { form = (TranslateAndOcrForm)item; + form.WindowState = FormWindowState.Normal; form.Activate(); break; } diff --git a/WindowsFormsOCR/SettingForm.Designer.cs b/WindowsFormsOCR/SettingForm.Designer.cs index 1cfa432..0743a99 100644 --- a/WindowsFormsOCR/SettingForm.Designer.cs +++ b/WindowsFormsOCR/SettingForm.Designer.cs @@ -850,9 +850,9 @@ private void InitializeComponent() this.label1.Location = new System.Drawing.Point(21, 35); this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(123, 17); + this.label1.Size = new System.Drawing.Size(130, 17); this.label1.TabIndex = 0; - this.label1.Text = "版本 1.3.1 (2022.4.9)"; + this.label1.Text = "版本 1.3.2 (2022.4.23)"; // // SettingForm // diff --git a/WindowsFormsOCR/TranslateAndOCRForm.Designer.cs b/WindowsFormsOCR/TranslateAndOCRForm.Designer.cs index 70f2e75..f89711e 100644 --- a/WindowsFormsOCR/TranslateAndOCRForm.Designer.cs +++ b/WindowsFormsOCR/TranslateAndOCRForm.Designer.cs @@ -191,6 +191,7 @@ private void InitializeComponent() this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Margin = new System.Windows.Forms.Padding(4); + this.MaximizeBox = false; this.Name = "TranslateAndOcrForm"; this.Text = "文字识别和翻译"; this.Load += new System.EventHandler(this.TranslateAndOcrForm_Load);