Skip to content

D
DataEditorX
Commit 38ae3542 authored by DailyShana's avatar DailyShana
Browse files
Options

2.3.1.3

parent 6fa567a1
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 45 deletions
DataEditorX/DataEditForm.cs
View file @ 38ae3542
...@@ -1090,7 +1090,7 @@ public void SaveCards(Card[] cards) ...@@ -1090,7 +1090,7 @@ public void SaveCards(Card[] cards)
return; return;
if (cards == null || cards.Length == 0) if (cards == null || cards.Length == 0)
return; return;
bool replace = MyMsg.Question(LMSG.IfReplaceExistingCard); bool replace = false;
Card[] oldcards = DataBase.Read(nowCdbFile, true, ""); Card[] oldcards = DataBase.Read(nowCdbFile, true, "");
string undo = ""; string undo = "";
foreach (Card c in cards) foreach (Card c in cards)
...@@ -1099,9 +1099,19 @@ public void SaveCards(Card[] cards) ...@@ -1099,9 +1099,19 @@ public void SaveCards(Card[] cards)
} }
if (oldcards != null && oldcards.Length != 0) if (oldcards != null && oldcards.Length != 0)
{ {
foreach (Card c in oldcards) int i = 0;
foreach (Card oc in oldcards)
{ {
undo += DataBase.GetInsertSQL(c, !replace); foreach (Card c in cards)
{
if (c.id == oc.id)
{
i += 1;
if (i == 1)
replace = MyMsg.Question(LMSG.IfReplaceExistingCard);
undo += DataBase.GetInsertSQL(oc, !replace);
}
}
} }
} }
cardedit.undoSQL.Add(undo); cardedit.undoSQL.Add(undo);
......
DataEditorX/Properties/AssemblyInfo.cs
View file @ 38ae3542
...@@ -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.3.1.2")] [assembly: AssemblyVersion("2.3.1.3")]
DataEditorX/changed.txt
View file @ 38ae3542
★更新历史 ★更新历史
2.3.1.3
优化复制卡片的撤销
2.3.1.2 2.3.1.2
修复bug：向空数据库复制卡片报错 修复bug：向空数据库复制卡片报错
2.3.1.1 2.3.1.1
......
DataEditorX/readme.txt
View file @ 38ae3542
[DataEditorX]2.3.1.2[DataEditorX] [DataEditorX]2.3.1.3[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)
......
win32/DataEditorX.exe
View file @ 38ae3542
No preview for this file type
win32/DataEditorX.vshost.exe.config
View file @ 38ae3542
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<connectionStrings> <connectionStrings>
<!-- Example connection to a SQL Server Database on localhost. --> <!-- Example connection to a SQL Server Database on localhost. -->
<!-- <add name="ExampleConnectionString" <!-- <add name="ExampleConnectionString"
connectionString="Data Source=.;Initial Catalog=DBName;Integrated Security=True" connectionString="Data Source=.;Initial Catalog=DBName;Integrated Security=True"
providerName="System.Data.SqlClient" /> --> providerName="System.Data.SqlClient" /> -->
</connectionStrings> </connectionStrings>
<appSettings> <appSettings>
<!-- access these values via the property: <!-- access these values via the property:
System.Configuration.ConfigurationManager.AppSettings[key] System.Configuration.ConfigurationManager.AppSettings[key]
--> -->
<!-- auto enter length --> <!-- auto enter length -->
<add key="autolength" value="30" /> <add key="autolength" value="30" />
<!-- MSE language data/mse_xxx.txt --> <!-- MSE language data/mse_xxx.txt -->
<add key="mse" value="Chinese-Simplified" /> <add key="mse" value="Chinese-Simplified" />
<!-- Language data/cardinfo_xxxx.txt data/language_xxx.txt --> <!-- Language data/cardinfo_xxxx.txt data/language_xxx.txt -->
<add key="language" value="Chinese" /> <add key="language" value="english" />
<!-- Check system language when running program first time --> <!-- Check system language when running program first time -->
<add key="check_system_language" value="false" /> <add key="check_system_language" value="true" />
<!-- async load data --> <!-- async load data -->
<add key="async" value="false" /> <add key="async" value="false" />
<!-- DataEditorX source code --> <!-- DataEditorX source code -->
<add key="sourceURL" value="https://github.com/247321453/DataEditorX" /> <add key="sourceURL" value="https://github.com/247321453/DataEditorX" />
<!-- DataEditorX update url--> <!-- DataEditorX update url-->
<add key="updateURL" value="https://github.com/247321453/DataEditorX/tree/master/win32/readme.txt" /> <add key="updateURL" value="https://github.com/247321453/DataEditorX/tree/master/win32/readme.txt" />
<!-- delete,modify with card's files image script --> <!-- delete,modify with card's files image script -->
<add key="opera_with_cards_file" value="true" /> <add key="opera_with_cards_file" value="true" />
<!-- open file in this.such as lua --> <!-- open file in this.such as lua -->
<add key="open_file_in_this" value="true" /> <add key="open_file_in_this" value="true" />
<!-- check update when opening application automatically --> <!-- check update when opening application automatically -->
<add key="auto_check_update" value="true" /> <add key="auto_check_update" value="true" />
<!-- Cut Images Setting --> <!-- Cut Images Setting -->
<add key="image_quilty" value="100" /> <add key="image_quilty" value="100" />
<add key="image" value="44,64,177,254" /> <add key="image" value="44,64,177,254" />
<add key="image_other" value="25,54,128,128" /> <add key="image_other" value="25,54,128,128" />
<add key="image_xyz" value="24,51,128,128" /> <add key="image_xyz" value="24,51,128,128" />
<add key="image_pendulum" value="14,46,149,120" /> <add key="image_pendulum" value="14,46,149,120" />
<!-- CodeEdiotr Setting <!-- CodeEdiotr Setting
IME = true 使用輸入法，正常顯示文字，反應變慢 IME = true 使用輸入法，正常顯示文字，反應變慢
IME = false English IME = false English
--> -->
<add key="IME" value="false" /> <add key="IME" value="false" />
<add key="wordwrap" value="true" /> <add key="wordwrap" value="true" />
<add key="tabisspace" value="false" /> <add key="tabisspace" value="false" />
<add key="fontname" value="Consolas" /> <add key="fontname" value="Consolas" />
<add key="fontsize" value="14.5" /> <add key="fontsize" value="14.5" />
</appSettings> </appSettings>
</configuration> </configuration>
\ No newline at end of file
win32/changed.txt
View file @ 38ae3542
★更新历史 ★更新历史
2.3.1.3
优化复制卡片的撤销
2.3.1.2 2.3.1.2
修复bug：向空数据库复制卡片报错 修复bug：向空数据库复制卡片报错
2.3.1.1 2.3.1.1
......
win32/readme.txt
View file @ 38ae3542
[DataEditorX]2.3.1.2[DataEditorX] [DataEditorX]2.3.1.3[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)
......
win32/win32.zip
View file @ 38ae3542
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