diff --git a/Bin/Debug/VSoft/DyLine.exe b/Bin/Debug/VSoft/DyLine.exe index 97e1b67..1b4dc29 100644 Binary files a/Bin/Debug/VSoft/DyLine.exe and b/Bin/Debug/VSoft/DyLine.exe differ diff --git a/Bin/Debug/VSoft/UserDb/Softs.dat b/Bin/Debug/VSoft/UserDb/Softs.dat index a51fdb4..93763f8 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/VSoft.dll b/Bin/Debug/VSoft/VSoft.dll index 33a3ed5..0e12434 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 a225bc4..3ca1466 100644 Binary files a/Bin/Debug/VSoft/VSoftBox.exe and b/Bin/Debug/VSoft/VSoftBox.exe differ diff --git a/Bin/Debug/VSoft/cUpdate.dat b/Bin/Debug/VSoft/cUpdate.dat index b0d51bb..0932e98 100644 --- a/Bin/Debug/VSoft/cUpdate.dat +++ b/Bin/Debug/VSoft/cUpdate.dat @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 206b8be..b645dbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ -### 2020-12-27 dev更新 +### 2021-01-24 dev更新 +------ +#### VSoft V1.0.2101.2401 +- *.[新增]新增图片缓存功能,提高列表加载速度 + +### 2020-12-27 dev更新 ------ #### VSoft V1.0.2012.2702 - *.[修复]修复按热键或鼠标显示主界面,有时无法获得焦点的BUG。 diff --git a/Source/.vs/VSoft/v16/.suo b/Source/.vs/VSoft/v16/.suo index f597a9f..970028a 100644 Binary files a/Source/.vs/VSoft/v16/.suo and b/Source/.vs/VSoft/v16/.suo differ diff --git a/Source/VSoftBox/Properties/AssemblyInfo.cs b/Source/VSoftBox/Properties/AssemblyInfo.cs index 92c8a8d..56f2316 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.2012.2702")] -[assembly: AssemblyFileVersion("1.0.2012.2702")] \ No newline at end of file +[assembly: AssemblyVersion("1.0.2101.2401")] +[assembly: AssemblyFileVersion("1.0.2101.2401")] \ No newline at end of file diff --git a/Source/VSoft_Dll/FrmAbout.Designer.cs b/Source/VSoft_Dll/FrmAbout.Designer.cs index 35948d8..38494f5 100644 --- a/Source/VSoft_Dll/FrmAbout.Designer.cs +++ b/Source/VSoft_Dll/FrmAbout.Designer.cs @@ -42,6 +42,7 @@ this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.label3 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); this.pnlTopLogo.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); @@ -142,7 +143,7 @@ // this.label3.AutoSize = true; this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.label3.Location = new System.Drawing.Point(13, 297); + this.label3.Location = new System.Drawing.Point(12, 322); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(365, 12); this.label3.TabIndex = 18; @@ -158,12 +159,23 @@ this.label6.TabIndex = 19; this.label6.Text = "支持微信或支付宝进行捐助,您可以捐助任意金额"; // + // label7 + // + this.label7.AutoSize = true; + this.label7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.label7.Location = new System.Drawing.Point(13, 300); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(311, 12); + this.label7.TabIndex = 20; + this.label7.Text = "注:本软件使用了Newtonsoft.Json、Gdu.WinformUI等组件"; + // // FrmAbout // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.White; - this.ClientSize = new System.Drawing.Size(493, 318); + this.ClientSize = new System.Drawing.Size(493, 343); + this.Controls.Add(this.label7); this.Controls.Add(this.label6); this.Controls.Add(this.label3); this.Controls.Add(this.pictureBox1); @@ -203,5 +215,6 @@ private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label7; } } \ No newline at end of file diff --git a/Source/VSoft_Dll/FrmVSoft.Designer.cs b/Source/VSoft_Dll/FrmVSoft.Designer.cs index da3fc72..ceff866 100644 --- a/Source/VSoft_Dll/FrmVSoft.Designer.cs +++ b/Source/VSoft_Dll/FrmVSoft.Designer.cs @@ -59,20 +59,22 @@ this.设置ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.退出软件ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.LblSetting = new System.Windows.Forms.Label(); - this.TabList_Type = new ryControls.TabList(); - this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.TabList_Column = new ryControls.TabList(); this.rySearch1 = new ryControls.rySearch(); this.panelEx1 = new ryControls.PanelEx(); this.LblEmpty = new System.Windows.Forms.Label(); this.IconViewEx1 = new ryControls.IconViewEx(); this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.PnlLeft = new System.Windows.Forms.Panel(); + this.TabList_Type = new ryControls.TabList(); + this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.TabList_Column = new ryControls.TabList(); this.MenuList.SuspendLayout(); this.MenuTabColumn.SuspendLayout(); this.MenuTabType.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.MenuTray.SuspendLayout(); this.panelEx1.SuspendLayout(); + this.PnlLeft.SuspendLayout(); this.SuspendLayout(); // // MenuList @@ -219,10 +221,11 @@ // // pictureBox1 // + this.pictureBox1.BackColor = System.Drawing.Color.Transparent; this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(4, 3); + this.pictureBox1.Location = new System.Drawing.Point(3, 2); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(80, 60); + this.pictureBox1.Size = new System.Drawing.Size(75, 60); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBox1.TabIndex = 5; this.pictureBox1.TabStop = false; @@ -302,81 +305,6 @@ this.LblSetting.Text = "设置"; this.LblSetting.Click += new System.EventHandler(this.LblSetting_Click); // - // TabList_Type - // - this.TabList_Type.AllowDrop = true; - this.TabList_Type.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.TabList_Type.BackColor = System.Drawing.SystemColors.Control; - this.TabList_Type.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.TabList_Type.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.columnHeader2}); - this.TabList_Type.ContextMenuStrip = this.MenuTabType; - this.TabList_Type.HideSelection = false; - this.TabList_Type.Icon = null; - this.TabList_Type.IsDrawGridLines = false; - this.TabList_Type.IsDrawIcon = false; - this.TabList_Type.Location = new System.Drawing.Point(4, 65); - this.TabList_Type.Margin = new System.Windows.Forms.Padding(0); - this.TabList_Type.MultiSelect = false; - this.TabList_Type.Name = "TabList_Type"; - this.TabList_Type.OwnerDraw = true; - this.TabList_Type.Scrollable = false; - this.TabList_Type.SelectedBorderColor = System.Drawing.Color.LightSkyBlue; - this.TabList_Type.SelectedEndBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(236)))), ((int)(((byte)(181))))); - this.TabList_Type.SelectedForeColor = System.Drawing.Color.Black; - this.TabList_Type.SelectedStartBackColor = System.Drawing.Color.LightSkyBlue; - this.TabList_Type.Size = new System.Drawing.Size(77, 445); - this.TabList_Type.TabIndex = 4; - this.TabList_Type.TileSize = new System.Drawing.Size(77, 28); - this.TabList_Type.UseCompatibleStateImageBehavior = false; - this.TabList_Type.View = System.Windows.Forms.View.Tile; - this.TabList_Type.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.TabList_Type_ItemDrag); - this.TabList_Type.SelectedIndexChanged += new System.EventHandler(this.TabList_Type_SelectedIndexChanged); - this.TabList_Type.DragDrop += new System.Windows.Forms.DragEventHandler(this.TabList_Type_DragDrop); - this.TabList_Type.DragEnter += new System.Windows.Forms.DragEventHandler(this.TabList_Type_DragEnter); - this.TabList_Type.DragOver += new System.Windows.Forms.DragEventHandler(this.IconViewEx1_DragOver); - this.TabList_Type.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TabList_Type_KeyDown); - // - // columnHeader2 - // - this.columnHeader2.Width = 80; - // - // TabList_Column - // - this.TabList_Column.Alignment = System.Windows.Forms.ListViewAlignment.Left; - this.TabList_Column.AllowDrop = true; - this.TabList_Column.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.TabList_Column.BackColor = System.Drawing.SystemColors.Control; - this.TabList_Column.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.TabList_Column.ContextMenuStrip = this.MenuTabColumn; - this.TabList_Column.HideSelection = false; - this.TabList_Column.Icon = null; - this.TabList_Column.IsDrawGridLines = false; - this.TabList_Column.IsDrawIcon = false; - this.TabList_Column.Location = new System.Drawing.Point(87, 34); - this.TabList_Column.Margin = new System.Windows.Forms.Padding(0); - this.TabList_Column.MultiSelect = false; - this.TabList_Column.Name = "TabList_Column"; - this.TabList_Column.OwnerDraw = true; - this.TabList_Column.Scrollable = false; - this.TabList_Column.SelectedBorderColor = System.Drawing.Color.LightSkyBlue; - this.TabList_Column.SelectedEndBackColor = System.Drawing.Color.SkyBlue; - this.TabList_Column.SelectedForeColor = System.Drawing.Color.Black; - this.TabList_Column.SelectedStartBackColor = System.Drawing.Color.PowderBlue; - this.TabList_Column.Size = new System.Drawing.Size(589, 29); - this.TabList_Column.TabIndex = 1; - this.TabList_Column.TileSize = new System.Drawing.Size(70, 30); - this.TabList_Column.UseCompatibleStateImageBehavior = false; - this.TabList_Column.View = System.Windows.Forms.View.Tile; - this.TabList_Column.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.TabList_Column_ItemDrag); - this.TabList_Column.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.TabList_Column_ItemSelectionChanged); - this.TabList_Column.DragDrop += new System.Windows.Forms.DragEventHandler(this.TabList_Column_DragDrop); - this.TabList_Column.DragEnter += new System.Windows.Forms.DragEventHandler(this.TabList_Column_DragEnter); - this.TabList_Column.DragOver += new System.Windows.Forms.DragEventHandler(this.IconViewEx1_DragOver); - this.TabList_Column.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TabList_Column_KeyDown); - // // rySearch1 // this.rySearch1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(239)))), ((int)(((byte)(244))))); @@ -458,15 +386,103 @@ this.IconViewEx1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.IconViewEx1_MouseDoubleClick); this.IconViewEx1.Resize += new System.EventHandler(this.IconViewEx1_Resize); // + // PnlLeft + // + this.PnlLeft.BackColor = System.Drawing.Color.WhiteSmoke; + this.PnlLeft.Controls.Add(this.pictureBox1); + this.PnlLeft.Controls.Add(this.TabList_Type); + this.PnlLeft.Dock = System.Windows.Forms.DockStyle.Left; + this.PnlLeft.Location = new System.Drawing.Point(0, 0); + this.PnlLeft.Name = "PnlLeft"; + this.PnlLeft.Size = new System.Drawing.Size(81, 525); + this.PnlLeft.TabIndex = 8; + // + // TabList_Type + // + this.TabList_Type.AllowDrop = true; + this.TabList_Type.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.TabList_Type.BackColor = System.Drawing.Color.WhiteSmoke; + this.TabList_Type.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.TabList_Type.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.columnHeader2}); + this.TabList_Type.ContextMenuStrip = this.MenuTabType; + this.TabList_Type.ForeColor = System.Drawing.Color.Black; + this.TabList_Type.HideSelection = false; + this.TabList_Type.Icon = null; + this.TabList_Type.IsDrawGridLines = false; + this.TabList_Type.IsDrawIcon = false; + this.TabList_Type.Location = new System.Drawing.Point(3, 63); + this.TabList_Type.Margin = new System.Windows.Forms.Padding(0); + this.TabList_Type.MultiSelect = false; + this.TabList_Type.Name = "TabList_Type"; + this.TabList_Type.OwnerDraw = true; + this.TabList_Type.Scrollable = false; + this.TabList_Type.SelectedBorderColor = System.Drawing.Color.LightSkyBlue; + this.TabList_Type.SelectedEndBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(236)))), ((int)(((byte)(181))))); + this.TabList_Type.SelectedForeColor = System.Drawing.Color.Black; + this.TabList_Type.SelectedStartBackColor = System.Drawing.Color.LightSkyBlue; + this.TabList_Type.Size = new System.Drawing.Size(77, 460); + this.TabList_Type.TabIndex = 4; + this.TabList_Type.TileSize = new System.Drawing.Size(77, 28); + this.TabList_Type.UseCompatibleStateImageBehavior = false; + this.TabList_Type.View = System.Windows.Forms.View.Tile; + this.TabList_Type.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.TabList_Type_ItemDrag); + this.TabList_Type.SelectedIndexChanged += new System.EventHandler(this.TabList_Type_SelectedIndexChanged); + this.TabList_Type.DragDrop += new System.Windows.Forms.DragEventHandler(this.TabList_Type_DragDrop); + this.TabList_Type.DragEnter += new System.Windows.Forms.DragEventHandler(this.TabList_Type_DragEnter); + this.TabList_Type.DragOver += new System.Windows.Forms.DragEventHandler(this.IconViewEx1_DragOver); + this.TabList_Type.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TabList_Type_KeyDown); + // + // columnHeader2 + // + this.columnHeader2.Width = 80; + // + // TabList_Column + // + this.TabList_Column.Alignment = System.Windows.Forms.ListViewAlignment.Left; + this.TabList_Column.AllowDrop = true; + this.TabList_Column.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.TabList_Column.BackColor = System.Drawing.Color.WhiteSmoke; + this.TabList_Column.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.TabList_Column.ContextMenuStrip = this.MenuTabColumn; + this.TabList_Column.HideSelection = false; + this.TabList_Column.Icon = null; + this.TabList_Column.IsDrawGridLines = false; + this.TabList_Column.IsDrawIcon = false; + this.TabList_Column.Location = new System.Drawing.Point(87, 34); + this.TabList_Column.Margin = new System.Windows.Forms.Padding(0); + this.TabList_Column.MultiSelect = false; + this.TabList_Column.Name = "TabList_Column"; + this.TabList_Column.OwnerDraw = true; + this.TabList_Column.Scrollable = false; + this.TabList_Column.SelectedBorderColor = System.Drawing.Color.LightSkyBlue; + this.TabList_Column.SelectedEndBackColor = System.Drawing.Color.SkyBlue; + this.TabList_Column.SelectedForeColor = System.Drawing.Color.Black; + this.TabList_Column.SelectedStartBackColor = System.Drawing.Color.PowderBlue; + this.TabList_Column.Size = new System.Drawing.Size(589, 29); + this.TabList_Column.TabIndex = 1; + this.TabList_Column.TileSize = new System.Drawing.Size(70, 30); + this.TabList_Column.UseCompatibleStateImageBehavior = false; + this.TabList_Column.View = System.Windows.Forms.View.Tile; + this.TabList_Column.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.TabList_Column_ItemDrag); + this.TabList_Column.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.TabList_Column_ItemSelectionChanged); + this.TabList_Column.DragDrop += new System.Windows.Forms.DragEventHandler(this.TabList_Column_DragDrop); + this.TabList_Column.DragEnter += new System.Windows.Forms.DragEventHandler(this.TabList_Column_DragEnter); + this.TabList_Column.DragOver += new System.Windows.Forms.DragEventHandler(this.IconViewEx1_DragOver); + this.TabList_Column.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TabList_Column_KeyDown); + // // FrmVSoft // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.WhiteSmoke; this.ClientSize = new System.Drawing.Size(722, 525); + this.Controls.Add(this.PnlLeft); this.Controls.Add(this.LblSetting); this.Controls.Add(this.LblDrag); - this.Controls.Add(this.pictureBox1); - this.Controls.Add(this.TabList_Type); this.Controls.Add(this.BtnAddColumn); this.Controls.Add(this.TabList_Column); this.Controls.Add(this.rySearch1); @@ -487,6 +503,7 @@ this.MenuTray.ResumeLayout(false); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); + this.PnlLeft.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -531,5 +548,6 @@ private System.Windows.Forms.ToolStripMenuItem 添加栏目ToolStripMenuItem; private System.Windows.Forms.Label LblEmpty; private System.Windows.Forms.Label LblSetting; + private System.Windows.Forms.Panel PnlLeft; } } \ No newline at end of file diff --git a/Source/VSoft_Dll/FrmVSoft.cs b/Source/VSoft_Dll/FrmVSoft.cs index 844835a..8278b98 100644 --- a/Source/VSoft_Dll/FrmVSoft.cs +++ b/Source/VSoft_Dll/FrmVSoft.cs @@ -78,6 +78,7 @@ namespace VSoft { LoadDb(false); } + Dictionary dictCacheImg = new Dictionary(); private void LoadDb(bool isSearch) { IconViewEx1.Items.Clear(); @@ -119,13 +120,23 @@ namespace VSoft info.SetJson = row["SetJson"].ToString(); info.StartPath= row["StartPath"].ToString(); info.IconPath = row["IconPath"].ToString(); + string img_path; if (info.IconPath.Length == 0) { - info.Image = API.GetImg(info.TruePath,128); + img_path = info.TruePath; } else { - info.Image = API.GetImg(RyFiles.GetRealPath(row["IconPath"].ToString()),128); + img_path = RyFiles.GetRealPath(row["IconPath"].ToString()); + } + if(dictCacheImg.ContainsKey(img_path)) + { + info.Image = dictCacheImg[img_path]; + } + else + { + info.Image = API.GetImg(img_path, 128); + dictCacheImg.Add(img_path, info.Image); } IconViewEx1.Items.Add(info.Name).Tag = info ; } diff --git a/Source/VSoft_Dll/Properties/AssemblyInfo.cs b/Source/VSoft_Dll/Properties/AssemblyInfo.cs index c924df2..a1dfbee 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.2012.2702")] -[assembly: AssemblyFileVersion("1.0.2012.2702")] \ No newline at end of file +[assembly: AssemblyVersion("1.0.2101.2401")] +[assembly: AssemblyFileVersion("1.0.2101.2401")] \ No newline at end of file