2.4.0.0

DataEditorX/Common/CheckUpdate.cs

@@ -31,7 +31,6 @@ static CheckUpdate()
 		const string HEAD = "[DataEditorX]";
 		const string HEAD2 = "[URL]";
 		public const string DEFALUT = "0.0.0.0";
-        const int VER_LENGTH = 4;
 
 		#region 检查版本
 		/// <summary>
@@ -72,12 +71,15 @@ public static string GetNewVersion(string VERURL)
 		public static bool CheckVersion(string ver, string oldver)
 		{
 			bool hasNew = false;
+			#if DEBUG
+			System.Windows.Forms.MessageBox.Show(oldver+"=>"+ver);
+			#endif
 			string[] vers = ver.Split('.');
 			string[] oldvers = oldver.Split('.');
-            if (vers.Length == oldvers.Length && vers.Length == VER_LENGTH)
+			if (vers.Length == oldvers.Length)
 			{
 				int j, k;//从左到右比较数字
-                for (int i = 0; i < VER_LENGTH; i++)
+				for (int i = 0; i < oldvers.Length; i++)
 				{
 					int.TryParse(vers[i], out j);
 					int.TryParse(oldvers[i], out k);
@@ -85,6 +87,9 @@ public static bool CheckVersion(string ver, string oldver)
 					{
 						hasNew = true;
 						break;
+					}else if(j < k){
+						hasNew = false;
+						break;
 					}
 				}
 			}

DataEditorX/Config/MyConfig.cs

@@ -18,6 +18,7 @@ public class MyConfig : XMLReader
         public const string TAG_SAVE_LAGN = "-savelanguage";
         public const string TAG_SAVE_LAGN2 = "-sl";
         public const string TAG_MSE_PATH="mse_path";
+        public const string TAG_MSE_EXPORT="mse_exprotpath";
         /// <summary>
         /// 窗口消息 打开文件
         /// </summary>
@@ -297,7 +298,8 @@ public static string GetCardInfoFile(string path)
         /// <param name="file"></param>
         public static bool OpenOnExistForm(string file)
         {
-            Process instance = RunningInstance();
+            Process instance = RunningInstance(Assembly.GetExecutingAssembly().Location.
+                        Replace('/', Path.DirectorySeparatorChar));
             if (instance == null)
             {
                 return false;
@@ -320,7 +322,7 @@ public static void OpenFileInThis(string file)
             //发送消息
             User32.SendMessage(Process.GetCurrentProcess().MainWindowHandle, MyConfig.WM_OPEN, 0, 0);
         }
-        static Process RunningInstance()
+        public static Process RunningInstance(string filename)
         {
             Process current = Process.GetCurrentProcess();
             Process[] processes = Process.GetProcessesByName(current.ProcessName);
@@ -331,9 +333,7 @@ static Process RunningInstance()
                 if (process.Id != current.Id)
                 {
                     //保证要打开的进程同已经存在的进程来自同一文件路径
-                    if (Assembly.GetExecutingAssembly().Location.
-                        Replace('/', Path.DirectorySeparatorChar)
-                        == current.MainModule.FileName)
+                    if (filename == current.MainModule.FileName)
                     {
                         //返回已经存在的进程
                         return process;

DataEditorX/Core/Mse/MseMaker.cs

@@ -768,6 +768,8 @@ public Card[] ReadCards(string set, bool repalceOld)
 		#endregion
 		
 		#region export
+		static System.Diagnostics.Process mseProcess;
+		static EventHandler exitHandler;
 		private static void exportSetThread(object obj){
 			string[] args=(string[])obj;
 			if(args==null||args.Length<3){
@@ -782,23 +784,36 @@ public Card[] ReadCards(string set, bool repalceOld)
 				return;
 			}else{
 				string cmd=" --export "+setfile.Replace("\\\\","\\").Replace("\\","/")+" {card.gamecode}.png";
-				System.Diagnostics.Process   ie   =   new   System.Diagnostics.Process();
-				ie.StartInfo.FileName   =   mse_path;
-				ie.StartInfo.Arguments   =  cmd;
-				ie.StartInfo.WorkingDirectory=path;
+				mseProcess   =   new   System.Diagnostics.Process();
+				mseProcess.StartInfo.FileName   =   mse_path;
+				mseProcess.StartInfo.Arguments   =  cmd;
+				mseProcess.StartInfo.WorkingDirectory=path;
+				mseProcess.EnableRaisingEvents=true;
 				MyPath.CreateDir(path);
 				try{
-					ie.Start();
+					mseProcess.Start();
 					//等待结束，需要把当前方法放到线程里面
-					ie.WaitForExit();
-					ie.Close();
+					mseProcess.WaitForExit();
+					mseProcess.Exited += new EventHandler(exitHandler);
+					mseProcess.Close();
+					mseProcess=null;
 					System.Windows.Forms.MessageBox.Show(Language.LanguageHelper.GetMsg(LMSG.exportMseImages));
 				}catch{
 					
 				}
 			}
 		}
-		public static void exportSet(string mse_path,string setfile,string path){
+		
+		public static bool MseIsRunning(){
+			return mseProcess != null;
+		}
+		public static void MseStop(){
+			try{
+				mseProcess.Kill();
+				mseProcess.Close();
+			}catch{}
+		}
+		public static void exportSet(string mse_path,string setfile,string path,EventHandler handler){
 			if(mse_path==null||mse_path.Length==0||setfile==null||setfile.Length==0){
 				return;
 			}
@@ -806,6 +821,7 @@ public Card[] ReadCards(string set, bool repalceOld)
 			Thread myThread = new Thread(ParStart);
 			myThread.IsBackground=true;
 			myThread.Start(new string[]{mse_path,setfile,path});
+			exitHandler = handler;
 		}
 		#endregion
 		

DataEditorX/DataEditForm.cs

@@ -13,13 +13,12 @@
 using System.Windows.Forms;
 
 using DataEditorX.Common;
+using DataEditorX.Config;
 using DataEditorX.Core;
+using DataEditorX.Core.Mse;
 using DataEditorX.Language;
 using WeifenLuo.WinFormsUI.Docking;
 
-using DataEditorX.Config;
-using DataEditorX.Core.Mse;
-
 namespace DataEditorX
 {
 	public partial class DataEditForm : DockContent, IDataForm
@@ -1632,6 +1631,20 @@ void Menuitem_exportMSEimageClick(object sender, EventArgs e)
 		{
 			if (isRun())
 				return;
+			string msepath=MyPath.GetRealPath(MyConfig.readString(MyConfig.TAG_MSE_PATH));
+			if(!File.Exists(msepath)){
+				MyMsg.Error(LMSG.exportMseImagesErr);
+				menuitem_exportMSEimage.Checked=false;
+				return;
+			}else{
+				if(MseMaker.MseIsRunning()){
+					MseMaker.MseStop();
+					menuitem_exportMSEimage.Checked=false;
+					return;
+				}else{
+					
+				}
+			}
 			//select open mse-set
 			using (OpenFileDialog dlg = new OpenFileDialog())
 			{
@@ -1640,8 +1653,13 @@ void Menuitem_exportMSEimageClick(object sender, EventArgs e)
 				if (dlg.ShowDialog() == DialogResult.OK)
 				{
 					string mseset=dlg.FileName;
-					string msepath=MyConfig.readString(MyConfig.TAG_MSE_PATH);
-					MseMaker.exportSet(msepath, mseset, MyPath.Combine(Application.StartupPath, "cache"));
+					string exportpath=MyPath.GetRealPath(MyConfig.readString(MyConfig.TAG_MSE_EXPORT));
+					MseMaker.exportSet(msepath, mseset, exportpath, delegate{
+					                   	menuitem_exportMSEimage.Checked=false;
+					                   });
+					menuitem_exportMSEimage.Checked=true;
+				}else{
+					menuitem_exportMSEimage.Checked=false;
 				}
 			}
 		}

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

DataEditorX/app.config

@@ -44,6 +44,7 @@
 		<add key="fontname" value="Consolas" />
 		<add key="fontsize" value="14.5" />
 		<!-- MSE path-->
-    <add key="mse_path" value="E:\\git\\MagicSetEditor2\\mse.exe"/>
+		<add key="mse_path" value="./MagicSetEditor2/mse.exe"/>
+		<add key="mse_exprotpath" value="./exprot"/>
 	</appSettings>
 </configuration>
\ No newline at end of file

DataEditorX/changed.txt

 ★更新历史
+2.4.0.0
+1.mse的相对路径，默认为当前MagicSetEditor2，其他地方请设置config的mse_path，
+导出的文件夹为export，其他地方请设置config的mse_exprotpath，
+2.从MSE存档导出图片，把MSE存档导出全部图片（如果需要停止，请到任务管理器结束mse.exe）
+3.生成MSE存档，不调整图片，测试没问题。
+如果需要开启，请修改data文件夹的MSE的配置文件
+reimage = true
+以及下面的值
+
 2.3.5.3
 MSE存档图片调整，灵摆文本测试
 2.3.5.2

DataEditorX/data/language_chinese.txt

@@ -55,7 +55,7 @@ DataEditForm.mainMenu.menuitem_saveasmse_select	把选中导为MSE存档
 DataEditForm.mainMenu.menuitem_saveasmse	把结果导为MSE存档
 DataEditForm.mainMenu.menuitem_cutimages	批量裁剪卡图
 DataEditForm.mainMenu.menuitem_convertimage	批量导入卡图
-DataEditForm.mainMenu.menuitem_exportMSEimage	从MSE存档导出图片
+DataEditForm.mainMenu.menuitem_exportMSEimage	从MSE存档导出图片(再次点击停止)
 DataEditForm.mainMenu.menuitem_cancelTask	取消任务
 DataEditForm.mainMenu.menuitem_testpendulumtext	测试灵摆效果文本
 DataEditForm.mainMenu.menuitem_help	帮助(&H)

DataEditorX/data/language_english.txt

@@ -56,7 +56,7 @@ DataEditForm.mainMenu.menuitem_cutimages	Cut Images
 DataEditForm.mainMenu.menuitem_convertimage	Convert Images
 DataEditForm.mainMenu.menuitem_importmseimg	Set MSE'Image 
 DataEditForm.mainMenu.menuitem_cancelTask	Cancel Task
-DataEditForm.mainMenu.menuitem_exportMSEimage	export mse-set to images
+DataEditForm.mainMenu.menuitem_exportMSEimage	export mse-set to images(Click stop)
 DataEditForm.mainMenu.menuitem_help	Help(&H)
 DataEditForm.mainMenu.menuitem_about	About
 DataEditForm.mainMenu.menuitem_language	Laguage

DataEditorX/readme.txt

-[DataEditorX]2.3.5.3[DataEditorX]
+[DataEditorX]2.4.0.0[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★运行环境(Environment)

win32/DataEditorX.exe.config

@@ -44,6 +44,7 @@
     <add key="fontname" value="Consolas" />
     <add key="fontsize" value="14.5" />
     <!-- MSE path-->
-    <add key="mse_path" value="E:\\git\\MagicSetEditor2\\mse.exe" />
+    <add key="mse_path" value="./MagicSetEditor2/mse.exe" />
+    <add key="mse_exprotpath" value="./exprot" />
   </appSettings>
 </configuration>
\ No newline at end of file

win32/changed.txt

 ★更新历史
+2.4.0.0
+1.mse的相对路径，默认为当前MagicSetEditor2，其他地方请设置config的mse_path，
+导出的文件夹为export，其他地方请设置config的mse_exprotpath，
+2.从MSE存档导出图片，把MSE存档导出全部图片（如果需要停止，请到任务管理器结束mse.exe）
+3.生成MSE存档，不调整图片，测试没问题。
+如果需要开启，请修改data文件夹的MSE的配置文件
+reimage = true
+以及下面的值
+
 2.3.5.3
 MSE存档图片调整，灵摆文本测试
 2.3.5.2

win32/data/language_chinese.txt

@@ -55,7 +55,7 @@ DataEditForm.mainMenu.menuitem_saveasmse_select	把选中导为MSE存档
 DataEditForm.mainMenu.menuitem_saveasmse	把结果导为MSE存档
 DataEditForm.mainMenu.menuitem_cutimages	批量裁剪卡图
 DataEditForm.mainMenu.menuitem_convertimage	批量导入卡图
-DataEditForm.mainMenu.menuitem_exportMSEimage	从MSE存档导出图片
+DataEditForm.mainMenu.menuitem_exportMSEimage	从MSE存档导出图片(再次点击停止)
 DataEditForm.mainMenu.menuitem_cancelTask	取消任务
 DataEditForm.mainMenu.menuitem_testpendulumtext	测试灵摆效果文本
 DataEditForm.mainMenu.menuitem_help	帮助(&H)

win32/data/language_english.txt

@@ -56,7 +56,7 @@ DataEditForm.mainMenu.menuitem_cutimages	Cut Images
 DataEditForm.mainMenu.menuitem_convertimage	Convert Images
 DataEditForm.mainMenu.menuitem_importmseimg	Set MSE'Image 
 DataEditForm.mainMenu.menuitem_cancelTask	Cancel Task
-DataEditForm.mainMenu.menuitem_exportMSEimage	export mse-set to images
+DataEditForm.mainMenu.menuitem_exportMSEimage	export mse-set to images(Click stop)
 DataEditForm.mainMenu.menuitem_help	Help(&H)
 DataEditForm.mainMenu.menuitem_about	About
 DataEditForm.mainMenu.menuitem_language	Laguage

win32/readme.txt

-[DataEditorX]2.3.5.3[DataEditorX]
+[DataEditorX]2.3.5.4[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★运行环境(Environment)