2.2.2.0

DataEditorX/CodeEditForm.Designer.cs

@@ -130,28 +130,32 @@ private void InitializeComponent()
 			// menuitem_showmap
 			// 
 			this.menuitem_showmap.Name = "menuitem_showmap";
-			this.menuitem_showmap.Size = new System.Drawing.Size(163, 22);
+			this.menuitem_showmap.Size = new System.Drawing.Size(168, 22);
 			this.menuitem_showmap.Text = "Show Map";
 			this.menuitem_showmap.Click += new System.EventHandler(this.ShowMapToolStripMenuItemClick);
 			// 
 			// menuitem_showinput
 			// 
+			this.menuitem_showinput.Checked = true;
+			this.menuitem_showinput.CheckState = System.Windows.Forms.CheckState.Checked;
 			this.menuitem_showinput.Name = "menuitem_showinput";
-			this.menuitem_showinput.Size = new System.Drawing.Size(163, 22);
+			this.menuitem_showinput.Size = new System.Drawing.Size(168, 22);
 			this.menuitem_showinput.Text = "Show InputBox";
 			this.menuitem_showinput.Click += new System.EventHandler(this.Menuitem_showinputClick);
 			// 
 			// menuitem_find
 			// 
 			this.menuitem_find.Name = "menuitem_find";
-			this.menuitem_find.Size = new System.Drawing.Size(163, 22);
+			this.menuitem_find.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F)));
+			this.menuitem_find.Size = new System.Drawing.Size(168, 22);
 			this.menuitem_find.Text = "Find";
 			this.menuitem_find.Click += new System.EventHandler(this.Menuitem_findClick);
 			// 
 			// menuitem_replace
 			// 
 			this.menuitem_replace.Name = "menuitem_replace";
-			this.menuitem_replace.Size = new System.Drawing.Size(163, 22);
+			this.menuitem_replace.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.H)));
+			this.menuitem_replace.Size = new System.Drawing.Size(168, 22);
 			this.menuitem_replace.Text = "Replace";
 			this.menuitem_replace.Click += new System.EventHandler(this.Menuitem_replaceClick);
 			// 
@@ -220,6 +224,7 @@ private void InitializeComponent()
 			// 
 			// documentMap1
 			// 
+			this.documentMap1.BackColor = System.Drawing.Color.DimGray;
 			this.documentMap1.Dock = System.Windows.Forms.DockStyle.Right;
 			this.documentMap1.ForeColor = System.Drawing.Color.Maroon;
 			this.documentMap1.Location = new System.Drawing.Point(498, 25);
@@ -232,12 +237,13 @@ private void InitializeComponent()
 			// 
 			// tb_input
 			// 
+			this.tb_input.BackColor = System.Drawing.SystemColors.Control;
 			this.tb_input.Dock = System.Windows.Forms.DockStyle.Bottom;
 			this.tb_input.Location = new System.Drawing.Point(0, 394);
 			this.tb_input.Name = "tb_input";
 			this.tb_input.Size = new System.Drawing.Size(498, 21);
 			this.tb_input.TabIndex = 1;
-			this.tb_input.Visible = false;
+			this.tb_input.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Tb_inputKeyDown);
 			// 
 			// CodeEditForm
 			// 

DataEditorX/CodeEditForm.cs

@@ -23,6 +23,7 @@ namespace DataEditorX
 	/// </summary>
 	public partial class CodeEditForm : DockContent
 	{
+		#region Style
 		TextStyle KeyStyle = new TextStyle(Brushes.DeepSkyBlue, null, FontStyle.Regular);
 		TextStyle BoldStyle = new TextStyle(null, null, FontStyle.Bold|FontStyle.Italic);
 		TextStyle GrayStyle = new TextStyle(Brushes.Gray, null, FontStyle.Regular);
@@ -31,10 +32,13 @@ public partial class CodeEditForm : DockContent
 		TextStyle YellowStyle = new TextStyle(Brushes.Yellow, null, FontStyle.Italic);
 		TextStyle FunStyle = new TextStyle(Brushes.SlateGray, null, FontStyle.Bold);
 		MarkerStyle SameWordsStyle = new MarkerStyle(new SolidBrush(Color.FromArgb(40, Color.White)));
+		#endregion
+		
 		#region init
 		AutocompleteMenu popupMenu;
 		AutocompleteMenu popupMenu_fun;
 		AutocompleteMenu popupMenu_con;
+		AutocompleteMenu popupMenu_find;
 		string nowFile;
 		string title;
 		Dictionary<string,string> tooltipDic;
@@ -69,6 +73,12 @@ void InitForm()
 			popupMenu_con.Items.Font = ft;
 			popupMenu_con.Items.MaximumSize = new System.Drawing.Size(200, 400);
 			popupMenu_con.Items.Width = 300;
+			
+			popupMenu_find = new FastColoredTextBoxNS.AutocompleteMenu(fctb);
+			popupMenu_find.MinFragmentLength = 2;
+			popupMenu_find.Items.Font = ft;
+			popupMenu_find.Items.MaximumSize = new System.Drawing.Size(200, 400);
+			popupMenu_find.Items.Width = 300;
 			title=this.Text;
 		}
 
@@ -392,5 +402,29 @@ void Menuitem_replaceClick(object sender, EventArgs e)
 		{
 			fctb.ShowReplaceDialog();
 		}
+		
+		#region find
+		void Tb_inputKeyDown(object sender, KeyEventArgs e)
+		{
+			if(e.KeyCode==Keys.Enter)
+			{
+				//
+				string key=tb_input.Text;
+				List<AutocompleteItem> tlist=new List<AutocompleteItem>();
+				foreach(string k in tooltipDic.Keys)
+				{
+					if(tooltipDic[k].IndexOf(key)>=0)
+					{
+						AutocompleteItem ai=new AutocompleteItem(k);
+						ai.ToolTipTitle=k;
+						ai.ToolTipText=tooltipDic[k];
+						tlist.Add(ai);
+					}
+				}
+				popupMenu_find.Items.SetAutocompleteItems(tlist.ToArray());
+				popupMenu_find.Show(true);
+			}
+		}
+		#endregion
 	}
 }

DataEditorX/Properties/AssemblyInfo.cs

@@ -28,4 +28,4 @@
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("2.2.1.2")]
+[assembly: AssemblyVersion("2.2.2.0")]

DataEditorX/chinese/language-codeeditor.txt

@@ -6,6 +6,8 @@ CodeEditForm->menuitem_saveas 另存为
 CodeEditForm->menuitem_quit 退出
 CodeEditForm->menuitem_setting 设置(&S)
 CodeEditForm->menuitem_showmap 显示缩略图
-CodeEditForm->menuitem_showinput 显示输入框
+CodeEditForm->menuitem_showinput 显示文本框
+CodeEditForm->menuitem_find 查找
+CodeEditForm->menuitem_replace 替换
 CodeEditForm->menuitem_help 帮助(&H)
 CodeEditForm->menuitem_about 关于
\ No newline at end of file

DataEditorX/english/language-codeeditor.txt

-CodeEditForm->CodeEditForm 脚本编辑器
-CodeEditForm->menuitem_file 文件(&F)
-CodeEditForm->menuitem_open 打开
-CodeEditForm->menuitem_save 保存
-CodeEditForm->menuitem_saveas 另存为
-CodeEditForm->menuitem_quit 退出
-CodeEditForm->menuitem_setting 设置(&S)
-CodeEditForm->menuitem_showmap 显示缩略图
-CodeEditForm->menuitem_showinput 显示输入框
-CodeEditForm->menuitem_help 帮助(&H)
-CodeEditForm->menuitem_about 关于
+CodeEditForm->CodeEditForm CodeEditor
+CodeEditForm->menuitem_file File(&F)
+CodeEditForm->menuitem_open Open
+CodeEditForm->menuitem_save Save
+CodeEditForm->menuitem_saveas Save As
+CodeEditForm->menuitem_quit Quit
+CodeEditForm->menuitem_setting Tools(&S)
+CodeEditForm->menuitem_showmap Show/Hide Map
+CodeEditForm->menuitem_showinput Show/Hide TextBox
+CodeEditForm->menuitem_find Find
+CodeEditForm->menuitem_replace Replace
\ No newline at end of file
+CodeEditForm->menuitem_help Help(&H)
+CodeEditForm->menuitem_about About
\ No newline at end of file

DataEditorX/readme.txt

-[DataEditorX]2.2.1.2[DataEditorX]
+[DataEditorX]2.2.2.0[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★使用前，请关联lua的打开方式，例如记事本，notepad++，等。
@@ -68,6 +68,9 @@ DataEditorX.exe.config
 描述不详细的bug，我修复不了。（都不知道是bug是什么）
 
 ★更新历史
+2.2.2.0
+lua编辑器增加根据功能说明搜索函数名
+在下面的文本框输入关键字，按Enter
 2.2.1.2
 lua编辑器的风格
 2.2.1.1

win32/chinese/history.txt

@@ -2,6 +2,6 @@
 F:\games\ygocore\cards (2).cdb
 F:\games\ygopro\cards.cdb
 F:\games\ygocore\script\c126218.lua
-F:\games\ygopro\script\c168917.lua
+F:\games\ygopro\script\c126218.lua
 F:\games\ygocore\script\c131182.lua
-F:\games\ygopro\script\c126218.lua
+F:\games\ygopro\script\c168917.lua
\ No newline at end of file

win32/chinese/language-codeeditor.txt

@@ -6,6 +6,8 @@ CodeEditForm->menuitem_saveas 另存为
 CodeEditForm->menuitem_quit 退出
 CodeEditForm->menuitem_setting 设置(&S)
 CodeEditForm->menuitem_showmap 显示缩略图
-CodeEditForm->menuitem_showinput 显示输入框
+CodeEditForm->menuitem_showinput 显示文本框
+CodeEditForm->menuitem_find 查找
+CodeEditForm->menuitem_replace 替换
 CodeEditForm->menuitem_help 帮助(&H)
 CodeEditForm->menuitem_about 关于
\ No newline at end of file

win32/english/language-codeeditor.txt

-CodeEditForm->CodeEditForm 脚本编辑器
-CodeEditForm->menuitem_file 文件(&F)
-CodeEditForm->menuitem_open 打开
-CodeEditForm->menuitem_save 保存
-CodeEditForm->menuitem_saveas 另存为
-CodeEditForm->menuitem_quit 退出
-CodeEditForm->menuitem_setting 设置(&S)
-CodeEditForm->menuitem_showmap 显示缩略图
-CodeEditForm->menuitem_showinput 显示输入框
-CodeEditForm->menuitem_help 帮助(&H)
-CodeEditForm->menuitem_about 关于
+CodeEditForm->CodeEditForm CodeEditor
+CodeEditForm->menuitem_file File(&F)
+CodeEditForm->menuitem_open Open
+CodeEditForm->menuitem_save Save
+CodeEditForm->menuitem_saveas Save As
+CodeEditForm->menuitem_quit Quit
+CodeEditForm->menuitem_setting Tools(&S)
+CodeEditForm->menuitem_showmap Show/Hide Map
+CodeEditForm->menuitem_showinput Show/Hide TextBox
+CodeEditForm->menuitem_find Find
+CodeEditForm->menuitem_replace Replace
\ No newline at end of file
+CodeEditForm->menuitem_help Help(&H)
+CodeEditForm->menuitem_about About
\ No newline at end of file

win32/readme.txt

-[DataEditorX]2.2.1.2[DataEditorX]
+[DataEditorX]2.2.2.0[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★使用前，请关联lua的打开方式，例如记事本，notepad++，等。
@@ -68,6 +68,9 @@ DataEditorX.exe.config
 描述不详细的bug，我修复不了。（都不知道是bug是什么）
 
 ★更新历史
+2.2.2.0
+lua编辑器增加根据功能说明搜索函数名
+在下面的文本框输入关键字，按Enter
 2.2.1.2
 lua编辑器的风格
 2.2.1.1