From c5a6d7f04162ae78b5d44f86871a0d37d4c9faa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AD=B1=E5=82=91?= Date: Wed, 27 Jul 2022 21:33:49 +0800 Subject: [PATCH] Add GOOD Help --- .../Forms/FormMain.Designer.cs | 39 +++++ Source/GrasscutterTools/Forms/FormMain.cs | 69 ++++++--- .../Forms/FormMain.en-us.resx | 12 +- Source/GrasscutterTools/Forms/FormMain.resx | 139 ++++++++++++++++-- .../Forms/FormMain.ru-ru.resx | 16 +- .../Forms/FormMain.zh-TW.resx | 12 +- 6 files changed, 238 insertions(+), 49 deletions(-) diff --git a/Source/GrasscutterTools/Forms/FormMain.Designer.cs b/Source/GrasscutterTools/Forms/FormMain.Designer.cs index 356c9cc..07a8e8d 100644 --- a/Source/GrasscutterTools/Forms/FormMain.Designer.cs +++ b/Source/GrasscutterTools/Forms/FormMain.Designer.cs @@ -35,6 +35,9 @@ namespace GrasscutterTools.Forms this.GrpCommand = new System.Windows.Forms.GroupBox(); this.BtnInvokeOpenCommand = new System.Windows.Forms.Button(); this.TPRemoteCall = new System.Windows.Forms.TabPage(); + this.LnkGOODHelp = new System.Windows.Forms.LinkLabel(); + this.LnkInventoryKamera = new System.Windows.Forms.LinkLabel(); + this.LblGOODHelp = new System.Windows.Forms.Label(); this.ButtonOpenGOODImport = new System.Windows.Forms.Button(); this.LblHostTip = new System.Windows.Forms.Label(); this.GrpServerStatus = new System.Windows.Forms.GroupBox(); @@ -222,6 +225,7 @@ namespace GrasscutterTools.Forms this.LblDefaultUid = new System.Windows.Forms.Label(); this.TCMain = new System.Windows.Forms.TabControl(); this.TxtBanReason = new GrasscutterTools.Controls.TextBoxXP(); + this.LnkLinks = new System.Windows.Forms.LinkLabel(); this.GrpCommand.SuspendLayout(); this.TPRemoteCall.SuspendLayout(); this.GrpServerStatus.SuspendLayout(); @@ -318,6 +322,10 @@ namespace GrasscutterTools.Forms // // TPRemoteCall // + this.TPRemoteCall.Controls.Add(this.LnkLinks); + this.TPRemoteCall.Controls.Add(this.LnkGOODHelp); + this.TPRemoteCall.Controls.Add(this.LnkInventoryKamera); + this.TPRemoteCall.Controls.Add(this.LblGOODHelp); this.TPRemoteCall.Controls.Add(this.ButtonOpenGOODImport); this.TPRemoteCall.Controls.Add(this.LblHostTip); this.TPRemoteCall.Controls.Add(this.GrpServerStatus); @@ -329,6 +337,26 @@ namespace GrasscutterTools.Forms this.TPRemoteCall.Name = "TPRemoteCall"; this.TPRemoteCall.UseVisualStyleBackColor = true; // + // LnkGOODHelp + // + resources.ApplyResources(this.LnkGOODHelp, "LnkGOODHelp"); + this.LnkGOODHelp.Cursor = System.Windows.Forms.Cursors.Help; + this.LnkGOODHelp.Name = "LnkGOODHelp"; + this.LnkGOODHelp.TabStop = true; + this.LnkGOODHelp.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LnkGOODHelp_LinkClicked); + // + // LnkInventoryKamera + // + resources.ApplyResources(this.LnkInventoryKamera, "LnkInventoryKamera"); + this.LnkInventoryKamera.Name = "LnkInventoryKamera"; + this.LnkInventoryKamera.TabStop = true; + this.LnkInventoryKamera.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LnkInventoryKamera_LinkClicked); + // + // LblGOODHelp + // + resources.ApplyResources(this.LblGOODHelp, "LblGOODHelp"); + this.LblGOODHelp.Name = "LblGOODHelp"; + // // ButtonOpenGOODImport // resources.ApplyResources(this.ButtonOpenGOODImport, "ButtonOpenGOODImport"); @@ -1962,6 +1990,13 @@ namespace GrasscutterTools.Forms this.TxtBanReason.Minimum = 0F; this.TxtBanReason.Name = "TxtBanReason"; // + // LnkLinks + // + resources.ApplyResources(this.LnkLinks, "LnkLinks"); + this.LnkLinks.Name = "LnkLinks"; + this.LnkLinks.TabStop = true; + this.LnkLinks.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LnkLinks_LinkClicked); + // // FormMain // resources.ApplyResources(this, "$this"); @@ -2254,5 +2289,9 @@ namespace GrasscutterTools.Forms private System.Windows.Forms.Button BtnGiveAllChar; private System.Windows.Forms.Label LblHostTip; private System.Windows.Forms.Button ButtonOpenGOODImport; + private System.Windows.Forms.LinkLabel LnkInventoryKamera; + private System.Windows.Forms.Label LblGOODHelp; + private System.Windows.Forms.LinkLabel LnkGOODHelp; + private System.Windows.Forms.LinkLabel LnkLinks; } } diff --git a/Source/GrasscutterTools/Forms/FormMain.cs b/Source/GrasscutterTools/Forms/FormMain.cs index 33c65dd..069bd77 100644 --- a/Source/GrasscutterTools/Forms/FormMain.cs +++ b/Source/GrasscutterTools/Forms/FormMain.cs @@ -21,7 +21,6 @@ using System.Collections.Generic; using System.Drawing; using System.IO; using System.Linq; -using System.Security; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; @@ -157,7 +156,7 @@ namespace GrasscutterTools.Forms MessageBoxButtons.YesNo, MessageBoxIcon.Information); if (r == DialogResult.Yes) - System.Diagnostics.Process.Start(info.Url); + OpenURL(info.Url); else if (r == DialogResult.No) Settings.Default.CheckedLastVersion = lastestVersion.ToString(); })); @@ -1164,16 +1163,7 @@ namespace GrasscutterTools.Forms private void LnkGithub_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - try - { - System.Diagnostics.Process.Start("https://github.com/jie65535/GrasscutterCommandGenerator"); - } - catch (Exception) - { - MessageBox.Show(Resources.BrowserOpenFailedTip - + "\n https://github.com/jie65535/GrasscutterCommandGenerator", - Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Warning); - } + OpenURL("https://github.com/jie65535/GrasscutterCommandGenerator"); } #endregion - 关于 - @@ -1192,9 +1182,9 @@ namespace GrasscutterTools.Forms private void SetCommand(string command, string args) { if (ChkIncludeUID.Checked) - SetCommand($"{command} @{NUDUid.Value} {args}"); + SetCommand($"{command} @{NUDUid.Value} {args.Trim()}"); else - SetCommand($"{command} {args}"); + SetCommand($"{command} {args.Trim()}"); } private async void BtnCopy_Click(object sender, EventArgs e) @@ -1494,16 +1484,7 @@ namespace GrasscutterTools.Forms private void LnkOpenCommandLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - try - { - System.Diagnostics.Process.Start("https://github.com/jie65535/gc-opencommand-plugin"); - } - catch (Exception) - { - MessageBox.Show(Resources.BrowserOpenFailedTip - + "\n https://github.com/jie65535/gc-opencommand-plugin", - Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Warning); - } + OpenURL("https://github.com/jie65535/gc-opencommand-plugin"); } private void LnkRCHelp_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) @@ -1511,6 +1492,45 @@ namespace GrasscutterTools.Forms MessageBox.Show(Resources.OpenCommandHelp, Resources.Help, MessageBoxButtons.OK, MessageBoxIcon.Information); } + private void LnkInventoryKamera_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + OpenURL("https://github.com/Andrewthe13th/Inventory_Kamera"); + } + + private void LnkGOODHelp_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + OpenURL("https://frzyc.github.io/genshin-optimizer/#/doc"); + } + + private void LnkLinks_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + var links = new List + { + "https://frzyc.github.io/genshin-optimizer/", + "https://genshin.aspirine.su/", + "https://genshin.mingyulab.com/", + "https://genshin-center.com/", + "https://github.com/Andrewthe13th/Inventory_Kamera", + "https://github.com/daydreaming666/Amenoma", + "https://seelie.me/", + "https://www.mona-uranai.com/", + }; + MessageBox.Show(string.Join("\n", links), "Links", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + + private void OpenURL(string url) + { + try + { + System.Diagnostics.Process.Start(url); + } + catch (Exception) + { + MessageBox.Show(Resources.BrowserOpenFailedTip + "\n " + url, + Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Warning); + } + } + #endregion - 远程 - #region - 任务 - @@ -1549,5 +1569,6 @@ namespace GrasscutterTools.Forms } #endregion - 任务 - + } } diff --git a/Source/GrasscutterTools/Forms/FormMain.en-us.resx b/Source/GrasscutterTools/Forms/FormMain.en-us.resx index 8f7daa7..840c17c 100644 --- a/Source/GrasscutterTools/Forms/FormMain.en-us.resx +++ b/Source/GrasscutterTools/Forms/FormMain.en-us.resx @@ -136,6 +136,15 @@ Remote + + InventoryKamera + + + Come and import your official server archive into GC! + + + Import GOOD + 108, 16 @@ -856,7 +865,4 @@ Therefore, the quest can be added and finished, but not necessarily work. Include UID - - Import GOOD - \ No newline at end of file diff --git a/Source/GrasscutterTools/Forms/FormMain.resx b/Source/GrasscutterTools/Forms/FormMain.resx index 264bbb0..02c9b16 100644 --- a/Source/GrasscutterTools/Forms/FormMain.resx +++ b/Source/GrasscutterTools/Forms/FormMain.resx @@ -264,6 +264,117 @@ 1 + + True + + + 419, 206 + + + 37, 17 + + + 14 + + + Links + + + LnkLinks + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TPRemoteCall + + + 0 + + + True + + + NoControl + + + 367, 206 + + + 46, 17 + + + 13 + + + GOOD + + + LnkGOODHelp + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TPRemoteCall + + + 1 + + + NoControl + + + 461, 183 + + + 107, 17 + + + 12 + + + 存档扫描开源工具 + + + LnkInventoryKamera + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TPRemoteCall + + + 2 + + + NoControl + + + 363, 139 + + + 205, 58 + + + 11 + + + 快来将你的官服存档导入GC吧！ + + + LblGOODHelp + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TPRemoteCall + + + 3 + None @@ -274,7 +385,7 @@ NoControl - 459, 196 + 459, 203 104, 23 @@ -283,7 +394,7 @@ 10 - 导入GOOD档案 + 导入GOOD存档 ButtonOpenGOODImport @@ -295,7 +406,7 @@ TPRemoteCall - 0 + 4 True @@ -325,7 +436,7 @@ TPRemoteCall - 1 + 5 None @@ -532,7 +643,7 @@ TPRemoteCall - 2 + 6 None @@ -835,7 +946,7 @@ 2 - Microsoft YaHei, 9pt, style=Italic + Microsoft YaHei UI, 9pt, style=Italic NoControl @@ -941,7 +1052,7 @@ TPRemoteCall - 3 + 7 None @@ -965,7 +1076,7 @@ TPRemoteCall - 4 + 8 None @@ -995,7 +1106,7 @@ TPRemoteCall - 5 + 9 None @@ -1028,7 +1139,7 @@ TPRemoteCall - 6 + 10 4, 26 @@ -1279,7 +1390,7 @@ TxtBanReason - GrasscutterTools.Controls.TextBoxXP, GrasscutterTools, Version=1.5.2.1, Culture=neutral, PublicKeyToken=null + GrasscutterTools.Controls.TextBoxXP, GrasscutterTools, Version=1.5.3.0, Culture=neutral, PublicKeyToken=null GrpBanPlayer @@ -3281,7 +3392,7 @@ Bottom, Right - Microsoft YaHei, 10pt + Microsoft YaHei UI, 10pt NoControl @@ -5209,7 +5320,7 @@ True - Microsoft YaHei, 13pt + Microsoft YaHei UI, 13pt NoControl @@ -5611,7 +5722,7 @@ 634, 361 - Microsoft YaHei, 9pt + Microsoft YaHei UI, 9pt NoControl diff --git a/Source/GrasscutterTools/Forms/FormMain.ru-ru.resx b/Source/GrasscutterTools/Forms/FormMain.ru-ru.resx index 2012f0d..b3d9a35 100644 --- a/Source/GrasscutterTools/Forms/FormMain.ru-ru.resx +++ b/Source/GrasscutterTools/Forms/FormMain.ru-ru.resx @@ -139,6 +139,15 @@ Подключение к БД + + InventoryKamera + + + Приходите и импортируйте свой официальный архив сервера в GC! + + + импорт GOOD + 83, 16 @@ -218,7 +227,7 @@ Подключить - Microsoft YaHei, 8pt, style=Italic + Microsoft YaHei UI, 8pt, style=Italic 15, 34 @@ -397,7 +406,7 @@ False - Microsoft YaHei, 8pt + Microsoft YaHei UI, 8pt 6, 89 @@ -980,7 +989,4 @@ GrasscutterTools - перевод Юрий Дворецкий - - импорт GOOD - \ No newline at end of file diff --git a/Source/GrasscutterTools/Forms/FormMain.zh-TW.resx b/Source/GrasscutterTools/Forms/FormMain.zh-TW.resx index d122835..f282659 100644 --- a/Source/GrasscutterTools/Forms/FormMain.zh-TW.resx +++ b/Source/GrasscutterTools/Forms/FormMain.zh-TW.resx @@ -129,6 +129,15 @@ 命令（按住 Ctrl 自動執行） + + 存檔掃描開源工具 + + + 快來把你的官服存檔導入GC吧！ + + + 導入GOOD檔案 + 206, 17 @@ -406,7 +415,4 @@ 主頁 - - 導入GOOD檔案 - \ No newline at end of file