diff --git a/Bin/Debug/VSoft/DyLine.exe b/Bin/Debug/VSoft/DyLine.exe
index 474237d..cb8627e 100644
Binary files a/Bin/Debug/VSoft/DyLine.exe and b/Bin/Debug/VSoft/DyLine.exe differ
diff --git a/Bin/Debug/VSoft/MyDb.dll b/Bin/Debug/VSoft/MyDb.dll
index 4e9d921..266b39a 100644
Binary files a/Bin/Debug/VSoft/MyDb.dll and b/Bin/Debug/VSoft/MyDb.dll differ
diff --git a/Bin/Debug/VSoft/MyDb.xml b/Bin/Debug/VSoft/MyDb.xml
index c8b08d3..ea007d1 100644
--- a/Bin/Debug/VSoft/MyDb.xml
+++ b/Bin/Debug/VSoft/MyDb.xml
@@ -9265,11 +9265,31 @@
Ctrl键
+
+
+ Alt+Ctrl键
+
+
Shift键
+
+
+ Shift+Alt键
+
+
+
+
+ Shift+Ctrl键
+
+
+
+
+ Alt+Shift+Ctrl键
+
+
Win键
diff --git a/Bin/Debug/VSoft/MyDb_SQLite.dll b/Bin/Debug/VSoft/MyDb_SQLite.dll
index 2b0d8ee..c1ad16d 100644
Binary files a/Bin/Debug/VSoft/MyDb_SQLite.dll and b/Bin/Debug/VSoft/MyDb_SQLite.dll differ
diff --git a/Bin/Debug/VSoft/UserDb/Softs.dat b/Bin/Debug/VSoft/UserDb/Softs.dat
index d8ff16f..e573eb7 100644
Binary files a/Bin/Debug/VSoft/UserDb/Softs.dat and b/Bin/Debug/VSoft/UserDb/Softs.dat differ
diff --git a/Bin/Debug/VSoft/UserDb/Win.dat b/Bin/Debug/VSoft/UserDb/Win.dat
index 2f7a2c1..00323a1 100644
--- a/Bin/Debug/VSoft/UserDb/Win.dat
+++ b/Bin/Debug/VSoft/UserDb/Win.dat
@@ -1,5 +1,5 @@
[VSoft]
-hwnd=8193010
+hwnd=207838
width=745
height=543
[VSoft_Test]
diff --git a/Bin/Debug/VSoft/VSoft.dll b/Bin/Debug/VSoft/VSoft.dll
index b96abfe..de28d31 100644
Binary files a/Bin/Debug/VSoft/VSoft.dll and b/Bin/Debug/VSoft/VSoft.dll differ
diff --git a/Bin/Debug/VSoft/VSoftBox.exe b/Bin/Debug/VSoft/VSoftBox.exe
index f9ba86a..4559fc0 100644
Binary files a/Bin/Debug/VSoft/VSoftBox.exe and b/Bin/Debug/VSoft/VSoftBox.exe differ
diff --git a/Bin/Debug/VSoft/ryControls.dll b/Bin/Debug/VSoft/ryControls.dll
index 4c3d665..e62362f 100644
Binary files a/Bin/Debug/VSoft/ryControls.dll and b/Bin/Debug/VSoft/ryControls.dll differ
diff --git a/Bin/Debug/VSoft/ryUpdate.dll b/Bin/Debug/VSoft/ryUpdate.dll
index b50988c..7cb5fa1 100644
Binary files a/Bin/Debug/VSoft/ryUpdate.dll and b/Bin/Debug/VSoft/ryUpdate.dll differ
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b09063..bd4f341 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,19 @@
-### 2021-10-08更新
+### 2021-10-18更新
+------
+#### VSoft V1.0.2110.1801
+- *.[修复]修复在流程软件目录下，无法准确获取数据库目录的BUG。
+### 2021-10-09更新
+------
+#### VSoft V1.0.2110.0901
+- *.[修复]修复添加软件和添加分类时,相同热键依然能添加的BUG。
+
+### 2021-10-08更新
------
#### VSoft V1.0.2110.0801
- *.[新增]新增支持将分类绑定快捷键。
- *.[修复]修复新增软件后,热键可能设置不正确的BUG
-### 2021-09-07更新
+### 2021-09-07更新
------
#### VSoft V1.0.2109.0701
- *.[新增]新增支持设置软件全局快捷键。
diff --git a/Source/.vs/VSoft/v17/.suo b/Source/.vs/VSoft/v17/.suo
index 41c9abd..14a08fe 100644
Binary files a/Source/.vs/VSoft/v17/.suo and b/Source/.vs/VSoft/v17/.suo differ
diff --git a/Source/DyLine/Properties/AssemblyInfo.cs b/Source/DyLine/Properties/AssemblyInfo.cs
index 4458562..df7e8fc 100644
--- a/Source/DyLine/Properties/AssemblyInfo.cs
+++ b/Source/DyLine/Properties/AssemblyInfo.cs
@@ -1,36 +1,36 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// 有关程序集的一般信息由以下
-// 控制。更改这些特性值可修改
-// 与程序集关联的信息。
-[assembly: AssemblyTitle("当游命令行执行工具")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("DyLine")]
-[assembly: AssemblyCopyright("Copyright © 2021")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// 将 ComVisible 设置为 false 会使此程序集中的类型
-//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
-//请将此类型的 ComVisible 特性设置为 true。
-[assembly: ComVisible(false)]
-
-// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
-[assembly: Guid("8ee4505a-7d76-4209-85d5-274357a81fb8")]
-
-// 程序集的版本信息由下列四个值组成:
-//
-// 主版本
-// 次版本
-// 生成号
-// 修订号
-//
-//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
-//通过使用 "*"，如下所示:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("当游命令行执行工具")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("DyLine")]
+[assembly: AssemblyCopyright("Copyright © 2021")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
+[assembly: Guid("8ee4505a-7d76-4209-85d5-274357a81fb8")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
+//通过使用 "*"，如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("2.0.2110.1801")]
+[assembly: AssemblyFileVersion("2.0.2110.1801")]
\ No newline at end of file
diff --git a/Source/VSoftBox/Properties/AssemblyInfo.cs b/Source/VSoftBox/Properties/AssemblyInfo.cs
index 03ff88f..db9d0f7 100644
--- a/Source/VSoftBox/Properties/AssemblyInfo.cs
+++ b/Source/VSoftBox/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2110.0801")]
-[assembly: AssemblyFileVersion("1.0.2110.0801")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.0.2110.1801")]
+[assembly: AssemblyFileVersion("1.0.2110.1801")]
\ No newline at end of file
diff --git a/Source/VSoft_Dll/FrmAddSoft.cs b/Source/VSoft_Dll/FrmAddSoft.cs
index 14d15d1..637bae9 100644
--- a/Source/VSoft_Dll/FrmAddSoft.cs
+++ b/Source/VSoft_Dll/FrmAddSoft.cs
@@ -132,21 +132,23 @@ namespace VSoft
}
if (hotkeyTextBox1.HaveHotKey)
{
- var ds = db.ReadData("select * from " + tableName + " where Hotkey='" + hotkeyTextBox1.HotKey + "' and id<>" + SelectId + " limit 1");
- if (mydb.HaveData(ds))
+ var ds_soft = db.ReadData("select * from " + tableName + " where Hotkey='" + hotkeyTextBox1.HotKey + "' and id<>" + SelectId + " limit 1");
+ var ds_type = db.ReadData("select * from Columns where Hotkey='" + hotkeyTextBox1.HotKey + "' limit 1");
+ if (mydb.HaveData(ds_soft) || ds_type.HaveData())
{
Msg.ShowMsg("当前热键已经存在,请更换热键。", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
- ds.Dispose(); return;
+ ds_soft.Dispose(); ds_type.Dispose(); return;
}
else
{
if(Config.Soft_Config.IsHotKeyExistInList(hotkeyTextBox1.HotKey)>=0)
{
Msg.ShowMsg("当前热键已经存在,请更换热键。", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
- ds.Dispose(); return;
+ ds_soft.Dispose(); ds_type.Dispose(); return;
}
}
- ds.Dispose();
+ ds_soft.Dispose();
+ ds_type.Dispose();
}
RyQuickSQL mySQL = new RyQuickSQL(tableName);
mySQL.AddField("Name", TxtName.Text);
diff --git a/Source/VSoft_Dll/FrmAddType.cs b/Source/VSoft_Dll/FrmAddType.cs
index f6d0ed3..903f3dd 100644
--- a/Source/VSoft_Dll/FrmAddType.cs
+++ b/Source/VSoft_Dll/FrmAddType.cs
@@ -69,6 +69,26 @@ namespace VSoft
IDbInterface db = Itrycn_Db.CreateDataProvider(Itrycn_Db.dataType);
if (db.ConnDb(SQLConnStr) == 1)
{
+ if (hotkeyTextBox1.HaveHotKey)
+ {
+ var ds_type = db.ReadData("select * from " + tableName + " where Hotkey='" + hotkeyTextBox1.HotKey + "' and id<>" + SelectId + " limit 1");
+ var ds_soft = db.ReadData("select * from Softs where Hotkey='" + hotkeyTextBox1.HotKey + "' limit 1");
+ if (ds_soft.HaveData() || ds_type.HaveData())
+ {
+ Msg.ShowMsg("当前热键已经存在,请更换热键。", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ ds_soft.Dispose(); ds_type.Dispose(); return;
+ }
+ else
+ {
+ if (Config.Soft_Config.IsHotKeyExistInList(hotkeyTextBox1.HotKey) >= 0)
+ {
+ Msg.ShowMsg("当前热键已经存在,请更换热键。", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ ds_soft.Dispose(); ds_type.Dispose(); return;
+ }
+ }
+ ds_soft.Dispose();
+ ds_type.Dispose();
+ }
if (IsAdd >= 1)
{
mySQL.AddField("sortindex", Itrycn_Db.GetColumnCount(db, ParentId) + 1);
diff --git a/Source/VSoft_Dll/FrmInCMD.cs b/Source/VSoft_Dll/FrmInCMD.cs
index d643e19..21500e6 100644
--- a/Source/VSoft_Dll/FrmInCMD.cs
+++ b/Source/VSoft_Dll/FrmInCMD.cs
@@ -199,6 +199,8 @@ namespace VSoft
private void FrmVSoft_Load(object sender, EventArgs e)
{
Config.Soft_Info.UserDataFolder = ryCommon.RyFiles.GetRealPath(Config.Soft_Info.UserDataFolder);
+ Itrycn_Db.SQLConnStr = Config.Soft_Info.UserDataFolder + "\\Softs.dat|";
+ Itrycn_Db.SQLConnStr_Logs = Config.Soft_Info.UserDataFolder + "\\logs.dat|";
VSoft.Prams.Itrycn_Db.CreateTable();
VSoft.Config.Soft_Config.LoadSetting();
LoadColumn();
diff --git a/Source/VSoft_Dll/FrmVSoft.cs b/Source/VSoft_Dll/FrmVSoft.cs
index 7722a2a..4d23a84 100644
--- a/Source/VSoft_Dll/FrmVSoft.cs
+++ b/Source/VSoft_Dll/FrmVSoft.cs
@@ -291,7 +291,9 @@ namespace VSoft
MinimumSize = new Size(400, 200);
LblEmpty.Left =((panelEx1.Width - LblEmpty.Width) / 2);
Config.Soft_Info.UserDataFolder = ryCommon.RyFiles.GetRealPath(Config.Soft_Info.UserDataFolder);
- VSoft.Prams.Itrycn_Db.CreateTable();
+ Itrycn_Db.SQLConnStr = Soft_Info.UserDataFolder + "\\Softs.dat|";
+ Itrycn_Db.SQLConnStr_Logs = Soft_Info.UserDataFolder + "\\logs.dat|";
+ VSoft.Prams.Itrycn_Db.CreateTable();
var dbver = Itrycn_Db.GetDbVer();
if (dbver == 2) //当前要求的数据库
{
diff --git a/Source/VSoft_Dll/Properties/AssemblyInfo.cs b/Source/VSoft_Dll/Properties/AssemblyInfo.cs
index 800e592..7fed538 100644
--- a/Source/VSoft_Dll/Properties/AssemblyInfo.cs
+++ b/Source/VSoft_Dll/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2110.0801")]
-[assembly: AssemblyFileVersion("1.0.2110.0801")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.0.2110.1801")]
+[assembly: AssemblyFileVersion("1.0.2110.1801")]
\ No newline at end of file