diff --git a/Source/GrasscutterTools/Forms/FormMain.Designer.cs b/Source/GrasscutterTools/Forms/FormMain.Designer.cs index d01e7d6..46e39e4 100644 --- a/Source/GrasscutterTools/Forms/FormMain.Designer.cs +++ b/Source/GrasscutterTools/Forms/FormMain.Designer.cs @@ -53,19 +53,17 @@ namespace GrasscutterTools.Forms // // NavContainer.Panel1 // - resources.ApplyResources(this.NavContainer.Panel1, "NavContainer.Panel1"); this.NavContainer.Panel1.Controls.Add(this.ListPages); // // NavContainer.Panel2 // - resources.ApplyResources(this.NavContainer.Panel2, "NavContainer.Panel2"); this.NavContainer.Panel2.Controls.Add(this.TCMain); // // ListPages // - resources.ApplyResources(this.ListPages, "ListPages"); this.ListPages.BackColor = System.Drawing.Color.WhiteSmoke; this.ListPages.BorderStyle = System.Windows.Forms.BorderStyle.None; + resources.ApplyResources(this.ListPages, "ListPages"); this.ListPages.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable; this.ListPages.FormattingEnabled = true; this.ListPages.Name = "ListPages"; @@ -121,8 +119,8 @@ namespace GrasscutterTools.Forms // // MenuSpawnEntityFilter // - resources.ApplyResources(this.MenuSpawnEntityFilter, "MenuSpawnEntityFilter"); this.MenuSpawnEntityFilter.Name = "MenuSpawnEntityFilter"; + resources.ApplyResources(this.MenuSpawnEntityFilter, "MenuSpawnEntityFilter"); // // FormMain // diff --git a/Source/GrasscutterTools/Forms/FormMain.resx b/Source/GrasscutterTools/Forms/FormMain.resx index 44ab3dc..bd4abdc 100644 --- a/Source/GrasscutterTools/Forms/FormMain.resx +++ b/Source/GrasscutterTools/Forms/FormMain.resx @@ -117,236 +117,47 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 600, 25 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 1 - - - $this - - - FlatButtons + + Top, Bottom, Left, Right - - 0 - - - 51, 21 - - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 656, 275 - - - GrpCommand - - - 850, 400 + + + 12, 12 Fill - - GrpCommand + + Microsoft YaHei UI, 10pt - - $this + + + 22 0, 0 - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0 - - - 0 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Bottom, Left, Right - - - 115, 22 - 150, 275 - - NavContainer - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 12, 293 - - - 执行(F5) - - - 2 - - - - 6 - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpCommand - - - 3, 4, 3, 4 - - - 自动 - - - Fill - - - 22 - - - 3 - - - Top, Right - - - ChkAutoCopy - - - NoControl - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 2 - - - 721, 22 - - - 0, 0 - - - True - - - BtnCopy - - - BtnInvokeOpenCommand - - - 75, 25 - - - NavContainer - - - GrasscutterTools - - - 0 - 5 - - 610, 275 - - - 3 - - - Top, Right - - - TCMain - - - GrpCommand - - - Top, Bottom, Left, Right - - - NavContainer.Panel2 - - - Microsoft YaHei UI, 10pt - - - 50, 25 - - - 150 - - - Microsoft YaHei UI, 9pt - - - 834, 361 - - - NavContainer.Panel1 - - - 61, 4 - - - 1 - - - CenterScreen - - - NoControl - ListPages - - 12, 12 - System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - GrpCommand + + NavContainer.Panel1 - - 0, 1 + + 0 - - 命令 - [Ctrl] 自动执行 - [Shift] 拼接命令 - [Alt] 仅执行 - [|] 分割多条命令 - - - 59, 22 - - - 610 + + NavContainer.Panel1 System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -354,76 +165,262 @@ NavContainer - - FormMain - - - 1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Top, Left, Right - - - 610, 56 + + 0 80 - - 810, 275 + + FlatButtons - - MenuSpawnEntityFilter + + Fill - - 10, 24 + + 0, 1 - - NoControl + + 0, 0 - - 复制 + + 610, 275 + + + 656, 275 4 - - 810, 56 + + TCMain - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 7, 17 + + NavContainer.Panel2 - + 0 NavContainer.Panel2 - - NavContainer.Panel1 + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NavContainer + + + 1 + + + 610 + + + 810, 275 + + + 150 + + + 6 + + + NavContainer + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this 1 - - 3 + + Top, Left, Right - - 2 + + 115, 22 + + + 600, 25 + + + 1 CmbCommand + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpCommand + + + 3 + + + NoControl + + + 59, 22 + + + 50, 25 + + + 2 + + + 复制 + + + BtnCopy + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpCommand + + + 1 + + + True + + + NoControl + + + 10, 24 + + + 51, 21 + + + 3 + + + 自动 + + + ChkAutoCopy + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpCommand + + + 2 + + + Bottom, Left, Right + + + Top, Right + + + NoControl + + + 721, 22 + + + 75, 25 + + + 0 + + + 执行(F5) + + + BtnInvokeOpenCommand + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpCommand + + + 0 + + + 12, 293 + + + 610, 56 + + + 810, 56 + + + 3 + + + 命令 - [Ctrl] 自动执行 - [Shift] 拼接命令 - [Alt] 仅执行 - [|] 分割多条命令 + + + GrpCommand + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + 17, 17 + + 61, 4 + + + MenuSpawnEntityFilter + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + True + + 7, 17 + + + 834, 361 + + + Microsoft YaHei UI, 9pt + + + 3, 4, 3, 4 + + + 850, 400 + + + CenterScreen + + + GrasscutterTools + + + FormMain + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageGiveItem.cs b/Source/GrasscutterTools/Pages/PageGiveItem.cs index 9308be4..22ab168 100644 --- a/Source/GrasscutterTools/Pages/PageGiveItem.cs +++ b/Source/GrasscutterTools/Pages/PageGiveItem.cs @@ -49,6 +49,7 @@ namespace GrasscutterTools.Pages MenuItemFilter.SuspendLayout(); MenuItemFilter.Items.Clear(); SelectedItemTypeLines = GameData.Items.Lines; + BtnFilterItem.Text = Resources.All; var all = new ToolStripMenuItem { Text = Resources.All, @@ -82,6 +83,7 @@ namespace GrasscutterTools.Pages private void OnItemFilterClick(object sender, EventArgs e) { var btn = sender as ToolStripMenuItem; + BtnFilterItem.Text = btn.Text; SelectedItemTypeLines = btn.Tag as string[]; LoadItemList(); } @@ -155,7 +157,7 @@ namespace GrasscutterTools.Pages /// private void BtnFilterItem_Click(object sender, EventArgs e) { - MenuItemFilter.Show(BtnFilterItem, 0, BtnFilterItem.Height); + MenuItemFilter.Show(BtnFilterItem, BtnFilterItem.Width, BtnFilterItem.Height); } #region -- 物品记录 -- diff --git a/Source/GrasscutterTools/Pages/PageGiveItem.resx b/Source/GrasscutterTools/Pages/PageGiveItem.resx index d89a6e7..4d28cf7 100644 --- a/Source/GrasscutterTools/Pages/PageGiveItem.resx +++ b/Source/GrasscutterTools/Pages/PageGiveItem.resx @@ -301,10 +301,10 @@ Top, Left, Right - 343, 3 + 448, 3 - 268, 23 + 195, 23 9 @@ -493,23 +493,20 @@ 13 - - Top, Right - NoControl - 617, 3 + 342, 2 - 26, 24 + 100, 25 10 - 三 + 全部 BtnFilterItem @@ -545,6 +542,6 @@ PageGiveItem - GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.7.6.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 + GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.12.1.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageSpawn.cs b/Source/GrasscutterTools/Pages/PageSpawn.cs index f178354..f4241e0 100644 --- a/Source/GrasscutterTools/Pages/PageSpawn.cs +++ b/Source/GrasscutterTools/Pages/PageSpawn.cs @@ -60,6 +60,7 @@ namespace GrasscutterTools.Pages // 初始化列表类型过滤器 MenuSpawnEntityFilter.SuspendLayout(); MenuSpawnEntityFilter.Items.Clear(); + BtnFilterEntity.Text = Resources.All; // 默认显示所有 SelectedEntityTypeLines = GameData.Monsters.AllLines.Concat(GameData.Gadgets.AllLines).ToArray(); var all = new ToolStripMenuItem @@ -103,6 +104,7 @@ namespace GrasscutterTools.Pages private void OnEntityTypeFilterClick(object sender, EventArgs e) { var btn = sender as ToolStripMenuItem; + BtnFilterEntity.Text = btn.Text; SelectedEntityTypeLines = btn.Tag as string[]; LoadEntityList(); } diff --git a/Source/GrasscutterTools/Pages/PageSpawn.resx b/Source/GrasscutterTools/Pages/PageSpawn.resx index edae240..c44d81b 100644 --- a/Source/GrasscutterTools/Pages/PageSpawn.resx +++ b/Source/GrasscutterTools/Pages/PageSpawn.resx @@ -1594,10 +1594,10 @@ Top, Left, Right - 0, 3 + 103, 3 - 242, 23 + 168, 23 0 @@ -1614,23 +1614,20 @@ 0 - - Top, Right - NoControl - 245, 3 + 0, 2 - 26, 24 + 100, 25 1 - 三 + 全部 BtnFilterEntity @@ -1909,6 +1906,6 @@ PageSpawn - GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.10.1.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 + GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.12.1.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 \ No newline at end of file