diff --git a/Bin/Debug/VSoft/VSoft.dll b/Bin/Debug/VSoft/VSoft.dll index d1e1a40..0a60df7 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 3bbc61d..ef045cf 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 e7866ae..c432781 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ -### 2022-02-10更新 +### 2022-02-20更新 +------ +#### VSoft V1.0.2202.2001 +- *.[改进]删除鼠标移上去提示功能。 + +### 2022-02-10更新 ------ #### VSoft V1.0.2202.1001 - *.[改进]优化点击分组时的卡顿问题。 diff --git a/Source/.vs/VSoft/FileContentIndex/56760e46-0f6c-4184-94de-4f88f3d6cb9d.vsidx b/Source/.vs/VSoft/FileContentIndex/56760e46-0f6c-4184-94de-4f88f3d6cb9d.vsidx new file mode 100644 index 0000000..effaf09 Binary files /dev/null and b/Source/.vs/VSoft/FileContentIndex/56760e46-0f6c-4184-94de-4f88f3d6cb9d.vsidx differ diff --git a/Source/.vs/VSoft/FileContentIndex/7a50249d-4387-4ee4-b462-f3692c4981e3.vsidx b/Source/.vs/VSoft/FileContentIndex/7a50249d-4387-4ee4-b462-f3692c4981e3.vsidx deleted file mode 100644 index e8b13ca..0000000 Binary files a/Source/.vs/VSoft/FileContentIndex/7a50249d-4387-4ee4-b462-f3692c4981e3.vsidx and /dev/null differ diff --git a/Source/.vs/VSoft/v17/.suo b/Source/.vs/VSoft/v17/.suo index 3eb8b31..5d8e99b 100644 Binary files a/Source/.vs/VSoft/v17/.suo and b/Source/.vs/VSoft/v17/.suo differ diff --git a/Source/VSoft_Dll/FrmVSoft.Designer.cs b/Source/VSoft_Dll/FrmVSoft.Designer.cs index d986fe5..1d94a3c 100644 --- a/Source/VSoft_Dll/FrmVSoft.Designer.cs +++ b/Source/VSoft_Dll/FrmVSoft.Designer.cs @@ -427,7 +427,6 @@ this.IconViewEx1.SelectedForeColor = System.Drawing.Color.Black; this.IconViewEx1.SelectedStartBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(251)))), ((int)(((byte)(237))))); this.IconViewEx1.ShowGroups = false; - this.IconViewEx1.ShowItemToolTips = true; this.IconViewEx1.Size = new System.Drawing.Size(650, 467); this.IconViewEx1.TabIndex = 0; this.IconViewEx1.TextHeight = 20; diff --git a/Source/VSoft_Dll/FrmVSoft.cs b/Source/VSoft_Dll/FrmVSoft.cs index d544867..83a6567 100644 --- a/Source/VSoft_Dll/FrmVSoft.cs +++ b/Source/VSoft_Dll/FrmVSoft.cs @@ -28,7 +28,7 @@ namespace VSoft prog_args = args; //配置软件信息 notifyIcon1.Text = Config.Soft_Info.Soft_Title; - Text = Config.Soft_Info.Soft_Title + " V" + RySoft.VersionStr; + Text = Config.Soft_Info.Soft_Title + " V" + RySoft.GetVersionStr(Application.ExecutablePath); #if TEST Text +=" V内部测试版"; #endif @@ -126,16 +126,18 @@ namespace VSoft for (int i = 0; i < ds.Tables[0].Rows.Count; i++) { DataRow row = ds.Tables[0].Rows[i]; - SoftInfo info = new SoftInfo(); - info.Id = row["id"].ToInt(); - info.SoftType = row["SoftType"].ToInt(); - info.ColumnId = row["ColumnId"].ToInt(); - info.Name = row["Name"].ToString(); - info.Path = row["Path"].ToString(); - info.RunPram = row["RunPram"].ToString(); - info.SetJson = row["SetJson"].ToString(); - info.StartPath= row["StartPath"].ToString(); - info.IconPath = row["IconPath"].ToString(); + SoftInfo info = new SoftInfo + { + Id = row["id"].ToInt(), + SoftType = row["SoftType"].ToInt(), + ColumnId = row["ColumnId"].ToInt(), + Name = row["Name"].ToString(), + Path = row["Path"].ToString(), + RunPram = row["RunPram"].ToString(), + SetJson = row["SetJson"].ToString(), + StartPath = row["StartPath"].ToString(), + IconPath = row["IconPath"].ToString() + }; string img_path; if (info.IconPath.Length == 0) { @@ -294,7 +296,7 @@ namespace VSoft 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(); + VSoft.Prams.Itrycn_Db.CreateTable(); var dbver = Itrycn_Db.GetDbVer(); if (dbver == 2) //当前要求的数据库 { @@ -1732,7 +1734,14 @@ namespace VSoft if (lvi != null && lvi != currentItem) { currentItem = lvi; - lvTp.Show(lvi.Text, IconViewEx1, e.Location); + if (lvi.Text.Length > 10) + { + lvTp.Show(lvi.Text, IconViewEx1, e.Location); + } + else + { + lvTp.Hide(IconViewEx1); + } } else if (lvi == null) { diff --git a/Source/VSoft_Dll/FrmVSoft.resx b/Source/VSoft_Dll/FrmVSoft.resx index b1e11b0..8db5b61 100644 --- a/Source/VSoft_Dll/FrmVSoft.resx +++ b/Source/VSoft_Dll/FrmVSoft.resx @@ -124,7 +124,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAYRJREFUOE+NkztPwlAUx8/gakIYWFwYHB1w8FUQCEpI1KiTYpSHQVQisviYjZsJ + wQAADsEBuJFr7QAAAYRJREFUOE+NkztPwlAUx8/gakIYWFwYHB1w8FUQCEpI1KiTYpSHQVQisviYjZsJ k4OJMT6ILhgTFheDiongc4AP4HdgcO/xnPZWaG81/JN/Qu49v1972wJ2iUQiQWqFiqL82yO2/w4Nuann DA3MrqMrWcDaSRB30uOGiPfcYrwVWuQr1HnIPxXFnsQxQvYDYeMd1Scf1Yt3hwGMz4UNEc9WBK4JsHfx AJ0r1wibBAoYMizwolpR9D6OYOPCh5f7AU0kcF0AuU8JhsybCVYfhvXeD9kIbGBYEwILrJYHZYEzVZRg @@ -137,7 +137,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAIpJREFUOE/tktEGxDAQRef/v6NLly5dQpfQtSXkixJJHu661R36NC/70NJhiDnH + wQAADsEBuJFr7QAAAIpJREFUOE/tktEGxDAQRef/v6NLly5dQpfQtSXkixJJHu661R36NC/70NJhiDnH mImRv0SMESEELJ8F73mG9x6vacKGTS6ErbVdOudUsLiwM4s55zX5fo6jChYXjvUTUkqoteIxDCpYXLgT BSZhKQX3vlfB4sIP4U4ci50Jb12ngsUPENcdnPsORL5USPZgYQ6cHAAAAABJRU5ErkJggg== @@ -182,7 +182,7 @@ iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL - EQAACxEBf2RfkQAABvRJREFUeF7tnE2IHEUUxwcjIjkE1JMREnMWD7phd7uzfuBJEPSkd0+55BLQc9ds + EAAACxABrSO9dQAABvRJREFUeF7tnE2IHEUUxwcjIjkE1JMREnMWD7phd7uzfuBJEPSkd0+55BLQc9ds ooIXT+bix8kgbtSYgxA1hsWLImLAPYTEXBRUNGiMEojpnpTvdWpIT2/Nm+6e7uqerv+DH0tPVfVs7/t1 ffTHDopEoPS9QTQ6FKrkbKjiC/TzCqFBp6CcpLk5G6h4GK7rYKD0HSaF1WL5iN4XqOR4ECU3cl8GFoAg ii8eWNePmXQWjyWld4ZRcox2kuR3ChYPOonfeVLpu0165TgQ6d3UlWzZdgQWF+oNvufcmjTbIzyq99KZ diff --git a/Source/VSoft_Dll/Prams/Itrycn_Db.cs b/Source/VSoft_Dll/Prams/Itrycn_Db.cs index c821e1e..69d00d5 100644 --- a/Source/VSoft_Dll/Prams/Itrycn_Db.cs +++ b/Source/VSoft_Dll/Prams/Itrycn_Db.cs @@ -199,7 +199,6 @@ namespace VSoft.Prams } public static void CreateSysTable(DataProvider.DataProviderType dataType, string ConnStr) { - DataProvider mydb = new DataProvider(); IDbInterface db = CreateDataProvider(dataType); if (db.ConnDb(ConnStr) == 1) { diff --git a/Source/VSoft_Dll/Properties/AssemblyInfo.cs b/Source/VSoft_Dll/Properties/AssemblyInfo.cs index 1069393..3c0950e 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.1001")] -[assembly: AssemblyFileVersion("1.0.2202.1001")] \ No newline at end of file +[assembly: AssemblyVersion("1.0.2202.2001")] +[assembly: AssemblyFileVersion("1.0.2202.2001")] \ No newline at end of file