Merge branch 'resize'

DataEditorX/CodeEditForm.cs

@@ -326,7 +326,7 @@ void AboutToolStripMenuItemClick(object sender, EventArgs e)
             MyMsg.Show(
                 LanguageHelper.GetMsg(LMSG.About) + "\t" + Application.ProductName + "\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)

DataEditorX/DataEditForm.cs

@@ -801,6 +801,11 @@ void Search(Card c, bool isfresh)
 				string sql = DataBase.GetSelectSQL(c);
 				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()
@@ -890,6 +895,10 @@ void Tb_cardnameKeyDown(object sender, KeyEventArgs e)
 					Search(c, false);
 				}
 			}
+            if (e.KeyCode == Keys.R && e.Control)
+            {
+                Btn_resetClick(null, null);
+            }
 		}
 		//卡片描述编辑
 		void Setscripttext(string str)
@@ -1831,6 +1840,15 @@ void Tb_linkTextChanged(object sender, EventArgs e)
 			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)
 		{
 			if(e.KeyChar != '0' && e.KeyChar != '1' && e.KeyChar != 1 && e.KeyChar!=22 && e.KeyChar!=3 && e.KeyChar != 8){

DataEditorX/MainForm.Designer.cs

@@ -86,7 +86,7 @@ private void InitializeComponent()
             this.dockPanel1.Location = new System.Drawing.Point(0, 25);
             this.dockPanel1.Margin = new System.Windows.Forms.Padding(0);
             this.dockPanel1.Name = "dockPanel1";
-			this.dockPanel1.Size = new System.Drawing.Size(864, 597);
+            this.dockPanel1.Size = new System.Drawing.Size(992, 736);
             dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight;
             dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight;
             autoHideStripSkin1.DockStripGradient = dockPanelGradient1;
@@ -143,7 +143,7 @@ private void InitializeComponent()
             this.mainMenu.Location = new System.Drawing.Point(0, 0);
             this.mainMenu.MdiWindowListItem = this.menuitem_windows;
             this.mainMenu.Name = "mainMenu";
-			this.mainMenu.Size = new System.Drawing.Size(864, 25);
+            this.mainMenu.Size = new System.Drawing.Size(992, 25);
             this.mainMenu.TabIndex = 3;
             this.mainMenu.Text = "mainMenu";
             // 
@@ -335,11 +335,12 @@ private void InitializeComponent()
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.BackColor = System.Drawing.SystemColors.Control;
-			this.ClientSize = new System.Drawing.Size(864, 622);
+            this.ClientSize = new System.Drawing.Size(992, 761);
             this.Controls.Add(this.dockPanel1);
             this.Controls.Add(this.mainMenu);
             this.IsMdiContainer = true;
             this.MainMenuStrip = this.mainMenu;
+            this.MinimumSize = new System.Drawing.Size(1008, 800);
             this.Name = "MainForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "MainForm";

DataEditorX/MainForm.resx

@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="dockPanel1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="mainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>237, 17</value>
   </metadata>

DataEditorX/data/language_chinese.txt

@@ -14,14 +14,16 @@ CodeEditForm.mainMenu.menuitem_help	帮助(&H)
 CodeEditForm.mainMenu.menuitem_about	关于
 #
 DataEditForm.pl_bottom.btn_img	导入图片
-DataEditForm.pl_main.lb_types	卡片类型
-DataEditForm.pl_main.lb_markers	连接标记
-DataEditForm.pl_main.lb_tiptexts	脚本提示文字
-DataEditForm.pl_main.lb_categorys	效果分类
-DataEditForm.pl_main.lb_cardcode	卡片密码
-DataEditForm.pl_main.lb_cardalias	同名卡
-DataEditForm.pl_main.lb_atkdef	ATK/DEF
-DataEditForm.pl_main.lb_pleft_right	灵摆刻度
+DataEditForm.pl_main.splitContainer..lb_types	卡片类型
+DataEditForm.pl_main.splitContainer..lb_markers	连接标记
+DataEditForm.pl_main.splitContainer..lb_tiptexts	脚本提示文字
+DataEditForm.pl_main.splitContainer..lb_categorys	效果分类
+DataEditForm.pl_main.splitContainer..lb_cardcode	卡片密码
+DataEditForm.pl_main.splitContainer..lb_cardalias	同名卡
+DataEditForm.pl_main.splitContainer..lb_atkdef	ATK/DEF
+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_lua	脚本
 DataEditForm.pl_bottom.btn_serach	搜索