Skip to content

D
DataEditorX
Commit 8d05291a authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' of github.com:purerosefallen/DataEditorX into test-vc

parents de86e973 79e724fb
Hide whitespace changes
Inline Side-by-side
Showing with 111 additions and 58 deletions
DataEditorX/CodeEditForm.cs
View file @ 8d05291a
......@@ -354,7 +354,11 @@ bool savefile(bool saveas)
{
using (SaveFileDialog sfdlg = new SaveFileDialog())
{
sfdlg.Filter = LanguageHelper.GetMsg(LMSG.ScriptFilter);
try
{
sfdlg.Filter = LanguageHelper.GetMsg(LMSG.ScriptFilter);
}
catch { }
if (sfdlg.ShowDialog() == DialogResult.OK)
{
this.nowFile = sfdlg.FileName;
......@@ -446,7 +450,11 @@ void Menuitem_openClick(object sender, EventArgs e)
{
using (OpenFileDialog sfdlg = new OpenFileDialog())
{
sfdlg.Filter = LanguageHelper.GetMsg(LMSG.ScriptFilter);
try
{
sfdlg.Filter = LanguageHelper.GetMsg(LMSG.ScriptFilter);
}
catch { }
if (sfdlg.ShowDialog() == DialogResult.OK)
{
this.nowFile = sfdlg.FileName;
......
DataEditorX/DataEditForm.cs
View file @ 8d05291a
......@@ -323,7 +323,6 @@ public void InitControl(DataConfig datacfg)
this.InitCheckPanel(this.pl_cardtype, datacfg.dicCardTypes);
this.InitCheckPanel(this.pl_markers, datacfg.dicLinkMarkers);
this.InitCheckPanel(this.pl_category, datacfg.dicCardcategorys);
this.SetEnabled(this.pl_markers, false);
this.InitComboBox(this.cb_setname1, setcodes, setnames);
this.InitComboBox(this.cb_setname2, setcodes, setnames);
this.InitComboBox(this.cb_setname3, setcodes, setnames);
......@@ -1129,7 +1128,11 @@ void Menuitem_openClick(object sender, EventArgs e)
using (OpenFileDialog dlg = new OpenFileDialog())
{
dlg.Title = LanguageHelper.GetMsg(LMSG.SelectDataBasePath);
dlg.Filter = LanguageHelper.GetMsg(LMSG.CdbType);
try
{
dlg.Filter = LanguageHelper.GetMsg(LMSG.CdbType);
}
catch { }
if (dlg.ShowDialog() == DialogResult.OK)
{
this.Open(dlg.FileName);
......@@ -1142,7 +1145,11 @@ void Menuitem_newClick(object sender, EventArgs e)
using (SaveFileDialog dlg = new SaveFileDialog())
{
dlg.Title = LanguageHelper.GetMsg(LMSG.SelectDataBasePath);
dlg.Filter = LanguageHelper.GetMsg(LMSG.CdbType);
try
{
dlg.Filter = LanguageHelper.GetMsg(LMSG.CdbType);
}
catch { }
if (dlg.ShowDialog() == DialogResult.OK)
{
if (DataBase.Create(dlg.FileName))
......@@ -1166,7 +1173,11 @@ void Menuitem_readydkClick(object sender, EventArgs e)
using (OpenFileDialog dlg = new OpenFileDialog())
{
dlg.Title = LanguageHelper.GetMsg(LMSG.SelectYdkPath);
dlg.Filter = LanguageHelper.GetMsg(LMSG.ydkType);
try
{
dlg.Filter = LanguageHelper.GetMsg(LMSG.ydkType);
}
catch { }
if (dlg.ShowDialog() == DialogResult.OK)
{
this.tmpCodes.Clear();
......@@ -1379,7 +1390,11 @@ void CopyTo(Card[] cards)
using (OpenFileDialog dlg = new OpenFileDialog())
{
dlg.Title = LanguageHelper.GetMsg(LMSG.SelectDataBasePath);
dlg.Filter = LanguageHelper.GetMsg(LMSG.CdbType);
try
{
dlg.Filter = LanguageHelper.GetMsg(LMSG.CdbType);
}
catch { }
if (dlg.ShowDialog() == DialogResult.OK)
{
filename = dlg.FileName;
......@@ -1446,7 +1461,11 @@ void SaveAsMSE(bool onlyselect)
using (SaveFileDialog dlg = new SaveFileDialog())
{
dlg.Title = LanguageHelper.GetMsg(LMSG.selectMseset);
dlg.Filter = LanguageHelper.GetMsg(LMSG.MseType);
try
{
dlg.Filter = LanguageHelper.GetMsg(LMSG.MseType);
}
catch { }
if (dlg.ShowDialog() == DialogResult.OK)
{
bool isUpdate = false;
......@@ -1473,7 +1492,11 @@ void ImportImageFromSelect()
using (OpenFileDialog dlg = new OpenFileDialog())
{
dlg.Title = LanguageHelper.GetMsg(LMSG.SelectImage) + "-" + this.tb_cardname.Text;
dlg.Filter = LanguageHelper.GetMsg(LMSG.ImageType);
try
{
dlg.Filter = LanguageHelper.GetMsg(LMSG.ImageType);
}
catch { }
if (dlg.ShowDialog() == DialogResult.OK)
{
//dlg.FileName;
......@@ -1605,7 +1628,11 @@ void Menuitem_exportdataClick(object sender, EventArgs e)
using (SaveFileDialog dlg = new SaveFileDialog())
{
dlg.InitialDirectory = this.ygopath.gamepath;
dlg.Filter = "Zip|(*.zip|All Files(*.*)|*.*";
try
{
dlg.Filter = "Zip|(*.zip|All Files(*.*)|*.*";
}
catch { }
if (dlg.ShowDialog() == DialogResult.OK)
{
this.tasker.SetTask(MyTask.ExportData,
......@@ -1855,7 +1882,11 @@ private void menuitem_readmse_Click(object sender, EventArgs e)
using (OpenFileDialog dlg = new OpenFileDialog())
{
dlg.Title = LanguageHelper.GetMsg(LMSG.selectMseset);
dlg.Filter = LanguageHelper.GetMsg(LMSG.MseType);
try
{
dlg.Filter = LanguageHelper.GetMsg(LMSG.MseType);
}
catch { }
if (dlg.ShowDialog() == DialogResult.OK)
{
bool isUpdate = MyMsg.Question(LMSG.IfReplaceExistingImage);
......@@ -1988,7 +2019,11 @@ void Menuitem_exportMSEimageClick(object sender, EventArgs e)
using (OpenFileDialog dlg = new OpenFileDialog())
{
dlg.Title = LanguageHelper.GetMsg(LMSG.selectMseset);
dlg.Filter = LanguageHelper.GetMsg(LMSG.MseType);
try
{
dlg.Filter = LanguageHelper.GetMsg(LMSG.MseType);
}
catch { }
if (dlg.ShowDialog() == DialogResult.OK)
{
string mseset=dlg.FileName;
......@@ -2045,7 +2080,11 @@ void Menuitem_autoreturnClick(object sender, EventArgs e)
using (SaveFileDialog dlg = new SaveFileDialog())
{
dlg.Title = LanguageHelper.GetMsg(LMSG.SelectDataBasePath);
dlg.Filter = LanguageHelper.GetMsg(LMSG.CdbType);
try
{
dlg.Filter = LanguageHelper.GetMsg(LMSG.CdbType);
}
catch { }
if (dlg.ShowDialog() == DialogResult.OK)
{
Card[] cards = DataBase.Read(this.nowCdbFile, true, "");
......@@ -2083,7 +2122,11 @@ void Menuitem_replaceClick(object sender, EventArgs e)
using (SaveFileDialog dlg = new SaveFileDialog())
{
dlg.Title = LanguageHelper.GetMsg(LMSG.SelectDataBasePath);
dlg.Filter = LanguageHelper.GetMsg(LMSG.CdbType);
try
{
dlg.Filter = LanguageHelper.GetMsg(LMSG.CdbType);
}
catch { }
if (dlg.ShowDialog() == DialogResult.OK)
{
Card[] cards = DataBase.Read(this.nowCdbFile, true, "");
......
DataEditorX/MainForm.cs
View file @ 8d05291a
......@@ -345,11 +345,19 @@ void Menuitem_openClick(object sender, EventArgs e)
dlg.Title = LanguageHelper.GetMsg(LMSG.OpenFile);
if (this.GetActive() != null || this.dockPanel.Contents.Count == 0)//判断当前窗口是不是DataEditor
{
dlg.Filter = LanguageHelper.GetMsg(LMSG.CdbType);
try
{
dlg.Filter = LanguageHelper.GetMsg(LMSG.CdbType);
}
catch { }
}
else
{
dlg.Filter = LanguageHelper.GetMsg(LMSG.ScriptFilter);
try
{
dlg.Filter = LanguageHelper.GetMsg(LMSG.ScriptFilter);
}
catch { }
}
if (dlg.ShowDialog() == DialogResult.OK)
......@@ -373,11 +381,19 @@ void Menuitem_newClick(object sender, EventArgs e)
dlg.Title = LanguageHelper.GetMsg(LMSG.NewFile);
if (this.GetActive() != null)//判断当前窗口是不是DataEditor
{
dlg.Filter = LanguageHelper.GetMsg(LMSG.CdbType);
try
{
dlg.Filter = LanguageHelper.GetMsg(LMSG.CdbType);
}
catch { }
}
else
{
dlg.Filter = LanguageHelper.GetMsg(LMSG.ScriptFilter);
try
{
dlg.Filter = LanguageHelper.GetMsg(LMSG.ScriptFilter);
}
catch { }
}
if (dlg.ShowDialog() == DialogResult.OK)
......
DataEditorX/Properties/AssemblyInfo.cs
View file @ 8d05291a
......@@ -27,4 +27,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("3.0.0.4")]
[assembly: AssemblyVersion("3.0.0.5")]
DataEditorX/changed.txt
View file @ 8d05291a
★更新历史
3.0.0.5
修正连接标记无法修改的bug
3.0.0.4
修正不显示连接标记的bug
修正拖拽非文件时报错的bug
......
DataEditorX/data/language_chinese.txt
View file @ 8d05291a
......@@ -173,3 +173,4 @@ MainForm.mainMenu.menuitem_closeall 关闭所有
0x4b 从MSE存档导出图片失败。
0x4c 测试完成，没有发现语法错误。
0x4d 一次性打开大量文件将导致卡顿，是否继续？
0x4e 下载完成，即将重新启动程序以完成更新。
\ No newline at end of file
DataEditorX/data/language_english.txt
View file @ 8d05291a
......@@ -168,4 +168,5 @@ MainForm.mainMenu.menuitem_closeall Close All
0x4a Successfully exported MSE-set to images.
0x4b Failed to export MSE-set to images fail.
0x4c No syntax error found.
0x4d It is not recommended to open lots of file at a time. Continue?
\ No newline at end of file
0x4d It is not recommended to open lots of file at a time. Continue?
0x4e Download completed; the application will be restarted.
\ No newline at end of file
DataEditorX/readme.txt
View file @ 8d05291a
[DataEditorX]3.0.0.4[DataEditorX]
[DataEditorX]3.0.0.5[DataEditorX]
[URL]https://cdn01.moecube.com/DataEditorX/releases/DataEditorX-3.0.0.4.zip[URL]
★运行环境(Environment)
......
DataEditorX/readme_english.txt
View file @ 8d05291a

★Environment
This program based on .Net2.0/winXP(need .Net2.0)/win7(with.Net2.0)/win8(need.Net3.5 include 2.0)
This program is based on .Net Framework 4.6
★File association
.lua Notepad++/Sublime text/DataEditorX
.cdb DataEditorX
Click file with right mouse button, Open with, Browse Files, Choose confirm(Yes）
DataEditorX can open files with specified extension:
.lua (Notepad++/Sublime text/DataEditorX)
.cdb (DataEditorX)
★Feedback
If you has problems, please report on https://github.com/purerosefallen/DataEditorX/issues
Title：DataEditorX X.X.X.X
Text：
The error message text: If there is a error message box, please press Ctrl+C, then paste in someplace.
please give a detailed description of: card message; antivirus; programe location;the operation that time.
Please report on https://github.com/purerosefallen/DataEditorX/issues with a format like below, if you have any problem in use.
Version:
DataEditorX X.X.X.X
Error message:
The error message text
(If there is a error message box, You can press Ctrl+C to copy the message to clipboard)
Detail:
Card message; antivirus; program location; your operation at that time.
★Setting
★Settings
DataEditorX.exe.config ★Language，★Image，★CodeEditor
data/language_xxx.txt Interface and prompt message
data/cardinfo_xxx.txt types/series
★Language setting
DataEditorX.exe.config
<add key="language" value="chinese" />Simplified Chinese
chinese => english
If you want to add a language，you need two file，xxx is a type of language:
If you want to add a language，you will need two file(xxx is a type of language):
data/language_xxx.txt
data/cardinfo_xxx.txt
★Image setting
you need it when you want to add or pendulum.
★Image settings
image_quilty 1-100
image Width/height of image and thumbnail,total four numerical value;
image_other pendulum of other cards
image_xyz pendulum of Xyz monsters
image_pendulum Pendulum
★CodeEditor Setting
IME Input Method Editors
★CodeEditor Settings
IME Editors Input Method
wordwrap
tabisspace tab→space
fontname
fontsize
★DataEditor：
If you need to input Attack "?", you can use anyone of ？/?/-2 instead.
The folder of pics, script and cdb should be in a same folder consistent.
★Read cardlist from ydk and folder pics
Support：png,jpg pics with card number/card number with 0
★Output data
Example：mydiy.cdb
New card：deck/mydiy.ydk
Instruction：mydiy.txt
script
pics
↑ all of them in mydiy.zip，you can use it in expansions of ygopro with sound effect or release it.
↑ all of them are in mydiy.zip，you can use it in expansions of ygopro with sound effect or release it.
★Database comparison
......@@ -81,7 +70,6 @@ Return in parameter type, C++ implement code
Copy and Replace: If there's a card with same name, replace it.
Copy without Replace: If there's a card with same name, ignore it.
★Card search
1.Now it can not support search by Pendulum Scale
2.You can search card with card name/effect/Attribute/Types/Level（racnk）/effect type/card number
......@@ -103,8 +91,6 @@ Copy without Replace: If there's a card with same name, ignore it.
--Card number over 10000000,less than 20000000
card with same name: 10000000 card number: 10000000
★CodeEditor：
Input keyword in the under text box，press Enter
Ctrl+F Look up
......@@ -114,19 +100,15 @@ Ctrl+K List of function
Ctrl+T List of constant
Ctrl+The mouse wheel Zoom in/out
★Magic Set Editor 2
Download/update："Magic Set Editor 2/download.bat"
Or
https://github.com/247321453/MagicSetEditor2
★MSE pics
Support：png,jpg pics with card number/card number with 0
Tick “Set MSE'Image ”，Import pics will go into pics folder under MSE
★MSE flie making setting
mse_xxx.txt modify\r\n can be newlines，\t will replace for tab
......
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