Skip to content

D
DataEditorX
Commit e0692acb authored by nanahira's avatar nanahira
Browse files
Options

fixes by JoyJ

parent 075c3f5d
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 34 deletions
DataEditorX/CodeEditForm.cs
View file @ e0692acb
...@@ -326,7 +326,7 @@ void AboutToolStripMenuItemClick(object sender, EventArgs e) ...@@ -326,7 +326,7 @@ void AboutToolStripMenuItemClick(object sender, EventArgs e)
MyMsg.Show( MyMsg.Show(
LanguageHelper.GetMsg(LMSG.About) + "\t" + Application.ProductName + "\n" LanguageHelper.GetMsg(LMSG.About) + "\t" + Application.ProductName + "\n"
+ LanguageHelper.GetMsg(LMSG.Version) + "\t1.1.0.0\n" + LanguageHelper.GetMsg(LMSG.Version) + "\t1.1.0.0\n"
+ LanguageHelper.GetMsg(LMSG.Author) + "\tNanahira"); + LanguageHelper.GetMsg(LMSG.Author) + "\t菜菜");
} }
void Menuitem_openClick(object sender, EventArgs e) void Menuitem_openClick(object sender, EventArgs e)
......
DataEditorX/DataEditForm.Designer.cs
View file @ e0692acb
...@@ -700,9 +700,9 @@ private void InitializeComponent() ...@@ -700,9 +700,9 @@ private void InitializeComponent()
// //
// lb4 // lb4
// //
this.lb4.Anchor = System.Windows.Forms.AnchorStyles.Top; this.lb4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.lb4.AutoSize = true; this.lb4.AutoSize = true;
this.lb4.Location = new System.Drawing.Point(163, 11); this.lb4.Location = new System.Drawing.Point(106, 11);
this.lb4.Name = "lb4"; this.lb4.Name = "lb4";
this.lb4.Size = new System.Drawing.Size(11, 12); this.lb4.Size = new System.Drawing.Size(11, 12);
this.lb4.TabIndex = 7; this.lb4.TabIndex = 7;
...@@ -710,8 +710,8 @@ private void InitializeComponent() ...@@ -710,8 +710,8 @@ private void InitializeComponent()
// //
// tb_page // tb_page
// //
this.tb_page.Anchor = System.Windows.Forms.AnchorStyles.Top; this.tb_page.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.tb_page.Location = new System.Drawing.Point(128, 7); this.tb_page.Location = new System.Drawing.Point(71, 7);
this.tb_page.MaxLength = 12; this.tb_page.MaxLength = 12;
this.tb_page.Name = "tb_page"; this.tb_page.Name = "tb_page";
this.tb_page.Size = new System.Drawing.Size(34, 21); this.tb_page.Size = new System.Drawing.Size(34, 21);
...@@ -722,8 +722,8 @@ private void InitializeComponent() ...@@ -722,8 +722,8 @@ private void InitializeComponent()
// //
// tb_pagenum // tb_pagenum
// //
this.tb_pagenum.Anchor = System.Windows.Forms.AnchorStyles.Top; this.tb_pagenum.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.tb_pagenum.Location = new System.Drawing.Point(178, 7); this.tb_pagenum.Location = new System.Drawing.Point(121, 7);
this.tb_pagenum.MaxLength = 12; this.tb_pagenum.MaxLength = 12;
this.tb_pagenum.Name = "tb_pagenum"; this.tb_pagenum.Name = "tb_pagenum";
this.tb_pagenum.ReadOnly = true; this.tb_pagenum.ReadOnly = true;
...@@ -734,8 +734,8 @@ private void InitializeComponent() ...@@ -734,8 +734,8 @@ private void InitializeComponent()
// //
// btn_PageUp // btn_PageUp
// //
this.btn_PageUp.Anchor = System.Windows.Forms.AnchorStyles.Top; this.btn_PageUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btn_PageUp.Location = new System.Drawing.Point(63, 3); this.btn_PageUp.Location = new System.Drawing.Point(6, 3);
this.btn_PageUp.Name = "btn_PageUp"; this.btn_PageUp.Name = "btn_PageUp";
this.btn_PageUp.Size = new System.Drawing.Size(64, 28); this.btn_PageUp.Size = new System.Drawing.Size(64, 28);
this.btn_PageUp.TabIndex = 5; this.btn_PageUp.TabIndex = 5;
...@@ -745,8 +745,8 @@ private void InitializeComponent() ...@@ -745,8 +745,8 @@ private void InitializeComponent()
// //
// btn_PageDown // btn_PageDown
// //
this.btn_PageDown.Anchor = System.Windows.Forms.AnchorStyles.Top; this.btn_PageDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btn_PageDown.Location = new System.Drawing.Point(214, 3); this.btn_PageDown.Location = new System.Drawing.Point(157, 3);
this.btn_PageDown.Name = "btn_PageDown"; this.btn_PageDown.Name = "btn_PageDown";
this.btn_PageDown.Size = new System.Drawing.Size(64, 28); this.btn_PageDown.Size = new System.Drawing.Size(64, 28);
this.btn_PageDown.TabIndex = 5; this.btn_PageDown.TabIndex = 5;
...@@ -756,8 +756,8 @@ private void InitializeComponent() ...@@ -756,8 +756,8 @@ private void InitializeComponent()
// //
// btn_add // btn_add
// //
this.btn_add.Anchor = System.Windows.Forms.AnchorStyles.Top; this.btn_add.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btn_add.Location = new System.Drawing.Point(612, 3); this.btn_add.Location = new System.Drawing.Point(683, 3);
this.btn_add.Name = "btn_add"; this.btn_add.Name = "btn_add";
this.btn_add.Size = new System.Drawing.Size(75, 28); this.btn_add.Size = new System.Drawing.Size(75, 28);
this.btn_add.TabIndex = 5; this.btn_add.TabIndex = 5;
...@@ -829,10 +829,10 @@ private void InitializeComponent() ...@@ -829,10 +829,10 @@ private void InitializeComponent()
// //
// btn_mod // btn_mod
// //
this.btn_mod.Anchor = System.Windows.Forms.AnchorStyles.Top; this.btn_mod.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btn_mod.Location = new System.Drawing.Point(691, 3); this.btn_mod.Location = new System.Drawing.Point(764, 3);
this.btn_mod.Name = "btn_mod"; this.btn_mod.Name = "btn_mod";
this.btn_mod.Size = new System.Drawing.Size(75, 28); this.btn_mod.Size = new System.Drawing.Size(68, 28);
this.btn_mod.TabIndex = 5; this.btn_mod.TabIndex = 5;
this.btn_mod.Text = "&Modify"; this.btn_mod.Text = "&Modify";
this.btn_mod.UseVisualStyleBackColor = true; this.btn_mod.UseVisualStyleBackColor = true;
...@@ -840,11 +840,11 @@ private void InitializeComponent() ...@@ -840,11 +840,11 @@ private void InitializeComponent()
// //
// btn_del // btn_del
// //
this.btn_del.Anchor = System.Windows.Forms.AnchorStyles.Top; this.btn_del.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btn_del.ForeColor = System.Drawing.Color.DarkRed; this.btn_del.ForeColor = System.Drawing.Color.DarkRed;
this.btn_del.Location = new System.Drawing.Point(847, 3); this.btn_del.Location = new System.Drawing.Point(914, 3);
this.btn_del.Name = "btn_del"; this.btn_del.Name = "btn_del";
this.btn_del.Size = new System.Drawing.Size(75, 28); this.btn_del.Size = new System.Drawing.Size(72, 28);
this.btn_del.TabIndex = 5; this.btn_del.TabIndex = 5;
this.btn_del.Text = "&Delete"; this.btn_del.Text = "&Delete";
this.btn_del.UseVisualStyleBackColor = true; this.btn_del.UseVisualStyleBackColor = true;
...@@ -854,7 +854,7 @@ private void InitializeComponent() ...@@ -854,7 +854,7 @@ private void InitializeComponent()
// //
this.btn_lua.Anchor = System.Windows.Forms.AnchorStyles.Top; this.btn_lua.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.btn_lua.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(64)))), ((int)(((byte)(0))))); this.btn_lua.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btn_lua.Location = new System.Drawing.Point(528, 3); this.btn_lua.Location = new System.Drawing.Point(587, 3);
this.btn_lua.Name = "btn_lua"; this.btn_lua.Name = "btn_lua";
this.btn_lua.Size = new System.Drawing.Size(80, 28); this.btn_lua.Size = new System.Drawing.Size(80, 28);
this.btn_lua.TabIndex = 5; this.btn_lua.TabIndex = 5;
...@@ -865,7 +865,7 @@ private void InitializeComponent() ...@@ -865,7 +865,7 @@ private void InitializeComponent()
// btn_reset // btn_reset
// //
this.btn_reset.Anchor = System.Windows.Forms.AnchorStyles.Top; this.btn_reset.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.btn_reset.Location = new System.Drawing.Point(363, 3); this.btn_reset.Location = new System.Drawing.Point(422, 3);
this.btn_reset.Name = "btn_reset"; this.btn_reset.Name = "btn_reset";
this.btn_reset.Size = new System.Drawing.Size(80, 28); this.btn_reset.Size = new System.Drawing.Size(80, 28);
this.btn_reset.TabIndex = 5; this.btn_reset.TabIndex = 5;
...@@ -876,7 +876,7 @@ private void InitializeComponent() ...@@ -876,7 +876,7 @@ private void InitializeComponent()
// btn_serach // btn_serach
// //
this.btn_serach.Anchor = System.Windows.Forms.AnchorStyles.Top; this.btn_serach.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.btn_serach.Location = new System.Drawing.Point(281, 3); this.btn_serach.Location = new System.Drawing.Point(340, 3);
this.btn_serach.Name = "btn_serach"; this.btn_serach.Name = "btn_serach";
this.btn_serach.Size = new System.Drawing.Size(80, 28); this.btn_serach.Size = new System.Drawing.Size(80, 28);
this.btn_serach.TabIndex = 0; this.btn_serach.TabIndex = 0;
...@@ -956,9 +956,9 @@ private void InitializeComponent() ...@@ -956,9 +956,9 @@ private void InitializeComponent()
// //
// btn_undo // btn_undo
// //
this.btn_undo.Anchor = System.Windows.Forms.AnchorStyles.Top; this.btn_undo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btn_undo.Enabled = false; this.btn_undo.Enabled = false;
this.btn_undo.Location = new System.Drawing.Point(769, 3); this.btn_undo.Location = new System.Drawing.Point(836, 3);
this.btn_undo.Name = "btn_undo"; this.btn_undo.Name = "btn_undo";
this.btn_undo.Size = new System.Drawing.Size(75, 28); this.btn_undo.Size = new System.Drawing.Size(75, 28);
this.btn_undo.TabIndex = 5; this.btn_undo.TabIndex = 5;
...@@ -969,7 +969,7 @@ private void InitializeComponent() ...@@ -969,7 +969,7 @@ private void InitializeComponent()
// btn_img // btn_img
// //
this.btn_img.Anchor = System.Windows.Forms.AnchorStyles.Top; this.btn_img.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.btn_img.Location = new System.Drawing.Point(446, 3); this.btn_img.Location = new System.Drawing.Point(505, 3);
this.btn_img.Name = "btn_img"; this.btn_img.Name = "btn_img";
this.btn_img.Size = new System.Drawing.Size(80, 28); this.btn_img.Size = new System.Drawing.Size(80, 28);
this.btn_img.TabIndex = 17; this.btn_img.TabIndex = 17;
...@@ -1178,7 +1178,7 @@ private void InitializeComponent() ...@@ -1178,7 +1178,7 @@ private void InitializeComponent()
// ch_cardname // ch_cardname
// //
this.ch_cardname.Text = "Card Name"; this.ch_cardname.Text = "Card Name";
this.ch_cardname.Width = 140; this.ch_cardname.Width = 1294;
// //
// pl_cardtype // pl_cardtype
// //
...@@ -1251,6 +1251,7 @@ private void InitializeComponent() ...@@ -1251,6 +1251,7 @@ private void InitializeComponent()
this.Load += new System.EventHandler(this.DataEditFormLoad); this.Load += new System.EventHandler(this.DataEditFormLoad);
this.SizeChanged += new System.EventHandler(this.DataEditFormSizeChanged); this.SizeChanged += new System.EventHandler(this.DataEditFormSizeChanged);
this.Enter += new System.EventHandler(this.DataEditFormEnter); this.Enter += new System.EventHandler(this.DataEditFormEnter);
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.DataEditForm_KeyDown);
this.mainMenu.ResumeLayout(false); this.mainMenu.ResumeLayout(false);
this.mainMenu.PerformLayout(); this.mainMenu.PerformLayout();
this.pl_bottom.ResumeLayout(false); this.pl_bottom.ResumeLayout(false);
......
DataEditorX/DataEditForm.cs
View file @ e0692acb
...@@ -801,6 +801,11 @@ void Search(Card c, bool isfresh) ...@@ -801,6 +801,11 @@ void Search(Card c, bool isfresh)
string sql = DataBase.GetSelectSQL(c); string sql = DataBase.GetSelectSQL(c);
SetCards(DataBase.Read(nowCdbFile, true, sql), isfresh); SetCards(DataBase.Read(nowCdbFile, true, sql), isfresh);
} }
if (lv_cardlist.Items.Count > 0)
{
lv_cardlist.SelectedIndices.Clear();
lv_cardlist.SelectedIndices.Add(0);
}
} }
//更新临时卡片 //更新临时卡片
public void Reset() public void Reset()
...@@ -890,6 +895,10 @@ void Tb_cardnameKeyDown(object sender, KeyEventArgs e) ...@@ -890,6 +895,10 @@ void Tb_cardnameKeyDown(object sender, KeyEventArgs e)
Search(c, false); Search(c, false);
} }
} }
if (e.KeyCode == Keys.R && e.Control)
{
Btn_resetClick(null, null);
}
} }
//卡片描述编辑 //卡片描述编辑
void Setscripttext(string str) void Setscripttext(string str)
...@@ -1831,6 +1840,15 @@ void Tb_linkTextChanged(object sender, EventArgs e) ...@@ -1831,6 +1840,15 @@ void Tb_linkTextChanged(object sender, EventArgs e)
text2LinkMarks(tb_link.Text); text2LinkMarks(tb_link.Text);
} }
private void DataEditForm_KeyDown(object sender, KeyEventArgs e)
{
if (e.Control && e.KeyCode == Keys.F)
{
tb_cardname.Focus();
tb_cardname.SelectAll();
}
}
void Tb_linkKeyPress(object sender, KeyPressEventArgs e) void Tb_linkKeyPress(object sender, KeyPressEventArgs e)
{ {
if(e.KeyChar != '0' && e.KeyChar != '1' && e.KeyChar != 1 && e.KeyChar!=22 && e.KeyChar!=3 && e.KeyChar != 8){ if(e.KeyChar != '0' && e.KeyChar != '1' && e.KeyChar != 1 && e.KeyChar!=22 && e.KeyChar!=3 && e.KeyChar != 8){
......
DataEditorX/data/language_chinese.txt
View file @ e0692acb
...@@ -14,14 +14,16 @@ CodeEditForm.mainMenu.menuitem_help 帮助(&H) ...@@ -14,14 +14,16 @@ CodeEditForm.mainMenu.menuitem_help 帮助(&H)
CodeEditForm.mainMenu.menuitem_about 关于 CodeEditForm.mainMenu.menuitem_about 关于
# #
DataEditForm.pl_bottom.btn_img 导入图片 DataEditForm.pl_bottom.btn_img 导入图片
DataEditForm.pl_main.lb_types 卡片类型 DataEditForm.pl_main.splitContainer..lb_types 卡片类型
DataEditForm.pl_main.lb_markers 连接标记 DataEditForm.pl_main.splitContainer..lb_markers 连接标记
DataEditForm.pl_main.lb_tiptexts 脚本提示文字 DataEditForm.pl_main.splitContainer..lb_tiptexts 脚本提示文字
DataEditForm.pl_main.lb_categorys 效果分类 DataEditForm.pl_main.splitContainer..lb_categorys 效果分类
DataEditForm.pl_main.lb_cardcode 卡片密码 DataEditForm.pl_main.splitContainer..lb_cardcode 卡片密码
DataEditForm.pl_main.lb_cardalias 同名卡 DataEditForm.pl_main.splitContainer..lb_cardalias 同名卡
DataEditForm.pl_main.lb_atkdef ATK/DEF DataEditForm.pl_main.splitContainer..lb_atkdef ATK/DEF
DataEditForm.pl_main.lb_pleft_right 灵摆刻度 DataEditForm.pl_main.splitContainer..lb_pleft_right 灵摆刻度
DataEditForm.pl_main.splitContainer..lv_cardlist.0 卡片编码
DataEditForm.pl_main.splitContainer..lv_cardlist.1 卡片名称
DataEditForm.pl_bottom.btn_reset 重置 DataEditForm.pl_bottom.btn_reset 重置
DataEditForm.pl_bottom.btn_lua 脚本 DataEditForm.pl_bottom.btn_lua 脚本
DataEditForm.pl_bottom.btn_serach 搜索 DataEditForm.pl_bottom.btn_serach 搜索
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment