2.2.1.0

DataEditorX/CodeEditForm.cs

@@ -145,12 +145,11 @@ void FctbTextChangedDelayed(object sender, TextChangedEventArgs e)
 		#region title
 		void SetTitle()
 		{
-			string name=fctb.GetLineText(0);
 			string str=title;
 			if(string.IsNullOrEmpty(nowFile))
 				str=title;
 			else
-				str=nowFile+name;
+				str=nowFile;
 			if(this.MdiParent !=null)
 			{
 				if(string.IsNullOrEmpty(nowFile))
@@ -249,8 +248,8 @@ void Menuitem_showinputClick(object sender, EventArgs e)
 		}
 		#endregion
 		
-		
-		void SaveToolStripMenuItemClick(object sender, EventArgs e)
+		#region menu
+		public void Save()
 		{
 			if(string.IsNullOrEmpty(nowFile))
 			{
@@ -260,6 +259,7 @@ void SaveToolStripMenuItemClick(object sender, EventArgs e)
 					if(sfdlg.ShowDialog()==DialogResult.OK)
 					{
 						nowFile=sfdlg.FileName;
+						SetTitle();
 					}
 					else
 						return;
@@ -267,7 +267,7 @@ void SaveToolStripMenuItemClick(object sender, EventArgs e)
 			}
 			fctb.SaveToFile(nowFile, new UTF8Encoding(false));
 		}
-		void SaveAsToolStripMenuItemClick(object sender, EventArgs e)
+		public void SaveAs()
 		{
 			using(SaveFileDialog sfdlg=new SaveFileDialog())
 			{
@@ -282,6 +282,14 @@ void SaveAsToolStripMenuItemClick(object sender, EventArgs e)
 			fctb.SaveToFile(nowFile, new UTF8Encoding(false));
 		}
 		
+		void SaveToolStripMenuItemClick(object sender, EventArgs e)
+		{
+			Save();
+		}
+		void SaveAsToolStripMenuItemClick(object sender, EventArgs e)
+		{
+			SaveAs();
+		}
 		
 		void QuitToolStripMenuItemClick(object sender, EventArgs e)
 		{
@@ -309,5 +317,7 @@ void Menuitem_openClick(object sender, EventArgs e)
 				}
 			}
 		}
+	
+		#endregion
 	}
 }

DataEditorX/Language/LMsg.cs

@@ -80,6 +80,10 @@ public enum LMSG : uint
         ExportDataOK,
         CheckText,
         CompareOK,
+        OpenFile,
+        OpenFileFilter,
+        NewFile,
+        SaveFileOK,
         COUNT,
     }
 }

DataEditorX/MainForm.Designer.cs

@@ -35,26 +35,27 @@ protected override void Dispose(bool disposing)
 		/// </summary>
 		private void InitializeComponent()
 		{
-			WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin2 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin();
-			WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin2 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin();
-			WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient4 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient();
-			WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient8 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
-			WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin();
-			WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient();
-			WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient9 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
-			WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient5 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient();
-			WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient10 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
-			WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient();
-			WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient11 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
-			WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient12 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
-			WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient6 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient();
-			WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient13 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
-			WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient14 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+			WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin();
+			WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin1 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin();
+			WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient();
+			WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient1 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+			WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin();
+			WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient();
+			WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient2 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+			WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient();
+			WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient3 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+			WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient();
+			WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient4 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+			WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient5 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+			WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient3 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient();
+			WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient6 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+			WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient7 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
 			this.dockPanel1 = new WeifenLuo.WinFormsUI.Docking.DockPanel();
 			this.menuStrip1 = new System.Windows.Forms.MenuStrip();
 			this.menuitem_file = new System.Windows.Forms.ToolStripMenuItem();
 			this.menuitem_open = new System.Windows.Forms.ToolStripMenuItem();
 			this.menuitem_new = new System.Windows.Forms.ToolStripMenuItem();
+			this.menuitem_save = new System.Windows.Forms.ToolStripMenuItem();
 			this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
 			this.menuitem_copyselect = new System.Windows.Forms.ToolStripMenuItem();
 			this.menuitem_copyall = new System.Windows.Forms.ToolStripMenuItem();
@@ -68,11 +69,11 @@ private void InitializeComponent()
 			this.menuitem_quit = new System.Windows.Forms.ToolStripMenuItem();
 			this.menuitem_windows = new System.Windows.Forms.ToolStripMenuItem();
 			this.menuitem_dataeditor = new System.Windows.Forms.ToolStripMenuItem();
+			this.menuitem_codeeditor = new System.Windows.Forms.ToolStripMenuItem();
 			this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
 			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_codeeditor = new System.Windows.Forms.ToolStripMenuItem();
 			this.menuStrip1.SuspendLayout();
 			this.SuspendLayout();
 			// 
@@ -83,52 +84,52 @@ private void InitializeComponent()
 			this.dockPanel1.Margin = new System.Windows.Forms.Padding(0);
 			this.dockPanel1.Name = "dockPanel1";
 			this.dockPanel1.Size = new System.Drawing.Size(868, 572);
-			dockPanelGradient4.EndColor = System.Drawing.SystemColors.ControlLight;
-			dockPanelGradient4.StartColor = System.Drawing.SystemColors.ControlLight;
-			autoHideStripSkin2.DockStripGradient = dockPanelGradient4;
-			tabGradient8.EndColor = System.Drawing.SystemColors.Control;
-			tabGradient8.StartColor = System.Drawing.SystemColors.Control;
-			tabGradient8.TextColor = System.Drawing.SystemColors.ControlDarkDark;
-			autoHideStripSkin2.TabGradient = tabGradient8;
-			autoHideStripSkin2.TextFont = new System.Drawing.Font("微软雅黑", 9F);
-			dockPanelSkin2.AutoHideStripSkin = autoHideStripSkin2;
-			tabGradient9.EndColor = System.Drawing.SystemColors.ControlLightLight;
-			tabGradient9.StartColor = System.Drawing.SystemColors.ControlLightLight;
-			tabGradient9.TextColor = System.Drawing.SystemColors.ControlText;
-			dockPaneStripGradient2.ActiveTabGradient = tabGradient9;
-			dockPanelGradient5.EndColor = System.Drawing.SystemColors.Control;
-			dockPanelGradient5.StartColor = System.Drawing.SystemColors.Control;
-			dockPaneStripGradient2.DockStripGradient = dockPanelGradient5;
-			tabGradient10.EndColor = System.Drawing.SystemColors.ControlLight;
-			tabGradient10.StartColor = System.Drawing.SystemColors.ControlLight;
-			tabGradient10.TextColor = System.Drawing.SystemColors.ControlText;
-			dockPaneStripGradient2.InactiveTabGradient = tabGradient10;
-			dockPaneStripSkin2.DocumentGradient = dockPaneStripGradient2;
-			dockPaneStripSkin2.TextFont = new System.Drawing.Font("微软雅黑", 9F);
-			tabGradient11.EndColor = System.Drawing.SystemColors.ActiveCaption;
-			tabGradient11.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
-			tabGradient11.StartColor = System.Drawing.SystemColors.GradientActiveCaption;
-			tabGradient11.TextColor = System.Drawing.SystemColors.ActiveCaptionText;
-			dockPaneStripToolWindowGradient2.ActiveCaptionGradient = tabGradient11;
-			tabGradient12.EndColor = System.Drawing.SystemColors.Control;
-			tabGradient12.StartColor = System.Drawing.SystemColors.Control;
-			tabGradient12.TextColor = System.Drawing.SystemColors.ControlText;
-			dockPaneStripToolWindowGradient2.ActiveTabGradient = tabGradient12;
-			dockPanelGradient6.EndColor = System.Drawing.SystemColors.ControlLight;
-			dockPanelGradient6.StartColor = System.Drawing.SystemColors.ControlLight;
-			dockPaneStripToolWindowGradient2.DockStripGradient = dockPanelGradient6;
-			tabGradient13.EndColor = System.Drawing.SystemColors.InactiveCaption;
-			tabGradient13.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
-			tabGradient13.StartColor = System.Drawing.SystemColors.GradientInactiveCaption;
-			tabGradient13.TextColor = System.Drawing.SystemColors.InactiveCaptionText;
-			dockPaneStripToolWindowGradient2.InactiveCaptionGradient = tabGradient13;
-			tabGradient14.EndColor = System.Drawing.Color.Transparent;
-			tabGradient14.StartColor = System.Drawing.Color.Transparent;
-			tabGradient14.TextColor = System.Drawing.SystemColors.ControlDarkDark;
-			dockPaneStripToolWindowGradient2.InactiveTabGradient = tabGradient14;
-			dockPaneStripSkin2.ToolWindowGradient = dockPaneStripToolWindowGradient2;
-			dockPanelSkin2.DockPaneStripSkin = dockPaneStripSkin2;
-			this.dockPanel1.Skin = dockPanelSkin2;
+			dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight;
+			dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight;
+			autoHideStripSkin1.DockStripGradient = dockPanelGradient1;
+			tabGradient1.EndColor = System.Drawing.SystemColors.Control;
+			tabGradient1.StartColor = System.Drawing.SystemColors.Control;
+			tabGradient1.TextColor = System.Drawing.SystemColors.ControlDarkDark;
+			autoHideStripSkin1.TabGradient = tabGradient1;
+			autoHideStripSkin1.TextFont = new System.Drawing.Font("微软雅黑", 9F);
+			dockPanelSkin1.AutoHideStripSkin = autoHideStripSkin1;
+			tabGradient2.EndColor = System.Drawing.SystemColors.ControlLightLight;
+			tabGradient2.StartColor = System.Drawing.SystemColors.ControlLightLight;
+			tabGradient2.TextColor = System.Drawing.SystemColors.ControlText;
+			dockPaneStripGradient1.ActiveTabGradient = tabGradient2;
+			dockPanelGradient2.EndColor = System.Drawing.SystemColors.Control;
+			dockPanelGradient2.StartColor = System.Drawing.SystemColors.Control;
+			dockPaneStripGradient1.DockStripGradient = dockPanelGradient2;
+			tabGradient3.EndColor = System.Drawing.SystemColors.ControlLight;
+			tabGradient3.StartColor = System.Drawing.SystemColors.ControlLight;
+			tabGradient3.TextColor = System.Drawing.SystemColors.ControlText;
+			dockPaneStripGradient1.InactiveTabGradient = tabGradient3;
+			dockPaneStripSkin1.DocumentGradient = dockPaneStripGradient1;
+			dockPaneStripSkin1.TextFont = new System.Drawing.Font("微软雅黑", 9F);
+			tabGradient4.EndColor = System.Drawing.SystemColors.ActiveCaption;
+			tabGradient4.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
+			tabGradient4.StartColor = System.Drawing.SystemColors.GradientActiveCaption;
+			tabGradient4.TextColor = System.Drawing.SystemColors.ActiveCaptionText;
+			dockPaneStripToolWindowGradient1.ActiveCaptionGradient = tabGradient4;
+			tabGradient5.EndColor = System.Drawing.SystemColors.Control;
+			tabGradient5.StartColor = System.Drawing.SystemColors.Control;
+			tabGradient5.TextColor = System.Drawing.SystemColors.ControlText;
+			dockPaneStripToolWindowGradient1.ActiveTabGradient = tabGradient5;
+			dockPanelGradient3.EndColor = System.Drawing.SystemColors.ControlLight;
+			dockPanelGradient3.StartColor = System.Drawing.SystemColors.ControlLight;
+			dockPaneStripToolWindowGradient1.DockStripGradient = dockPanelGradient3;
+			tabGradient6.EndColor = System.Drawing.SystemColors.InactiveCaption;
+			tabGradient6.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
+			tabGradient6.StartColor = System.Drawing.SystemColors.GradientInactiveCaption;
+			tabGradient6.TextColor = System.Drawing.SystemColors.InactiveCaptionText;
+			dockPaneStripToolWindowGradient1.InactiveCaptionGradient = tabGradient6;
+			tabGradient7.EndColor = System.Drawing.Color.Transparent;
+			tabGradient7.StartColor = System.Drawing.Color.Transparent;
+			tabGradient7.TextColor = System.Drawing.SystemColors.ControlDarkDark;
+			dockPaneStripToolWindowGradient1.InactiveTabGradient = tabGradient7;
+			dockPaneStripSkin1.ToolWindowGradient = dockPaneStripToolWindowGradient1;
+			dockPanelSkin1.DockPaneStripSkin = dockPaneStripSkin1;
+			this.dockPanel1.Skin = dockPanelSkin1;
 			this.dockPanel1.TabIndex = 0;
 			// 
 			// menuStrip1
@@ -148,6 +149,7 @@ private void InitializeComponent()
 			this.menuitem_file.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
 									this.menuitem_open,
 									this.menuitem_new,
+									this.menuitem_save,
 									this.toolStripSeparator3,
 									this.menuitem_copyselect,
 									this.menuitem_copyall,
@@ -168,7 +170,7 @@ private void InitializeComponent()
 			this.menuitem_open.Name = "menuitem_open";
 			this.menuitem_open.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
 			this.menuitem_open.Size = new System.Drawing.Size(261, 22);
-			this.menuitem_open.Text = "Open Database(&O)";
+			this.menuitem_open.Text = "Open";
 			this.menuitem_open.Click += new System.EventHandler(this.Menuitem_openClick);
 			// 
 			// menuitem_new
@@ -176,9 +178,17 @@ private void InitializeComponent()
 			this.menuitem_new.Name = "menuitem_new";
 			this.menuitem_new.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
 			this.menuitem_new.Size = new System.Drawing.Size(261, 22);
-			this.menuitem_new.Text = "New Database(&N)";
+			this.menuitem_new.Text = "New";
 			this.menuitem_new.Click += new System.EventHandler(this.Menuitem_newClick);
 			// 
+			// menuitem_save
+			// 
+			this.menuitem_save.Name = "menuitem_save";
+			this.menuitem_save.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
+			this.menuitem_save.Size = new System.Drawing.Size(261, 22);
+			this.menuitem_save.Text = "Save";
+			this.menuitem_save.Click += new System.EventHandler(this.Menuitem_saveClick);
+			// 
 			// toolStripSeparator3
 			// 
 			this.toolStripSeparator3.Name = "toolStripSeparator3";
@@ -268,43 +278,43 @@ private void InitializeComponent()
 			// menuitem_dataeditor
 			// 
 			this.menuitem_dataeditor.Name = "menuitem_dataeditor";
-			this.menuitem_dataeditor.Size = new System.Drawing.Size(152, 22);
+			this.menuitem_dataeditor.Size = new System.Drawing.Size(145, 22);
 			this.menuitem_dataeditor.Text = "DataEditor";
 			this.menuitem_dataeditor.Click += new System.EventHandler(this.DataEditorToolStripMenuItemClick);
 			// 
+			// menuitem_codeeditor
+			// 
+			this.menuitem_codeeditor.Name = "menuitem_codeeditor";
+			this.menuitem_codeeditor.Size = new System.Drawing.Size(145, 22);
+			this.menuitem_codeeditor.Text = "CodeEditor";
+			this.menuitem_codeeditor.Click += new System.EventHandler(this.Menuitem_codeeditorClick);
+			// 
 			// toolStripSeparator2
 			// 
 			this.toolStripSeparator2.Name = "toolStripSeparator2";
-			this.toolStripSeparator2.Size = new System.Drawing.Size(149, 6);
+			this.toolStripSeparator2.Size = new System.Drawing.Size(142, 6);
 			// 
 			// menuitem_close
 			// 
 			this.menuitem_close.Name = "menuitem_close";
-			this.menuitem_close.Size = new System.Drawing.Size(152, 22);
+			this.menuitem_close.Size = new System.Drawing.Size(145, 22);
 			this.menuitem_close.Text = "Close";
 			this.menuitem_close.Click += new System.EventHandler(this.CloseToolStripMenuItemClick);
 			// 
 			// menuitem_closeother
 			// 
 			this.menuitem_closeother.Name = "menuitem_closeother";
-			this.menuitem_closeother.Size = new System.Drawing.Size(152, 22);
+			this.menuitem_closeother.Size = new System.Drawing.Size(145, 22);
 			this.menuitem_closeother.Text = "Close Other";
 			this.menuitem_closeother.Click += new System.EventHandler(this.CloseOtherToolStripMenuItemClick);
 			// 
 			// menuitem_closeall
 			// 
 			this.menuitem_closeall.Name = "menuitem_closeall";
-			this.menuitem_closeall.Size = new System.Drawing.Size(152, 22);
+			this.menuitem_closeall.Size = new System.Drawing.Size(145, 22);
 			this.menuitem_closeall.Text = "Close All";
 			this.menuitem_closeall.Click += new System.EventHandler(this.CloseAllToolStripMenuItemClick);
 			// 
-			// menuitem_codeeditor
-			// 
-			this.menuitem_codeeditor.Name = "menuitem_codeeditor";
-			this.menuitem_codeeditor.Size = new System.Drawing.Size(152, 22);
-			this.menuitem_codeeditor.Text = "CodeEditor";
-			this.menuitem_codeeditor.Click += new System.EventHandler(this.Menuitem_codeeditorClick);
-			// 
 			// MainForm
 			// 
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -324,6 +334,7 @@ private void InitializeComponent()
 			this.ResumeLayout(false);
 			this.PerformLayout();
 		}
+		private System.Windows.Forms.ToolStripMenuItem menuitem_save;
 		private System.Windows.Forms.ToolStripMenuItem menuitem_codeeditor;
 		private System.Windows.Forms.ToolStripMenuItem menuitem_copyall;
 		private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;

DataEditorX/MainForm.cs

@@ -28,13 +28,6 @@ public partial class MainForm : Form
 		#region member
 		bool isInitAuto=false;
 		bool isInitDataEditor=false;
-		public const int CLOSE_ONE=1;
-		public const int CLOSE_OTHER=2;
-		public const int CLOSE_ALL=3;
-		public const int WM_OPEN=0x0401;
-		public const int WM_OPEN_SCRIPT=0x0402;
-		public const string TMPFILE="open.tmp";
-		public const int MAX_HISTORY=0x20;
 		string cdbHistoryFile;
 		List<string> cdblist;
 		string datapath;
@@ -89,12 +82,21 @@ void Init(string datapath)
 		}
 		#endregion
 		
+		#region const
+		public const int CLOSE_ONE=1;
+		public const int CLOSE_OTHER=2;
+		public const int CLOSE_ALL=3;
+		public const int WM_OPEN=0x0401;
+		public const int WM_OPEN_SCRIPT=0x0402;
+		public const string TMPFILE="open.tmp";
+		public const int MAX_HISTORY=0x20;
 		public static bool isScript(string file)
 		{
 			if(file.EndsWith("lua",StringComparison.OrdinalIgnoreCase))
 				return true;
 			return false;
 		}
+		#endregion
 		
 		#region History
 		void ReadHistory()
@@ -303,7 +305,10 @@ void CloseToolStripMenuItemClick(object sender, EventArgs e)
 		{
 			CloseMdi(MainForm.CLOSE_ONE);
 		}
-		
+		void Menuitem_codeeditorClick(object sender, EventArgs e)
+		{
+			OpenScript(null);
+		}
 		void CloseMdi(int type)
 		{
 			DockContentCollection contents = dockPanel1.Contents;
@@ -342,8 +347,8 @@ void Menuitem_openClick(object sender, EventArgs e)
 		{
 			using(OpenFileDialog dlg=new OpenFileDialog())
 			{
-				dlg.Title=LANG.GetMsg(LMSG.SelectDataBasePath);
-				dlg.Filter=LANG.GetMsg(LMSG.CdbType);
+				dlg.Title=LANG.GetMsg(LMSG.OpenFile);
+				dlg.Filter=LANG.GetMsg(LMSG.OpenFileFilter);
 				if(dlg.ShowDialog()==DialogResult.OK)
 				{
 					string file=dlg.FileName;
@@ -357,15 +362,15 @@ void Menuitem_openClick(object sender, EventArgs e)
 		
 		void QuitToolStripMenuItemClick(object sender, EventArgs e)
 		{
-			Application.Exit();
+			this.Close();
 		}
 		
 		void Menuitem_newClick(object sender, EventArgs e)
 		{
 			using(SaveFileDialog dlg=new SaveFileDialog())
 			{
-				dlg.Title=LANG.GetMsg(LMSG.SelectDataBasePath);
-				dlg.Filter=LANG.GetMsg(LMSG.CdbType);
+				dlg.Title=LANG.GetMsg(LMSG.NewFile);
+				dlg.Filter=LANG.GetMsg(LMSG.OpenFileFilter);
 				if(dlg.ShowDialog()==DialogResult.OK)
 				{
 					string file=dlg.FileName;
@@ -382,6 +387,15 @@ void Menuitem_newClick(object sender, EventArgs e)
 				}
 			}
 		}
+		void Menuitem_saveClick(object sender, EventArgs e)
+		{
+			CodeEditForm cf= dockPanel1.ActiveContent as CodeEditForm;
+			if(cf!=null)
+			{
+				cf.Save();
+				MyMsg.Show(LMSG.SaveFileOK);
+			}
+		}
 		#endregion
 		
 		#region copy
@@ -481,6 +495,7 @@ void Menuitem_comp2Click(object sender, EventArgs e)
 		}
 		#endregion
 
+		#region complate
 		void InitCodeEditor(string funtxt,string conlua)
 		{
 			if(!isInitDataEditor)
@@ -500,6 +515,8 @@ void InitCodeEditor(string funtxt,string conlua)
 			}
 			
 		}
+		#endregion
+		
 		#region function
 		void AddFunction(string funtxt)
 		{
@@ -564,7 +581,8 @@ void AddFuncTooltip(string name,string desc)
 			{
 				string fname=GetFunName(name);
 				if(!tooltipDic.ContainsKey(fname)){
-					tooltipDic.Add(fname, desc);
+					tooltipDic.Add(fname, desc
+					              );
 					AutocompleteItem aitem=new AutocompleteItem(fname);
 					aitem.ToolTipTitle = fname;
 					aitem.ToolTipText = desc;
@@ -615,9 +633,5 @@ void AddConstant(string conlua)
 		}
 		#endregion
 		
-		void Menuitem_codeeditorClick(object sender, EventArgs e)
-		{
-			OpenScript(null);
-		}
 	}
 }

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

DataEditorX/chinese/_functions.txt

@@ -407,8 +407,6 @@ o_range表示可选择的表示形式。
 设置Label属性
 ●void Effect.SetCategory(Effect e, integer cate)
 设置Category属性
-●void Effect.SetCategory(Effect e, integer cate)
-设置Category属性
 ●void Effect.SetCondition(Effect e, function con_func)
 设置Condition属性
 ●void Effect.SetCost(Effect e, function cost_func)
@@ -1000,8 +998,6 @@ integer target_player=player])
 ●boolean Duel.CheckNormalSummonActivity(integer player)
 检查玩家player本回合有没有进行过通常召唤的行为。包括召唤和set
 ●boolean Duel.CheckFlipSummonActivity(integer player)
-检查玩家player本回合有没有进行过反转召唤的行为。
-●boolean Duel.CheckFlipSummonActivity(integer player)
 检查玩家player本回合有没有进行过特殊召唤的行为。
 特殊召唤的行为包括：
 进行了入连锁和不入连锁的特殊召唤；

DataEditorX/chinese/language-mainform.txt

 MainForm->menuitem_file 文件(&F)
 MainForm->menuitem_new 新建(&N)
 MainForm->menuitem_open 打开(&O)
+MainForm->menuitem_save 保存(&S)
 MainForm->menuitem_copyselect 复制所选卡片
 MainForm->menuitem_copyall 复制当前结果的所有卡片
 MainForm->menuitem_pastecards 粘贴卡片

DataEditorX/chinese/message.txt

@@ -31,8 +31,8 @@
 0x1e	关于：
 0x1f	版本：
 0x20	作者：
-0x21	cdb文件(*.cdb)|*.cdb|所有文件(*.*)|*.*
-0x22	ydk文件(*.ydk)|*.ydk|所有文件(*.*)|*.*
+0x21	数据库文件(*.cdb)|*.cdb|所有文件(*.*)|*.*
+0x22	卡组文件(*.ydk)|*.ydk|所有文件(*.*)|*.*
 0x23	系列号输入出错！
 0x24	选择卡片图像
 0x25	jpg图像(*.jpg)|*.jpg|bmp图像(*.bmp)|*.bmp|png图像(*.png)|*.png|所有文件(*.*)|*.*
@@ -63,4 +63,8 @@
 0x3e	正在导出数据
 0x3f	导出数据完成
 0x40	是否对比卡片信息？
-0x41	对比完成
\ No newline at end of file
+0x41	对比完成
+0x42	打开文件
+0x43	数据库文件(*.cdb)|*.cdb|脚本文件(*.lua)|*.lua|所有文件(*.*)|*.*
+0x44	新建文件
+0x45	保存完成
\ No newline at end of file

DataEditorX/english/language-mainform.txt

 MainForm->menuitem_file File
-MainForm->menuitem_new New DataBase
-MainForm->menuitem_open Open DataBase
+MainForm->menuitem_new New
+MainForm->menuitem_open Open
+MainForm->menuitem_save Save
 MainForm->menuitem_copyselect Copy Select Cards
 MainForm->menuitem_copyall Copy All Cards
 MainForm->menuitem_pastecards Paste Cards

DataEditorX/english/message.txt

@@ -63,4 +63,8 @@
 0x3e	Exporting Data
 0x3f	Export Data OK
 0x40	Compare Cards With Text?
-0x41	Cards is Compared.
\ No newline at end of file
+0x41	Cards is Compared.
+0x42	Open File
+0x43	DataBase(*.cdb)|*.cdb|Script(*.lua)|*.lua|all files(*.*)|*.*
+0x44	New File
+0x45	Save OK
\ No newline at end of file

DataEditorX/readme.txt

-[DataEditorX]2.2.0.0[DataEditorX]
+[DataEditorX]2.2.1.0[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★使用前，请关联lua的打开方式，例如记事本，notepad++，等。
@@ -66,6 +66,8 @@ DataEditorX.exe.config
 描述不详细的bug，我修复不了。（都不知道是bug是什么）
 
 ★更新历史
+2.2.1.0
+lua编辑器的文件菜单整合
 2.2.0.0
 增加lua编辑器，支持关联lua文件
 等待：

win32/chinese/_functions.txt

@@ -407,8 +407,6 @@ o_range表示可选择的表示形式。
 设置Label属性
 ●void Effect.SetCategory(Effect e, integer cate)
 设置Category属性
-●void Effect.SetCategory(Effect e, integer cate)
-设置Category属性
 ●void Effect.SetCondition(Effect e, function con_func)
 设置Condition属性
 ●void Effect.SetCost(Effect e, function cost_func)
@@ -1000,8 +998,6 @@ integer target_player=player])
 ●boolean Duel.CheckNormalSummonActivity(integer player)
 检查玩家player本回合有没有进行过通常召唤的行为。包括召唤和set
 ●boolean Duel.CheckFlipSummonActivity(integer player)
-检查玩家player本回合有没有进行过反转召唤的行为。
-●boolean Duel.CheckFlipSummonActivity(integer player)
 检查玩家player本回合有没有进行过特殊召唤的行为。
 特殊召唤的行为包括：
 进行了入连锁和不入连锁的特殊召唤；

win32/chinese/language-mainform.txt

 MainForm->menuitem_file 文件(&F)
 MainForm->menuitem_new 新建(&N)
 MainForm->menuitem_open 打开(&O)
+MainForm->menuitem_save 保存(&S)
 MainForm->menuitem_copyselect 复制所选卡片
 MainForm->menuitem_copyall 复制当前结果的所有卡片
 MainForm->menuitem_pastecards 粘贴卡片

win32/chinese/message.txt

@@ -31,8 +31,8 @@
 0x1e	关于：
 0x1f	版本：
 0x20	作者：
-0x21	cdb文件(*.cdb)|*.cdb|所有文件(*.*)|*.*
-0x22	ydk文件(*.ydk)|*.ydk|所有文件(*.*)|*.*
+0x21	数据库文件(*.cdb)|*.cdb|所有文件(*.*)|*.*
+0x22	卡组文件(*.ydk)|*.ydk|所有文件(*.*)|*.*
 0x23	系列号输入出错！
 0x24	选择卡片图像
 0x25	jpg图像(*.jpg)|*.jpg|bmp图像(*.bmp)|*.bmp|png图像(*.png)|*.png|所有文件(*.*)|*.*
@@ -63,4 +63,8 @@
 0x3e	正在导出数据
 0x3f	导出数据完成
 0x40	是否对比卡片信息？
-0x41	对比完成
\ No newline at end of file
+0x41	对比完成
+0x42	打开文件
+0x43	数据库文件(*.cdb)|*.cdb|脚本文件(*.lua)|*.lua|所有文件(*.*)|*.*
+0x44	新建文件
+0x45	保存完成
\ No newline at end of file

win32/english/language-mainform.txt

 MainForm->menuitem_file File
-MainForm->menuitem_new New DataBase
-MainForm->menuitem_open Open DataBase
+MainForm->menuitem_new New
+MainForm->menuitem_open Open
+MainForm->menuitem_save Save
 MainForm->menuitem_copyselect Copy Select Cards
 MainForm->menuitem_copyall Copy All Cards
 MainForm->menuitem_pastecards Paste Cards

win32/english/message.txt

@@ -63,4 +63,8 @@
 0x3e	Exporting Data
 0x3f	Export Data OK
 0x40	Compare Cards With Text?
-0x41	Cards is Compared.
\ No newline at end of file
+0x41	Cards is Compared.
+0x42	Open File
+0x43	DataBase(*.cdb)|*.cdb|Script(*.lua)|*.lua|all files(*.*)|*.*
+0x44	New File
+0x45	Save OK
\ No newline at end of file

win32/readme.txt

-[DataEditorX]2.2.0.0[DataEditorX]
+[DataEditorX]2.2.1.0[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★使用前，请关联lua的打开方式，例如记事本，notepad++，等。
@@ -66,6 +66,8 @@ DataEditorX.exe.config
 描述不详细的bug，我修复不了。（都不知道是bug是什么）
 
 ★更新历史
+2.2.1.0
+lua编辑器的文件菜单整合
 2.2.0.0
 增加lua编辑器，支持关联lua文件
 等待：