### 2021-03-04更新

------
#### VSoft    V1.0.2103.0401
- *.[新增]新增测试模式,测试模式下支持编辑内置命令。
- *.[修复]修复内置命令删除栏目时,内置命令没有同步删除的BUG。
#### VSoftBox    V1.0.2103.0401
- *.[删除]删除配置类,全部集合在VSoft.dll中。
This commit is contained in:
如果当时 2021-03-04 21:38:46 +08:00
parent 2eb38def50
commit b84dac3cb1
62 changed files with 145 additions and 108 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Binary file not shown.

View File

@ -1,4 +1,8 @@
[VSoft]
hwnd=399788
hwnd=659936
width=699
height=508
[VSoft_Test]
hwnd=399336
width=733
height=570

Binary file not shown.

Binary file not shown.

View File

@ -1,3 +1,3 @@
<root>
<list id="LastUpdateTime" Value="2021/2/28 16:44:50" />
<list id="LastUpdateTime" Value="2021/3/4 21:23:03" />
</root>

View File

@ -1,4 +1,13 @@
### 2021-02-28更新
### 2021-03-04更新
------
#### VSoft V1.0.2103.0401
- *.[新增]新增测试模式,测试模式下支持编辑内置命令。
- *.[修复]修复内置命令删除栏目时,内置命令没有同步删除的BUG。
#### VSoftBox V1.0.2103.0401
- *.[删除]删除配置类,全部集合在VSoft.dll中。
### 2021-02-28更新
------
#### VSoft V1.0.2102.2801
- *.[新增]项目支持毕方3.0标准。

Binary file not shown.

View File

@ -25,7 +25,11 @@ namespace Itrycn_Project
/// <summary>
/// 软件ID
/// </summary>
#if TEST
public const string Soft_Id = "VSoft_Test";
#else
public const string Soft_Id = "VSoft";
#endif
/// <summary>
/// 开机启动的参数
/// </summary>

View File

@ -1,8 +1,8 @@
using Itrycn_Project;
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Windows.Forms;
using VSoft.Config;
namespace VSoftBox
{

View File

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

View File

@ -55,8 +55,6 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Config\Soft_Config.cs" />
<Compile Include="Config\Soft_Info.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="Properties\Resources.resx">

View File

@ -1,66 +1,75 @@
using ryCommon;
using ryCommonDb;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Windows.Forms;
using static ryCommonDb.DataProvider;
namespace VSoft.Config
{
/// <summary>
/// 配置类,保存在运行期间不会被改变的配置信息(本系统基于乘黄V2架构)
/// </summary>
public static class Soft_Info
{
/// <summary>
/// 在线升级配置文件的url
/// </summary>
public const string Update_Url = "http://www.itrycn.com/update/vsoft.xml";
/// <summary>
/// 软件标题
/// </summary>
public const string Soft_Title = "VSoft 快速启动";
/// <summary>
/// 软件ID
/// </summary>
public const string Soft_Id = "VSoft";
/// <summary>
/// 开机启动的参数
/// </summary>
using ryCommon;
using ryCommonDb;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Windows.Forms;
using static ryCommonDb.DataProvider;
namespace VSoft.Config
{
/// <summary>
/// 配置类,保存在运行期间不会被改变的配置信息(本系统基于乘黄V2架构)
/// </summary>
public static class Soft_Info
{
/// <summary>
/// 在线升级配置文件的url
/// </summary>
public const string Update_Url = "http://www.itrycn.com/update/vsoft.xml";
/// <summary>
/// 软件标题
/// </summary>
#if TEST
public const string Soft_Title = "VSoft 快速启动【测试模式】";
#else
public const string Soft_Title = "VSoft 快速启动";
#endif
/// <summary>
/// 软件ID
/// </summary>
#if TEST
public const string Soft_Id = "VSoft_Test";
#else
public const string Soft_Id = "VSoft";
#endif
/// <summary>
/// 开机启动的参数
/// </summary>
public const string Soft_Pram = "q";
/// <summary>
/// 官网地址
/// </summary>
#if DY
public const string Soft_Url = "http://www.3h3.com";
#else
/// <summary>
/// 官网地址
/// </summary>
#if DY
public const string Soft_Url = "http://www.3h3.com";
#else
public const string Soft_Url = "http://www.itrycn.com";
#endif
/// <summary>
/// 售后QQ群
/// </summary>
#if DY
public const string QQ_Qun = "暂无";
#else
public const string QQ_Qun = "183161992";
#endif
/// <summary>
/// 关于界面内容.
/// </summary>
public const string AboutText = "#softname# #ver# 是一款完全免费的快速启动软件。";
/// <summary>
/// 用户文件夹,该相对路径设置,将在程序启动后转换
/// </summary>
public static string UserDataFolder = @"<app>\UserDb";
/// <summary>
/// 是否允许显示托盘图标
/// </summary>
public static bool ShowTray { get; } = true;
/// <summary>
/// 是否显示捐赠方式
/// </summary>
public static bool DonateVisabled { get; } = true;
}
}
#endif
/// <summary>
/// 售后QQ群
/// </summary>
#if DY
public const string QQ_Qun = "暂无";
#else
public const string QQ_Qun = "183161992";
#endif
/// <summary>
/// 关于界面内容.
/// </summary>
public const string AboutText = "#softname# #ver# 是一款完全免费的快速启动软件。";
/// <summary>
/// 用户文件夹,该相对路径设置,将在程序启动后转换
/// </summary>
public static string UserDataFolder = @"<app>\UserDb";
/// <summary>
/// 是否允许显示托盘图标
/// </summary>
public static bool ShowTray { get; } = true;
/// <summary>
/// 是否显示捐赠方式
/// </summary>
public static bool DonateVisabled { get; } = true;
}
}

View File

@ -13,7 +13,11 @@ namespace VSoft
public partial class FrmInCMD : Skins.SKinForm
{
public string SQLConnStr = Itrycn_Db.SQLConnStr_SysDb;
#if TEST
private bool ReadOnly { get; set; } = false;
#else
private bool ReadOnly { get; set; } = true;
#endif
public FrmInCMD()
{
InitializeComponent();
@ -130,7 +134,7 @@ namespace VSoft
}
if(ds.Tables[0].Rows.Count==0)
{
#region ,
#region ,
RyQuickSQL mySQL = new RyQuickSQL("Columns");
mySQL.AddField("Name", "默认栏目");
mySQL.AddField("editTime", DateTime.Now);
@ -151,7 +155,7 @@ namespace VSoft
TabList_Column.Items.Add(row["Name"].ToString()).Tag = info;
}
ds2.Dispose();
#endregion
#endregion
}
ds.Dispose();
TabList_Column.EndUpdate();
@ -204,7 +208,7 @@ namespace VSoft
{
LoadDb(true);
}
#region
#region
/// <summary>
/// 将栏目列表中的第几个栏目修改
/// </summary>
@ -212,7 +216,7 @@ namespace VSoft
/// <param name="index"></param>
private void SetColumnRow(int id, int index)
{
#region
#region
DataProvider mydb = new DataProvider();
IDbInterface db = Itrycn_Db.CreateDataProvider(Itrycn_Db.dataType);
if (db.ConnDb(SQLConnStr) == 1)
@ -238,7 +242,7 @@ namespace VSoft
}
db.Free();
}
#endregion
#endregion
}
private void BtnAddColumn_Click(object sender, EventArgs e)
{
@ -315,6 +319,7 @@ namespace VSoft
}
ds.Dispose();
db.DelById("Columns", column_id.ToString());
db.ExecuteNonQuery("delete from Softs where ColumnId=" + column_id);
TabList_Column.SelectedItems[0].Remove();
db.BeginTransaction();
for (int i = 1; i < TabList_Column.Items.Count; i++)
@ -328,8 +333,8 @@ namespace VSoft
}
db.Free();
}
#endregion
#region
#endregion
#region
/// <summary>
///将分类列表中的第几个分类进行修改
/// </summary>
@ -337,7 +342,7 @@ namespace VSoft
/// <param name="index"></param>
private void SetTypeRow(int id, int index)
{
#region
#region
DataProvider mydb = new DataProvider();
IDbInterface db = Itrycn_Db.CreateDataProvider(Itrycn_Db.dataType);
if (db.ConnDb(SQLConnStr) == 1)
@ -354,7 +359,7 @@ namespace VSoft
}
db.Free();
}
#endregion
#endregion
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
@ -470,11 +475,11 @@ namespace VSoft
}
db.Free();
}
#endregion
#region
#endregion
#region
private void SetSoftRow(int id, int index)
{
#region
#region
DataProvider mydb = new DataProvider();
IDbInterface db = Itrycn_Db.CreateDataProvider(Itrycn_Db.dataType);
if (db.ConnDb(SQLConnStr) == 1)
@ -506,7 +511,7 @@ namespace VSoft
}
db.Free();
}
#endregion
#endregion
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
@ -662,8 +667,8 @@ namespace VSoft
DialogResult = DialogResult.OK;
}
}
#endregion
#region
#endregion
#region
private void IconViewEx1_ItemDrag(object sender, ItemDragEventArgs e)
{
if (ReadOnly){return;}
@ -695,7 +700,7 @@ namespace VSoft
var filedrop = e.Data.GetData(DataFormats.FileDrop);
if (filedrop != null)
{
#region
#region
var ColumnId = GetCurColumnId();
if(ColumnId==0)
{
@ -711,7 +716,7 @@ namespace VSoft
}
frm.Dispose();
return;
#endregion
#endregion
}
Point pt;
pt = ((IconViewEx)(sender)).PointToClient(new Point(e.X, e.Y));
@ -786,8 +791,8 @@ namespace VSoft
LblDrag.Location = item.Position;
}
}
#endregion
#region
#endregion
#region
private void TabList_Column_DragEnter(object sender, DragEventArgs e)
{
if (ReadOnly)
@ -818,7 +823,7 @@ namespace VSoft
ListViewItem lvi = (ListViewItem)drag_item;
if (lvi.ListView == IconViewEx1)
{
#region
#region
var info = (SoftInfo)lvi.Tag;
RyQuickSQL mySQL = new RyQuickSQL("Softs");
mySQL.AddField("ColumnId", columnid);
@ -847,7 +852,7 @@ namespace VSoft
ReSortSoftByList(db);
}
db.Free();
#endregion
#endregion
}
else if (lvi.ListView == TabList_Column)
{
@ -879,8 +884,8 @@ namespace VSoft
if (ReadOnly) { return; }
this.DoDragDrop(e.Item, DragDropEffects.Move);
}
#endregion
#region
#endregion
#region
private void TabList_Type_DragEnter(object sender, DragEventArgs e)
{
if (ReadOnly)
@ -919,7 +924,7 @@ namespace VSoft
ListViewItem lvi = (ListViewItem)drag_item;
if (lvi.ListView == IconViewEx1)
{
#region
#region
var info = (SoftInfo)lvi.Tag;
RyQuickSQL mySQL = new RyQuickSQL("Softs");
mySQL.AddField("ColumnId", columnid);
@ -940,7 +945,7 @@ namespace VSoft
ReSortSoftByList(db);
}
db.Free();
#endregion
#endregion
}
else if (lvi.ListView == TabList_Type)
{
@ -972,7 +977,7 @@ namespace VSoft
if (ReadOnly) { return; }
this.DoDragDrop(e.Item, DragDropEffects.Move);
}
#endregion
#endregion
private void FrmVSoft_Shown(object sender, EventArgs e)
{
}

View File

@ -71,6 +71,7 @@
this.IconViewEx1 = new ryControls.IconViewEx();
this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.TabList_Column = new ryControls.TabList();
this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator();
this.MenuList.SuspendLayout();
this.MenuTabColumn.SuspendLayout();
this.MenuTabType.SuspendLayout();
@ -243,9 +244,10 @@
this.ToolStripMenuItem,
this.ToolStripMenuItem,
this.ToolStripMenuItem,
this.toolStripMenuItem3,
this.退ToolStripMenuItem});
this.MenuTray.Name = "MenuTray";
this.MenuTray.Size = new System.Drawing.Size(137, 114);
this.MenuTray.Size = new System.Drawing.Size(137, 120);
//
// 显示主窗体ToolStripMenuItem
//
@ -355,11 +357,10 @@
this.rySearch1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(239)))), ((int)(((byte)(244)))));
this.rySearch1.BaseColor = System.Drawing.Color.Teal;
this.rySearch1.ButtonRoundBackColor = System.Drawing.SystemColors.Control;
this.rySearch1.ColorGradient = true;
this.rySearch1.EmptyText = "输入名称或拼音即可搜索";
this.rySearch1.Location = new System.Drawing.Point(509, 36);
this.rySearch1.EmptyText = "输入名称或拼音搜索";
this.rySearch1.Location = new System.Drawing.Point(537, 36);
this.rySearch1.Name = "rySearch1";
this.rySearch1.Size = new System.Drawing.Size(170, 27);
this.rySearch1.Size = new System.Drawing.Size(142, 27);
this.rySearch1.TabIndex = 2;
this.rySearch1.UseDefSkin = false;
this.rySearch1.OnSearch += new System.EventHandler(this.rySearch1_OnSearch);
@ -470,6 +471,11 @@
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);
//
// toolStripMenuItem3
//
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
this.toolStripMenuItem3.Size = new System.Drawing.Size(133, 6);
//
// FrmVSoft
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@ -488,6 +494,7 @@
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MinimumSize = new System.Drawing.Size(160, 60);
this.Name = "FrmVSoft";
this.Opacity = 0.97D;
this.SideResizeWidth = 4;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "VSoft";
@ -671,5 +678,6 @@
private System.Windows.Forms.Label LblEmpty;
private System.Windows.Forms.Label LblSetting;
private System.Windows.Forms.Panel PnlLeft;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem3;
}
}

View File

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

View File

@ -24,7 +24,7 @@ namespace VSoft.Skins
{
if (!this.DesignMode)
{ base.XTheme = new VSoft.Skins.ThemeForm(); }
Opacity = 0.9;
Opacity = 0.97;
}
}
}

View File

@ -18,7 +18,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\Bin\Debug\VSoft\</OutputPath>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<DefineConstants>TRACE;DEBUG;TEST</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>