Commit f629a0c7 authored by keyongyu's avatar keyongyu

2.4.2.4

parent ca7c981b
...@@ -229,3 +229,4 @@ pip-log.txt ...@@ -229,3 +229,4 @@ pip-log.txt
#Mr Developer #Mr Developer
.mr.developer.cfg .mr.developer.cfg
/win32/*.cdb /win32/*.cdb
/win32/data/history.txt
...@@ -61,7 +61,7 @@ public override string ToString() ...@@ -61,7 +61,7 @@ public override string ToString()
#region Public fields #region Public fields
/// <summary>True if UTF8 encoding for filename and comments, false if default (CP 437)</summary> /// <summary>True if UTF8 encoding for filename and comments, false if default (CP 437)</summary>
public bool EncodeUTF8 = false; public bool EncodeUTF8 = true;
/// <summary>Force deflate algotithm even if it inflates the stored file. Off by default.</summary> /// <summary>Force deflate algotithm even if it inflates the stored file. Off by default.</summary>
public bool ForceDeflating = false; public bool ForceDeflating = false;
#endregion #endregion
......
...@@ -334,7 +334,7 @@ public Card[] ReadMSE(string mseset, bool repalceOld) ...@@ -334,7 +334,7 @@ public Card[] ReadMSE(string mseset, bool repalceOld)
#endregion #endregion
#region 导出数据 #region 导出数据
public void ExportData(string path, string zipname) public void ExportData(string path, string zipname, string _cdbfile)
{ {
int i = 0; int i = 0;
Card[] cards = cardlist; Card[] cards = cardlist;
...@@ -358,7 +358,7 @@ public void ExportData(string path, string zipname) ...@@ -358,7 +358,7 @@ public void ExportData(string path, string zipname)
File.Delete(zipname); File.Delete(zipname);
using (ZipStorer zips = ZipStorer.Create(zipname, "")) using (ZipStorer zips = ZipStorer.Create(zipname, ""))
{ {
zips.AddFile(cdbfile, name + ".cdb", ""); zips.AddFile(cdbfile, Path.GetFileNameWithoutExtension(_cdbfile) + ".cdb", "");
if (File.Exists(readme)) if (File.Exists(readme))
zips.AddFile(readme, "readme_" + name + ".txt", ""); zips.AddFile(readme, "readme_" + name + ".txt", "");
if (File.Exists(deckydk)) if (File.Exists(deckydk))
...@@ -393,7 +393,7 @@ public void Run() ...@@ -393,7 +393,7 @@ public void Run()
case MyTask.ExportData: case MyTask.ExportData:
if (mArgs != null && mArgs.Length >= 2) if (mArgs != null && mArgs.Length >= 2)
{ {
ExportData(mArgs[0], mArgs[1]); ExportData(mArgs[0], mArgs[1], mArgs[2]);
} }
break; break;
case MyTask.CheckUpdate: case MyTask.CheckUpdate:
......
...@@ -1339,7 +1339,9 @@ void Menuitem_exportdataClick(object sender, EventArgs e) ...@@ -1339,7 +1339,9 @@ void Menuitem_exportdataClick(object sender, EventArgs e)
{ {
tasker.SetTask(MyTask.ExportData, tasker.SetTask(MyTask.ExportData,
GetCardList(false), GetCardList(false),
ygopath.gamepath, dlg.FileName); ygopath.gamepath,
dlg.FileName,
GetOpenFile());
Run(LanguageHelper.GetMsg(LMSG.ExportData)); Run(LanguageHelper.GetMsg(LMSG.ExportData));
} }
} }
......
...@@ -28,4 +28,4 @@ ...@@ -28,4 +28,4 @@
// //
// You can specify all the values or you can use the default the Revision and // You can specify all the values or you can use the default the Revision and
// Build Numbers by using the '*' as shown below: // Build Numbers by using the '*' as shown below:
[assembly: AssemblyVersion("2.4.2.3")] [assembly: AssemblyVersion("2.4.2.4")]
★更新历史 ★更新历史
2.4.2.4
导出数据,中文名字乱码
2.4.2.3 2.4.2.3
添加连接类型 添加连接类型
添加电子界族 添加电子界族
......
[DataEditorX]2.4.2.3[DataEditorX] [DataEditorX]2.4.2.4[DataEditorX]
[URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL] [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
★运行环境(Environment) ★运行环境(Environment)
......
No preview for this file type
★更新历史 ★更新历史
2.4.2.4
导出数据,中文名字乱码
2.4.2.3 2.4.2.3
添加连接类型 添加连接类型
添加电子界族 添加电子界族
......
[DataEditorX]2.4.2.3[DataEditorX] [DataEditorX]2.4.2.4[DataEditorX]
[URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL] [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
★运行环境(Environment) ★运行环境(Environment)
......
No preview for this file type
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment