zilinsoft/VSoft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

### 2021-10-18更新

Browse Source 
------
#### VSoft    V1.0.2110.1801
- *.[修复]修复在流程软件目录下，无法准确获取数据库目录的BUG。
This commit is contained in:
鑫Intel 2021-10-19 08:33:09 +08:00
parent 574e29870d
commit a4462136c9
19 changed files with 104 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Bin/Debug/VSoft/DyLine.exe
View File

Binary file not shown.

BIN
Bin/Debug/VSoft/MyDb.dll
View File

Binary file not shown.

20
Bin/Debug/VSoft/MyDb.xml
View File

@ -9265,11 +9265,31 @@
Ctrl键
</summary>
</member>
<member name="F:SysFuns.KeyModifiers.AltAndCtrl">
<summary>
Alt+Ctrl键
</summary>
</member>
<member name="F:SysFuns.KeyModifiers.Shift">
<summary>
Shift键
</summary>
</member>
<member name="F:SysFuns.KeyModifiers.AltAndShift">
<summary>
Shift+Alt键
</summary>
</member>
<member name="F:SysFuns.KeyModifiers.CtrlAndShift">
<summary>
Shift+Ctrl键
</summary>
</member>
<member name="F:SysFuns.KeyModifiers.AltAndCtrlAndShift">
<summary>
Alt+Shift+Ctrl键
</summary>
</member>
<member name="F:SysFuns.KeyModifiers.WindowsKey">
<summary>
Win键

BIN
Bin/Debug/VSoft/MyDb_SQLite.dll
View File

Binary file not shown.

BIN
Bin/Debug/VSoft/UserDb/Softs.dat
View File

Binary file not shown.

2
Bin/Debug/VSoft/UserDb/Win.dat
View File

@ -1,5 +1,5 @@
[VSoft]
hwnd=8193010
hwnd=207838
width=745
height=543
[VSoft_Test]

BIN
Bin/Debug/VSoft/VSoft.dll
View File

Binary file not shown.

BIN
Bin/Debug/VSoft/VSoftBox.exe
View File

Binary file not shown.

BIN
Bin/Debug/VSoft/ryControls.dll
View File

Binary file not shown.

BIN
Bin/Debug/VSoft/ryUpdate.dll
View File

Binary file not shown.

13
CHANGELOG.md
View File

@ -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
- *.[新增]新增支持设置软件全局快捷键。

BIN
Source/.vs/VSoft/v17/.suo
View File

Binary file not shown.

4
Source/DyLine/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.0")]
[assembly: AssemblyVersion("2.0.2110.1801")]
[assembly: AssemblyFileVersion("2.0.2110.1801")]

4
Source/VSoftBox/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.2110.0801")]
[assembly: AssemblyFileVersion("1.0.2110.0801")]
[assembly: AssemblyVersion("1.0.2110.1801")]
[assembly: AssemblyFileVersion("1.0.2110.1801")]

12
Source/VSoft_Dll/FrmAddSoft.cs
View File

@ -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);

20
Source/VSoft_Dll/FrmAddType.cs
View File

@ -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);

2
Source/VSoft_Dll/FrmInCMD.cs
View File

@ -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();

2
Source/VSoft_Dll/FrmVSoft.cs
View File

@ -291,6 +291,8 @@ 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);
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) //当前要求的数据库

4
Source/VSoft_Dll/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.2110.0801")]
[assembly: AssemblyFileVersion("1.0.2110.0801")]
[assembly: AssemblyVersion("1.0.2110.1801")]
[assembly: AssemblyFileVersion("1.0.2110.1801")]