2.2.7.1

DataEditorX/Common/CodeEdit.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DataEditorX.Common
+{
+    class CodeEdit : RichTextBox
+    {
+        public CodeEdit()
+            : base()
+        {
+        }
+    }
+}

DataEditorX/Core/Card.cs

@@ -104,6 +104,7 @@ string levelString()
 		string redesc()
 		{
 			return desc
+                .Replace(Environment.NewLine, "")
 				//.Replace("，","，\n")
 				.Replace("。","。\n")
 				.Replace("？","？\n")

DataEditorX/DataEditorX.csproj

@@ -68,6 +68,9 @@
       <DependentUpon>CodeEditForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Common\CheckUpdate.cs" />
+    <Compile Include="Common\CodeEdit.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="Common\DoubleContorl.cs">
       <SubType>Component</SubType>
     </Compile>

DataEditorX/MainForm.Designer.cs

@@ -76,6 +76,7 @@ private void InitializeComponent()
             this.menuitem_close = new System.Windows.Forms.ToolStripMenuItem();
             this.menuitem_closeother = new System.Windows.Forms.ToolStripMenuItem();
             this.menuitem_closeall = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuitem_shistory = new System.Windows.Forms.ToolStripMenuItem();
             this.menuStrip1.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -162,6 +163,7 @@ private void InitializeComponent()
             this.menuitem_comp2,
             this.toolStripSeparator1,
             this.menuitem_history,
+            this.menuitem_shistory,
             this.toolStripSeparator5,
             this.menuitem_quit});
             this.menuitem_file.Name = "menuitem_file";
@@ -326,6 +328,12 @@ private void InitializeComponent()
             this.menuitem_closeall.Text = "Close All";
             this.menuitem_closeall.Click += new System.EventHandler(this.CloseAllToolStripMenuItemClick);
             // 
+            // menuitem_shistory
+            // 
+            this.menuitem_shistory.Name = "menuitem_shistory";
+            this.menuitem_shistory.Size = new System.Drawing.Size(261, 22);
+            this.menuitem_shistory.Text = "Script History";
+            // 
             // MainForm
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -372,6 +380,7 @@ private void InitializeComponent()
 		private System.Windows.Forms.ToolStripMenuItem menuitem_file;
 		private System.Windows.Forms.MenuStrip menuStrip1;
 		private WeifenLuo.WinFormsUI.Docking.DockPanel dockPanel1;
+        private System.Windows.Forms.ToolStripMenuItem menuitem_shistory;
 	
 	}
 }

DataEditorX/MainForm.cs

@@ -27,6 +27,7 @@ public partial class MainForm : Form
 	{
 		#region member
 		string cdbHistoryFile;
+        const int MAX_HIS = 0x20;
 		List<string> hittorylist;
 		string datapath;
 		string conflang,conflang_de,conflang_ce,confmsg,conflang_pe;
@@ -132,21 +133,46 @@ void SaveHistory()
 		void MenuHistory()
 		{
 			menuitem_history.DropDownItems.Clear();
+            menuitem_shistory.DropDownItems.Clear();
 			foreach(string str in hittorylist)
 			{
 				ToolStripMenuItem tsmi=new ToolStripMenuItem(str);
 				tsmi.Click+=MenuHistoryItem_Click;
+                if(MainForm.isScript(str))
+                    menuitem_shistory.DropDownItems.Add(tsmi);
+                else
 				    menuitem_history.DropDownItems.Add(tsmi);
 			}
 			menuitem_history.DropDownItems.Add(new ToolStripSeparator());
 			ToolStripMenuItem tsmiclear=new ToolStripMenuItem(LANG.GetMsg(LMSG.ClearHistory));
 			tsmiclear.Click+=MenuHistoryClear_Click;
 			menuitem_history.DropDownItems.Add(tsmiclear);
-			
+            menuitem_shistory.DropDownItems.Add(new ToolStripSeparator());
+            ToolStripMenuItem tsmiclear2 = new ToolStripMenuItem(LANG.GetMsg(LMSG.ClearHistory));
+            tsmiclear2.Click += MenuHistoryClear2_Click;
+            menuitem_shistory.DropDownItems.Add(tsmiclear2);
+		}
+        void MenuHistoryClear2_Click(object sender, EventArgs e)
+        {
+            int i = hittorylist.Count - 1;
+            while (i >= 0)
+            {
+                if (MainForm.isScript(hittorylist[i]))
+                    hittorylist.RemoveAt(i);
+                i--;
+            }
+            MenuHistory();
+            SaveHistory();
         }
 		void MenuHistoryClear_Click(object sender, EventArgs e)
 		{
-			hittorylist.Clear();
+            int i=hittorylist.Count-1;
+            while (i >= 0)
+            {
+                if (!MainForm.isScript(hittorylist[i]))
+                    hittorylist.RemoveAt(i);
+                i--;
+            }
 			MenuHistory();
 			SaveHistory();
 		}

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.7.0")]
+[assembly: AssemblyVersion("2.2.7.1")]

DataEditorX/chinese/language-mainform.txt

@@ -8,7 +8,8 @@ MainForm->menuitem_findluafunc 从源码获取Lua函数
 MainForm->menuitem_pastecards 粘贴卡片
 MainForm->menuitem_comp1 对比-卡片数据 1
 MainForm->menuitem_comp2 对比-卡片数据 2
-MainForm->menuitem_history 历史(&H)
+MainForm->menuitem_history 数据库历史记录(&H)
+MainForm->menuitem_shistory 脚本历史记录
 MainForm->menuitem_quit 退出(&Q)
 MainForm->menuitem_windows 窗口(&W)
 MainForm->menuitem_dataeditor DataEditor

DataEditorX/english/language-mainform.txt

@@ -9,6 +9,7 @@ MainForm->menuitem_pastecards Paste Cards
 MainForm->menuitem_comp1 Compare-Cards 1
 MainForm->menuitem_comp2 Compare-Cards 2
 MainForm->menuitem_history History(&H)
+MainForm->menuitem_shistory Script History
 MainForm->menuitem_quit Quit(&Q)
 MainForm->menuitem_windows Windwos(&W)
 MainForm->menuitem_dataeditor New DataEditor

DataEditorX/readme.txt

-[DataEditorX]2.2.7.0[DataEditorX]
+[DataEditorX]2.2.7.1[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★文件关联
@@ -58,6 +58,8 @@ Ctrl+鼠标左键 	跳转到函数定义
 Ctrl+鼠标滑轮 	缩放文字
 
 ★更新历史
+2.2.7.1
+历史记录分离，脚本编辑器的卡片信息描述
 2.2.7.0
 修复导入图片
 整理代码

win32/chinese/history.txt

 # history
-F:\games\ygopro\script\c242146.lua
-F:\games\ygopro\cards.cdb
-F:\games\ygopro\script\c126218.lua
+F:\games\ygopro\script\c78835747.lua
+F:\games\ygopro\p.zip.cdb
\ No newline at end of file
-F:\games\ygopro\script\c131182.lua
-F:\games\ygocore\script\c135598.lua
-F:\games\ygocore\script\c126218.lua
-F:\games\ygocore\script\c114932.lua
-F:\games\ygocore\single\[sample]BerserkDragon.lua
-F:\games\ygopro\script\c57774843.lua
-F:\games\ygopro\script\c33396948.lua
-F:\games\ygopro\script\c255998.lua
-F:\games\ygopro\script\utility.lua
\ No newline at end of file

win32/chinese/language-mainform.txt

@@ -8,7 +8,8 @@ MainForm->menuitem_findluafunc 从源码获取Lua函数
 MainForm->menuitem_pastecards 粘贴卡片
 MainForm->menuitem_comp1 对比-卡片数据 1
 MainForm->menuitem_comp2 对比-卡片数据 2
-MainForm->menuitem_history 历史(&H)
+MainForm->menuitem_history 数据库历史记录(&H)
+MainForm->menuitem_shistory 脚本历史记录
 MainForm->menuitem_quit 退出(&Q)
 MainForm->menuitem_windows 窗口(&W)
 MainForm->menuitem_dataeditor DataEditor

win32/english/language-mainform.txt

@@ -9,6 +9,7 @@ MainForm->menuitem_pastecards Paste Cards
 MainForm->menuitem_comp1 Compare-Cards 1
 MainForm->menuitem_comp2 Compare-Cards 2
 MainForm->menuitem_history History(&H)
+MainForm->menuitem_shistory Script History
 MainForm->menuitem_quit Quit(&Q)
 MainForm->menuitem_windows Windwos(&W)
 MainForm->menuitem_dataeditor New DataEditor

win32/readme.txt

-[DataEditorX]2.2.7.0[DataEditorX]
+[DataEditorX]2.2.7.1[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★文件关联
@@ -58,6 +58,8 @@ Ctrl+鼠标左键 	跳转到函数定义
 Ctrl+鼠标滑轮 	缩放文字
 
 ★更新历史
+2.2.7.1
+历史记录分离，脚本编辑器的卡片信息描述
 2.2.7.0
 修复导入图片
 整理代码