#### VSoft V1.0.2103.0601

- *.[新增]公司条件编译下拥有独立的皮肤。

Bin/Debug/VSoft/UserDb/Win.dat

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

Bin/Debug/VSoft/cUpdate.dat

@@ -1,3 +1,3 @@
 <root>
-  <list id="LastUpdateTime" Value="2021/3/4 21:23:03" />
+  <list id="LastUpdateTime" Value="2021/3/6 22:14:53" />
 </root>

CHANGELOG.md

@@ -1,4 +1,9 @@
-### 2021-03-04更新
+### 2021-03-06更新
+------
+#### VSoft    V1.0.2103.0601
+- *.[新增]公司条件编译下拥有独立的皮肤。
+
+### 2021-03-04更新
 ------
 #### VSoft    V1.0.2103.0401
 - *.[新增]新增测试模式,测试模式下支持编辑内置命令。

Source/VSoftBox/Properties/AssemblyInfo.cs

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

Source/VSoftBox/VSoftBox.csproj

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

Source/VSoft_Dll/FrmAddSoft.Designer.cs

@@ -115,7 +115,7 @@
             // label6
             // 
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(239, 40);
+            this.label6.Location = new System.Drawing.Point(239, 39);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(65, 12);
             this.label6.TabIndex = 13;
@@ -217,7 +217,8 @@
             // 
             // BtnBrowser
             // 
-            this.BtnBrowser.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(76)))), ((int)(((byte)(95)))));
+            this.BtnBrowser.BaseColor = System.Drawing.Color.DarkGreen;
+            this.BtnBrowser.ColorGradient = true;
             this.BtnBrowser.Location = new System.Drawing.Point(463, 20);
             this.BtnBrowser.Name = "BtnBrowser";
             this.BtnBrowser.Size = new System.Drawing.Size(33, 27);
@@ -317,7 +318,8 @@
             // BtnCancel
             // 
             this.BtnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.BtnCancel.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(76)))), ((int)(((byte)(95)))));
+            this.BtnCancel.BaseColor = System.Drawing.Color.DarkGreen;
+            this.BtnCancel.ColorGradient = true;
             this.BtnCancel.Location = new System.Drawing.Point(458, 467);
             this.BtnCancel.Name = "BtnCancel";
             this.BtnCancel.Size = new System.Drawing.Size(75, 27);
@@ -329,7 +331,8 @@
             // BtnOK
             // 
             this.BtnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.BtnOK.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(76)))), ((int)(((byte)(95)))));
+            this.BtnOK.BaseColor = System.Drawing.Color.DarkGreen;
+            this.BtnOK.ColorGradient = true;
             this.BtnOK.Location = new System.Drawing.Point(377, 467);
             this.BtnOK.Name = "BtnOK";
             this.BtnOK.Size = new System.Drawing.Size(75, 27);
@@ -355,7 +358,7 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(10, 40);
+            this.label1.Location = new System.Drawing.Point(10, 39);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(41, 12);
             this.label1.TabIndex = 1;

Source/VSoft_Dll/FrmVSoft.Designer.cs

@@ -60,6 +60,7 @@
             this.打开官网ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.捐助ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.设置ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator();
             this.退出软件ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.LblSetting = new System.Windows.Forms.Label();
             this.PnlLeft = new System.Windows.Forms.Panel();
@@ -71,7 +72,6 @@
             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();
@@ -153,7 +153,7 @@
             // 
             this.BtnAddColumn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.BtnAddColumn.Image = ((System.Drawing.Image)(resources.GetObject("BtnAddColumn.Image")));
-            this.BtnAddColumn.Location = new System.Drawing.Point(685, 35);
+            this.BtnAddColumn.Location = new System.Drawing.Point(685, 36);
             this.BtnAddColumn.Name = "BtnAddColumn";
             this.BtnAddColumn.Size = new System.Drawing.Size(27, 28);
             this.BtnAddColumn.TabIndex = 3;
@@ -277,6 +277,11 @@
             this.设置ToolStripMenuItem.Text = "设置";
             this.设置ToolStripMenuItem.Click += new System.EventHandler(this.设置ToolStripMenuItem_Click);
             // 
+            // toolStripMenuItem3
+            // 
+            this.toolStripMenuItem3.Name = "toolStripMenuItem3";
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(133, 6);
+            // 
             // 退出软件ToolStripMenuItem
             // 
             this.退出软件ToolStripMenuItem.Name = "退出软件ToolStripMenuItem";
@@ -357,12 +362,12 @@
             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(537, 36);
             this.rySearch1.Name = "rySearch1";
             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);
             this.rySearch1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.rySearch1_KeyDown);
             // 
@@ -449,7 +454,7 @@
             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.Location = new System.Drawing.Point(84, 34);
             this.TabList_Column.Margin = new System.Windows.Forms.Padding(0);
             this.TabList_Column.MultiSelect = false;
             this.TabList_Column.Name = "TabList_Column";
@@ -459,7 +464,7 @@
             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(595, 29);
+            this.TabList_Column.Size = new System.Drawing.Size(598, 29);
             this.TabList_Column.TabIndex = 1;
             this.TabList_Column.TileSize = new System.Drawing.Size(70, 30);
             this.TabList_Column.UseCompatibleStateImageBehavior = false;
@@ -471,11 +476,6 @@
             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);

Source/VSoft_Dll/Prams/SoftInfo.cs

@@ -1,96 +1,96 @@
-using ryCommon;
+using ryCommon;
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Drawing;
+using System.Drawing;
-using System.Linq;
+using System.Linq;
-using System.Text;
+using System.Text;
-using ryControls.Interface;
+using ryControls.Interface;
-namespace VSoft.Prams
+namespace VSoft.Prams
-{
+{
-    /// <summary>
+    /// <summary>
-    /// 软件信息
+    /// 软件信息
-    /// </summary>
+    /// </summary>
-    public class SoftInfo: IItemInfo
+    public class SoftInfo: IItemInfo
-    {
+    {
-        /// <summary>
+        /// <summary>
-        /// id
+        /// id
-        /// </summary>
+        /// </summary>
-        public int Id { get; set; } = 0;
+        public int Id { get; set; } = 0;
-        /// <summary>
+        /// <summary>
-        /// id
+        /// id
-        /// </summary>
+        /// </summary>
-        public int ColumnId { get; set; } = 0;
+        public int ColumnId { get; set; } = 0;
-        /// <summary>
+        /// <summary>
-        /// 0表示运行文件,1表示执行内置命令,2表示执行脚本
+        /// 0表示运行文件,1表示执行内置命令,2表示执行脚本
-        /// </summary>
+        /// </summary>
         public int SoftType { get; set; } = 0;
         /// <summary>
         /// -1表示无角标
         /// </summary>
-        public int BadgeImageIndex { get; set; } = -1;
+        public int BadgeImageIndex { get; set; } = -1;
-        /// <summary>
+        /// <summary>
-        /// 命令ID
+        /// 命令ID
-        /// </summary>
+        /// </summary>
-        public string CmdId { get; set; } = "";
+        public string CmdId { get; set; } = "";
-        /// <summary>
+        /// <summary>
-        /// 名称
+        /// 名称
-        /// </summary>
+        /// </summary>
-        public string Name { get; set; } = "";
+        public string Name { get; set; } = "";
-        /// <summary>
+        /// <summary>
-        /// 路径
+        /// 路径
-        /// </summary>
+        /// </summary>
-        public string Path { get; set; } = "";
+        public string Path { get; set; } = "";
-        /// <summary>
+        /// <summary>
-        /// 绝对路径
+        /// 绝对路径
-        /// </summary>
+        /// </summary>
-        public string TruePath
+        public string TruePath
-        {
+        {
-            get
+            get
-            {
+            {
-                return RyFiles.GetRealPath(Path);
+                return RyFiles.GetRealPath(Path);
-            }
+            }
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// 运行参数
+        /// 运行参数
-        /// </summary>
+        /// </summary>
-        public string RunPram { get; set; } = "";
+        public string RunPram { get; set; } = "";
-        /// <summary>
+        /// <summary>
-        /// 起始路径
+        /// 起始路径
-        /// </summary>
+        /// </summary>
-        public string StartPath { get; set; } = "";
+        public string StartPath { get; set; } = "";
-        /// <summary>
+        /// <summary>
-        /// 文件图标
+        /// 文件图标
-        /// </summary>
+        /// </summary>
-        public string IconPath { get; set; } = "";
+        public string IconPath { get; set; } = "";
-        /// <summary>
+        /// <summary>
-        /// 设置
+        /// 设置
-        /// </summary>
+        /// </summary>
-        public string SetJson { get; set; } = "";
+        public string SetJson { get; set; } = "";
-        /// <summary>
+        /// <summary>
-        /// 备注
+        /// 备注
-        /// </summary>
+        /// </summary>
-        public string Des { get; set; } = "";
+        public string Des { get; set; } = "";
-        /// <summary>
+        /// <summary>
-        /// 文件图标
+        /// 文件图标
-        /// </summary>
+        /// </summary>
-        public Image Image { get; set; } = null;
+        public Image Image { get; set; } = null;
-    }
+    }
-    /// <summary>
+    /// <summary>
-    /// 栏目或分类信息
+    /// 栏目或分类信息
-    /// </summary>
+    /// </summary>
-    public class ColumnInfo
+    public class ColumnInfo
-    {
+    {
-        /// <summary>
+        /// <summary>
-        /// id
+        /// id
-        /// </summary>
+        /// </summary>
-        public int Id { get; set; } = 0;
+        public int Id { get; set; } = 0;
-        /// <summary>
+        /// <summary>
-        /// 名称
+        /// 名称
-        /// </summary>
+        /// </summary>
-        public string Name { get; set; } = "";
+        public string Name { get; set; } = "";
-        /// <summary>
+        /// <summary>
-        /// 备注
+        /// 备注
-        /// </summary>
+        /// </summary>
-        public string Des { get; set; } = "";
+        public string Des { get; set; } = "";
-    }
+    }
-}
+}

Source/VSoft_Dll/Properties/AssemblyInfo.cs

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

Source/VSoft_Dll/Skins/SKinForm.cs

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

Source/VSoft_Dll/Skins/ThemeForm.cs

@@ -8,6 +8,7 @@ using System.Text;
 
 namespace VSoft.Skins
 {
+
     public class ThemeForm : ThemeFormBase
     {
         /// <summary>
@@ -17,7 +18,15 @@ namespace VSoft.Skins
             : base()
         {
             ThemeName = "Default";
+#if DY
+            ryControls.Skin.SkinCommon.ButtonSkin.BackColor = Color.DarkGreen;
+            CaptionBackColorTop = Color.DarkGreen;
+            CaptionBackColorBottom = Color.SeaGreen;
+#else
             ryControls.Skin.SkinCommon.ButtonSkin.BackColor = Color.Teal;
+            CaptionBackColorTop = Color.LightSeaGreen;
+            CaptionBackColorBottom = Color.Teal;
+#endif
             ryControls.Skin.SkinCommon.ButtonSkin.ColorGradient = true;
             BorderWidth = 1;
             CaptionHeight = 30;
@@ -27,8 +36,6 @@ namespace VSoft.Skins
             SideResizeWidth = 4;
             UseDefaultTopRoundingFormRegion = false;
 
-            CaptionBackColorBottom = Color.Teal;
-            CaptionBackColorTop = Color.LightSeaGreen;
 
             RoundedStyle = RoundStyle.None;
             FormBorderOutterColor = Color.Gray;

Source/VSoft_Dll/VSoft.csproj

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