2.2.6.3

DataEditorX/Common/MyBitmap.cs

@@ -118,6 +118,8 @@ public static bool SaveAsJPEG(Bitmap bitmap, string filename, int quality)
             return false;
         }
         #endregion
+
+        
     }
 
 }

DataEditorX/Core/TaskHelper.cs

@@ -9,6 +9,7 @@
 using System.Collections.Generic;
 using System.Configuration;
 using System.Drawing;
+using System.Drawing.Imaging;
 using System.IO;
 using System.IO.Compression;
 using System.Windows.Forms;
@@ -131,6 +132,7 @@ public void CutImages(string imgpath,bool isreplace)
 						                   imgSet.other_w,imgSet.other_h);
 					}
 					MyBitmap.SaveAsJPEG(bmp, savejpg, imgSet.quilty);
+					//bmp.Save(savejpg, ImageFormat.Png);
 				}
 			}
 		}
@@ -231,23 +233,25 @@ public string MSEImage
 			File.Delete(setFile);
 		}
 		
-		public void ExportData(string cdbfile)
+		public void ExportData(string zipname)
 		{
-			if(!File.Exists(cdbfile))
-				return;
 			int i=0;
-			Card[] cards=DataBase.Read(cdbfile, false, "");
+			Card[] cards=cardlist;
 			if(cards == null || cards.Length == 0)
 				return;
 			int count=cards.Length;
-			string path=Path.GetDirectoryName(cdbfile);
-			string name=Path.GetFileNameWithoutExtension(cdbfile);
-			string zipname=MyPath.Combine(path, name+".zip");
+			string path=Path.GetDirectoryName(zipname);
+			string name=Path.GetFileNameWithoutExtension(zipname);
+			string cdbfile=zipname+".cdb";
 			string readme=MyPath.Combine(path, name+".txt");
 			string deckydk=MyPath.Combine(path, "deck/"+name+".ydk");
 			string pics=MyPath.Combine(path,"pics");
 			string thumb=MyPath.Combine(pics,"thumbnail");
 			string script=MyPath.Combine(path,"script");
+			
+			File.Delete(cdbfile);
+			DataBase.Create(cdbfile);
+			DataBase.CopyDB(cdbfile,false,cardlist);
 
 			if(File.Exists(zipname))
 				File.Delete(zipname);

DataEditorX/DataEditForm.cs

@@ -1510,8 +1510,16 @@ void Menuitem_exportdataClick(object sender, EventArgs e)
 				return;
 			if(isRun())
 				return;
-			tasker.SetTask(MyTask.ExportData, null, nowCdbFile);
-			Run(LANG.GetMsg(LMSG.ExportData));
+			using(SaveFileDialog dlg=new SaveFileDialog())
+			{
+				dlg.Filter="Zip|(*.zip|All Files(*.*)|*.*";
+				if(dlg.ShowDialog()==DialogResult.OK)
+				{
+					tasker.SetTask(MyTask.ExportData, getCardList(false), dlg.FileName);
+					Run(LANG.GetMsg(LMSG.ExportData));
+				}
+			}
+
 		}
 		#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.6.2")]
+[assembly: AssemblyVersion("2.2.6.3")]

DataEditorX/app.config

@@ -17,7 +17,7 @@
 		<!-- DataEditorX update url-->
 		<add key="updateURL" value="https://github.com/247321453/DataEditorX/tree/master/win32/readme.txt" />
 		<!-- Cut Images Setting -->
-		<add key="image_quilty" value="96" />
+		<add key="image_quilty" value="100" />
 		<add key="image" value="44,64,177,254" />
 		<add key="image_other" value="25,54,128,128" />
 		<add key="image_xyz" value="24,51,128,128" />

DataEditorX/readme.txt

-[DataEditorX]2.2.6.2[DataEditorX]
+[DataEditorX]2.2.6.3[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★文件关联
@@ -58,6 +58,8 @@ Ctrl+鼠标左键 	跳转到函数定义
 Ctrl+鼠标滑轮 	缩放文字
 
 ★更新历史
+2.2.6.3
+导出数据：改为导出当前列表
 2.2.6.2
 导出MSE存档，支持png,jpg格式，支持密码，带0密码，卡名命名方式
 2.2.6.1

win32/DataEditorX.exe.config

@@ -17,7 +17,7 @@
 		<!-- DataEditorX update url-->
 		<add key="updateURL" value="https://github.com/247321453/DataEditorX/tree/master/win32/readme.txt" />
 		<!-- Cut Images Setting -->
-		<add key="image_quilty" value="96" />
+		<add key="image_quilty" value="100" />
 		<add key="image" value="44,64,177,254" />
 		<add key="image_other" value="25,54,128,128" />
 		<add key="image_xyz" value="24,51,128,128" />

win32/chinese/history.txt

 # history
-F:\games\ygopro\script\c255998.lua
-F:\games\ygopro\cards.cdb
\ No newline at end of file
+F:\games\ygopro\p.cdb
+F:\games\ygopro\cards.cdb
+F:\games\ygopro\script\c255998.lua
\ No newline at end of file

win32/readme.txt

-[DataEditorX]2.2.6.2[DataEditorX]
+[DataEditorX]2.2.6.3[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★文件关联
@@ -58,6 +58,8 @@ Ctrl+鼠标左键 	跳转到函数定义
 Ctrl+鼠标滑轮 	缩放文字
 
 ★更新历史
+2.2.6.3
+导出数据：改为导出当前列表
 2.2.6.2
 导出MSE存档，支持png,jpg格式，支持密码，带0密码，卡名命名方式
 2.2.6.1