diff --git a/.gitignore b/.gitignore index 758c1ca..6ef991c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ Res/ **/obj *.pdb **/dcu -*.dcu \ No newline at end of file +*.dcu +/Source/.vs diff --git a/Bin/Debug/VSoft/UserDb/Win.dat b/Bin/Debug/VSoft/UserDb/Win.dat index 804a0f3..7971cd4 100644 --- a/Bin/Debug/VSoft/UserDb/Win.dat +++ b/Bin/Debug/VSoft/UserDb/Win.dat @@ -1,5 +1,5 @@ [VSoft] -hwnd=334384 +hwnd=134844 width=745 height=543 [VSoft_Test] diff --git a/Bin/Debug/VSoft/VSoft.dll b/Bin/Debug/VSoft/VSoft.dll index 0a60df7..8bb721d 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 ef045cf..b4e53f6 100644 Binary files a/Bin/Debug/VSoft/VSoftBox.exe and b/Bin/Debug/VSoft/VSoftBox.exe differ diff --git a/CHANGELOG.md b/CHANGELOG.md index c432781..428cd3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ -### 2022-02-20更新 +### 2022-04-16更新 +------ +#### VSoft V1.0.2204.1601 +- *.[改进]启动时加载图标缓存,增加切换分组的流畅度。 + +### 2022-02-20更新 ------ #### VSoft V1.0.2202.2001 - *.[改进]删除鼠标移上去提示功能。 diff --git a/Source/.vs/VSoft/FileContentIndex/1bd87c0f-a77d-4b02-b5d0-695931121b1e.vsidx b/Source/.vs/VSoft/FileContentIndex/1bd87c0f-a77d-4b02-b5d0-695931121b1e.vsidx new file mode 100644 index 0000000..a2c7b00 Binary files /dev/null and b/Source/.vs/VSoft/FileContentIndex/1bd87c0f-a77d-4b02-b5d0-695931121b1e.vsidx differ diff --git a/Source/.vs/VSoft/FileContentIndex/56760e46-0f6c-4184-94de-4f88f3d6cb9d.vsidx b/Source/.vs/VSoft/FileContentIndex/56760e46-0f6c-4184-94de-4f88f3d6cb9d.vsidx deleted file mode 100644 index effaf09..0000000 Binary files a/Source/.vs/VSoft/FileContentIndex/56760e46-0f6c-4184-94de-4f88f3d6cb9d.vsidx and /dev/null differ diff --git a/Source/.vs/VSoft/FileContentIndex/fe8d70b1-5774-4ebb-bf87-0f77ae2b2c92.vsidx b/Source/.vs/VSoft/FileContentIndex/fe8d70b1-5774-4ebb-bf87-0f77ae2b2c92.vsidx new file mode 100644 index 0000000..7d840c7 Binary files /dev/null and b/Source/.vs/VSoft/FileContentIndex/fe8d70b1-5774-4ebb-bf87-0f77ae2b2c92.vsidx differ diff --git a/Source/.vs/VSoft/FileContentIndex/read.lock b/Source/.vs/VSoft/FileContentIndex/read.lock deleted file mode 100644 index e69de29..0000000 diff --git a/Source/.vs/VSoft/project-colors.json b/Source/.vs/VSoft/project-colors.json deleted file mode 100644 index ec420a4..0000000 --- a/Source/.vs/VSoft/project-colors.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "Version": 1, - "ProjectMap": { - "13c45e68-2da3-4c9e-9bca-e63d0fa9a760": { - "ProjectGuid": "13c45e68-2da3-4c9e-9bca-e63d0fa9a760", - "DisplayName": "VSoft", - "ColorIndex": 0 - }, - "8ee4505a-7d76-4209-85d5-274357a81fb8": { - "ProjectGuid": "8ee4505a-7d76-4209-85d5-274357a81fb8", - "DisplayName": "DyLine", - "ColorIndex": 1 - }, - "ca619284-2939-4a14-9525-30fd7c04adc7": { - "ProjectGuid": "ca619284-2939-4a14-9525-30fd7c04adc7", - "DisplayName": "VSoftBox", - "ColorIndex": 2 - } - }, - "NextColorIndex": 3 -} \ No newline at end of file diff --git a/Source/.vs/VSoft/v16/.suo b/Source/.vs/VSoft/v16/.suo deleted file mode 100644 index 712dfff..0000000 Binary files a/Source/.vs/VSoft/v16/.suo and /dev/null differ diff --git a/Source/.vs/VSoft/v17/.suo b/Source/.vs/VSoft/v17/.suo deleted file mode 100644 index 5d8e99b..0000000 Binary files a/Source/.vs/VSoft/v17/.suo and /dev/null differ diff --git a/Source/VSoft_Dll/FrmVSoft.cs b/Source/VSoft_Dll/FrmVSoft.cs index 83a6567..2ec917c 100644 --- a/Source/VSoft_Dll/FrmVSoft.cs +++ b/Source/VSoft_Dll/FrmVSoft.cs @@ -145,7 +145,7 @@ namespace VSoft } else { - img_path = RyFiles.GetRealPath(row["IconPath"].ToString()); + img_path = RyFiles.GetRealPath(info.IconPath); } if(dictCacheImg.ContainsKey(img_path)) { @@ -352,6 +352,35 @@ namespace VSoft hotkey = new SysFuns.WinHotReg(Handle); hotkey.OnHotkey += Hotkey_OnHotkey; RegisterHotkey(); + #region 加载图标缓存 + IDbInterface db2 = Itrycn_Db.CreateDataProvider(Itrycn_Db.dataType); + if (db2.ConnDb(SQLConnStr) == 1) + { + DataSet ds = db2.ReadData("select * from Softs"); + for (int i = 0; i < ds.Tables[0].Rows.Count; i++) + { + DataRow row = ds.Tables[0].Rows[i]; + var IconPath = row["IconPath"].ToString(); + var TruePath = RyFiles.GetRealPath(row["Path"].ToString()); + string img_path; + Image image; + if (IconPath.Length == 0) + { + img_path = TruePath; + } + else + { + img_path = RyFiles.GetRealPath(IconPath); + } + if (!dictCacheImg.ContainsKey(img_path)) + { + image = API.GetImg(img_path, 128); + dictCacheImg.Add(img_path, image); + } + } + } + db2.Free(); + #endregion ryCommon.RyRegedit.RegRoot = Microsoft.Win32.RegistryHive.CurrentUser; //如果开机启动没有启动 if(!ryCommon.RyRegedit.IsAutoRun(Soft_Info.Soft_Id, "\"" + Application.ExecutablePath.Replace("/", "\\") + "\" " + Soft_Info.Soft_Pram)) diff --git a/Source/VSoft_Dll/Properties/AssemblyInfo.cs b/Source/VSoft_Dll/Properties/AssemblyInfo.cs index 3c0950e..ba9e562 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.2202.2001")] -[assembly: AssemblyFileVersion("1.0.2202.2001")] \ No newline at end of file +[assembly: AssemblyVersion("1.0.2204.1601")] +[assembly: AssemblyFileVersion("1.0.2204.1601")] \ No newline at end of file