diff --git a/Source/GrasscutterTools/Forms/FormDropEditor.Designer.cs b/Source/GrasscutterTools/Forms/FormDropEditor.Designer.cs index dd73cd6..3ebf572 100644 --- a/Source/GrasscutterTools/Forms/FormDropEditor.Designer.cs +++ b/Source/GrasscutterTools/Forms/FormDropEditor.Designer.cs @@ -57,6 +57,8 @@ this.ListItems = new System.Windows.Forms.ListBox(); this.GrpMonsterList = new System.Windows.Forms.GroupBox(); this.GrpItemList = new System.Windows.Forms.GroupBox(); + this.LblClearMonsterFilter = new System.Windows.Forms.Label(); + this.LblClearItemFilter = new System.Windows.Forms.Label(); this.GrpDropList.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.NUDMaxWeight)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUDMinWeight)).BeginInit(); @@ -292,6 +294,7 @@ // GrpMonsterList // resources.ApplyResources(this.GrpMonsterList, "GrpMonsterList"); + this.GrpMonsterList.Controls.Add(this.LblClearMonsterFilter); this.GrpMonsterList.Controls.Add(this.ListMonsters); this.GrpMonsterList.Controls.Add(this.TxtMonsterFilter); this.GrpMonsterList.Name = "GrpMonsterList"; @@ -300,11 +303,28 @@ // GrpItemList // resources.ApplyResources(this.GrpItemList, "GrpItemList"); + this.GrpItemList.Controls.Add(this.LblClearItemFilter); this.GrpItemList.Controls.Add(this.TxtItemFilter); this.GrpItemList.Controls.Add(this.ListItems); this.GrpItemList.Name = "GrpItemList"; this.GrpItemList.TabStop = false; // + // LblClearMonsterFilter + // + resources.ApplyResources(this.LblClearMonsterFilter, "LblClearMonsterFilter"); + this.LblClearMonsterFilter.BackColor = System.Drawing.Color.White; + this.LblClearMonsterFilter.Cursor = System.Windows.Forms.Cursors.Hand; + this.LblClearMonsterFilter.Name = "LblClearMonsterFilter"; + this.LblClearMonsterFilter.Click += new System.EventHandler(this.LblClearMonsterFilter_Click); + // + // LblClearItemFilter + // + resources.ApplyResources(this.LblClearItemFilter, "LblClearItemFilter"); + this.LblClearItemFilter.BackColor = System.Drawing.Color.White; + this.LblClearItemFilter.Cursor = System.Windows.Forms.Cursors.Hand; + this.LblClearItemFilter.Name = "LblClearItemFilter"; + this.LblClearItemFilter.Click += new System.EventHandler(this.LblClearItemFilter_Click); + // // FormDropEditor // resources.ApplyResources(this, "$this"); @@ -362,5 +382,7 @@ private System.Windows.Forms.Button BtnPaste; private System.Windows.Forms.Button BtnClear; private System.Windows.Forms.Button BtnCopyAll; + private System.Windows.Forms.Label LblClearMonsterFilter; + private System.Windows.Forms.Label LblClearItemFilter; } } \ No newline at end of file diff --git a/Source/GrasscutterTools/Forms/FormDropEditor.cs b/Source/GrasscutterTools/Forms/FormDropEditor.cs index 2f7da37..67755c3 100644 --- a/Source/GrasscutterTools/Forms/FormDropEditor.cs +++ b/Source/GrasscutterTools/Forms/FormDropEditor.cs @@ -199,6 +199,15 @@ namespace GrasscutterTools.Forms private void TxtMonsterFilter_TextChanged(object sender, EventArgs e) { UIUtil.ListBoxFilter(ListMonsters, Monsters, TxtMonsterFilter.Text); + LblClearMonsterFilter.Visible = TxtMonsterFilter.Text.Length > 0; + } + + /// + /// 点击清空怪物过滤器标签时触发 + /// + private void LblClearMonsterFilter_Click(object sender, EventArgs e) + { + TxtMonsterFilter.Clear(); } /// @@ -496,6 +505,15 @@ namespace GrasscutterTools.Forms private void TxtItemFilter_TextChanged(object sender, EventArgs e) { UIUtil.ListBoxFilter(ListItems, GameData.Items.Lines, TxtItemFilter.Text); + LblClearItemFilter.Visible = TxtItemFilter.Text.Length > 0; + } + + /// + /// 点击清空物品列表过滤器标签时触发 + /// + private void LblClearItemFilter_Click(object sender, EventArgs e) + { + TxtItemFilter.Clear(); } /// @@ -507,5 +525,7 @@ namespace GrasscutterTools.Forms } #endregion - 物品列表 - + + } } \ No newline at end of file diff --git a/Source/GrasscutterTools/Forms/FormDropEditor.resx b/Source/GrasscutterTools/Forms/FormDropEditor.resx index fac1cc6..fd972eb 100644 --- a/Source/GrasscutterTools/Forms/FormDropEditor.resx +++ b/Source/GrasscutterTools/Forms/FormDropEditor.resx @@ -241,7 +241,7 @@ GrpMonsterList - 0 + 1 Top, Left, Right @@ -265,7 +265,7 @@ GrpMonsterList - 1 + 2 Top, Left, Right @@ -289,7 +289,7 @@ GrpItemList - 0 + 1 Top, Bottom, Left, Right @@ -321,6 +321,222 @@ Top, Bottom, Left, Right + + BtnCopyAll + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpDropList + + + 0 + + + BtnClear + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpDropList + + + 1 + + + BtnPaste + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpDropList + + + 2 + + + BtnCopy + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpDropList + + + 3 + + + TxtItem + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpDropList + + + 4 + + + BtnDelete + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpDropList + + + 5 + + + BtnAddOrUpdate + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpDropList + + + 6 + + + LblItemLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpDropList + + + 7 + + + LblTilde2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpDropList + + + 8 + + + LblTilde1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpDropList + + + 9 + + + NUDMaxWeight + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpDropList + + + 10 + + + NUDMinWeight + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpDropList + + + 11 + + + NUDMaxCount + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpDropList + + + 12 + + + NUDMinCount + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpDropList + + + 13 + + + LblWeightLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpDropList + + + 14 + + + LblCountLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpDropList + + + 15 + + + 270, 41 + + + 300, 400 + + + 7 + + + 掉落列表 + + + GrpDropList + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + Bottom, Left @@ -753,30 +969,6 @@ 15 - - 270, 41 - - - 300, 400 - - - 7 - - - 掉落列表 - - - GrpDropList - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - Top, Bottom, Left, Right @@ -802,11 +994,23 @@ GrpItemList - 1 + 2 Top, Bottom, Left + + LblClearMonsterFilter + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpMonsterList + + + 0 + 12, 41 @@ -834,6 +1038,42 @@ Top, Bottom, Right + + Top, Right + + + True + + + NoControl + + + 228, 25 + + + 16, 17 + + + 23 + + + X + + + False + + + LblClearItemFilter + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpItemList + + + 0 + 576, 41 @@ -858,6 +1098,42 @@ 0 + + Top, Right + + + True + + + NoControl + + + 228, 25 + + + 16, 17 + + + 23 + + + X + + + False + + + LblClearMonsterFilter + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpMonsterList + + + 0 + True diff --git a/Source/GrasscutterTools/Forms/FormShopEditor.Designer.cs b/Source/GrasscutterTools/Forms/FormShopEditor.Designer.cs index 2ea530d..64699bd 100644 --- a/Source/GrasscutterTools/Forms/FormShopEditor.Designer.cs +++ b/Source/GrasscutterTools/Forms/FormShopEditor.Designer.cs @@ -86,6 +86,7 @@ this.BtnLoad = new System.Windows.Forms.Button(); this.TxtShopJsonPath = new System.Windows.Forms.TextBox(); this.LblShopPathLabel = new System.Windows.Forms.Label(); + this.LblClearItemFilter = new System.Windows.Forms.Label(); this.GrpShopList.SuspendLayout(); this.GrpGoodsList.SuspendLayout(); this.GrpItems.SuspendLayout(); @@ -132,8 +133,8 @@ // // GrpShopList // - resources.ApplyResources(this.GrpShopList, "GrpShopList"); this.GrpShopList.Controls.Add(this.ListShop); + resources.ApplyResources(this.GrpShopList, "GrpShopList"); this.GrpShopList.Name = "GrpShopList"; this.GrpShopList.TabStop = false; // @@ -163,6 +164,7 @@ // GrpItems // resources.ApplyResources(this.GrpItems, "GrpItems"); + this.GrpItems.Controls.Add(this.LblClearItemFilter); this.GrpItems.Controls.Add(this.TxtItemFilter); this.GrpItems.Controls.Add(this.ListItems); this.GrpItems.Name = "GrpItems"; @@ -598,6 +600,14 @@ resources.ApplyResources(this.LblShopPathLabel, "LblShopPathLabel"); this.LblShopPathLabel.Name = "LblShopPathLabel"; // + // LblClearItemFilter + // + resources.ApplyResources(this.LblClearItemFilter, "LblClearItemFilter"); + this.LblClearItemFilter.BackColor = System.Drawing.Color.White; + this.LblClearItemFilter.Cursor = System.Windows.Forms.Cursors.Hand; + this.LblClearItemFilter.Name = "LblClearItemFilter"; + this.LblClearItemFilter.Click += new System.EventHandler(this.LblClearItemFilter_Click); + // // FormShopEditor // resources.ApplyResources(this, "$this"); @@ -698,5 +708,6 @@ private System.Windows.Forms.TextBox TxtItemFilter; private System.Windows.Forms.Button BtnClearGoods; private System.Windows.Forms.Button BtnDeleteGoods; + private System.Windows.Forms.Label LblClearItemFilter; } } \ No newline at end of file diff --git a/Source/GrasscutterTools/Forms/FormShopEditor.cs b/Source/GrasscutterTools/Forms/FormShopEditor.cs index dc3c928..7ef48ff 100644 --- a/Source/GrasscutterTools/Forms/FormShopEditor.cs +++ b/Source/GrasscutterTools/Forms/FormShopEditor.cs @@ -529,6 +529,15 @@ namespace GrasscutterTools.Forms private void TxtItemFilter_TextChanged(object sender, EventArgs e) { UIUtil.ListBoxFilter(ListItems, GameData.Items.Lines, TxtItemFilter.Text); + LblClearItemFilter.Visible = TxtItemFilter.Text.Length > 0; + } + + /// + /// 点击清空物品列表过滤器标签时触发 + /// + private void LblClearItemFilter_Click(object sender, EventArgs e) + { + TxtItemFilter.Clear(); } /// diff --git a/Source/GrasscutterTools/Forms/FormShopEditor.resx b/Source/GrasscutterTools/Forms/FormShopEditor.resx index 92610a0..db91484 100644 --- a/Source/GrasscutterTools/Forms/FormShopEditor.resx +++ b/Source/GrasscutterTools/Forms/FormShopEditor.resx @@ -117,671 +117,866 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 7 - - - GrpGoodsInfo - - - - 45, 269 - - - 20 - Fill - - Top + + + 17 - - True + + + 3, 19 - - 175, 124 + + 244, 178 - - GrpGoodsInfo + + 0 - - Top + + ListShop - - LblCostItem4Label + + System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 13 + + GrpShopList - - 6 + + 0 - - 105, 17 + + Top, Bottom, Left, Right + + + 17 + + + 3, 19 + + + 244, 242 + + + 1 + + + ListGoods + + + System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsList + + + 2 + + + Top, Bottom, Left, Right + + + 17 + + + 6, 51 + + + 238, 446 + + + 2 + + + ListItems + + + System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpItems + + + 2 + + + 12, 41 + + + 250, 200 + + + 3 + + + 商店列表 + + + GrpShopList + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + + + Top, Bottom, Left + + + BtnClearGoods System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - GrpGoodsInfo + + GrpGoodsList - - 348, 508 - - - 119, 267 - - - 99, 472 - - - 27 - - - 8 - - + 0 - - 无 + + BtnDeleteGoods - - 6 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 13 + + GrpGoodsList - - x + + 1 + + + 12, 247 + + + 250, 302 + + + 4 + + + 商品列表 + + + GrpGoodsList System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Top + + $this - - 刷新方式： + + 6 - + + Bottom, Left + + + 112, 273 + + + 100, 23 + + + 3 + + + × 清空 + + + BtnClearGoods + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsList + + + 0 + + + Bottom, Left + + + 6, 273 + + + 100, 23 + + + 2 + + + - 删除 + + + BtnDeleteGoods + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsList + + + 1 + + + Top, Bottom, Right + + + LblClearItemFilter + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpItems + + + 0 + + + TxtItemFilter + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpItems + + + 1 + + + 622, 41 + + + 250, 508 + + + 6 + + + 物品列表 + + + GrpItems + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + 6, 22 + + + 238, 23 + + + 3 + + + TxtItemFilter + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpItems + + + 1 + + + Top, Bottom, Left, Right + + + BtnSaveGoods + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GrpGoodsInfo - - 消耗物品3： + + 0 - - 16 + + CmbRefreshType - - 57, 17 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 1 + + + NUDRefreshParm + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 2 + + + DTPEndTime + + + System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 3 + + + DTPBeginTime + + + System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 4 + + + NUDGoodsId + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 5 + + + NUDMaxLevel + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 6 + + + NUDMinLevel + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 7 + + + NUDCostItem4 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 8 + + + NUDCostItem3 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 9 + + + NUDCostItem2 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo 10 + + NUDCostItem1 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 11 + + + NUDCostMcoin + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 12 + + + NUDCostScoin + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 13 + + + NUDCostHcoin + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + 14 - - Top + + NUDBuyLimit - - 7 + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 15 + + + NUDCostItem4Count + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 GrpGoodsInfo + + 16 + + + NUDCostItem3Count + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + 17 - - True + + NUDCostItem2Count - - 198, 122 - - - NUDGoodsId - - - 0 - - - 119, 122 - - - 60, 23 - - - ListItems - - - 119, 412 - - - GrpGoodsList - - - 12 - - - 2 - - - 2 - - - 207, 328 - - - 32 - - - 884, 561 - - - 4 - - - 2 - - - True - - - True - - - 160, 23 - - - 24 - - - True - - - 1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 6, 22 - - - TxtGoodsItem - - - GrpGoodsInfo - - - 119, 296 - - - System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 消耗原石： - - - Top - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Top - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - LblCostHcoinLabel - - - True - - - 8 - - - 3, 19 - - - Top - - - 17 - - - GrpGoodsInfo - - - 50, 23 - - - 消耗创世结晶： - - - Top - - - 11 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpGoodsInfo - - - 30 - - - True - - + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - DTPBeginTime - - - 39 - - - NoControl - - - LblCostItem1Label - - - GrpGoodsInfo - - - 7 - - - 666, 12 - - - GrpGoodsInfo - - - Top - - - NUDRefreshParm - - - NUDCostItem4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 消耗物品4： - - - 250, 200 - - - 6 - - - 生成ID - - - BtnDeleteGoods - - - NUDCostMcoin - - - 44, 17 - - - $this - - - 7 - - - GrpItems - - - Top - - - GrpGoodsInfo - - - $this - - - GrpGoodsInfo - - - 45, 156 - - - Top, Bottom, Right - - - GrpGoodsInfo - - - GrpGoodsInfo - - - Top, Bottom, Left, Right - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 12 - - - 1 - - - GrpGoodsInfo - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 772, 12 - - - 19 - - - Top - - - $this - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 2 - - - 17 - - - 245, 64 - - - 商店列表 - - - x - - - 38, 356 - - - 2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 119, 383 - - - True - - - 95, 61 - - - Top - - - 9 - - - x - - - 商品： - - - Top - - - 33 - - - 4 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - 0 - - - True - - - GrpGoodsInfo - - - Top - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Top - - - 17, 17 - - - 物品列表 - - - 50, 23 - - - 6 - - - LblCostItem2Label - - - 2 - - - GrpGoodsInfo - - - Top - - - 7 - - - Top, Bottom, Left, Right - - - 12, 247 - - - LnkGenGoodsId - - - GrpGoodsInfo - - - 16 - - - 80, 23 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 31 - - - 120, 23 - - - LblBuyLimitLabel - - - 3 - - - LblGoodsIdLabel - - - GrpShopList - - - 2 - - - ~ - - - True - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 23 - - - 0 - - - 4 - - - True - - - 38 - - - 122, 12 - - - 21, 298 - - - 28 - - - 34 - - - Top - - - 12 - - - 538, 23 - - - Bottom, Left - - - Top - - - 38, 327 - - - 207, 415 - - - LblBuyLevelLabel - - - 消耗物品1： - - - 4 - - - 119, 151 - - - GrpItems - - - 6 - - - NUDCostItem1 - - - 68, 17 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 70, 23 - GrpGoodsInfo - - 商品列表 + + 18 - - 68, 17 + + NUDCostItem1Count - - 9 + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GrpGoodsInfo - - Top, Bottom, Left + + 19 - - 68, 17 + + NUDGoodsItemCount - - 45, 17 + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 92, 17 + + GrpGoodsInfo - + + 20 + + + TxtGoodsItem + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 21 + + + LblRefreshModeLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 22 + + + LblBuyLevelLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 23 + + + LblEndTimeLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 24 + + + LblBeginTimeLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 25 + + + LblCostItem4Label + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 26 + + + LblCostItem3Label + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 27 + + + LblCostItem2Label + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 28 + + + LblCostItem1Label + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 29 + + + LblCostMcoinLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 30 + + + LblCostScoinLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 31 + + + LblCostHcoinLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 32 + + + LblBuyLimitLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 33 + + + LblGoodsIdLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 34 + + + LblGoodsItemLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 35 + + + label13 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 36 + + + label12 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 37 + + + label11 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 38 + + + label14 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 39 + + + LnkGenGoodsId + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 40 + + + label18 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 41 + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 42 + + + 268, 41 + + + 348, 508 + + + 5 + + + 商品信息 + + + GrpGoodsInfo + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - 1 + + 4 + + + Top + + + 99, 472 + + + 150, 30 + + + 30 + + + √ 添加或更新 + + + BtnSaveGoods + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 0 + + + Top + + + 无 天 @@ -792,907 +987,1312 @@ 月 - - 4, 4, 4, 4 - - - 37 - - - 14, 17 - - - BtnLoad - - - 18 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpGoodsInfo - - - label11 - - - 100, 23 - - - 6, 51 - - - BtnSave - - - 45, 211 - - - CmbRefreshType - - - 219, 325 - - - 36 - - - NUDCostItem1Count - - - 80, 23 - - - 244, 242 - - - 5 - - - GrpGoodsInfo - - - $this - - - TxtItemFilter - - - Top - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 7 - - - 9 - - - 45, 240 - - - 14, 17 - - - LblCostItem3Label - - - 45, 92 - - - GrpGoodsInfo - - - NUDCostScoin - - - 29 - - - GrpGoodsInfo - - - 160, 23 - - - 3 - - - Top - - - 消耗物品2： - - - 1 - - - 238, 446 - - - 7 - - - NUDCostHcoin - - - Top - - - 60, 23 - - - 119, 209 - - - True - - - True - - - GrpGoodsInfo - - - 15 - - - 257, 61 - - - 11, 15 - - - NUDMaxLevel - - - 250, 302 - - - LblBeginTimeLabel - - - 26 - - - TxtShopJsonPath - - - 0 - - - Top, Bottom, Left, Right - - - Top - - - 119, 32 - - - True - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpGoodsInfo - - - GrpGoodsInfo - - - 2 - - - 21 - - - 消耗摩拉： - - - 42 - - - 10 - - - 加载 - - - 14, 17 - - - 5 - - - 50, 23 - - - 80, 23 - - - 限购数量： - - - GrpItems - - - 38, 383 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 11 - - - GrpGoodsInfo - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 2 - - - 68, 17 - - - GrpGoodsInfo - - - Top - - - Top - - - 18 - - - label13 - - - 268, 41 - 175, 207 - - Bottom, Left - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 80, 23 - - - × 清空 - - - True - - - 112, 273 - - - 60, 23 - - - GrpGoodsInfo - - - FormShopEditor - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpGoodsInfo - - - 6, 273 - - - GrpShopList - - - DTPEndTime - - - 3 - - - LblRefreshModeLabel - - - label14 - - - Top - - - True - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpGoodsList - - - NUDCostItem3Count - - - 7 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - 商品ID： - - - 144, 23 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Shop.json 路径： - - - Top - - - label18 - - - GrpGoodsInfo - - - 7 - - - 119, 90 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 商品信息 - - - GrpGoodsInfo - - - Top - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 上架时间： - - - 238, 23 - - - 5 - - - 120, 23 - - - $this - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - 3, 19 - - - NUDCostItem2Count - - - 120, 23 - - - 100, 23 - - - - 删除 - - - 保存 - - - True - - - BtnClearGoods - - - 12, 41 - - - GrpGoodsInfo - - - 100, 23 - - - 207, 357 - - - 119, 180 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 微软雅黑, 9pt - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - NUDMinLevel - - - GrpGoodsInfo - - - $this - - - 0 - - - NoControl - - - 15 - - - GrpGoodsInfo - - - 3 - - - Top - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - LblEndTimeLabel - - - 0 - - - NUDCostItem2 - - - 19 - - - 2 - - - Top - - - 68, 17 - - - 限购等级： - - - Top - - - Top - - - 0 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ListGoods - - - ListShop - - - 75, 17 - - - 8 - - - Shop.json Editor - - - LblCostMcoinLabel - - - 622, 41 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 22 - - - 2 - - - x - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 13 - - - 17 - - - 219, 412 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 15 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 1 - - - 60, 23 - - - Top - - - 1 - - - CenterScreen - - - System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 120, 23 - - - 207, 386 - - - 119, 354 - - - Top - - - GrpGoodsInfo - - - x - - - 247, 34 - - - label1 - - - 45, 64 - - - 3 - - - GrpGoodsInfo - - - NUDCostItem3 - - - 14, 17 - - - 119, 325 - - - 下架时间： - - - 1 - - - 14, 17 - - - GrpGoodsInfo - - - 4 - - - Top - - - 40 - - - 41 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Top - - - True - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Top - - - Top - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 75, 17 - - - 17 - - - 7, 17 - - - NoControl - - - label12 - - - BtnSaveGoods - - - 119, 238 - - - GrpGoodsList - - - GrpGoodsInfo - - - 244, 178 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - √ 添加或更新 - - - 900, 600 - - - 2 - - - 7 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 5 - - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 104, 25 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 10 - - 7 + + CmbRefreshType - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 38, 412 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - LblGoodsItemLabel - - + GrpGoodsInfo - - 14 + + 1 - - 150, 30 - - - 45, 125 - - - GrpGoodsInfo - - + Top - - 30 + + 119, 209 - - Top + + 50, 23 - - 250, 508 + + 9 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NUDRefreshParm - - 25 - - - NUDGoodsItemCount - - - 0 - - - GrpGoodsList - - - 120, 23 - - - True - - + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + GrpGoodsInfo - + + 2 + + Top - - NUDBuyLimit + + yyyy'/'MM'/'dd HH':'mm':'ss - + + 119, 180 + + + 160, 23 + + + 8 + + + DTPEndTime + + + System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GrpGoodsInfo - + + 3 + + Top yyyy'/'MM'/'dd HH':'mm':'ss - - 56, 34 + + 119, 151 - - 75, 17 + + 160, 23 - + + 7 + + + DTPBeginTime + + + System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 4 + + Top - - 68, 17 + + 119, 32 + + + 120, 23 + + + 0 + + + NUDGoodsId + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 5 + + + Top + + + 198, 122 + + + 50, 23 + + + 6 + + + NUDMaxLevel + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 6 + + + Top + + + 119, 122 + + + 50, 23 + + + 5 + + + NUDMinLevel + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 7 + + + Top + + + 119, 412 + + + 80, 23 + + + 20 + + + NUDCostItem4 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 8 + + + Top + + + 119, 383 + + + 80, 23 + + + 18 + + + NUDCostItem3 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 9 + + + Top + + + 119, 354 + + + 80, 23 + + + 16 + + + NUDCostItem2 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 10 + + + Top + + + 119, 325 + + + 80, 23 + + + 14 + + + NUDCostItem1 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 11 + + + Top + + + 119, 296 + + + 120, 23 + + + 13 + + + NUDCostMcoin + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 GrpGoodsInfo - - 68, 17 + + 12 - - 35 + + Top - - LblShopPathLabel + + 119, 267 - + + 120, 23 + + + 12 + + + NUDCostScoin + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 13 + + + Top + + + 119, 238 + + + 120, 23 + + + 11 + + + NUDCostHcoin + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 14 + + + Top + + + 119, 90 + + + 120, 23 + + + 4 + + + NUDBuyLimit + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 15 + + + Top + + + 219, 412 + + + 60, 23 + + + 21 + + + NUDCostItem4Count + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 16 + + + Top + + + 219, 383 + + + 60, 23 + + + 19 + + + NUDCostItem3Count + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 17 + + Top 219, 354 + + 60, 23 + + + 17 + + + NUDCostItem2Count + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 18 + + + Top + + + 219, 325 + + + 60, 23 + + + 15 + + + NUDCostItem1Count + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 19 + + + Top + + + 257, 61 + + + 70, 23 + + + 3 + + + NUDGoodsItemCount + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + 20 - - NUDCostItem4Count + + Top - - $this + + 95, 61 - + + 144, 23 + + + 2 + + + TxtGoodsItem + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + 21 - - 75, 17 + + Top - - LblCostScoinLabel + + True - - 100, 23 + + 45, 211 - - yyyy'/'MM'/'dd HH':'mm':'ss + + 68, 17 - - 219, 383 + + 15 + + + 刷新方式： + + + LblRefreshModeLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 22 + + + Top + + + True + + + 45, 125 + + + 68, 17 + + + 12 + + + 限购等级： + + + LblBuyLevelLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 23 + + + Top + + + True 45, 185 + + 68, 17 + + + 9 + + + 下架时间： + + + LblEndTimeLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 24 + + + Top + + + True + + + 45, 156 + + + 68, 17 + + + 8 + + + 上架时间： + + + LblBeginTimeLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 25 + + + Top + + + True + + + 38, 412 + + + 75, 17 + + + 7 + + + 消耗物品4： + + + LblCostItem4Label + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 26 + + + Top + + + True + + + 38, 383 + + + 75, 17 + + + 7 + + + 消耗物品3： + + + LblCostItem3Label + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 27 + + + Top + + + True + + + 38, 356 + + + 75, 17 + + + 7 + + + 消耗物品2： + + + LblCostItem2Label + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 28 + + + Top + + + True + + + 38, 327 + + + 75, 17 + + + 7 + + + 消耗物品1： + + + LblCostItem1Label + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 29 + + + Top + + + True + + + 21, 298 + + + 92, 17 + + + 7 + + + 消耗创世结晶： + + + LblCostMcoinLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 30 + + + Top + + + True + + + 45, 269 + + + 68, 17 + + + 7 + + + 消耗摩拉： + + + LblCostScoinLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 31 + + + Top + + + True + + + 45, 240 + + + 68, 17 + + + 7 + + + 消耗原石： + + + LblCostHcoinLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 32 + + + Top + + + True + + + 45, 92 + + + 68, 17 + + + 6 + + + 限购数量： + + + LblBuyLimitLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 33 + + + Top + + + True + + + 56, 34 + + + 57, 17 + + + 4 + + + 商品ID： + + + LblGoodsIdLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 34 + + + Top + + + True + + + 45, 64 + + + 44, 17 + + + 0 + + + 商品： + + + LblGoodsItemLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 35 + + + Top + + + True + + + 207, 386 + + + 14, 17 + + + 2 + + + x + + + label13 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 36 + + + Top + + + True + + + 207, 357 + + + 14, 17 + + + 2 + + + x + + + label12 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 37 + + + Top + + + True + + + 207, 328 + + + 14, 17 + + + 2 + + + x + + + label11 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 38 + + + Top + + + True + + + 207, 415 + + + 14, 17 + + + 2 + + + x + + + label14 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 39 + + + Top + + + True + + + 247, 34 + + + 45, 17 + + + 1 + + + 生成ID + + + LnkGenGoodsId + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 40 + + + Top + + + True + + + 175, 124 + + + 17, 17 + + + 13 + + + ~ + + + label18 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 41 + + + Top + + + True + + + 245, 64 + + + 14, 17 + + + 2 + + + x + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGoodsInfo + + + 42 + + + NoControl + + + 772, 12 + + + 100, 23 + + + 2 + + + 保存 + + + BtnSave + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + NoControl + + + 666, 12 + + + 100, 23 + + + 1 + + + 加载 + + + BtnLoad + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + 122, 12 + + + 538, 23 + + + 0 + + + TxtShopJsonPath + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + True + + + NoControl + + + 11, 15 + + + 105, 17 + + + 7 + + + Shop.json 路径： + + + LblShopPathLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + Top, Right + + + True + + + NoControl + + + 228, 25 + + + 16, 17 + + + 24 + + + X + + + False + + + LblClearItemFilter + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpItems + + + 0 + True + + 7, 17 + + + 884, 561 + + + 微软雅黑, 9pt + + + 4, 4, 4, 4 + + + 900, 600 + + + CenterScreen + + + Shop.json Editor (Support load from Resources/ShopGoodsExcelConfigData.json) + + + FormShopEditor + + + 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/Forms/FormTextMapBrowser.Designer.cs b/Source/GrasscutterTools/Forms/FormTextMapBrowser.Designer.cs index f3a563c..ef8832a 100644 --- a/Source/GrasscutterTools/Forms/FormTextMapBrowser.Designer.cs +++ b/Source/GrasscutterTools/Forms/FormTextMapBrowser.Designer.cs @@ -40,6 +40,7 @@ this.ColumnHash = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ColumnID = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ColumnText = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.LblClearFilter = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.DGVTextMap)).BeginInit(); this.SuspendLayout(); // @@ -47,6 +48,7 @@ // resources.ApplyResources(this.TxtTextMapFilter, "TxtTextMapFilter"); this.TxtTextMapFilter.Name = "TxtTextMapFilter"; + this.TxtTextMapFilter.TextChanged += new System.EventHandler(this.TxtTextMapFilter_TextChanged); this.TxtTextMapFilter.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TxtTextMapFilter_KeyDown); // // BtnSelectRecoursePath @@ -90,10 +92,10 @@ // // DGVTextMap // - resources.ApplyResources(this.DGVTextMap, "DGVTextMap"); this.DGVTextMap.AllowUserToAddRows = false; this.DGVTextMap.AllowUserToDeleteRows = false; this.DGVTextMap.AllowUserToResizeRows = false; + resources.ApplyResources(this.DGVTextMap, "DGVTextMap"); this.DGVTextMap.BackgroundColor = System.Drawing.Color.White; this.DGVTextMap.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.DGVTextMap.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { @@ -122,10 +124,19 @@ this.ColumnText.Name = "ColumnText"; this.ColumnText.ReadOnly = true; // + // LblClearFilter + // + resources.ApplyResources(this.LblClearFilter, "LblClearFilter"); + this.LblClearFilter.BackColor = System.Drawing.Color.White; + this.LblClearFilter.Cursor = System.Windows.Forms.Cursors.Hand; + this.LblClearFilter.Name = "LblClearFilter"; + this.LblClearFilter.Click += new System.EventHandler(this.LblClearFilter_Click); + // // FormTextMapBrowser // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.LblClearFilter); this.Controls.Add(this.DGVTextMap); this.Controls.Add(this.BtnSearch); this.Controls.Add(this.ChkTopMost); @@ -154,5 +165,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn ColumnHash; private System.Windows.Forms.DataGridViewTextBoxColumn ColumnID; private System.Windows.Forms.DataGridViewTextBoxColumn ColumnText; + private System.Windows.Forms.Label LblClearFilter; } } \ No newline at end of file diff --git a/Source/GrasscutterTools/Forms/FormTextMapBrowser.cs b/Source/GrasscutterTools/Forms/FormTextMapBrowser.cs index fb2bc4d..1a2060a 100644 --- a/Source/GrasscutterTools/Forms/FormTextMapBrowser.cs +++ b/Source/GrasscutterTools/Forms/FormTextMapBrowser.cs @@ -195,5 +195,15 @@ namespace GrasscutterTools.Forms if (e.KeyCode == Keys.Enter) BtnSearch_Click(sender, e); } + + private void TxtTextMapFilter_TextChanged(object sender, EventArgs e) + { + LblClearFilter.Visible = TxtTextMapFilter.Text.Length > 0; + } + + private void LblClearFilter_Click(object sender, EventArgs e) + { + TxtTextMapFilter.Clear(); + } } } \ No newline at end of file diff --git a/Source/GrasscutterTools/Forms/FormTextMapBrowser.resx b/Source/GrasscutterTools/Forms/FormTextMapBrowser.resx index ab7f65d..74d941e 100644 --- a/Source/GrasscutterTools/Forms/FormTextMapBrowser.resx +++ b/Source/GrasscutterTools/Forms/FormTextMapBrowser.resx @@ -117,289 +117,325 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - BtnSelectRecoursePath - - - Top, Right - - - - 3 + + Top, Left, Right - - 177, 15 - - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BtnSearch - - - LblLanguage - - - Text - - - 8 - - - True - 12, 41 - - System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 3 - - - 96, 12 - - - 80 - - - Top, Bottom, Left, Right - - - CenterScreen - - - 240 - - - 请选择Resources路径 - - - $this - - - 32, 17 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 327, 17 - 555, 23 - - 文本映射表浏览器 - - - 4, 4, 4, 4 - - - 636, 379 - - - $this - - - 5 - - - Top, Right - - - True - - - LblResourcesPath - - - 7 - + 1 - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Hash - - - 250 - - - 548, 12 - - - $this - - - 0 - - - 6 - - - 100, 25 - - - 搜索 - - - 4 - - - DGVTextMap - - - Top, Left, Right - - - ColumnHash - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 9 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 浏览 - - - 510, 15 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 4 - - - ChkTopMost - - - 微软雅黑, 9pt - - - 660, 461 - - - CmbLanguage - - - 7, 17 - - - 1 - - - ColumnID - - - Top, Left, Right - - - 2 - - - 5 - - - ID - - - Top, Right - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ColumnText - - - FormTextMapBrowser - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 573, 41 - - - $this - - - $this - - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 7 - TxtTextMapFilter - - 12, 70 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 语言 + + 8 - - 51, 21 - - - 2 - - - $this - - - 置顶 - - - 75, 23 - - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 96, 12 75, 23 - - 600, 400 + + 2 + + + 浏览 + + + BtnSelectRecoursePath + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + + + Top, Right + + + 548, 12 + + + 100, 25 + + + 4 + + + CmbLanguage + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + Top, Right + + + True + + + 510, 15 + + + 32, 17 + + + 5 + + + 语言 + + + LblLanguage + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + True 12, 14 - - True - - - True - - - True - + + 51, 21 + + + 7 + + + 置顶 + + + ChkTopMost + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + Top, Left, Right + + + 177, 15 + + + 327, 17 + + + 3 + + + 请选择Resources路径 + + + LblResourcesPath + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + Top, Right + + + 573, 41 + + + 75, 23 + + + 8 + + + 搜索 + + + BtnSearch + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + Top, Bottom, Left, Right + True + + Hash + + + 80 + + + True + + + ID + + + 240 + + + True + + + Text + + + 250 + + + 12, 70 + + + 636, 379 + + + 9 + + + DGVTextMap + + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + Top, Right + + + True + + + NoControl + + + 545, 44 + + + 16, 17 + + + 18 + + + X + + + False + + + LblClearFilter + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + 7, 17 + + + 660, 461 + + + 微软雅黑, 9pt + + + 4, 4, 4, 4 + + + 600, 400 + + + CenterScreen + + + 文本映射表浏览器 + + + ColumnHash + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ColumnID + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ColumnText + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + FormTextMapBrowser + + + 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/PageAchievement.Designer.cs b/Source/GrasscutterTools/Pages/PageAchievement.Designer.cs index 64294bf..4a17232 100644 --- a/Source/GrasscutterTools/Pages/PageAchievement.Designer.cs +++ b/Source/GrasscutterTools/Pages/PageAchievement.Designer.cs @@ -39,6 +39,7 @@ this.BtnProgress = new System.Windows.Forms.Button(); this.BtnRevoke = new System.Windows.Forms.Button(); this.BtnGrant = new System.Windows.Forms.Button(); + this.LblClearFilter = new System.Windows.Forms.Label(); this.GrpAchievements.SuspendLayout(); this.GrpAchievementCommands.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.NUDProgress)).BeginInit(); @@ -54,6 +55,7 @@ // GrpAchievements // resources.ApplyResources(this.GrpAchievements, "GrpAchievements"); + this.GrpAchievements.Controls.Add(this.LblClearFilter); this.GrpAchievements.Controls.Add(this.TxtAchievementFilter); this.GrpAchievements.Controls.Add(this.LnkRevokeAll); this.GrpAchievements.Controls.Add(this.ListAchievements); @@ -127,6 +129,14 @@ this.BtnGrant.UseVisualStyleBackColor = true; this.BtnGrant.Click += new System.EventHandler(this.BtnGrant_Click); // + // LblClearFilter + // + resources.ApplyResources(this.LblClearFilter, "LblClearFilter"); + this.LblClearFilter.BackColor = System.Drawing.Color.White; + this.LblClearFilter.Cursor = System.Windows.Forms.Cursors.Hand; + this.LblClearFilter.Name = "LblClearFilter"; + this.LblClearFilter.Click += new System.EventHandler(this.LblClearFilter_Click); + // // PageAchievement // resources.ApplyResources(this, "$this"); @@ -154,5 +164,6 @@ private System.Windows.Forms.TextBox TxtAchievementFilter; private System.Windows.Forms.LinkLabel LnkRevokeAll; private System.Windows.Forms.LinkLabel LnkGrantAll; + private System.Windows.Forms.Label LblClearFilter; } } diff --git a/Source/GrasscutterTools/Pages/PageAchievement.cs b/Source/GrasscutterTools/Pages/PageAchievement.cs index 247d2b2..7d77dd8 100644 --- a/Source/GrasscutterTools/Pages/PageAchievement.cs +++ b/Source/GrasscutterTools/Pages/PageAchievement.cs @@ -54,6 +54,15 @@ namespace GrasscutterTools.Pages private void TxtAchievementFilter_TextChanged(object sender, EventArgs e) { UpdateList(); + LblClearFilter.Visible = TxtAchievementFilter.Text.Length > 0; + } + + /// + /// 点击清空过滤器标签时触发 + /// + private void LblClearFilter_Click(object sender, EventArgs e) + { + TxtAchievementFilter.Clear(); } /// @@ -100,5 +109,6 @@ namespace GrasscutterTools.Pages { GenSelected("/achievement progress", NUDProgress.Text); } + } } \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageAchievement.resx b/Source/GrasscutterTools/Pages/PageAchievement.resx index 462c00f..b793e08 100644 --- a/Source/GrasscutterTools/Pages/PageAchievement.resx +++ b/Source/GrasscutterTools/Pages/PageAchievement.resx @@ -145,11 +145,47 @@ GrpAchievements - 2 + 3 Top, Bottom, Left, Right + + Top, Right + + + True + + + NoControl + + + 618, 25 + + + 16, 17 + + + 18 + + + X + + + False + + + LblClearFilter + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpAchievements + + + 0 + Top, Left, Right @@ -172,7 +208,7 @@ GrpAchievements - 0 + 1 Top, Right @@ -202,7 +238,7 @@ GrpAchievements - 1 + 2 Top, Right @@ -232,7 +268,7 @@ GrpAchievements - 3 + 4 3, 3 @@ -261,6 +297,78 @@ Bottom, Left, Right + + NUDProgress + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpAchievementCommands + + + 0 + + + BtnProgress + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpAchievementCommands + + + 1 + + + BtnRevoke + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpAchievementCommands + + + 2 + + + BtnGrant + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpAchievementCommands + + + 3 + + + 3, 176 + + + 640, 60 + + + 2 + + + 成就控制（在列表中选择目标项） + + + GrpAchievementCommands + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + Top, Right @@ -360,30 +468,6 @@ 3 - - 3, 176 - - - 640, 60 - - - 2 - - - 成就控制（在列表中选择目标项） - - - GrpAchievementCommands - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - True @@ -394,6 +478,6 @@ PageAchievement - GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.9.0.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 + GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.13.0.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageCustomCommands.Designer.cs b/Source/GrasscutterTools/Pages/PageCustomCommands.Designer.cs index da02cc8..7edc340 100644 --- a/Source/GrasscutterTools/Pages/PageCustomCommands.Designer.cs +++ b/Source/GrasscutterTools/Pages/PageCustomCommands.Designer.cs @@ -39,6 +39,7 @@ this.BtnSaveCustomCommand = new System.Windows.Forms.Button(); this.TxtCustomName = new System.Windows.Forms.TextBox(); this.BtnAddHotKey = new System.Windows.Forms.Button(); + this.LblClearFilter = new System.Windows.Forms.Label(); this.GrpCustomCommands.SuspendLayout(); this.SuspendLayout(); // @@ -99,6 +100,7 @@ // resources.ApplyResources(this.TxtCustomName, "TxtCustomName"); this.TxtCustomName.Name = "TxtCustomName"; + this.TxtCustomName.TextChanged += new System.EventHandler(this.TxtCustomName_TextChanged); this.TxtCustomName.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TxtCustomName_KeyDown); // // BtnAddHotKey @@ -108,10 +110,19 @@ this.BtnAddHotKey.UseVisualStyleBackColor = true; this.BtnAddHotKey.Click += new System.EventHandler(this.BtnAddHotKey_Click); // + // LblClearFilter + // + resources.ApplyResources(this.LblClearFilter, "LblClearFilter"); + this.LblClearFilter.BackColor = System.Drawing.Color.White; + this.LblClearFilter.Cursor = System.Windows.Forms.Cursors.Hand; + this.LblClearFilter.Name = "LblClearFilter"; + this.LblClearFilter.Click += new System.EventHandler(this.LblClearFilter_Click); + // // PageCustomCommands // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.LblClearFilter); this.Controls.Add(this.BtnAddHotKey); this.Controls.Add(this.BtnExportCustomCommands); this.Controls.Add(this.BtnLoadCustomCommands); @@ -140,5 +151,6 @@ private System.Windows.Forms.Button BtnSaveCustomCommand; private System.Windows.Forms.TextBox TxtCustomName; private System.Windows.Forms.Button BtnAddHotKey; + private System.Windows.Forms.Label LblClearFilter; } } diff --git a/Source/GrasscutterTools/Pages/PageCustomCommands.cs b/Source/GrasscutterTools/Pages/PageCustomCommands.cs index 49e7330..ed47617 100644 --- a/Source/GrasscutterTools/Pages/PageCustomCommands.cs +++ b/Source/GrasscutterTools/Pages/PageCustomCommands.cs @@ -267,5 +267,22 @@ namespace GrasscutterTools.Pages FormMain.Instance.NavigateTo()? .AddNewHotKey(name); // 设置标签 } + + /// + /// 标签栏文本改变时触发 + /// + private void TxtCustomName_TextChanged(object sender, EventArgs e) + { + LblClearFilter.Visible = TxtCustomName.Text.Length > 0; + } + + /// + /// 点击清空标签栏标签时触发 + /// + private void LblClearFilter_Click(object sender, EventArgs e) + { + TxtCustomName.Clear(); + } + } } \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageCustomCommands.resx b/Source/GrasscutterTools/Pages/PageCustomCommands.resx index faac5e3..0955b23 100644 --- a/Source/GrasscutterTools/Pages/PageCustomCommands.resx +++ b/Source/GrasscutterTools/Pages/PageCustomCommands.resx @@ -148,7 +148,7 @@ $this - 1 + 2 Bottom, Right @@ -178,7 +178,7 @@ $this - 2 + 3 Bottom, Left @@ -211,7 +211,7 @@ $this - 3 + 4 Top, Bottom, Left, Right @@ -301,7 +301,7 @@ $this - 4 + 5 Bottom, Right @@ -331,7 +331,7 @@ $this - 5 + 6 Bottom, Right @@ -361,7 +361,7 @@ $this - 6 + 7 Bottom, Left, Right @@ -385,7 +385,7 @@ $this - 7 + 8 Bottom, Right @@ -412,6 +412,42 @@ $this + 1 + + + Bottom, Right + + + True + + + NoControl + + + 302, 213 + + + 16, 17 + + + 19 + + + X + + + False + + + LblClearFilter + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 0 @@ -424,6 +460,6 @@ PageCustomCommands - GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.12.2.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 + GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.13.0.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageGiveItem.Designer.cs b/Source/GrasscutterTools/Pages/PageGiveItem.Designer.cs index e50a7a7..cf2a36b 100644 --- a/Source/GrasscutterTools/Pages/PageGiveItem.Designer.cs +++ b/Source/GrasscutterTools/Pages/PageGiveItem.Designer.cs @@ -45,6 +45,7 @@ this.LblGiveCommandDescription = new System.Windows.Forms.Label(); this.CmbFilterItem = new System.Windows.Forms.ComboBox(); this.MenuItemFilter = new System.Windows.Forms.ContextMenuStrip(this.components); + this.LblClearFilter = new System.Windows.Forms.Label(); this.GrpGiveItemRecord.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.NUDGameItemAmout)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUDGameItemLevel)).BeginInit(); @@ -174,10 +175,19 @@ this.MenuItemFilter.Name = "MenuSpawnEntityFilter"; resources.ApplyResources(this.MenuItemFilter, "MenuItemFilter"); // + // LblClearFilter + // + resources.ApplyResources(this.LblClearFilter, "LblClearFilter"); + this.LblClearFilter.BackColor = System.Drawing.Color.White; + this.LblClearFilter.Cursor = System.Windows.Forms.Cursors.Hand; + this.LblClearFilter.Name = "LblClearFilter"; + this.LblClearFilter.Click += new System.EventHandler(this.LblClearFilter_Click); + // // PageGiveItem // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.LblClearFilter); this.Controls.Add(this.CmbFilterItem); this.Controls.Add(this.LblClearGiveItemLogs); this.Controls.Add(this.BtnSaveGiveItemLog); @@ -217,5 +227,6 @@ private System.Windows.Forms.Label LblGiveCommandDescription; private System.Windows.Forms.ComboBox CmbFilterItem; private System.Windows.Forms.ContextMenuStrip MenuItemFilter; + private System.Windows.Forms.Label LblClearFilter; } } diff --git a/Source/GrasscutterTools/Pages/PageGiveItem.cs b/Source/GrasscutterTools/Pages/PageGiveItem.cs index 921b7b5..bb22d77 100644 --- a/Source/GrasscutterTools/Pages/PageGiveItem.cs +++ b/Source/GrasscutterTools/Pages/PageGiveItem.cs @@ -99,6 +99,15 @@ namespace GrasscutterTools.Pages private void TxtGameItemFilter_TextChanged(object sender, EventArgs e) { LoadItemList(); + LblClearFilter.Visible = TxtGameItemFilter.Text.Length > 0; + } + + /// + /// 点击清空过滤器标签时触发 + /// + private void LblClearFilter_Click(object sender, EventArgs e) + { + TxtGameItemFilter.Clear(); } /// @@ -240,5 +249,6 @@ namespace GrasscutterTools.Pages } #endregion -- 物品记录 -- + } } \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageGiveItem.resx b/Source/GrasscutterTools/Pages/PageGiveItem.resx index f027c35..e98d101 100644 --- a/Source/GrasscutterTools/Pages/PageGiveItem.resx +++ b/Source/GrasscutterTools/Pages/PageGiveItem.resx @@ -151,7 +151,7 @@ $this - 2 + 3 NoControl @@ -178,7 +178,7 @@ $this - 3 + 4 False @@ -208,7 +208,7 @@ $this - 4 + 5 Top, Bottom, Left @@ -262,7 +262,7 @@ $this - 5 + 6 Bottom, Left @@ -295,7 +295,7 @@ $this - 6 + 7 Top, Left, Right @@ -319,7 +319,7 @@ $this - 7 + 8 Top, Bottom, Left, Right @@ -346,7 +346,7 @@ $this - 8 + 9 Bottom, Left @@ -379,7 +379,7 @@ $this - 9 + 10 Bottom, Left @@ -412,7 +412,7 @@ $this - 10 + 11 Bottom, Left @@ -436,7 +436,7 @@ $this - 11 + 12 Bottom, Left @@ -460,7 +460,7 @@ $this - 12 + 13 True @@ -491,7 +491,7 @@ $this - 13 + 14 NoControl @@ -515,7 +515,7 @@ $this - 0 + 2 17, 17 @@ -529,6 +529,42 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Top, Right + + + True + + + NoControl + + + 627, 6 + + + 16, 17 + + + 17 + + + X + + + False + + + LblClearFilter + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + True @@ -539,6 +575,6 @@ PageGiveItem - GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.12.1.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 + GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.13.0.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageGiveWeapon.Designer.cs b/Source/GrasscutterTools/Pages/PageGiveWeapon.Designer.cs index ce51c4f..7bd4aba 100644 --- a/Source/GrasscutterTools/Pages/PageGiveWeapon.Designer.cs +++ b/Source/GrasscutterTools/Pages/PageGiveWeapon.Designer.cs @@ -39,6 +39,7 @@ this.NUDWeaponAmout = new System.Windows.Forms.NumericUpDown(); this.NUDWeaponLevel = new System.Windows.Forms.NumericUpDown(); this.ListWeapons = new System.Windows.Forms.ListBox(); + this.LblClearFilter = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.NUDWeaponRefinement)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUDWeaponAmout)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUDWeaponLevel)).BeginInit(); @@ -142,10 +143,19 @@ this.ListWeapons.Name = "ListWeapons"; this.ListWeapons.SelectedIndexChanged += new System.EventHandler(this.WeaponValueChanged); // + // LblClearFilter + // + resources.ApplyResources(this.LblClearFilter, "LblClearFilter"); + this.LblClearFilter.BackColor = System.Drawing.Color.White; + this.LblClearFilter.Cursor = System.Windows.Forms.Cursors.Hand; + this.LblClearFilter.Name = "LblClearFilter"; + this.LblClearFilter.Click += new System.EventHandler(this.LblClearFilter_Click); + // // PageGiveWeapon // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.LblClearFilter); this.Controls.Add(this.ListWeapons); this.Controls.Add(this.TxtWeaponFilter); this.Controls.Add(this.NUDWeaponRefinement); @@ -177,5 +187,6 @@ private System.Windows.Forms.NumericUpDown NUDWeaponAmout; private System.Windows.Forms.NumericUpDown NUDWeaponLevel; private System.Windows.Forms.ListBox ListWeapons; + private System.Windows.Forms.Label LblClearFilter; } } diff --git a/Source/GrasscutterTools/Pages/PageGiveWeapon.cs b/Source/GrasscutterTools/Pages/PageGiveWeapon.cs index 9bf7e76..27bc684 100644 --- a/Source/GrasscutterTools/Pages/PageGiveWeapon.cs +++ b/Source/GrasscutterTools/Pages/PageGiveWeapon.cs @@ -48,6 +48,15 @@ namespace GrasscutterTools.Pages private void TxtWeaponFilter_TextChanged(object sender, EventArgs e) { UIUtil.ListBoxFilter(ListWeapons, GameData.Weapons.Lines, TxtWeaponFilter.Text); + LblClearFilter.Visible = TxtWeaponFilter.Text.Length > 0; + } + + /// + /// 点击清空过滤器标签时触发 + /// + private void LblClearFilter_Click(object sender, EventArgs e) + { + TxtWeaponFilter.Clear(); } /// diff --git a/Source/GrasscutterTools/Pages/PageGiveWeapon.resx b/Source/GrasscutterTools/Pages/PageGiveWeapon.resx index fc46954..bc8bbf4 100644 --- a/Source/GrasscutterTools/Pages/PageGiveWeapon.resx +++ b/Source/GrasscutterTools/Pages/PageGiveWeapon.resx @@ -151,7 +151,7 @@ $this - 8 + 9 Top, Right @@ -175,7 +175,7 @@ $this - 1 + 2 Top, Bottom, Left, Right @@ -216,7 +216,7 @@ $this - 9 + 10 Bottom, Left @@ -249,7 +249,7 @@ $this - 3 + 4 Bottom, Left @@ -282,7 +282,7 @@ $this - 7 + 8 Bottom, Left @@ -315,7 +315,7 @@ $this - 5 + 6 Bottom, Left @@ -339,7 +339,7 @@ $this - 2 + 3 Bottom, Left @@ -363,7 +363,7 @@ $this - 6 + 7 Bottom, Left @@ -387,7 +387,7 @@ $this - 4 + 5 Top, Bottom, Right @@ -414,6 +414,42 @@ $this + 1 + + + Top, Right + + + True + + + NoControl + + + 627, 6 + + + 16, 17 + + + 20 + + + X + + + False + + + LblClearFilter + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 0 @@ -426,6 +462,6 @@ PageGiveWeapon - GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.7.4.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 + GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.13.0.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageHotKey.Designer.cs b/Source/GrasscutterTools/Pages/PageHotKey.Designer.cs index f6ecd60..3069133 100644 --- a/Source/GrasscutterTools/Pages/PageHotKey.Designer.cs +++ b/Source/GrasscutterTools/Pages/PageHotKey.Designer.cs @@ -41,17 +41,18 @@ this.LblHotKeyLabel = new System.Windows.Forms.Label(); this.TxtTag = new System.Windows.Forms.TextBox(); this.LblTagLabel = new System.Windows.Forms.Label(); + this.LblClearFilter = new System.Windows.Forms.Label(); this.GrpHotKeyList.SuspendLayout(); this.SuspendLayout(); // // LvHotKeyList // - resources.ApplyResources(this.LvHotKeyList, "LvHotKeyList"); this.LvHotKeyList.CheckBoxes = true; this.LvHotKeyList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.ColTag, this.ColHotKey, this.ColCommand}); + resources.ApplyResources(this.LvHotKeyList, "LvHotKeyList"); this.LvHotKeyList.HideSelection = false; this.LvHotKeyList.Name = "LvHotKeyList"; this.LvHotKeyList.UseCompatibleStateImageBehavior = false; @@ -119,16 +120,26 @@ // resources.ApplyResources(this.TxtTag, "TxtTag"); this.TxtTag.Name = "TxtTag"; + this.TxtTag.TextChanged += new System.EventHandler(this.TxtTag_TextChanged); // // LblTagLabel // resources.ApplyResources(this.LblTagLabel, "LblTagLabel"); this.LblTagLabel.Name = "LblTagLabel"; // + // LblClearFilter + // + resources.ApplyResources(this.LblClearFilter, "LblClearFilter"); + this.LblClearFilter.BackColor = System.Drawing.Color.White; + this.LblClearFilter.Cursor = System.Windows.Forms.Cursors.Hand; + this.LblClearFilter.Name = "LblClearFilter"; + this.LblClearFilter.Click += new System.EventHandler(this.LblClearFilter_Click); + // // PageHotKey // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.LblClearFilter); this.Controls.Add(this.BtnRemove); this.Controls.Add(this.BtnAddOrUpdate); this.Controls.Add(this.GrpHotKeyList); @@ -158,5 +169,6 @@ private System.Windows.Forms.TextBox TxtTag; private System.Windows.Forms.Label LblTagLabel; private System.Windows.Forms.CheckBox ChkEnableGlobal; + private System.Windows.Forms.Label LblClearFilter; } } diff --git a/Source/GrasscutterTools/Pages/PageHotKey.cs b/Source/GrasscutterTools/Pages/PageHotKey.cs index 8651c55..a4f74bb 100644 --- a/Source/GrasscutterTools/Pages/PageHotKey.cs +++ b/Source/GrasscutterTools/Pages/PageHotKey.cs @@ -309,5 +309,21 @@ namespace GrasscutterTools.Pages } } + + /// + /// 标签输入栏改变时触发 + /// + private void TxtTag_TextChanged(object sender, EventArgs e) + { + LblClearFilter.Visible = TxtTag.Text.Length > 0; + } + + /// + /// 点击清空标签输入栏标签时触发 + /// + private void LblClearFilter_Click(object sender, EventArgs e) + { + TxtTag.Clear(); + } } } \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageHotKey.resx b/Source/GrasscutterTools/Pages/PageHotKey.resx index e4fa274..b920e45 100644 --- a/Source/GrasscutterTools/Pages/PageHotKey.resx +++ b/Source/GrasscutterTools/Pages/PageHotKey.resx @@ -117,92 +117,245 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 - - - - 100, 30 + + 标签 - - 3 + + 150 - - True - - - GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.13.0.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 - - - 640, 200 - - - 212, 213 - - - BtnAddOrUpdate - - - 543, 206 - - - 1 - - - $this - - - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 387, 206 - - - 165, 23 - - - $this - - - 547, -2 - - - 44, 17 - - - 快捷执行列表 + + 快捷键 100 - + + 命令 + + + 350 + + + + Fill + + + + 3, 19 + + + 634, 178 + + + 0 + + + LvHotKeyList + + + System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpHotKeyList + + + 1 + + + Top, Bottom, Left, Right + + + Top, Right + + + True + + + 547, -2 + + + 87, 21 + + + 1 + + + 全局快捷键 + + + ChkEnableGlobal + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpHotKeyList + + + 0 + + + 3, 3 + + + 640, 200 + + + 1 + + + 快捷执行列表 + + + GrpHotKeyList + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + Bottom, Right + + + 543, 206 + + + 100, 30 + + + 5 + + + - 删除 + + + BtnRemove + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + Bottom, Right + + + 387, 206 + + + 150, 30 + + 4 - + + √ 添加或更新 + + + BtnAddOrUpdate + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this + + 2 + + + Bottom, Left, Right + + + 262, 210 + + + 119, 23 + + + 3 + + + Center + TxtHotKey + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + Bottom, Left, Right + + + True + + + 212, 213 + + + 44, 17 + + + 2 + + + 快捷键 + + + LblHotKeyLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + - 5 + 6 - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Bottom, Left, Right - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 41, 210 - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 165, 23 - - 3 + + 1 + + + TxtTag + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + Bottom, Left True @@ -210,208 +363,91 @@ 3, 213 - - 150, 30 - - - 快捷键 - - - 0 - - - Bottom, Left - - - $this - - - TxtTag - - - 2 - - - 634, 178 - - - 6 - - - LvHotKeyList - - - 0 - - - ColTag - - - 262, 210 - - - 命令 - - - 119, 23 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpHotKeyList - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 5 - - - Fill - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpHotKeyList - - - 快捷键 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BtnRemove - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 标签 - - - 全局快捷键 - - - √ 添加或更新 - - - 7, 17 - - - 150 - - - LblTagLabel - - - $this - - - 3, 19 - - - True - - - 2 - - - 1 - 32, 17 - - ChkEnableGlobal - - - 4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - PageHotKey - - - Bottom, Left, Right - - - 1 - - - Top, Bottom, Left, Right - - - ColHotKey - - - LblHotKeyLabel - - - 标签 - - - ColCommand - - - 1 - - - 87, 21 - - - $this - - - - 删除 - - - Bottom, Right - - - Bottom, Right - - - 350 - - - 41, 210 - - - Center - 0 - - GrpHotKeyList + + 标签 - - 1 + + LblTagLabel - - 3, 3 + + System.Windows.Forms.Label, 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 - - - Bottom, Left, Right - - + $this - - Top, Right + + 7 + + + Bottom, Right + + + True + + + NoControl + + + 190, 213 + + + 16, 17 + + + 21 + + + X + + + False + + + LblClearFilter + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 True + + 7, 17 + + + ColTag + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ColHotKey + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ColCommand + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + PageHotKey + + + GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.13.0.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 + \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageMail.Designer.cs b/Source/GrasscutterTools/Pages/PageMail.Designer.cs index aeb9ebe..659623c 100644 --- a/Source/GrasscutterTools/Pages/PageMail.Designer.cs +++ b/Source/GrasscutterTools/Pages/PageMail.Designer.cs @@ -59,6 +59,7 @@ this.LblMailTitleLabel = new System.Windows.Forms.Label(); this.TxtMailSender = new System.Windows.Forms.TextBox(); this.LblMailSenderLabel = new System.Windows.Forms.Label(); + this.LblClearFilter = new System.Windows.Forms.Label(); this.TCMailRight.SuspendLayout(); this.TPMailSelectableItemList.SuspendLayout(); this.PanelMailItemArgs.SuspendLayout(); @@ -100,6 +101,7 @@ // // TPMailSelectableItemList // + this.TPMailSelectableItemList.Controls.Add(this.LblClearFilter); this.TPMailSelectableItemList.Controls.Add(this.ListMailSelectableItems); this.TPMailSelectableItemList.Controls.Add(this.TxtMailSelectableItemFilter); this.TPMailSelectableItemList.Controls.Add(this.PanelMailItemArgs); @@ -296,6 +298,14 @@ resources.ApplyResources(this.LblMailSenderLabel, "LblMailSenderLabel"); this.LblMailSenderLabel.Name = "LblMailSenderLabel"; // + // LblClearFilter + // + resources.ApplyResources(this.LblClearFilter, "LblClearFilter"); + this.LblClearFilter.BackColor = System.Drawing.Color.White; + this.LblClearFilter.Cursor = System.Windows.Forms.Cursors.Hand; + this.LblClearFilter.Name = "LblClearFilter"; + this.LblClearFilter.Click += new System.EventHandler(this.LblClearFilter_Click); + // // PageMail // resources.ApplyResources(this, "$this"); @@ -365,5 +375,6 @@ private System.Windows.Forms.Label LblMailTitleLabel; private System.Windows.Forms.TextBox TxtMailSender; private System.Windows.Forms.Label LblMailSenderLabel; + private System.Windows.Forms.Label LblClearFilter; } } diff --git a/Source/GrasscutterTools/Pages/PageMail.cs b/Source/GrasscutterTools/Pages/PageMail.cs index 6301c0e..11a4a1c 100644 --- a/Source/GrasscutterTools/Pages/PageMail.cs +++ b/Source/GrasscutterTools/Pages/PageMail.cs @@ -201,6 +201,15 @@ namespace GrasscutterTools.Pages private void TxtMailSelectableItemFilter_TextChanged(object sender, EventArgs e) { UIUtil.ListBoxFilter(ListMailSelectableItems, MailSelectableItems, TxtMailSelectableItemFilter.Text); + LblClearFilter.Visible = TxtMailSelectableItemFilter.Text.Length > 0; + } + + /// + /// 点击清空过滤栏标签时触发 + /// + private void LblClearFilter_Click(object sender, EventArgs e) + { + TxtMailSelectableItemFilter.Clear(); } #endregion -- 邮件附件可选列表 Mail item selectable list -- @@ -289,5 +298,6 @@ namespace GrasscutterTools.Pages } #endregion -- 邮件列表 Mail list -- + } } \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageMail.resx b/Source/GrasscutterTools/Pages/PageMail.resx index b3ac414..30aea54 100644 --- a/Source/GrasscutterTools/Pages/PageMail.resx +++ b/Source/GrasscutterTools/Pages/PageMail.resx @@ -213,6 +213,60 @@ Top, Bottom, Left, Right + + Top, Right + + + True + + + NoControl + + + 206, 6 + + + 16, 17 + + + 22 + + + X + + + False + + + LblClearFilter + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TPMailSelectableItemList + + + 0 + + + Fill + + + 17 + + + 3, 26 + + + 0, 0, 0, 0 + + + 222, 141 + + + 1 + ListMailSelectableItems @@ -223,6 +277,18 @@ TPMailSelectableItemList + 1 + + + Top + + + 3, 3 + + + 222, 23 + + 0 @@ -235,8 +301,122 @@ TPMailSelectableItemList + 2 + + + 171, 5 + + + 50, 23 + + + 3 + + + NUDMailItemLevel + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + PanelMailItemArgs + + + 0 + + + 47, 5 + + + 60, 23 + + 1 + + NUDMailItemCount + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + PanelMailItemArgs + + + 1 + + + True + + + NoControl + + + -3, 7 + + + 44, 17 + + + 0 + + + 数量： + + + LblMailItemCount + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + PanelMailItemArgs + + + 2 + + + True + + + NoControl + + + 123, 7 + + + 44, 17 + + + 2 + + + 等级： + + + LblMailItemLevel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + PanelMailItemArgs + + + 3 + + + Bottom + + + 3, 167 + + + 222, 30 + + + 2 + PanelMailItemArgs @@ -247,7 +427,7 @@ TPMailSelectableItemList - 2 + 3 4, 26 @@ -432,234 +612,6 @@ 3 - - Fill - - - 17 - - - 3, 26 - - - 0, 0, 0, 0 - - - 222, 141 - - - 1 - - - ListMailSelectableItems - - - System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TPMailSelectableItemList - - - 0 - - - Top - - - 3, 3 - - - 222, 23 - - - 0 - - - TxtMailSelectableItemFilter - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TPMailSelectableItemList - - - 1 - - - NUDMailItemLevel - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - PanelMailItemArgs - - - 0 - - - NUDMailItemCount - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - PanelMailItemArgs - - - 1 - - - LblMailItemCount - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - PanelMailItemArgs - - - 2 - - - LblMailItemLevel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - PanelMailItemArgs - - - 3 - - - Bottom - - - 3, 167 - - - 222, 30 - - - 2 - - - PanelMailItemArgs - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TPMailSelectableItemList - - - 2 - - - 171, 5 - - - 50, 23 - - - 3 - - - NUDMailItemLevel - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - PanelMailItemArgs - - - 0 - - - 47, 5 - - - 60, 23 - - - 1 - - - NUDMailItemCount - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - PanelMailItemArgs - - - 1 - - - True - - - NoControl - - - -3, 7 - - - 44, 17 - - - 0 - - - 数量： - - - LblMailItemCount - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - PanelMailItemArgs - - - 2 - - - True - - - NoControl - - - 123, 7 - - - 44, 17 - - - 2 - - - 等级： - - - LblMailItemLevel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - PanelMailItemArgs - - - 3 - Bottom, Left @@ -1033,6 +985,6 @@ PageMail - GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.7.4.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 + GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.13.0.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageQuest.Designer.cs b/Source/GrasscutterTools/Pages/PageQuest.Designer.cs index e009516..8e79d5e 100644 --- a/Source/GrasscutterTools/Pages/PageQuest.Designer.cs +++ b/Source/GrasscutterTools/Pages/PageQuest.Designer.cs @@ -38,6 +38,7 @@ this.LblQuestDescription = new System.Windows.Forms.Label(); this.TxtQuestFilter = new System.Windows.Forms.TextBox(); this.ListQuest = new System.Windows.Forms.ListBox(); + this.LblClearFilter = new System.Windows.Forms.Label(); this.GrpQuestFilters.SuspendLayout(); this.SuspendLayout(); // @@ -107,10 +108,19 @@ this.ListQuest.FormattingEnabled = true; this.ListQuest.Name = "ListQuest"; // + // LblClearFilter + // + resources.ApplyResources(this.LblClearFilter, "LblClearFilter"); + this.LblClearFilter.BackColor = System.Drawing.Color.White; + this.LblClearFilter.Cursor = System.Windows.Forms.Cursors.Hand; + this.LblClearFilter.Name = "LblClearFilter"; + this.LblClearFilter.Click += new System.EventHandler(this.LblClearFilter_Click); + // // PageQuest // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.LblClearFilter); this.Controls.Add(this.GrpQuestFilters); this.Controls.Add(this.BtnFinishQuest); this.Controls.Add(this.BtnAddQuest); @@ -136,5 +146,6 @@ private System.Windows.Forms.Label LblQuestDescription; private System.Windows.Forms.TextBox TxtQuestFilter; private System.Windows.Forms.ListBox ListQuest; + private System.Windows.Forms.Label LblClearFilter; } } diff --git a/Source/GrasscutterTools/Pages/PageQuest.cs b/Source/GrasscutterTools/Pages/PageQuest.cs index 9245d5d..83099f1 100644 --- a/Source/GrasscutterTools/Pages/PageQuest.cs +++ b/Source/GrasscutterTools/Pages/PageQuest.cs @@ -63,6 +63,16 @@ namespace GrasscutterTools.Pages return true; }).ToArray()); ListQuest.EndUpdate(); + + LblClearFilter.Visible = TxtQuestFilter.Text.Length > 0; + } + + /// + /// 点击清空过滤栏标签时触发 + /// + private void LblClearFilter_Click(object sender, EventArgs e) + { + TxtQuestFilter.Clear(); } /// diff --git a/Source/GrasscutterTools/Pages/PageQuest.resx b/Source/GrasscutterTools/Pages/PageQuest.resx index c885b2d..70b530a 100644 --- a/Source/GrasscutterTools/Pages/PageQuest.resx +++ b/Source/GrasscutterTools/Pages/PageQuest.resx @@ -235,7 +235,7 @@ $this - 0 + 1 Bottom, Left @@ -265,7 +265,7 @@ $this - 1 + 2 Bottom, Left @@ -295,7 +295,7 @@ $this - 2 + 3 Top, Bottom, Left @@ -327,7 +327,7 @@ $this - 3 + 4 Top, Left, Right @@ -351,7 +351,7 @@ $this - 4 + 5 Top, Bottom, Left, Right @@ -378,7 +378,43 @@ $this - 5 + 6 + + + Top, Right + + + True + + + NoControl + + + 627, 5 + + + 16, 17 + + + 22 + + + X + + + False + + + LblClearFilter + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 True @@ -390,6 +426,6 @@ PageQuest - GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.7.4.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 + GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.13.0.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageScene.Designer.cs b/Source/GrasscutterTools/Pages/PageScene.Designer.cs index a07803a..843781d 100644 --- a/Source/GrasscutterTools/Pages/PageScene.Designer.cs +++ b/Source/GrasscutterTools/Pages/PageScene.Designer.cs @@ -45,6 +45,7 @@ this.LblTp = new System.Windows.Forms.Label(); this.RbListCutScene = new System.Windows.Forms.RadioButton(); this.BtnFreezeTime = new System.Windows.Forms.Button(); + this.LblClearFilter = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.NUDTpZ)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUDTpY)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUDTpX)).BeginInit(); @@ -196,10 +197,19 @@ this.BtnFreezeTime.UseVisualStyleBackColor = true; this.BtnFreezeTime.Click += new System.EventHandler(this.BtnFreezeTime_Click); // + // LblClearFilter + // + resources.ApplyResources(this.LblClearFilter, "LblClearFilter"); + this.LblClearFilter.BackColor = System.Drawing.Color.White; + this.LblClearFilter.Cursor = System.Windows.Forms.Cursors.Hand; + this.LblClearFilter.Name = "LblClearFilter"; + this.LblClearFilter.Click += new System.EventHandler(this.LblClearFilter_Click); + // // PageScene // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.LblClearFilter); this.Controls.Add(this.BtnFreezeTime); this.Controls.Add(this.RbListCutScene); this.Controls.Add(this.RbListDungeons); @@ -243,5 +253,6 @@ private System.Windows.Forms.Label LblTp; private System.Windows.Forms.RadioButton RbListCutScene; private System.Windows.Forms.Button BtnFreezeTime; + private System.Windows.Forms.Label LblClearFilter; } } diff --git a/Source/GrasscutterTools/Pages/PageScene.cs b/Source/GrasscutterTools/Pages/PageScene.cs index 5183c52..113b68f 100644 --- a/Source/GrasscutterTools/Pages/PageScene.cs +++ b/Source/GrasscutterTools/Pages/PageScene.cs @@ -90,6 +90,15 @@ namespace GrasscutterTools.Pages private void TxtSceneFilter_TextChanged(object sender, EventArgs e) { UIUtil.ListBoxFilter(ListScenes, Scenes, TxtSceneFilter.Text); + TxtSceneFilter.Visible = TxtSceneFilter.Text.Length > 0; + } + + /// + /// 点击清空过滤栏标签时触发 + /// + private void LblClearFilter_Click(object sender, EventArgs e) + { + TxtSceneFilter.Clear(); } /// diff --git a/Source/GrasscutterTools/Pages/PageScene.resx b/Source/GrasscutterTools/Pages/PageScene.resx index f65f348..f086313 100644 --- a/Source/GrasscutterTools/Pages/PageScene.resx +++ b/Source/GrasscutterTools/Pages/PageScene.resx @@ -148,7 +148,7 @@ $this - 2 + 3 True @@ -178,7 +178,7 @@ $this - 3 + 4 Top, Left, Right @@ -202,7 +202,7 @@ $this - 4 + 5 Bottom, Left @@ -238,7 +238,7 @@ $this - 5 + 6 Bottom, Left @@ -271,7 +271,7 @@ $this - 6 + 7 Bottom, Left @@ -304,7 +304,7 @@ $this - 7 + 8 Bottom, Left @@ -334,7 +334,7 @@ $this - 8 + 9 Bottom, Left @@ -367,7 +367,7 @@ $this - 9 + 10 Bottom, Left @@ -391,7 +391,7 @@ $this - 10 + 11 Bottom, Left @@ -415,7 +415,7 @@ $this - 11 + 12 Bottom, Left @@ -439,7 +439,7 @@ $this - 12 + 13 True @@ -469,7 +469,7 @@ $this - 13 + 14 Top, Bottom, Left, Right @@ -496,7 +496,7 @@ $this - 14 + 15 Bottom, Left @@ -532,7 +532,7 @@ $this - 15 + 16 True @@ -562,7 +562,7 @@ $this - 1 + 2 Bottom, Left @@ -592,6 +592,42 @@ $this + 1 + + + Top, Right + + + True + + + NoControl + + + 627, 5 + + + 16, 17 + + + 23 + + + X + + + False + + + LblClearFilter + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 0 diff --git a/Source/GrasscutterTools/Pages/PageTasks.Designer.cs b/Source/GrasscutterTools/Pages/PageTasks.Designer.cs index 00ec6c2..eb30928 100644 --- a/Source/GrasscutterTools/Pages/PageTasks.Designer.cs +++ b/Source/GrasscutterTools/Pages/PageTasks.Designer.cs @@ -36,6 +36,7 @@ this.ColDelay = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.ColCount = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.GrpTask = new System.Windows.Forms.GroupBox(); + this.LblClearFilter = new System.Windows.Forms.Label(); this.BtnRemove = new System.Windows.Forms.Button(); this.BtnAccept = new System.Windows.Forms.Button(); this.NUDTriggerCount = new System.Windows.Forms.NumericUpDown(); @@ -58,7 +59,6 @@ // // ListTasks // - resources.ApplyResources(this.ListTasks, "ListTasks"); this.ListTasks.AllowColumnReorder = true; this.ListTasks.CheckBoxes = true; this.ListTasks.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { @@ -66,6 +66,7 @@ this.ColContent, this.ColDelay, this.ColCount}); + resources.ApplyResources(this.ListTasks, "ListTasks"); this.ListTasks.HideSelection = false; this.ListTasks.MultiSelect = false; this.ListTasks.Name = "ListTasks"; @@ -93,6 +94,7 @@ // GrpTask // resources.ApplyResources(this.GrpTask, "GrpTask"); + this.GrpTask.Controls.Add(this.LblClearFilter); this.GrpTask.Controls.Add(this.BtnRemove); this.GrpTask.Controls.Add(this.BtnAccept); this.GrpTask.Controls.Add(this.NUDTriggerCount); @@ -104,6 +106,14 @@ this.GrpTask.Name = "GrpTask"; this.GrpTask.TabStop = false; // + // LblClearFilter + // + resources.ApplyResources(this.LblClearFilter, "LblClearFilter"); + this.LblClearFilter.BackColor = System.Drawing.Color.White; + this.LblClearFilter.Cursor = System.Windows.Forms.Cursors.Hand; + this.LblClearFilter.Name = "LblClearFilter"; + this.LblClearFilter.Click += new System.EventHandler(this.LblClearFilter_Click); + // // BtnRemove // resources.ApplyResources(this.BtnRemove, "BtnRemove"); @@ -160,6 +170,7 @@ // resources.ApplyResources(this.TxtTag, "TxtTag"); this.TxtTag.Name = "TxtTag"; + this.TxtTag.TextChanged += new System.EventHandler(this.TxtTag_TextChanged); // // LblTag // @@ -198,5 +209,6 @@ private System.Windows.Forms.ColumnHeader ColContent; private System.Windows.Forms.ColumnHeader ColDelay; private System.Windows.Forms.ColumnHeader ColCount; + private System.Windows.Forms.Label LblClearFilter; } } diff --git a/Source/GrasscutterTools/Pages/PageTasks.cs b/Source/GrasscutterTools/Pages/PageTasks.cs index 19489b1..e7b185b 100644 --- a/Source/GrasscutterTools/Pages/PageTasks.cs +++ b/Source/GrasscutterTools/Pages/PageTasks.cs @@ -261,5 +261,21 @@ namespace GrasscutterTools.Pages MessageBox.Show(ex.ToString(), Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Error); } } + + /// + /// 任务标签输入栏改变时触发 + /// + private void TxtTag_TextChanged(object sender, EventArgs e) + { + LblClearFilter.Visible = TxtTag.Text.Length > 0; + } + + /// + /// 点击清空任务标签输入栏标签时触发 + /// + private void LblClearFilter_Click(object sender, EventArgs e) + { + TxtTag.Clear(); + } } } \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageTasks.resx b/Source/GrasscutterTools/Pages/PageTasks.resx index f5beccd..0a78c9d 100644 --- a/Source/GrasscutterTools/Pages/PageTasks.resx +++ b/Source/GrasscutterTools/Pages/PageTasks.resx @@ -117,355 +117,391 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + + Top, Bottom, Left, Right - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - 100, 23 - - - ColContent - - - GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.8.0.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 - - - LblDelay - - - $this - - - 延迟 - - - 次数 - - - GrpTask - - - 534, 18 + + 标签 - - 1 - - - - Top, Right - - - GrpTask - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 634, 161 - - - 165, 23 - - - LblTag - - - 6 - - - 50, 23 - - - 3, 19 - - - 640, 183 - - - ColTag - - - TxtTag - - - 334, 22 - - - 任务列表 - - - 1 - - - LblTriggerCount - - - 32, 17 - - - Top, Left, Right - - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Top, Right - - - 5 - - - 4 - - - - - - 2 - - - GrpTask - - - BtnAccept - - - 32, 17 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpTask - - - GrpTask - - - $this - - - 258, 19 - - - True - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 372, 19 - - - True - - - 4 - - - GrpTask - - - 标签 + + 150 内容 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 330 延迟 - - GrpTask - - - 32, 17 - - - 7 - - - 11, 21 - - - System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Bottom, Left, Right - - - ColCount - - - NUDTriggerCount - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BtnRemove - - - GrpTask - - - GrpTasks - - - 7 - - - 7, 17 - - - √ 确定 - - - 150 - - - 70, 23 - - - 1 - - - 1 - - - 428, 18 - - - DTPDelay - - - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 2 - - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Top, Right - 次数 - - Top, Right - - - PageTasks - - - Top, Bottom, Left, Right - - - 0 - - - 任务 - - - Top, Right - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0 - - - 3, 186 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 3 - Fill - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 3, 19 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpTask - - - 0 - - - 6 - - - Top, Right - - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0 + + 634, 161 0 - - True - - - 5 - - - 标签 - - - 3 - - - 640, 50 - - - 100, 23 - - - 220, 22 - - - ColDelay - - - × 删除 - - - 49, 18 - ListTasks + + System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + GrpTasks + + 0 + 3, 3 + + 640, 183 + + + 0 + + + 任务列表 + + + GrpTasks + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + Bottom, Left, Right + + + Top, Right + + + True + + + NoControl + + + 198, 21 + + + 16, 17 + + + 8 + + + X + + + False + + + LblClearFilter + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpTask + + + 0 + + + Top, Right + + + 534, 18 + + + 100, 23 + + + 7 + + + × 删除 + + + BtnRemove + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpTask + + + 1 + + + Top, Right + + + 428, 18 + + + 100, 23 + + + 6 + + + √ 确定 + + + BtnAccept + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpTask + + + 2 + + + Top, Right + + + 372, 19 + + + 50, 23 + + + 5 + + + NUDTriggerCount + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpTask + + + 3 + + + Top, Right + + + True + + + 334, 22 + + + 32, 17 + + + 4 + + + 次数 + + + LblTriggerCount + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpTask + + + 4 + + + Top, Right + + + + + + 258, 19 + + + 70, 23 + + + 3 + + + DTPDelay + + + System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpTask + + + 5 + + + Top, Right + + + True + + + 220, 22 + + + 32, 17 + + + 2 + + + 延迟 + + + LblDelay + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpTask + + + 6 + + + Top, Left, Right + + + 49, 18 + + + 165, 23 + + + 1 + + + TxtTag + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpTask + + + 7 + + + True + + + 11, 21 + + + 32, 17 + + + 0 + + + 标签 + + + LblTag + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpTask + + + 8 + + + 3, 186 + + + 640, 50 + + + 1 + + + 任务 + + + GrpTask + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + True + + 7, 17 + + + ColTag + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ColContent + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ColDelay + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ColCount + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + PageTasks + + + GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.13.0.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 + \ No newline at end of file