README.md

@@ -23,11 +23,11 @@ SunnyUI.Net项目已加入[dotNET China](https://gitee.com/dotnetchina) 组织
 ![dotnetchina](https://images.gitee.com/uploads/images/2021/0324/120117_2da9922c_416720.png "132645_21007ea0_974299.png")
 
 #### 软件介绍
-- SunnyUI.NET 是基于.Net Framework4.0+、.Net8、.Net9 框架的 C# WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。    
+- SunnyUI.NET 是基于.Net Framework4.0+、.Net6、.Net8、.Net9 框架的 C# WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。    
 - 源码编译环境：    
   1. **VS2022**，安装.NetFramework4.0目标包的方法见：https://www.cnblogs.com/yhuse/p/15536393.html    
   2. 编译源码，.Net8需要VS2022 17.12+版本，或者修改SunnyUI.csproj文件的TargetFrameworks属性以适应VS环境    
-- 动态库应用环境： **VS2010**及以上均可，支持.Net Framework4.0+、.Net8、.Net9    
+- 动态库应用环境： **VS2010**及以上均可，支持.Net Framework4.0+、.Net6、.Net8、.Net9    
   1. 推荐通过Nuget安装：Install-Package SunnyUI，或者通过Nuget搜索SunnyUI安装。    
   2. 不支持（.Net Framework 4 **Client Profile**）。     
     

SunnyUI.Demo/Controls/FButton.Designer.cs

@@ -84,17 +84,10 @@ namespace Sunny.UI.Demo
             this.uiToolTip1 = new Sunny.UI.UIToolTip(this.components);
             this.uiSwitch5 = new Sunny.UI.UISwitch();
             this.uiSwitch6 = new Sunny.UI.UISwitch();
-            this.uiMenuButton1 = new Sunny.UI.UIMenuButton();
-            this.uiLine6 = new Sunny.UI.UILine();
-            this.uiContextMenuStrip1 = new Sunny.UI.UIContextMenuStrip();
-            this.菜单一ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.菜单二ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.菜单三ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             ((System.ComponentModel.ISupportInitialize)(this.uiImageButton4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.uiImageButton3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.uiImageButton2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.uiImageButton1)).BeginInit();
-            this.uiContextMenuStrip1.SuspendLayout();
             this.SuspendLayout();
             // 
             // uiSwitch3
@@ -1011,69 +1004,11 @@ namespace Sunny.UI.Demo
             this.uiSwitch6.TabIndex = 117;
             this.uiSwitch6.Text = "uiSwitch6";
             // 
-            // uiMenuButton1
-            // 
-            this.uiMenuButton1.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.uiMenuButton1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiMenuButton1.Location = new System.Drawing.Point(30, 554);
-            this.uiMenuButton1.Menu = this.uiContextMenuStrip1;
-            this.uiMenuButton1.MinimumSize = new System.Drawing.Size(1, 1);
-            this.uiMenuButton1.Name = "uiMenuButton1";
-            this.uiMenuButton1.Size = new System.Drawing.Size(180, 35);
-            this.uiMenuButton1.Symbol = 361642;
-            this.uiMenuButton1.TabIndex = 118;
-            this.uiMenuButton1.Text = "下拉菜单按钮";
-            this.uiMenuButton1.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            // 
-            // uiLine6
-            // 
-            this.uiLine6.BackColor = System.Drawing.Color.Transparent;
-            this.uiLine6.Font = new System.Drawing.Font("宋体", 12F);
-            this.uiLine6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.uiLine6.Location = new System.Drawing.Point(30, 516);
-            this.uiLine6.MinimumSize = new System.Drawing.Size(16, 16);
-            this.uiLine6.Name = "uiLine6";
-            this.uiLine6.Size = new System.Drawing.Size(312, 20);
-            this.uiLine6.TabIndex = 119;
-            this.uiLine6.Text = "UIMenuButton";
-            this.uiLine6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // uiContextMenuStrip1
-            // 
-            this.uiContextMenuStrip1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
-            this.uiContextMenuStrip1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiContextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.菜单一ToolStripMenuItem,
-            this.菜单二ToolStripMenuItem,
-            this.菜单三ToolStripMenuItem});
-            this.uiContextMenuStrip1.Name = "uiContextMenuStrip1";
-            this.uiContextMenuStrip1.Size = new System.Drawing.Size(123, 70);
-            // 
-            // 菜单一ToolStripMenuItem
-            // 
-            this.菜单一ToolStripMenuItem.Name = "菜单一ToolStripMenuItem";
-            this.菜单一ToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
-            this.菜单一ToolStripMenuItem.Text = "菜单一";
-            // 
-            // 菜单二ToolStripMenuItem
-            // 
-            this.菜单二ToolStripMenuItem.Name = "菜单二ToolStripMenuItem";
-            this.菜单二ToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
-            this.菜单二ToolStripMenuItem.Text = "菜单二";
-            // 
-            // 菜单三ToolStripMenuItem
-            // 
-            this.菜单三ToolStripMenuItem.Name = "菜单三ToolStripMenuItem";
-            this.菜单三ToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
-            this.菜单三ToolStripMenuItem.Text = "菜单三";
-            // 
             // FButton
             // 
             this.AllowShowTitle = true;
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.ClientSize = new System.Drawing.Size(800, 614);
-            this.Controls.Add(this.uiLine6);
-            this.Controls.Add(this.uiMenuButton1);
             this.Controls.Add(this.uiSymbolButton24);
             this.Controls.Add(this.uiSwitch6);
             this.Controls.Add(this.uiSwitch5);
@@ -1137,7 +1072,6 @@ namespace Sunny.UI.Demo
             ((System.ComponentModel.ISupportInitialize)(this.uiImageButton3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.uiImageButton2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.uiImageButton1)).EndInit();
-            this.uiContextMenuStrip1.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -1198,11 +1132,5 @@ namespace Sunny.UI.Demo
         private UIToolTip uiToolTip1;
         private UISwitch uiSwitch5;
         private UISwitch uiSwitch6;
-        private UIMenuButton uiMenuButton1;
-        private UILine uiLine6;
-        private UIContextMenuStrip uiContextMenuStrip1;
-        private System.Windows.Forms.ToolStripMenuItem 菜单一ToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem 菜单二ToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem 菜单三ToolStripMenuItem;
     }
 }

SunnyUI.Demo/Controls/FButton.resx

@@ -120,7 +120,4 @@
   <metadata name="uiToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="uiContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>133, 17</value>
-  </metadata>
 </root>

SunnyUI.Demo/Controls/FCombobox.cs

@@ -40,6 +40,8 @@ namespace Sunny.UI.Demo
             uiComboDataGridView1.DataGridView.AddColumn("数据列2", "Column2");
             uiComboDataGridView1.DataGridView.AddColumn("数据列3", "Column3");
             uiComboDataGridView1.DataGridView.ReadOnly = true;
+            uiComboDataGridView1.SelectIndexChange += UiComboDataGridView1_SelectIndexChange;
+            uiComboDataGridView1.ShowFilter = true;
             uiComboDataGridView1.DataGridView.DataSource = dt;//用DataTable做数据源过滤，用List不行
             uiComboDataGridView1.FilterColumnName = "Column1;Column3"; //不设置则全部列过滤，可加分号过滤多列
 
@@ -50,6 +52,7 @@ namespace Sunny.UI.Demo
             uiComboDataGridView2.DataGridView.AddColumn("数据列2", "Column2");
             uiComboDataGridView2.DataGridView.AddColumn("数据列3", "Column3");
             uiComboDataGridView2.DataGridView.ReadOnly = true;
+            uiComboDataGridView2.ShowFilter = true;
             uiComboDataGridView2.DataGridView.DataSource = dt;
             uiComboDataGridView2.FilterColumnName = "Column1"; //不设置则全部列过滤
 
@@ -149,7 +152,7 @@ namespace Sunny.UI.Demo
             if (value != null && value is DataGridViewSelectedRowCollection)
             {
                 DataGridViewSelectedRowCollection collection = (DataGridViewSelectedRowCollection)value;
-                foreach (object item in collection)
+                foreach (var item in collection)
                 {
                     DataGridViewRow row = (DataGridViewRow)item;
                     uiComboDataGridView2.Text += row.Cells[0].Value.ToString();//通过索引显示值

SunnyUI.Demo/Controls/FContextMenuStrip.cs

@@ -12,7 +12,7 @@ namespace Sunny.UI.Demo
             var styles = UIStyles.PopularStyles();
             foreach (UIStyle style in styles)
             {
-                ToolStripMenuItem item = new ToolStripMenuItem(style.Description()) { Tag = style };
+                ToolStripMenuItem item = new ToolStripMenuItem(style.DisplayText()) { Tag = style };
                 item.Click += Item_Click;
                 uiContextMenuStrip1.Items.Add(item);
             }

SunnyUI.Demo/FMain.cs

@@ -6,10 +6,10 @@ using System.Windows.Forms;
 namespace Sunny.UI.Demo
 {
     /// <summary>
-    /// WindowsXP、Windows7、Windows10、Windows11 建议使用 UIForm
+    /// Windows10、Windows11 建议用UIForm2，更接近原生窗体使用体验，用UIForm也可以
-    /// Windows10、Windows11 可尝试使用 UIForm2，更接近原生窗体使用体验，用 UIForm 也可以 
+    /// WindowsXP、Windows7 建议使用UIForm
     /// </summary>
-    public partial class FMain : UIForm
+    public partial class FMain : UIForm2
     {
         public FMain()
         {
@@ -97,7 +97,7 @@ namespace Sunny.UI.Demo
             var styles = UIStyles.PopularStyles();
             foreach (UIStyle style in styles)
             {
-                uiNavBar1.CreateChildNode(uiNavBar1.Nodes[4], style.Description(), style.Value());
+                uiNavBar1.CreateChildNode(uiNavBar1.Nodes[4], style.DisplayText(), style.Value());
             }
 
             var node = uiNavBar1.CreateChildNode(uiNavBar1.Nodes[4], "字体图标", 99999);
@@ -105,17 +105,17 @@ namespace Sunny.UI.Demo
             node = uiNavBar1.CreateChildNode(uiNavBar1.Nodes[4], "多彩主题", UIStyle.Colorful.Value());
             uiNavBar1.SetNodeSymbol(node, 558295);
             //左侧导航主节点关联页面
-            uiNavMenu1.CreateNode(AddPage(new FSymbols(), 99999));
+            uiNavMenu1.CreateNode(AddPage(new FSymbols()));
-            uiNavMenu1.CreateNode(AddPage(new FColorful(), UIStyle.Colorful.Value()));
+            uiNavMenu1.CreateNode(AddPage(new FColorful()));
 
             //直接增加一个页面，不在左侧列表显示
+            //AddPage(new FColorful());
             AddPage(new FCommon());
 
             //选中第一个节点
             uiNavMenu1.SelectPage(1002);
 
             uiPanel2.Text = Text = Version;
-            //设置全局热键
             RegisterHotKey(UI.ModifierKeys.Shift, Keys.F8);
 
             //根据页面类型获取页面
@@ -177,11 +177,6 @@ namespace Sunny.UI.Demo
             Process.Start("https://gitee.com/yhuse/SunnyUI");
         }
 
-        /// <summary>
-        /// 全局热键事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
         private void Form1_HotKeyEventHandler(object sender, HotKeyEventArgs e)
         {
             if (e.hotKey.ModifierKey == UI.ModifierKeys.Shift && e.hotKey.Key == Keys.F8)
@@ -233,8 +228,8 @@ namespace Sunny.UI.Demo
             this.uiNavMenu1.Nodes[2].Text = this.uiNavBar1.Nodes[2].Text = CodeTranslator.Current.Charts;
             this.uiNavMenu1.Nodes[3].Text = this.uiNavBar1.Nodes[3].Text = CodeTranslator.Current.Industrial;
             this.uiNavBar1.Nodes[4].Text = CodeTranslator.Current.Theme;
-            this.uiNavMenu1.Nodes[4].Text = CodeTranslator.Current.Symbols;
+            this.uiNavMenu1.Nodes[4].Text = CodeTranslator.Current.Colorful;
-            this.uiNavMenu1.Nodes[5].Text = CodeTranslator.Current.Colorful;
+            this.uiNavMenu1.Nodes[5].Text = CodeTranslator.Current.Symbols;
 
             this.uiNavBar1.Invalidate();
             this.uiNavMenu1.Invalidate();

SunnyUI.Demo/Forms/FColorful.Designer.cs

@@ -235,7 +235,6 @@ namespace Sunny.UI.Demo
             // uiLabel1
             // 
             this.uiLabel1.Font = new System.Drawing.Font("宋体", 12F);
-            this.uiLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
             this.uiLabel1.Location = new System.Drawing.Point(30, 288);
             this.uiLabel1.Name = "uiLabel1";
             this.uiLabel1.Size = new System.Drawing.Size(698, 23);
@@ -264,7 +263,6 @@ namespace Sunny.UI.Demo
             // uiLabel2
             // 
             this.uiLabel2.Font = new System.Drawing.Font("宋体", 12F);
-            this.uiLabel2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
             this.uiLabel2.Location = new System.Drawing.Point(176, 383);
             this.uiLabel2.Name = "uiLabel2";
             this.uiLabel2.Size = new System.Drawing.Size(172, 23);
@@ -274,9 +272,7 @@ namespace Sunny.UI.Demo
             // 
             // uiLine1
             // 
-            this.uiLine1.BackColor = System.Drawing.Color.Transparent;
             this.uiLine1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLine1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
             this.uiLine1.Location = new System.Drawing.Point(30, 430);
             this.uiLine1.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiLine1.Name = "uiLine1";
@@ -287,9 +283,7 @@ namespace Sunny.UI.Demo
             // 
             // uiLine2
             // 
-            this.uiLine2.BackColor = System.Drawing.Color.Transparent;
             this.uiLine2.Font = new System.Drawing.Font("宋体", 12F);
-            this.uiLine2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
             this.uiLine2.Location = new System.Drawing.Point(30, 55);
             this.uiLine2.MinimumSize = new System.Drawing.Size(16, 16);
             this.uiLine2.Name = "uiLine2";
@@ -304,15 +298,12 @@ namespace Sunny.UI.Demo
             this.cbFont.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList;
             this.cbFont.FillColor = System.Drawing.Color.White;
             this.cbFont.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cbFont.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255)))));
-            this.cbFont.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
             this.cbFont.Location = new System.Drawing.Point(101, 473);
             this.cbFont.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.cbFont.MinimumSize = new System.Drawing.Size(63, 0);
             this.cbFont.Name = "cbFont";
             this.cbFont.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
             this.cbFont.Size = new System.Drawing.Size(469, 29);
-            this.cbFont.SymbolSize = 24;
             this.cbFont.TabIndex = 79;
             this.cbFont.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.cbFont.Watermark = "";
@@ -320,7 +311,6 @@ namespace Sunny.UI.Demo
             // uiLabel3
             // 
             this.uiLabel3.Font = new System.Drawing.Font("宋体", 12F);
-            this.uiLabel3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
             this.uiLabel3.Location = new System.Drawing.Point(30, 524);
             this.uiLabel3.Name = "uiLabel3";
             this.uiLabel3.Size = new System.Drawing.Size(172, 23);
@@ -331,7 +321,6 @@ namespace Sunny.UI.Demo
             // uiLabel4
             // 
             this.uiLabel4.Font = new System.Drawing.Font("宋体", 12F);
-            this.uiLabel4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
             this.uiLabel4.Location = new System.Drawing.Point(30, 476);
             this.uiLabel4.Name = "uiLabel4";
             this.uiLabel4.Size = new System.Drawing.Size(85, 23);
@@ -370,7 +359,6 @@ namespace Sunny.UI.Demo
             // uiLabel5
             // 
             this.uiLabel5.Font = new System.Drawing.Font("宋体", 12F);
-            this.uiLabel5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
             this.uiLabel5.Location = new System.Drawing.Point(511, 524);
             this.uiLabel5.Name = "uiLabel5";
             this.uiLabel5.Size = new System.Drawing.Size(59, 23);
@@ -408,7 +396,7 @@ namespace Sunny.UI.Demo
             this.Padding = new System.Windows.Forms.Padding(0, 35, 0, 0);
             this.PageIndex = 999;
             this.ShowTitle = true;
-            this.Symbol = 558295;
+            this.Symbol = 262210;
             this.Text = "多彩主题";
             this.ResumeLayout(false);
 

SunnyUI.Demo/Forms/FDialogs.cs

@@ -123,12 +123,12 @@ namespace Sunny.UI.Demo
 
         private void uiSymbolButton2_Click(object sender, EventArgs e)
         {
-            this.ShowInfoNotifier("Hello SunnyUI!", InfoNotifierClick);
+            this.ShowInfoNotifier("Info", InfoNotifierClick);
         }
 
-        private void InfoNotifierClick(object sender, DescriptionEventArgs e)
+        private void InfoNotifierClick(object sender, EventArgs e)
         {
-            this.ShowInfoTip(e.Description);
+            this.ShowInfoTip(CodeTranslator.Current.PressedNotifier);
         }
 
         private void uiSymbolButton6_Click(object sender, EventArgs e)

SunnyUI.Demo/Industrial/FLed.Designer.cs

@@ -56,7 +56,6 @@ namespace Sunny.UI.Demo
             this.uiDigitalLabel2 = new Sunny.UI.UIDigitalLabel();
             this.uiDigitalLabel1 = new Sunny.UI.UIDigitalLabel();
             this.uiLine4 = new Sunny.UI.UILine();
-            this.uiBattery7 = new Sunny.UI.UIBattery();
             this.SuspendLayout();
             // 
             // uiBattery6
@@ -171,7 +170,7 @@ namespace Sunny.UI.Demo
             this.uiLedStopwatch1.Name = "uiLedStopwatch1";
             this.uiLedStopwatch1.Size = new System.Drawing.Size(190, 34);
             this.uiLedStopwatch1.TabIndex = 61;
-            this.uiLedStopwatch1.Text = "01:05";
+            this.uiLedStopwatch1.Text = "12:50";
             // 
             // uiLedDisplay1
             // 
@@ -360,25 +359,11 @@ namespace Sunny.UI.Demo
             this.uiLine4.Text = "UIDigitalLabel";
             this.uiLine4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
-            // uiBattery7
-            // 
-            this.uiBattery7.Font = new System.Drawing.Font("宋体", 12F);
-            this.uiBattery7.Location = new System.Drawing.Point(42, 410);
-            this.uiBattery7.MinimumSize = new System.Drawing.Size(1, 1);
-            this.uiBattery7.Name = "uiBattery7";
-            this.uiBattery7.Size = new System.Drawing.Size(73, 105);
-            this.uiBattery7.SymbolOffset = new System.Drawing.Point(1, 3);
-            this.uiBattery7.SymbolRotate = 270;
-            this.uiBattery7.SymbolSize = 100;
-            this.uiBattery7.TabIndex = 110;
-            this.uiBattery7.Text = "uiBattery7";
-            // 
             // FLed
             // 
             this.AllowShowTitle = true;
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.ClientSize = new System.Drawing.Size(800, 555);
-            this.Controls.Add(this.uiBattery7);
             this.Controls.Add(this.uiLine4);
             this.Controls.Add(this.uiDigitalLabel2);
             this.Controls.Add(this.uiDigitalLabel1);
@@ -441,6 +426,5 @@ namespace Sunny.UI.Demo
         private UIDigitalLabel uiDigitalLabel2;
         private UIDigitalLabel uiDigitalLabel1;
         private UILine uiLine4;
-        private UIBattery uiBattery7;
     }
 }

SunnyUI.Demo/Industrial/FLed.cs

@@ -19,7 +19,7 @@
         private void timer1_Tick(object sender, System.EventArgs e)
         {
             value++;
-            uiBattery7.Power = uiBattery1.Power = value;
+            uiBattery1.Power = value;
             uiLedDisplay1.Text = value + " Ω";
             uiDigitalLabel2.Value += 0.1;
         }

SunnyUI.Demo/Industrial/FLight.Designer.cs

@@ -45,12 +45,6 @@ namespace Sunny.UI.Demo
             this.uiLedBulb6 = new Sunny.UI.UILedBulb();
             this.uiLight5 = new Sunny.UI.UILight();
             this.uiLight6 = new Sunny.UI.UILight();
-            this.uiStatusBox1 = new Sunny.UI.UIStatusBox();
-            this.uiLine1 = new Sunny.UI.UILine();
-            this.uiButton1 = new Sunny.UI.UIButton();
-            this.uiButton2 = new Sunny.UI.UIButton();
-            this.uiButton3 = new Sunny.UI.UIButton();
-            ((System.ComponentModel.ISupportInitialize)(this.uiStatusBox1)).BeginInit();
             this.SuspendLayout();
             // 
             // uiLedBulb4
@@ -84,9 +78,7 @@ namespace Sunny.UI.Demo
             // 
             // uiLine8
             // 
-            this.uiLine8.BackColor = System.Drawing.Color.Transparent;
             this.uiLine8.Font = new System.Drawing.Font("宋体", 12F);
-            this.uiLine8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
             this.uiLine8.Location = new System.Drawing.Point(381, 55);
             this.uiLine8.MinimumSize = new System.Drawing.Size(16, 16);
             this.uiLine8.Name = "uiLine8";
@@ -152,9 +144,7 @@ namespace Sunny.UI.Demo
             // 
             // uiLine2
             // 
-            this.uiLine2.BackColor = System.Drawing.Color.Transparent;
             this.uiLine2.Font = new System.Drawing.Font("宋体", 12F);
-            this.uiLine2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
             this.uiLine2.Location = new System.Drawing.Point(30, 55);
             this.uiLine2.MinimumSize = new System.Drawing.Size(16, 16);
             this.uiLine2.Name = "uiLine2";
@@ -233,113 +223,11 @@ namespace Sunny.UI.Demo
             this.uiLight6.TabIndex = 75;
             this.uiLight6.Text = "uiLight6";
             // 
-            // uiStatusBox1
-            // 
-            this.uiStatusBox1.Image = global::Sunny.UI.Demo.Properties.Resources.led_g;
-            this.uiStatusBox1.Location = new System.Drawing.Point(30, 272);
-            this.uiStatusBox1.Name = "uiStatusBox1";
-            this.uiStatusBox1.Size = new System.Drawing.Size(36, 36);
-            this.uiStatusBox1.Status1 = global::Sunny.UI.Demo.Properties.Resources.led_g;
-            this.uiStatusBox1.Status2 = global::Sunny.UI.Demo.Properties.Resources.led_y;
-            this.uiStatusBox1.Status3 = global::Sunny.UI.Demo.Properties.Resources.led_r;
-            this.uiStatusBox1.TabIndex = 77;
-            this.uiStatusBox1.TabStop = false;
-            // 
-            // uiLine1
-            // 
-            this.uiLine1.BackColor = System.Drawing.Color.Transparent;
-            this.uiLine1.Font = new System.Drawing.Font("宋体", 12F);
-            this.uiLine1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.uiLine1.Location = new System.Drawing.Point(30, 230);
-            this.uiLine1.MinimumSize = new System.Drawing.Size(16, 16);
-            this.uiLine1.Name = "uiLine1";
-            this.uiLine1.Size = new System.Drawing.Size(319, 20);
-            this.uiLine1.TabIndex = 79;
-            this.uiLine1.Text = "UILight";
-            this.uiLine1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // uiButton1
-            // 
-            this.uiButton1.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.uiButton1.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(190)))), ((int)(((byte)(40)))));
-            this.uiButton1.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(190)))), ((int)(((byte)(40)))));
-            this.uiButton1.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(139)))), ((int)(((byte)(203)))), ((int)(((byte)(83)))));
-            this.uiButton1.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(88)))), ((int)(((byte)(152)))), ((int)(((byte)(32)))));
-            this.uiButton1.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(88)))), ((int)(((byte)(152)))), ((int)(((byte)(32)))));
-            this.uiButton1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiButton1.LightColor = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(251)))), ((int)(((byte)(241)))));
-            this.uiButton1.Location = new System.Drawing.Point(78, 273);
-            this.uiButton1.MinimumSize = new System.Drawing.Size(1, 1);
-            this.uiButton1.Name = "uiButton1";
-            this.uiButton1.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(190)))), ((int)(((byte)(40)))));
-            this.uiButton1.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(139)))), ((int)(((byte)(203)))), ((int)(((byte)(83)))));
-            this.uiButton1.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(88)))), ((int)(((byte)(152)))), ((int)(((byte)(32)))));
-            this.uiButton1.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(88)))), ((int)(((byte)(152)))), ((int)(((byte)(32)))));
-            this.uiButton1.Size = new System.Drawing.Size(75, 35);
-            this.uiButton1.Style = Sunny.UI.UIStyle.Custom;
-            this.uiButton1.TabIndex = 80;
-            this.uiButton1.Text = "切换";
-            this.uiButton1.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiButton1.Click += new System.EventHandler(this.uiButton1_Click);
-            // 
-            // uiButton2
-            // 
-            this.uiButton2.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.uiButton2.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(155)))), ((int)(((byte)(40)))));
-            this.uiButton2.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(155)))), ((int)(((byte)(40)))));
-            this.uiButton2.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(175)))), ((int)(((byte)(83)))));
-            this.uiButton2.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(176)))), ((int)(((byte)(124)))), ((int)(((byte)(32)))));
-            this.uiButton2.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(176)))), ((int)(((byte)(124)))), ((int)(((byte)(32)))));
-            this.uiButton2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiButton2.LightColor = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(249)))), ((int)(((byte)(241)))));
-            this.uiButton2.Location = new System.Drawing.Point(159, 273);
-            this.uiButton2.MinimumSize = new System.Drawing.Size(1, 1);
-            this.uiButton2.Name = "uiButton2";
-            this.uiButton2.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(155)))), ((int)(((byte)(40)))));
-            this.uiButton2.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(175)))), ((int)(((byte)(83)))));
-            this.uiButton2.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(176)))), ((int)(((byte)(124)))), ((int)(((byte)(32)))));
-            this.uiButton2.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(176)))), ((int)(((byte)(124)))), ((int)(((byte)(32)))));
-            this.uiButton2.Size = new System.Drawing.Size(75, 35);
-            this.uiButton2.Style = Sunny.UI.UIStyle.Custom;
-            this.uiButton2.TabIndex = 81;
-            this.uiButton2.Text = "切换";
-            this.uiButton2.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiButton2.Click += new System.EventHandler(this.uiButton2_Click);
-            // 
-            // uiButton3
-            // 
-            this.uiButton3.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.uiButton3.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(80)))), ((int)(((byte)(80)))));
-            this.uiButton3.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(80)))), ((int)(((byte)(80)))));
-            this.uiButton3.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(115)))), ((int)(((byte)(115)))));
-            this.uiButton3.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(184)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
-            this.uiButton3.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(184)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
-            this.uiButton3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiButton3.LightColor = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(243)))), ((int)(((byte)(243)))));
-            this.uiButton3.Location = new System.Drawing.Point(240, 273);
-            this.uiButton3.MinimumSize = new System.Drawing.Size(1, 1);
-            this.uiButton3.Name = "uiButton3";
-            this.uiButton3.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(80)))), ((int)(((byte)(80)))));
-            this.uiButton3.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(115)))), ((int)(((byte)(115)))));
-            this.uiButton3.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(184)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
-            this.uiButton3.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(184)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
-            this.uiButton3.Size = new System.Drawing.Size(75, 35);
-            this.uiButton3.Style = Sunny.UI.UIStyle.Custom;
-            this.uiButton3.TabIndex = 82;
-            this.uiButton3.Text = "切换";
-            this.uiButton3.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiButton3.Click += new System.EventHandler(this.uiButton3_Click);
-            // 
             // FLight
             // 
             this.AllowShowTitle = true;
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.uiButton3);
-            this.Controls.Add(this.uiButton2);
-            this.Controls.Add(this.uiButton1);
-            this.Controls.Add(this.uiLine1);
-            this.Controls.Add(this.uiStatusBox1);
             this.Controls.Add(this.uiLight5);
             this.Controls.Add(this.uiLight6);
             this.Controls.Add(this.uiLedBulb5);
@@ -359,7 +247,6 @@ namespace Sunny.UI.Demo
             this.ShowTitle = true;
             this.Symbol = 362751;
             this.Text = "Light";
-            ((System.ComponentModel.ISupportInitialize)(this.uiStatusBox1)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -380,10 +267,5 @@ namespace Sunny.UI.Demo
         private UILedBulb uiLedBulb6;
         private UILight uiLight5;
         private UILight uiLight6;
-        private UIStatusBox uiStatusBox1;
-        private UILine uiLine1;
-        private UIButton uiButton1;
-        private UIButton uiButton2;
-        private UIButton uiButton3;
     }
 }

SunnyUI.Demo/Industrial/FLight.cs

@@ -6,27 +6,5 @@
         {
             InitializeComponent();
         }
-
-        public enum LightState
-        {
-            Green = 1,
-            Yellow = 2,
-            Red = 3
-        }
-
-        private void uiButton1_Click(object sender, System.EventArgs e)
-        {
-            uiStatusBox1.Status = (int)LightState.Green;
-        }
-
-        private void uiButton2_Click(object sender, System.EventArgs e)
-        {
-            uiStatusBox1.Status = (int)LightState.Yellow;
-        }
-
-        private void uiButton3_Click(object sender, System.EventArgs e)
-        {
-            uiStatusBox1.Status = (int)LightState.Red;
-        }
     }
 }

SunnyUI.Demo/Properties/Resources.Designer.cs

@@ -470,36 +470,6 @@ namespace Sunny.UI.Demo.Properties {
             }
         }
         
-        /// <summary>
-        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
-        /// </summary>
-        internal static System.Drawing.Bitmap led_g {
-            get {
-                object obj = ResourceManager.GetObject("led_g", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
-        /// </summary>
-        internal static System.Drawing.Bitmap led_r {
-            get {
-                object obj = ResourceManager.GetObject("led_r", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
-        /// </summary>
-        internal static System.Drawing.Bitmap led_y {
-            get {
-                object obj = ResourceManager.GetObject("led_y", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>

SunnyUI.Demo/Properties/Resources.resx

@@ -214,15 +214,6 @@
   <data name="lazio" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\lazio.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="led_g" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\led_g.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="led_r" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\led_r.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="led_y" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\led_y.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="mallorca" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\mallorca.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>

SunnyUI.Demo/SunnyUI.Demo.csproj

@@ -41,33 +41,36 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="SunnyUI, Version=3.8.3.0, Culture=neutral, PublicKeyToken=27d7d2e821d97aeb, processorArchitecture=MSIL">
+    <Reference Include="SunnyUI, Version=3.8.0.1, Culture=neutral, PublicKeyToken=27d7d2e821d97aeb, processorArchitecture=MSIL">
-      <HintPath>..\packages\SunnyUI.3.8.3\lib\net472\SunnyUI.dll</HintPath>
+      <HintPath>..\packages\SunnyUI.3.8.0.1\lib\net472\SunnyUI.dll</HintPath>
     </Reference>
-    <Reference Include="SunnyUI.COM, Version=9.0.3.1, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="SunnyUI.COM, Version=6.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SunnyUI.COM.9.0.3.1\lib\net472\SunnyUI.COM.dll</HintPath>
+      <HintPath>..\packages\SunnyUI.COM.6.5.0\lib\net472\SunnyUI.COM.dll</HintPath>
     </Reference>
-    <Reference Include="SunnyUI.Common, Version=3.8.3.0, Culture=neutral, PublicKeyToken=5a271fb7ba597231, processorArchitecture=MSIL">
+    <Reference Include="SunnyUI.Common, Version=3.8.0.0, Culture=neutral, PublicKeyToken=5a271fb7ba597231, processorArchitecture=MSIL">
-      <HintPath>..\packages\SunnyUI.Common.3.8.3\lib\net472\SunnyUI.Common.dll</HintPath>
+      <HintPath>..\packages\SunnyUI.Common.3.8.0\lib\net472\SunnyUI.Common.dll</HintPath>
     </Reference>
-    <Reference Include="SunnyUI.FrameDecoder, Version=7.6.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="SunnyUI.FrameDecoder, Version=7.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SunnyUI.FrameDecoder.7.6.0\lib\net472\SunnyUI.FrameDecoder.dll</HintPath>
+      <HintPath>..\packages\SunnyUI.FrameDecoder.7.2.0\lib\net472\SunnyUI.FrameDecoder.dll</HintPath>
+    </Reference>
+    <Reference Include="SunnyUI.Serialization, Version=6.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SunnyUI.Serialization.6.5.0\lib\net472\SunnyUI.Serialization.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>
+      <HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="System.Design" />
-    <Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
+      <HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
     </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Xml.Linq" />
@@ -772,9 +775,6 @@
     <None Include="Resources\Tom.gif" />
     <None Include="Resources\Sunny24.png" />
     <None Include="Resources\SunnyUI72.png" />
-    <None Include="Resources\led_g.png" />
-    <None Include="Resources\led_r.png" />
-    <None Include="Resources\led_y.png" />
     <Content Include="SunnyUI.ico" />
   </ItemGroup>
   <ItemGroup />

SunnyUI.Demo/app.config

@@ -9,15 +9,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

SunnyUI.Demo/packages.config

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SunnyUI" version="3.8.3" targetFramework="net472" />
+  <package id="SunnyUI" version="3.8.0.1" targetFramework="net472" />
-  <package id="SunnyUI.COM" version="9.0.3.1" targetFramework="net472" />
+  <package id="SunnyUI.COM" version="6.5.0" targetFramework="net472" />
-  <package id="SunnyUI.Common" version="3.8.3" targetFramework="net472" />
+  <package id="SunnyUI.Common" version="3.8.0" targetFramework="net472" />
-  <package id="SunnyUI.FrameDecoder" version="7.6.0" targetFramework="net472" />
+  <package id="SunnyUI.FrameDecoder" version="7.2.0" targetFramework="net472" />
-  <package id="System.Buffers" version="4.6.1" targetFramework="net472" />
+  <package id="SunnyUI.Serialization" version="6.5.0" targetFramework="net472" />
-  <package id="System.Memory" version="4.6.3" targetFramework="net472" />
+  <package id="System.Buffers" version="4.6.0" targetFramework="net472" />
-  <package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net472" />
+  <package id="System.Memory" version="4.6.0" targetFramework="net472" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" targetFramework="net472" />
+  <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net472" />
 </packages>

SunnyUI/Charts/UIBarChart.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -33,7 +33,6 @@
  * 2023-06-06: V3.3.7 修复Y轴文字居中
  * 2024-06-08: V3.6.6 修复X轴文字带角度显示时居中
  * 2024-10-25: V3.7.2 增加了一个快捷的显示数据函数ShowData
- * 2025-03-05: V3.8.1 增加Y轴零度线偏移量，Option.ZeroLineOffset
 ******************************************************************************/
 
 using System;
@@ -50,7 +49,6 @@ namespace Sunny.UI
     /// 柱状图
     /// </summary>
     [ToolboxItem(true)]
-    [Description("柱状图控件")]
     public class UIBarChart : UIChart
     {
         private bool NeedDraw;
@@ -212,7 +210,7 @@ namespace Sunny.UI
                         float ww = Math.Min(x2, series.MaxWidth);
                         xx -= ww / 2.0f;
 
-                        float YZeroPos = YScale.CalcYPixel(Option.ZeroLineOffset, DrawOrigin.Y, DrawSize.Height);
+                        float YZeroPos = YScale.CalcYPixel(0, DrawOrigin.Y, DrawSize.Height);
                         float VPos = YScale.CalcYPixel(series.Data[j], DrawOrigin.Y, DrawSize.Height);
 
                         if (VPos <= YZeroPos)
@@ -258,7 +256,7 @@ namespace Sunny.UI
                         float ww = Math.Min(x2, series.MaxWidth);
                         float xl = (DrawBarWidth - Option.SeriesCount * ww - (Option.SeriesCount - 1) * Option.BarInterval) / 2.0f;
                         float xx = barX + xl + i * ww + i * Option.BarInterval;
-                        float YZeroPos = YScale.CalcYPixel(Option.ZeroLineOffset, DrawOrigin.Y, DrawSize.Height);
+                        float YZeroPos = YScale.CalcYPixel(0, DrawOrigin.Y, DrawSize.Height);
                         float VPos = YScale.CalcYPixel(series.Data[j], DrawOrigin.Y, DrawSize.Height);
 
                         if (VPos <= YZeroPos)
@@ -539,11 +537,6 @@ namespace Sunny.UI
             double[] YLabels = YScale.CalcLabels();
             float[] labels = YScale.CalcYPixels(YLabels, DrawOrigin.Y, DrawSize.Height);
             float wmax = 0;
-
-            using Pen pn = new Pen(ForeColor);
-            pn.DashStyle = DashStyle.Dash;
-            pn.DashPattern = new float[] { 3, 3 };
-
             for (int i = 0; i < labels.Length; i++)
             {
                 if (labels[i] > DrawOrigin.Y) continue;
@@ -554,16 +547,17 @@ namespace Sunny.UI
 
                     if (YLabels[i].IsNanOrInfinity()) continue;
                     if (!Option.YAxis.ShowGridLine) continue;
-                    //if (!YLabels[i].EqualsDouble(Option.ZeroLineOffset))
+                    if (!YLabels[i].EqualsDouble(0))
-                    //{
+                    {
-
+                        using Pen pn = new Pen(ForeColor);
+                        pn.DashStyle = DashStyle.Dash;
+                        pn.DashPattern = new float[] { 3, 3 };
                         g.DrawLine(pn, DrawOrigin.X, labels[i], Width - Option.Grid.Right, labels[i]);
-
+                    }
-                    //}
+                    else
-                    //else
+                    {
-                    //{
+                        g.DrawLine(ForeColor, DrawOrigin.X, labels[i], Width - Option.Grid.Right, labels[i]);
-                    //    g.DrawLine(ForeColor, DrawOrigin.X, labels[i], Width - Option.Grid.Right, labels[i]);
+                    }
-                    //}
                 }
 
                 if (Option.YAxis.AxisLabel.Show)
@@ -582,9 +576,6 @@ namespace Sunny.UI
                 float yy = Option.Grid.Top + DrawSize.Height / 2.0f;
                 g.DrawRotateString(Option.YAxis.Name, TempFont, ForeColor, new PointF(xx, yy), 270);
             }
-
-            float YZeroPos = YScale.CalcYPixel(Option.ZeroLineOffset, DrawOrigin.Y, DrawSize.Height);
-            g.DrawLine(ForeColor, DrawOrigin.X, YZeroPos, Width - Option.Grid.Right, YZeroPos);
         }
 
         private void DrawAxisScales(Graphics g)

SunnyUI/Charts/UIBarChartOption.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -87,11 +87,6 @@ namespace Sunny.UI
 
         public int BarInterval { get; set; } = -1;
 
-        /// <summary>
-        /// Y轴零度线偏移
-        /// </summary>
-        public double ZeroLineOffset { get; set; } = 0;
-
         public void AddSeries(UIBarSeries series)
         {
             if (series == null)

SunnyUI/Charts/UIChart.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Charts/UIChartStyle.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Charts/UIDoughnutChart.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -32,7 +32,7 @@ using System.Windows.Forms;
 
 namespace Sunny.UI
 {
-    [ToolboxItem(true), Description("甜甜圈图控件")]
+    [ToolboxItem(true), Description("甜甜圈图")]
     public sealed class UIDoughnutChart : UIChart
     {
         /// <summary>
@@ -249,9 +249,9 @@ namespace Sunny.UI
                 {
                     Angle angle = Angles[pieIndex][azIndex];
                     PointF pf = angle.Center;
-                    if (e.Location.CalcDistance(pf) > angle.Outer) continue;
+                    if (Drawing.CalcDistance(e.Location, pf) > angle.Outer) continue;
-                    if (e.Location.CalcDistance(pf) < angle.Inner) continue;
+                    if (Drawing.CalcDistance(e.Location, pf) < angle.Inner) continue;
-                    double az = e.Location.CalcAngle(pf);
+                    double az = Drawing.CalcAngle(e.Location, pf);
                     if (az >= angle.Start && az <= angle.Start + angle.Sweep)
                     {
                         SetPieAndAzIndex(pieIndex, azIndex);

SunnyUI/Charts/UILineChart.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -69,7 +69,6 @@ using System.Windows.Forms;
 namespace Sunny.UI
 {
     [ToolboxItem(true)]
-    [Description("曲线图控件")]
     public class UILineChart : UIChart
     {
         protected bool NeedDraw;

SunnyUI/Charts/UILineChartOption.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Charts/UIOption.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Charts/UIPieChart.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -32,7 +32,6 @@ using System.Windows.Forms;
 namespace Sunny.UI
 {
     [ToolboxItem(true)]
-    [Description("饼状图控件")]
     public sealed class UIPieChart : UIChart
     {
         /// <summary>
@@ -274,9 +273,9 @@ namespace Sunny.UI
                 if (!e.Location.InRect(rect)) continue;
 
                 PointF pf = new PointF(rect.Left + rect.Width / 2.0f, rect.Top + rect.Height / 2.0f);
-                if (e.Location.CalcDistance(pf) * 2 > rect.Width) continue;
+                if (Drawing.CalcDistance(e.Location, pf) * 2 > rect.Width) continue;
 
-                double az = e.Location.CalcAngle(pf);
+                double az = Drawing.CalcAngle(e.Location, pf);
                 for (int azIndex = 0; azIndex < Option.Series[pieIndex].Data.Count; azIndex++)
                 {
                     Angle angle = Angles[pieIndex][azIndex];

SunnyUI/Charts/UIPieChartOption.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Charts/UIScale.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Common/UApplicationEx.cs

@@ -1,77 +1,67 @@
-using System;
+using Microsoft.Win32;
+using System;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
-using Microsoft.Win32;
 
 namespace Sunny.UI
 {
     public static class ApplicationEx
     {
-        private static readonly string StartUpPath = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run";
+        private static string StartUpPath = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run";
 
-        /// <summary>
+        //获取GUID
-        /// 获取当前应用程序的 GUID
-        /// </summary>
-        /// <returns>应用程序的 GUID</returns>
         public static Guid AppGuid()
         {
-            var asm = Assembly.GetEntryAssembly();
+            Assembly asm = Assembly.GetEntryAssembly();
-            if (asm == null) return Guid.Empty;
             object[] attr = (asm.GetCustomAttributes(typeof(GuidAttribute), true));
-            return attr.Length > 0 && attr[0] is GuidAttribute ga ? new Guid(ga.Value) : Guid.Empty;
+            return new Guid((attr[0] as GuidAttribute).Value);
         }
 
-        /// <summary>
+        public static string Folder(this Environment.SpecialFolder specialFolder)
-        /// 获取指定特殊文件夹的路径，并处理路径格式
+        {
-        /// </summary>
+            return Environment.GetFolderPath(specialFolder).DealPath();
-        /// <param name="specialFolder">特殊文件夹枚举</param>
+        }
-        /// <returns>处理后的文件夹路径</returns>
-        public static string Folder(this Environment.SpecialFolder specialFolder) => Environment.GetFolderPath(specialFolder).DealPath();
 
-        /// <summary>
-        /// 获取指定特殊文件夹下的应用程序文件夹路径，并在必要时创建该文件夹
-        /// </summary>
-        /// <param name="specialFolder">特殊文件夹枚举</param>
-        /// <param name="createIfNotExists">如果文件夹不存在，是否创建</param>
-        /// <returns>应用程序文件夹路径</returns>
         public static string FolderWithApplication(this Environment.SpecialFolder specialFolder, bool createIfNotExists = true)
         {
-            var dir = (specialFolder.Folder() + Application.ProductName).DealPath();
+            string dir = (specialFolder.Folder() + Application.ProductName).DealPath();
             if (createIfNotExists) Dir.CreateDir(dir);
             return dir;
         }
 
         /// <summary>
-        /// 获取当前漫游用户的应用程序特定数据的公共储存库的目录
+        /// 用作当前漫游用户的应用程序特定数据的公共储存库的目录。 漫游用户在网络上的多台计算机上工作。 漫游用户的配置文件保留在网络服务器上，并在用户登录时加载到系统中。
         /// C:\Users\{YourUserName}\AppData\Roaming\{Application.ProductName}\
         /// </summary>
-        /// <returns>应用程序数据文件夹路径</returns>
+        /// <returns></returns>
         public static string ApplicationDataFolder() => Environment.SpecialFolder.ApplicationData.FolderWithApplication();
 
         /// <summary>
-        /// 获取当前非漫游用户使用的应用程序特定数据的公共储存库的目录
+        /// 用作当前非漫游用户使用的应用程序特定数据的公共储存库的目录。
         /// C:\Users\{YourUserName}\AppData\Local\{Application.ProductName}\
         /// </summary>
-        /// <returns>本地应用程序数据文件夹路径</returns>
+        /// <returns></returns>
         public static string LocalApplicationDataFolder() => Environment.SpecialFolder.LocalApplicationData.FolderWithApplication();
 
         /// <summary>
-        /// 获取所有用户使用的应用程序特定数据的公共储存库的目录
+        /// 用作所有用户使用的应用程序特定数据的公共储存库的目录。
         /// C:\ProgramData \{Application.ProductName}\
         /// </summary>
-        /// <returns>公共应用程序数据文件夹路径</returns>
+        /// <returns></returns>
         public static string CommonApplicationDataFolder() => Environment.SpecialFolder.CommonApplicationData.FolderWithApplication();
 
         /// <summary>
         /// 增加当前程序到开机自动运行
         /// </summary>
-        /// <param name="arguments">启动参数</param>
+        /// <param name="arguments"></param>
         public static void AddToStartup(string arguments)
         {
-            using var key = Registry.CurrentUser.OpenSubKey(StartUpPath, true);
+            using (RegistryKey key = Registry.CurrentUser.OpenSubKey(StartUpPath, true))
-            key?.SetValue(Application.ProductName, $"\"{Application.ExecutablePath}\" {arguments}");
+            {
+                key.SetValue(Application.ProductName, "\"" + Application.ExecutablePath + "\" " + arguments);
+            }
         }
 
         /// <summary>
@@ -79,8 +69,10 @@ namespace Sunny.UI
         /// </summary>
         public static void AddToStartup()
         {
-            using var key = Registry.CurrentUser.OpenSubKey(StartUpPath, true);
+            using (RegistryKey key = Registry.CurrentUser.OpenSubKey(StartUpPath, true))
-            key?.SetValue(Application.ProductName, $"\"{Application.ExecutablePath}\"");
+            {
+                key.SetValue(Application.ProductName, "\"" + Application.ExecutablePath + "\"");
+            }
         }
 
         /// <summary>
@@ -88,18 +80,22 @@ namespace Sunny.UI
         /// </summary>
         public static void RemoveFromStartup()
         {
-            using var key = Registry.CurrentUser.OpenSubKey(StartUpPath, true);
+            using (RegistryKey key = Registry.CurrentUser.OpenSubKey(StartUpPath, true))
-            if (Application.ProductName != null) key?.DeleteValue(Application.ProductName, false);
+            {
+                key.DeleteValue(Application.ProductName, false);
+            }
         }
 
         /// <summary>
         /// 判断当前程序是否开机自动运行
         /// </summary>
-        /// <returns>是否开机自动运行</returns>
+        /// <returns></returns>
         public static bool StartupEnabled()
         {
-            using var key = Registry.CurrentUser.OpenSubKey(StartUpPath, false);
+            using (RegistryKey key = Registry.CurrentUser.OpenSubKey(StartUpPath, false))
-            return key != null && key.GetValue(Application.ProductName) != null;
+            {
+                return key.GetValue(Application.ProductName) != null;
+            }
         }
 
         /// <summary>
@@ -107,14 +103,15 @@ namespace Sunny.UI
         /// </summary>
         public static void CheckAndUpdateStartupPath()
         {
-            if (!StartupEnabled()) return;
+            if (StartupEnabled())
-
+            {
+                string oldValue;
                 string arg = string.Empty;
-            // 从注册表键值中读取启动参数
+
-            using var key = Registry.CurrentUser.OpenSubKey(StartUpPath, true);
+                //Read Argument From Registry Key Value
-            if (key == null) return;
+                using (RegistryKey key = Registry.CurrentUser.OpenSubKey(StartUpPath, true))
-            string oldValue = key.GetValue(Application.ProductName)?.ToString();
+                {
-            if (oldValue == null) return;
+                    oldValue = key.GetValue(Application.ProductName).ToString();
                     if (oldValue.StartsWith("\""))
                     {
                         arg = string.Join("\"", oldValue.Split('\"').Skip(2)).Trim();
@@ -123,6 +120,7 @@ namespace Sunny.UI
                     {
                         arg = string.Join(" ", oldValue.Split(' ').Skip(1));
                     }
+                }
 
                 if (string.IsNullOrEmpty(arg))
                     AddToStartup();
@@ -131,3 +129,4 @@ namespace Sunny.UI
             }
         }
     }
+}

SunnyUI/Common/UAssemblyRef.cs

@@ -1,33 +1,11 @@
 namespace Sunny.UI
 {
-    /// <summary>
-    /// 提供程序集引用的常量定义。
-    /// </summary>
     internal static class AssemblyRefEx
     {
-        /// <summary>
-        /// 程序集版本号。
-        /// </summary>
         internal const string Version = "4.0.0.0";
-
-        /// <summary>
-        /// Microsoft 公钥。
-        /// </summary>
         internal const string MicrosoftPublicKey = "b03f5f7f11d50a3a";
-
-        /// <summary>
-        /// System.Design 程序集引用。
-        /// </summary>
         internal const string SystemDesign = "System.Design, Version=" + Version + ", Culture=neutral, PublicKeyToken=" + MicrosoftPublicKey;
-
-        /// <summary>
-        /// System.Drawing.Design 程序集引用。
-        /// </summary>
         internal const string SystemDrawingDesign = "System.Drawing.Design, Version=" + Version + ", Culture=neutral, PublicKeyToken=" + MicrosoftPublicKey;
-
-        /// <summary>
-        /// System.Drawing 程序集引用。
-        /// </summary>
         internal const string SystemDrawing = "System.Drawing, Version=" + Version + ", Culture=neutral, PublicKeyToken=" + MicrosoftPublicKey;
     }
 }

SunnyUI/Common/UAudio.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -57,14 +57,10 @@ namespace Sunny.UI
             BackgroundLoop
         }
 
-        private static SoundPlayer _soundPlayer;
+        private static SoundPlayer _SoundPlayer;
 
         #region Methods
 
-        /// <summary>
-        /// 停止播放声音。
-        /// </summary>
-        /// <param name="sound">SoundPlayer 对象。</param>
         private static void InternalStop(SoundPlayer sound)
         {
             new SecurityPermission(SecurityPermissionFlag.UnmanagedCode).Assert();
@@ -78,66 +74,60 @@ namespace Sunny.UI
             }
         }
 
-        /// <summary>
+        /// <summary>播放。wav声音文件。</summary>
-        /// 播放 .wav 声音文件。
+        /// <param name="location">String，包含声音文件的名称 </param>
-        /// </summary>
+        /// <PermissionSet><IPermission class="System.Security.Permissions.EnvironmentPermission, mscorlib, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" /><IPermission class="System.Security.Permissions.FileIOPermission, mscorlib, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" /><IPermission class="System.Security.Permissions.SecurityPermission, mscorlib, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Flags="UnmanagedCode, ControlThread" /><IPermission class="System.Net.WebPermission, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" /></PermissionSet>
-        /// <param name="location">包含声音文件的名称的字符串。</param>
         public static void Play(string location)
         {
             Play(location, AudioPlayMode.Background);
         }
 
         /// <summary>
-        /// 播放 .wav 声音文件。
+        /// 播放。wav声音文件.
         /// </summary>
-        /// <param name="location">包含声音文件的名称的字符串。</param>
+        /// <param name="location">AudioPlayMode枚举模式播放声音。默认情况下，AudioPlayMode.Background。</param>
-        /// <param name="playMode">AudioPlayMode 枚举，指示播放模式。</param>
+        /// <param name="playMode">String，包含声音文件的名称</param>
         public static void Play(string location, AudioPlayMode playMode)
         {
-            ValidateAudioPlayModeEnum(playMode, nameof(playMode));
+            ValidateAudioPlayModeEnum(playMode, "playMode");
-            var validatedLocation = ValidateFilename(location);
+            string text1 = ValidateFilename(location);
-            SoundPlayer player = new SoundPlayer(validatedLocation);
+            SoundPlayer player1 = new SoundPlayer(text1);
-            Play(player, playMode);
+            Play(player1, playMode);
         }
 
-        /// <summary>
-        /// 根据播放模式播放声音。
-        /// </summary>
-        /// <param name="sound">SoundPlayer 对象。</param>
-        /// <param name="mode">AudioPlayMode 枚举，指示播放模式。</param>
         private static void Play(SoundPlayer sound, AudioPlayMode mode)
         {
-            if (_soundPlayer != null)
+            if (_SoundPlayer != null)
             {
-                InternalStop(_soundPlayer);
+                InternalStop(_SoundPlayer);
             }
 
-            _soundPlayer = sound;
+            _SoundPlayer = sound;
             switch (mode)
             {
                 case AudioPlayMode.WaitToComplete:
-                    _soundPlayer.PlaySync();
+                    _SoundPlayer.PlaySync();
-                    break;
+                    return;
 
                 case AudioPlayMode.Background:
-                    _soundPlayer.Play();
+                    _SoundPlayer.Play();
-                    break;
+                    return;
 
                 case AudioPlayMode.BackgroundLoop:
-                    _soundPlayer.PlayLooping();
+                    _SoundPlayer.PlayLooping();
-                    break;
+                    return;
             }
         }
 
         /// <summary>
         /// 播放系统声音。
         /// </summary>
-        /// <param name="systemSound">SystemSound 对象，代表系统播放声音。</param>
+        /// <param name="systemSound">对象代表系统播放声音。</param>
         public static void PlaySystemSound(SystemSound systemSound)
         {
             if (systemSound == null)
             {
-                throw new ArgumentNullException(nameof(systemSound));
+                throw new ArgumentNullException();
             }
 
             systemSound.Play();
@@ -146,35 +136,26 @@ namespace Sunny.UI
         /// <summary>
         /// 停止在后台播放声音。
         /// </summary>
+        /// <filterpriority>1</filterpriority>
         public static void Stop()
         {
-            SoundPlayer player = new SoundPlayer();
+            SoundPlayer player1 = new SoundPlayer();
-            InternalStop(player);
+            InternalStop(player1);
         }
 
-        /// <summary>
-        /// 验证 AudioPlayMode 枚举值。
-        /// </summary>
-        /// <param name="value">AudioPlayMode 枚举值。</param>
-        /// <param name="paramName">参数名称。</param>
         private static void ValidateAudioPlayModeEnum(AudioPlayMode value, string paramName)
         {
-            if (!Enum.IsDefined(typeof(AudioPlayMode), value))
+            if ((value < AudioPlayMode.WaitToComplete) || (value > AudioPlayMode.BackgroundLoop))
             {
                 throw new InvalidEnumArgumentException(paramName, (int)value, typeof(AudioPlayMode));
             }
         }
 
-        /// <summary>
-        /// 验证文件名。
-        /// </summary>
-        /// <param name="location">文件名字符串。</param>
-        /// <returns>验证后的文件名。</returns>
         private static string ValidateFilename(string location)
         {
             if (string.IsNullOrEmpty(location))
             {
-                throw new ArgumentNullException(nameof(location));
+                throw new ArgumentNullException();
             }
 
             return location;
@@ -189,18 +170,18 @@ namespace Sunny.UI
     public static class Mp3Player
     {
         /// <summary>
-        /// 播放 MP3 文件。
+        /// 播放
         /// </summary>
-        /// <param name="mp3FileName">文件名。</param>
+        /// <param name="MP3_FileName">文件名</param>
-        /// <param name="repeat">是否重复播放。</param>
+        /// <param name="Repeat">重复</param>
-        public static void Play(string mp3FileName, bool repeat)
+        public static void Play(string MP3_FileName, bool Repeat)
         {
-            Win32.WinMM.mciSendString($"open \"{mp3FileName}\" type mpegvideo alias MediaFile", null, 0, IntPtr.Zero);
+            Win32.WinMM.mciSendString("open \"" + MP3_FileName + "\" type mpegvideo alias MediaFile", null, 0, IntPtr.Zero);
-            Win32.WinMM.mciSendString($"play MediaFile{(repeat ? " repeat" : string.Empty)}", null, 0, IntPtr.Zero);
+            Win32.WinMM.mciSendString("play MediaFile" + (Repeat ? " repeat" : string.Empty), null, 0, IntPtr.Zero);
         }
 
         /// <summary>
-        /// 暂停播放。
+        /// 暂停
         /// </summary>
         public static void Pause()
         {
@@ -208,7 +189,7 @@ namespace Sunny.UI
         }
 
         /// <summary>
-        /// 停止播放。
+        /// 停止
         /// </summary>
         public static void Stop()
         {

SunnyUI/Common/UBaseConfig.cs

@@ -1,743 +0,0 @@
-/******************************************************************************
- * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2023 ShenYongHua(沈永华).
- * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
- *
- * Blog:   https://www.cnblogs.com/yhuse
- * Gitee:  https://gitee.com/yhuse/SunnyUI
- * GitHub: https://github.com/yhuse/SunnyUI
- *
- * SunnyUI.Common.dll can be used for free under the MIT license.
- * If you use this code, please keep this note.
- * 如果您使用此代码，请保留此说明。
- ******************************************************************************
- * 文件名称: UBaseConfig.cs
- * 文件说明: 配置文件基类
- * 当前版本: V3.1
- * 创建日期: 2020-01-01
- *
- * 2020-01-01: V2.2.0 增加文件说明
-******************************************************************************/
-
-using System;
-using System.Collections;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Reflection;
-using System.Xml.Serialization;
-
-namespace Sunny.UI
-{
-    /// <summary>
-    /// 配置文件基类
-    /// </summary>
-    /// <typeparam name="TConfig">类型</typeparam>
-    public abstract class BaseConfig<TConfig> where TConfig : BaseConfig<TConfig>, new()
-    {
-        /// <summary>
-        /// 实体对象
-        /// </summary>
-        protected static TConfig current;
-
-        /// <summary>
-        /// 配置文件描述
-        /// </summary>
-        public static string Description
-        {
-            get
-            {
-                var fileanddesc = ConfigHelper.GetConfigFile<TConfig>();
-                return fileanddesc.Item2;
-            }
-        }
-
-        /// <summary>
-        /// 配置文件名
-        /// </summary>
-        public static string ConfigFile
-        {
-            get
-            {
-                var fileanddesc = ConfigHelper.GetConfigFile<TConfig>();
-                return fileanddesc.Item1;
-            }
-        }
-
-        /// <summary>
-        /// 当前可执行文件路径，末尾包括\
-        /// </summary>
-        /// <returns>结果</returns>
-        private static string CurrentDir()
-        {
-            return Environment.CurrentDirectory.DealPath();
-        }
-
-        /// <summary>
-        /// 当前实例。通过置空可以使其重新加载。
-        /// </summary>
-        public static TConfig Current
-        {
-            get
-            {
-                if (current != null)
-                {
-                    return current;
-                }
-
-                // 现在没有对象，尝试加载，若返回null则实例化一个新的
-                current = CreateNew();
-                if (!current.Load(CurrentDir() + ConfigFile))
-                {
-                    try
-                    {
-                        // 根据配置，有可能不保存，直接返回默认
-                        current.Save();
-                    }
-                    catch (Exception ex)
-                    {
-                        Console.WriteLine(ex.Message);
-                    }
-                }
-
-                return current;
-            }
-
-            set => current = value;
-        }
-
-        private static TConfig CreateNew()
-        {
-            TConfig config = new TConfig();
-            config.SetDefault();
-            return config;
-        }
-
-        /// <summary>保存到配置文件中去</summary>
-        public void Save()
-        {
-            Save(null);
-        }
-
-        /// <summary>
-        /// 加载指定配置文件
-        /// </summary>
-        /// <returns>结果</returns>
-        public bool Load()
-        {
-            return Load(null);
-        }
-
-        /// <summary>
-        /// 加密
-        /// </summary>
-        /// <param name="str">字符串</param>
-        /// <returns>加密后字符串</returns>
-        public string Encrypt(string str)
-        {
-            Random random = new Random();
-            var value = random.Next(100000, 999999);
-            string tmp = str + value.ToString();
-            return tmp.DesEncrypt();
-        }
-
-        /// <summary>
-        /// 解密
-        /// </summary>
-        /// <param name="str">字符串</param>
-        /// <returns>解密后字符串</returns>
-        public string Decrypt(string str)
-        {
-            string result = str.DesDecrypt();
-            return result.Left(result.Length - 6);
-        }
-
-        /// <summary>加载指定配置文件</summary>
-        /// <param name="filename">文件名</param>
-        /// <returns>结果</returns>
-        public abstract bool Load(string filename);
-
-        /// <summary>保存到配置文件中去</summary>
-        /// <param name="filename">文件名</param>
-        public abstract void Save(string filename);
-
-        /// <summary>
-        /// 设置默认值
-        /// </summary>
-        public virtual void SetDefault()
-        {
-        }
-    }
-
-    /// <summary>
-    /// 忽略此属性的配置存储
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Property)]
-    public class MapperIgnoreAttribute : Attribute
-    {
-    }
-
-    /// <summary>
-    /// 忽略此属性的配置存储
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Property)]
-    public class IgnoreAttribute : Attribute
-    {
-    }
-
-    /// <summary>
-    /// 配置文件帮助类
-    /// </summary>
-    public static class ConfigHelper
-    {
-        /// <summary>
-        /// 类型是否能够转为指定基类
-        /// </summary>
-        /// <param name="type">类型</param>
-        /// <param name="baseType">基类</param>
-        /// <returns>是否能够转为指定基类</returns>
-        public static bool As(this Type type, Type baseType)
-        {
-            if (type == null)
-            {
-                return false;
-            }
-
-            // 如果基类是泛型定义
-            if (baseType.IsGenericTypeDefinition && type.IsGenericType && !type.IsGenericTypeDefinition)
-            {
-                type = type.GetGenericTypeDefinition();
-            }
-
-            if (type == baseType)
-            {
-                return true;
-            }
-
-            if (baseType.IsAssignableFrom(type))
-            {
-                return true;
-            }
-
-            var rs = false;
-
-            // 接口
-            if (baseType.IsInterface)
-            {
-                if (type.GetInterface(baseType.FullName) != null)
-                {
-                    rs = true;
-                }
-                else
-                    foreach (var e in type.GetInterfaces())
-                    {
-                        if (e.IsGenericType && baseType.IsGenericTypeDefinition ? e.GetGenericTypeDefinition() == baseType : e == baseType)
-                        {
-                            rs = true;
-                            break;
-                        }
-                    }
-            }
-
-            // 判断是否子类时，支持只反射加载的程序集
-            if (!rs && type.Assembly.ReflectionOnly)
-            {
-                // 反射加载时，需要特殊处理接口
-                while (!rs && type != typeof(object))
-                {
-                    if (type == null)
-                    {
-                        continue;
-                    }
-
-                    if (type.FullName == baseType.FullName && type.AssemblyQualifiedName == baseType.AssemblyQualifiedName)
-                    {
-                        rs = true;
-                    }
-
-                    type = type.BaseType;
-                }
-            }
-
-            return rs;
-        }
-
-        /// <summary>是否泛型字典</summary>
-        /// <param name="type">类型</param>
-        /// <returns>是否泛型字典</returns>
-        public static bool IsDictionary(this Type type) => type != null && type.IsGenericType && type.As(typeof(IDictionary<,>));
-
-        /// <summary>是否泛型列表</summary>
-        /// <param name="type">类型</param>
-        /// <returns>是否泛型列表</returns>
-        public static bool IsList(this Type type)
-        {
-            return type != null && type.IsGenericType && type.As(typeof(IList<>));
-            //return Array.IndexOf(type.GetInterfaces(), typeof(IEnumerable)) > -1;
-        }
-
-        /// <summary>获取成员绑定的显示名，优先DisplayName，然后Description</summary>
-        /// <param name="member">member</param>
-        /// <returns>显示名</returns>
-        public static string DisplayName(this PropertyInfo member)
-        {
-            var att = member.GetCustomAttribute<DisplayNameAttribute>();
-            if (att != null && !att.DisplayName.IsNullOrWhiteSpace())
-            {
-                return att.DisplayName;
-            }
-
-            return "";
-        }
-
-        /// <summary>获取成员绑定的显示名，优先DisplayName，然后Description</summary>
-        /// <param name="member">member</param>
-        /// <returns>显示名</returns>
-        public static string Description(this PropertyInfo member)
-        {
-            var att2 = member.GetCustomAttribute<DescriptionAttribute>();
-            if (att2 != null && !att2.Description.IsNullOrWhiteSpace())
-            {
-                return att2.Description;
-            }
-
-            return "";
-        }
-
-        /// <summary>
-        /// 获取需要的属性，删除忽略的属性
-        /// </summary>
-        /// <param name="type">类型</param>
-        /// <returns>属性列表</returns>
-        public static List<PropertyInfo> GetNeedProperties(this Type type)
-        {
-            var list = type.GetProperties();
-            List<PropertyInfo> result = new List<PropertyInfo>();
-            foreach (var info in list)
-            {
-                if (info.GetCustomAttribute<XmlIgnoreAttribute>() != null)
-                {
-                    continue;
-                }
-
-                if (info.GetCustomAttribute<ConfigIgnoreAttribute>() != null)
-                {
-                    continue;
-                }
-
-                if (info.GetCustomAttribute<MapperIgnoreAttribute>() != null)
-                {
-                    continue;
-                }
-
-                if (info.GetCustomAttribute<IgnoreAttribute>() != null)
-                {
-                    continue;
-                }
-
-                result.Add(info);
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// 获取配置文件路径
-        /// </summary>
-        /// <typeparam name="TConfig">类型</typeparam>
-        /// <returns>文件名</returns>
-        public static Tuple<string, string> GetConfigFile<TConfig>()
-        {
-            string filename;
-            string description = "配置文件";
-            var att = typeof(TConfig).GetCustomAttribute<ConfigFileAttribute>();
-            if (att == null || att.FileName.IsNullOrWhiteSpace())
-            {
-                filename = $"{typeof(TConfig).Name}.cfg";
-            }
-            else
-            {
-                filename = att.FileName;
-
-                if (!att.Description.IsNullOrEmpty())
-                {
-                    description = att.Description;
-                }
-            }
-
-            return new Tuple<string, string>(filename, description);
-        }
-
-        /// <summary>
-        /// 初始化属性
-        /// </summary>
-        /// <param name="config">配置类</param>
-        /// <typeparam name="TConfig">类型</typeparam>
-        /// <returns>节点</returns>
-        /// <exception cref="ApplicationException">ApplicationException</exception>
-        public static ConcurrentDictionary<string, Ident> InitIdents<TConfig>(TConfig config)
-        {
-            ConcurrentDictionary<string, Ident> idents = new ConcurrentDictionary<string, Ident>();
-            var list = config.GetType().GetNeedProperties();
-            foreach (PropertyInfo info in list)
-            {
-                Ident ident = new Ident
-                {
-                    Key = info.Name,
-                    Show = true,
-                    Description = info.Description(),
-                    IsList = info.PropertyType.IsList()
-                };
-
-                var section = info.GetCustomAttribute<ConfigSectionAttribute>();
-                ident.Section = section != null ? section.Section : "";
-
-                var propertyatt = info.GetCustomAttribute<ConfigPropertyAttribute>();
-                ident.Caption = propertyatt != null ? propertyatt.Caption : "";
-                ident.Unit = propertyatt != null ? propertyatt.Unit : "";
-                ident.Description = propertyatt != null ? propertyatt.Description : "";
-
-                var indexatt = info.GetCustomAttribute<ConfigIndexAttribute>();
-                ident.Index = indexatt?.Index ?? short.MaxValue + idents.Count;
-                ident.Show = indexatt == null || indexatt.Show;
-
-                if (ident.Description.IsNullOrEmpty())
-                {
-                    ident.Description = info.DisplayName() ?? info.Description();
-                }
-
-                if (ident.Description.IsNullOrEmpty())
-                {
-                    ident.Description = "";
-                }
-
-                if (!idents.ContainsKey(ident.Key))
-                {
-                    idents.TryAdd(ident.Key, ident);
-                }
-            }
-
-            return idents;
-        }
-
-        /// <summary>
-        /// 类型默认值
-        /// </summary>
-        /// <param name="targetType">类型</param>
-        /// <returns>默认值</returns>
-        public static object DefaultValue(Type targetType)
-        {
-            return targetType.IsValueType ? Activator.CreateInstance(targetType) : null;
-        }
-
-        /// <summary>
-        /// 读取对象数值
-        /// </summary>
-        /// <param name="config">配置文件</param>
-        /// <param name="idents">节点</param>
-        /// <typeparam name="TConfig">类型</typeparam>
-        /// <exception cref="ApplicationException">ApplicationException</exception>
-        public static void LoadConfigValue<TConfig>(TConfig config, ConcurrentDictionary<string, Ident> idents)
-        {
-            var list = config.GetType().GetNeedProperties();
-            foreach (PropertyInfo info in list)
-            {
-                object defaultobj = info.GetValue(config, null);
-                Type type = info.PropertyType;
-
-                if (type == typeof(string))
-                {
-                    object value = idents[info.Name].Value;
-                    info.SetValue(config, Convert.ChangeType(value == null ? defaultobj : value, type), null);
-                    continue;
-                }
-
-                if (ConvertEx.CanConvent(type))
-                {
-                    object value = ConvertEx.StringToObject(idents[info.Name].Value, type, defaultobj);
-                    info.SetValue(config, Convert.ChangeType(value, type), null);
-                    continue;
-                }
-
-                if (type.IsList())
-                {
-                    Type[] genericTypes = type.GetGenericArguments();
-                    if (genericTypes.Length != 1)
-                    {
-                        throw new ApplicationException("转换出错: " + type.FullName);
-                    }
-
-                    Type childtype = genericTypes[0];
-                    Type typeDataList = typeof(List<>).MakeGenericType(childtype);
-                    MethodInfo methodInfo = typeDataList.GetMethod("Add", BindingFlags.Public | BindingFlags.Instance);
-                    if (methodInfo == null)
-                    {
-                        continue;
-                    }
-
-                    object listvalue = typeDataList.InvokeMember(null, BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.CreateInstance, null, null, new object[] { });
-
-                    foreach (string strvalue in idents[info.Name].Values)
-                    {
-                        if (childtype == typeof(string))
-                        {
-                            object value = strvalue;
-                            methodInfo.Invoke(listvalue, new[] { value });
-                        }
-                        else if (ConvertEx.CanConvent(childtype))
-                        {
-                            object value = ConvertEx.StringToObject(strvalue, childtype, DefaultValue(childtype));
-                            methodInfo.Invoke(listvalue, new[] { value });
-                        }
-                    }
-
-                    info.SetValue(config, listvalue, null);
-                    continue;
-                }
-
-                throw new ApplicationException("不支持此类型: " + type.FullName);
-            }
-        }
-
-        /// <summary>
-        /// 设置对象数值
-        /// </summary>
-        /// <param name="config">配置文件</param>
-        /// <param name="idents">节点</param>
-        /// <typeparam name="TConfig">类型</typeparam>
-        /// <exception cref="ApplicationException">ApplicationException</exception>
-        public static void SaveConfigValue<TConfig>(TConfig config, ConcurrentDictionary<string, Ident> idents)
-        {
-            var list = config.GetType().GetNeedProperties();
-            foreach (PropertyInfo info in list)
-            {
-                object obj = info.GetValue(config, null);
-                Type type = info.PropertyType;
-
-                if (ConvertEx.CanConvent(type))
-                {
-                    string value = ConvertEx.ObjectToString(obj, type);
-                    idents[info.Name].Value = value;
-                    continue;
-                }
-
-                if (type.IsList())
-                {
-                    Type[] genericTypes = type.GetGenericArguments();
-                    if (genericTypes.Length != 1)
-                    {
-                        throw new ApplicationException("转换出错: " + type.FullName);
-                    }
-
-                    Type childtype = genericTypes[0];
-                    IEnumerable en = obj as IEnumerable;
-                    if (en == null)
-                    {
-                        throw new ApplicationException("转换出错: " + type.FullName);
-                    }
-
-                    idents[info.Name].Values.Clear();
-                    foreach (object child in en)
-                    {
-                        if (ConvertEx.CanConvent(childtype))
-                        {
-                            idents[info.Name].Values.Add(ConvertEx.ObjectToString(child, childtype));
-                        }
-                        else
-                        {
-                            throw new ApplicationException("不支持此类型: " + type.FullName);
-                        }
-                    }
-
-                    continue;
-                }
-
-                throw new ApplicationException("不支持此类型: " + type.FullName);
-            }
-        }
-    }
-
-    /// <summary>配置文件特性</summary>
-    [AttributeUsage(AttributeTargets.Class)]
-    public class ConfigFileAttribute : Attribute
-    {
-        /// <summary>
-        /// 配置文件名
-        /// </summary>
-        public string FileName { get; }
-
-        /// <summary>
-        /// 描述
-        /// </summary>
-        public string Description { get; }
-
-        /// <summary>
-        /// 配置文件
-        /// </summary>
-        public ConfigFileAttribute() : this(string.Empty, string.Empty)
-        {
-        }
-
-        /// <summary>配置文件</summary>
-        /// <param name="fileName">文件名</param>
-        /// <param name="description">描述</param>
-        public ConfigFileAttribute(string fileName, string description = "")
-        {
-            FileName = fileName;
-            Description = description;
-        }
-    }
-
-    /// <summary>
-    /// 数据节点
-    /// </summary>
-    public class Ident
-    {
-        /// <summary>
-        /// 节
-        /// </summary>
-        public string Section { get; set; }
-
-        /// <summary>
-        /// 键
-        /// </summary>
-        public string Key { get; set; }
-
-        /// <summary>
-        /// 值
-        /// </summary>
-        public string Value { get; set; }
-
-        /// <summary>
-        /// 描述
-        /// </summary>
-        public string Description { get; set; }
-
-        /// <summary>
-        /// 名称
-        /// </summary>
-        public string Caption { get; set; }
-
-        /// <summary>
-        /// 单位
-        /// </summary>
-        public string Unit { get; set; }
-
-        /// <summary>
-        /// 序号
-        /// </summary>
-        public int Index { get; set; }
-
-        /// <summary>
-        /// 是否显示
-        /// </summary>
-        public bool Show { get; set; }
-
-        /// <summary>
-        /// ToString()
-        /// </summary>
-        /// <returns>String</returns>
-        public override string ToString()
-        {
-            return Index + " [" + Section + "] " + Key + " = ?";
-        }
-
-        /// <summary>
-        /// 是否是列表类型
-        /// </summary>
-        public bool IsList { get; set; }
-
-        /// <summary>
-        /// 列表值
-        /// </summary>
-        public List<string> Values = new List<string>();
-    }
-
-    /// <summary>
-    /// 配置属性节点特性
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Property)]
-    public class ConfigSectionAttribute : Attribute
-    {
-        /// <summary>
-        /// 节
-        /// </summary>
-        public string Section { get; }
-
-        /// <summary>属性节点特性</summary>
-        /// <param name="section">节</param>
-        public ConfigSectionAttribute(string section)
-        {
-            Section = section;
-        }
-    }
-
-    /// <summary>
-    /// 配置属性描述特性
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Property)]
-    public class ConfigPropertyAttribute : Attribute
-    {
-        /// <summary>
-        /// 标题
-        /// </summary>
-        public string Caption { get; }
-
-        /// <summary>
-        /// 单位
-        /// </summary>
-        public string Unit { get; }
-
-        /// <summary>
-        /// 描述
-        /// </summary>
-        public string Description { get; }
-
-        /// <summary>
-        /// 配置文件属性
-        /// </summary>
-        /// <param name="caption">标题</param>
-        /// <param name="unit">单位</param>
-        /// <param name="description">描述</param>
-        public ConfigPropertyAttribute(string caption, string description = "", string unit = "")
-        {
-            Caption = caption;
-            Unit = unit;
-            Description = description;
-        }
-    }
-
-    /// <summary>
-    /// 忽略此属性的配置存储
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Property)]
-    public class ConfigIgnoreAttribute : Attribute
-    {
-    }
-
-    /// <summary>
-    /// 配置序号描述特性
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Property)]
-    public class ConfigIndexAttribute : Attribute
-    {
-        /// <summary>
-        /// 序号
-        /// </summary>
-        public int Index { get; }
-
-        /// <summary>
-        /// 是否显示
-        /// </summary>
-        public bool Show { get; }
-
-        /// <summary>配置序号特性</summary>
-        /// <param name="index">序号</param>
-        /// <param name="show">是否显示</param>
-        public ConfigIndexAttribute(int index, bool show = true)
-        {
-            Index = index;
-            Show = show;
-        }
-    }
-}

SunnyUI/Common/UBmp.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -153,16 +153,20 @@ namespace Sunny.UI
     /// </summary>
     public class BmpFile
     {
+        BmpHead head;
+
+        byte[] data;
+
         /// <summary>
         /// 慢于 bitmap.Save(XX,ImageFormat.Bmp)，只是为了解释BMP文件数据格式
         /// </summary>
         /// <param name="bitmap"></param>
         public BmpFile(Bitmap bitmap)
         {
-            var head = new BmpHead();
+            head = new BmpHead();
             head.Init(bitmap);
-            Data = new byte[head.FileSize];
+            data = new byte[head.FileSize];
-            Array.Copy(head.ToBytes(), 0, Data, 0, (int)head.BitmapDataOffset);
+            Array.Copy(head.ToBytes(), 0, data, 0, (int)head.BitmapDataOffset);
 
             var sourceArea = new Rectangle(0, 0, bitmap.Width, bitmap.Height);
             var bitmapData = bitmap.LockBits(sourceArea, ImageLockMode.ReadOnly, PixelFormat.Format32bppPArgb);
@@ -196,10 +200,10 @@ namespace Sunny.UI
         /// <param name="bmpData">数据，从左上角开始，为每个点的B、G、R循环</param>
         public BmpFile(int width, int height, byte[] bmpData)
         {
-            var head = new BmpHead();
+            head = new BmpHead();
             head.Init(width, height);
-            Data = new byte[head.FileSize];
+            data = new byte[head.FileSize];
-            Array.Copy(head.ToBytes(), 0, Data, 0, (int)head.BitmapDataOffset);
+            Array.Copy(head.ToBytes(), 0, data, 0, (int)head.BitmapDataOffset);
             if (bmpData.Length != width * height * 3) return;
 
             //BMP文件的数据从左下角开始，每行向上。System.Drawing.Bitmap数据是从左上角开始，每行向下
@@ -208,7 +212,7 @@ namespace Sunny.UI
             {
                 int offset = height - 1 - i;
                 offset *= width * 3;
-                Array.Copy(bmpData, offset, Data, idx, width * 3);
+                Array.Copy(bmpData, offset, data, idx, width * 3);
                 idx += width * 3;
             }
         }
@@ -216,7 +220,7 @@ namespace Sunny.UI
         /// <summary>
         /// 二进制数据
         /// </summary>
-        public byte[] Data { get; }
+        public byte[] Data => data;
 
         /// <summary>
         /// 保存文件
@@ -224,7 +228,7 @@ namespace Sunny.UI
         /// <param name="fileName">文件名</param>
         public void SaveToFile(string fileName)
         {
-            File.WriteAllBytes(fileName, Data);
+            File.WriteAllBytes(fileName, data);
         }
 
         /// <summary>
@@ -233,7 +237,7 @@ namespace Sunny.UI
         /// <returns>图片</returns>
         public Bitmap Bitmap()
         {
-            var ms = new MemoryStream(Data);
+            MemoryStream ms = new MemoryStream(data);
             ms.Position = 0;
             return new Bitmap(ms);
         }

SunnyUI/Common/UControl.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Common/UConvertEx.cs

@@ -1,371 +0,0 @@
-/******************************************************************************
- * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2023 ShenYongHua(沈永华).
- * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
- *
- * Blog:   https://www.cnblogs.com/yhuse
- * Gitee:  https://gitee.com/yhuse/SunnyUI
- * GitHub: https://github.com/yhuse/SunnyUI
- *
- * SunnyUI.Common.dll can be used for free under the MIT license.
- * If you use this code, please keep this note.
- * 如果您使用此代码，请保留此说明。
- ******************************************************************************
- * 文件名称: UConvertEx.cs
- * 文件说明: 对象转换扩展类
- * 当前版本: V3.1
- * 创建日期: 2020-01-01
- *
- * 2020-11-20: V3.0.0 增加文件说明
-******************************************************************************/
-
-using System;
-using System.Drawing;
-
-namespace Sunny.UI
-{
-    /// <summary>
-    /// 对象转换扩展类
-    /// </summary>
-    public static class ConvertEx
-    {
-        /// <summary>
-        /// 可以对象和字符串互相转换的类型
-        /// </summary>
-        /// <param name="type">类型</param>
-        /// <returns>结果</returns>
-        public static bool CanConvent(Type type)
-        {
-            bool result = false;
-            TypeCode typeCode = Type.GetTypeCode(type);
-            switch (typeCode)
-            {
-                case TypeCode.String:
-                case TypeCode.Char:
-                case TypeCode.SByte:
-                case TypeCode.Byte:
-                case TypeCode.Int16:
-                case TypeCode.UInt16:
-                case TypeCode.Int32:
-                case TypeCode.UInt32:
-                case TypeCode.Int64:
-                case TypeCode.UInt64:
-                case TypeCode.Single:
-                case TypeCode.Double:
-                case TypeCode.Decimal:
-                case TypeCode.Boolean:
-                case TypeCode.DateTime:
-                    result = true;
-                    break;
-
-                case TypeCode.Object:
-                    if (type == typeof(Point) ||
-                        type == typeof(PointF) ||
-                        type == typeof(Color) ||
-                        type == typeof(Size) ||
-                        type == typeof(SizeF))
-                    {
-                        result = true;
-                    }
-
-                    break;
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// 字符串转对象
-        /// </summary>
-        /// <param name="str">字符串</param>
-        /// <param name="type">类型</param>
-        /// <param name="defaultobj">默认对象</param>
-        /// <returns>对象</returns>
-        public static object StringToObject(string str, Type type, object defaultobj)
-        {
-            object obj = defaultobj;
-
-            if (type == typeof(string))
-            {
-                return str;
-            }
-
-            if (str.IsNullOrEmpty())
-            {
-                return defaultobj;
-            }
-
-            TypeCode typeCode = Type.GetTypeCode(type);
-            switch (typeCode)
-            {
-                case TypeCode.Char:
-                    obj = str.ToChar((char)defaultobj);
-                    break;
-
-                case TypeCode.SByte:
-                    obj = str.ToSByte((sbyte)defaultobj);
-                    break;
-
-                case TypeCode.Byte:
-                    obj = str.ToByte((byte)defaultobj);
-                    break;
-
-                case TypeCode.Int16:
-                    obj = str.ToShort((short)defaultobj);
-                    break;
-
-                case TypeCode.UInt16:
-                    obj = str.ToUShort((ushort)defaultobj);
-                    break;
-
-                case TypeCode.Int32:
-                    obj = str.ToInt((int)defaultobj);
-                    break;
-
-                case TypeCode.UInt32:
-                    obj = str.ToUInt((uint)defaultobj);
-                    break;
-
-                case TypeCode.Int64:
-                    obj = str.ToLong((long)defaultobj);
-                    break;
-
-                case TypeCode.UInt64:
-                    obj = str.ToULong((ulong)defaultobj);
-                    break;
-
-                case TypeCode.Single:
-                    obj = str.ToFloat((float)defaultobj);
-                    break;
-
-                case TypeCode.Double:
-                    obj = str.ToDouble((double)defaultobj);
-                    break;
-
-                case TypeCode.Decimal:
-                    obj = str.ToDecimal((decimal)defaultobj);
-                    break;
-
-                case TypeCode.Boolean:
-                    if (str.ToUpper().Equals(bool.TrueString.ToUpper()))
-                    {
-                        obj = true;
-                    }
-
-                    if (str.ToUpper().Equals(bool.FalseString.ToUpper()))
-                    {
-                        obj = false;
-                    }
-
-                    break;
-
-                case TypeCode.DateTime:
-                    try
-                    {
-                        DateTime dt = str.ToDateTime(DateTimeEx.DateTimeFormat);
-                        obj = dt;
-                    }
-                    catch (Exception e)
-                    {
-                        Console.WriteLine(e);
-                    }
-
-                    break;
-
-                case TypeCode.Object:
-                    obj = StringToObjectEx(str, type, defaultobj);
-                    break;
-
-                default:
-                    throw new ApplicationException("不支持此类型: " + type.FullName);
-            }
-
-            if (type == typeof(DateTime))
-            {
-            }
-
-            return obj;
-        }
-
-        /// <summary>
-        /// 字符串转对象扩展
-        /// </summary>
-        /// <param name="str">字符串</param>
-        /// <param name="type">类型</param>
-        /// <param name="defaultobj">默认对象</param>
-        /// <returns>对象</returns>
-        private static object StringToObjectEx(string str, Type type, object defaultobj)
-        {
-            object obj = defaultobj;
-
-            if (type == typeof(Point))
-            {
-                string[] strs = str.ToUpper().Replace("X:", "").Replace("Y:", "").Trim().Split(";");
-
-                if (strs.Length == 2)
-                {
-                    if (int.TryParse(strs[0], out var x) && int.TryParse(strs[1], out var y))
-                    {
-                        obj = new Point(x, y);
-                    }
-                }
-            }
-            else if (type == typeof(PointF))
-            {
-                string[] strs = str.ToUpper().Replace("X:", "").Replace("Y:", "").Trim().Split(";");
-
-                if (strs.Length == 2)
-                {
-                    if (float.TryParse(strs[0], out var x) && float.TryParse(strs[1], out var y))
-                    {
-                        obj = new PointF(x, y);
-                    }
-                }
-            }
-            else if (type == typeof(Color))
-            {
-                string[] strs = str.ToUpper().Replace("A:", "").Replace("R:", "").Replace("G:", "").Replace("B:", "").Trim().Split(";");
-
-                if (strs.Length == 4)
-                {
-                    if (int.TryParse(strs[0], out var a) && int.TryParse(strs[1], out var r) && int.TryParse(strs[2], out var g) && int.TryParse(strs[3], out var b))
-                    {
-                        if (a.InRange(0, 255) && r.InRange(0, 255) && g.InRange(0, 255) && b.InRange(0, 255))
-                        {
-                            obj = Color.FromArgb(a, r, g, b);
-                        }
-                    }
-                }
-            }
-            else if (type == typeof(Size))
-            {
-                string[] strs = str.ToUpper().Replace("W:", "").Replace("H:", "").Trim().Split(";");
-
-                if (strs.Length == 2)
-                {
-                    if (int.TryParse(strs[0], out var x) && int.TryParse(strs[1], out var y))
-                    {
-                        obj = new Size(x, y);
-                    }
-                }
-            }
-            else if (type == typeof(SizeF))
-            {
-                string[] strs = str.ToUpper().Replace("W:", "").Replace("H:", "").Trim().Split(";");
-
-                if (strs.Length == 2)
-                {
-                    if (float.TryParse(strs[0], out var x) && float.TryParse(strs[1], out var y))
-                    {
-                        obj = new SizeF(x, y);
-                    }
-                }
-            }
-            else
-            {
-                throw new ApplicationException("不支持此类型: " + type.FullName);
-            }
-
-            return obj;
-        }
-
-        /// <summary>
-        /// 对象转字符串
-        /// </summary>
-        /// <param name="obj">对象</param>
-        /// <param name="type">类型</param>
-        /// <returns>字符串</returns>
-        public static string ObjectToString(object obj, Type type)
-        {
-            string value;
-
-            TypeCode typeCode = Type.GetTypeCode(type);
-            switch (typeCode)
-            {
-                case TypeCode.String:
-                    if (obj == null)
-                    {
-                        obj = "";
-                    }
-
-                    value = obj.ToString();
-                    break;
-
-                case TypeCode.Char:
-                case TypeCode.SByte:
-                case TypeCode.Byte:
-                case TypeCode.Int16:
-                case TypeCode.UInt16:
-                case TypeCode.Int32:
-                case TypeCode.UInt32:
-                case TypeCode.Int64:
-                case TypeCode.UInt64:
-                case TypeCode.Single:
-                case TypeCode.Double:
-                case TypeCode.Decimal:
-                    value = obj.ToString();
-                    break;
-
-                case TypeCode.Boolean:
-                    value = (bool)obj ? bool.TrueString : bool.FalseString;
-                    break;
-
-                case TypeCode.DateTime:
-                    value = ((DateTime)obj).ToString(DateTimeEx.DateTimeFormat);
-                    break;
-
-                case TypeCode.Object:
-                    value = ObjectToStringEx(obj, type);
-                    break;
-
-                default:
-                    throw new ApplicationException("不支持此类型: " + type.FullName);
-            }
-
-            return value;
-        }
-
-        /// <summary>
-        /// 对象转字符串扩展
-        /// </summary>
-        /// <param name="obj">对象</param>
-        /// <param name="type">类型</param>
-        /// <returns>字符串</returns>
-        private static string ObjectToStringEx(object obj, Type type)
-        {
-            string value;
-
-            if (type == typeof(Point))
-            {
-                Point point = (Point)obj;
-                value = "X:" + point.X + "; Y:" + point.Y;
-            }
-            else if (type == typeof(PointF))
-            {
-                PointF point = (PointF)obj;
-                value = "X:" + point.X + "; Y:" + point.Y;
-            }
-            else if (type == typeof(Color))
-            {
-                Color color = (Color)obj;
-                value = "A:" + color.A + "; R:" + color.R + "; G:" + color.G + "; B:" + color.B;
-            }
-            else if (type == typeof(Size))
-            {
-                Size size = (Size)obj;
-                value = "W:" + size.Width + "; H:" + size.Height;
-            }
-            else if (type == typeof(SizeF))
-            {
-                SizeF size = (SizeF)obj;
-                value = "W:" + size.Width + "; H:" + size.Height;
-            }
-            else
-            {
-                throw new ApplicationException("不支持此类型: " + type.FullName);
-            }
-
-            return value;
-        }
-    }
-}

SunnyUI/Common/UDateTimeInt64.cs

@@ -1,382 +0,0 @@
-/******************************************************************************
- * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2023 ShenYongHua(沈永华).
- * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
- *
- * Blog:   https://www.cnblogs.com/yhuse
- * Gitee:  https://gitee.com/yhuse/SunnyUI
- * GitHub: https://github.com/yhuse/SunnyUI
- *
- * SunnyUI.dll can be used for free under the GPL-3.0 license.
- * If you use this code, please keep this note.
- * 如果您使用此代码，请保留此说明。
- ******************************************************************************
- * 文件名称: UDateTimeInt64.cs
- * 文件说明: 日期长整型
- * 当前版本: V2.2
- * 创建日期: 2020-09-23
- *
- * 2020-09-23: V2.2.8 增加文件说明
- * 2020-10-10: V2.2.8 增加与Double互转
-******************************************************************************/
-
-using System;
-
-namespace Sunny.UI
-{
-    /// <summary>
-    /// 日期与长整形和浮点型互转
-    /// Value：长整形，为1970年1月1日0时起的毫秒数
-    /// DoubleValue：双精度浮点数，1970年1月1日0时起的天数
-    /// </summary>
-    public struct DateTimeInt64 : IComparable, IEquatable<DateTimeInt64>, IEquatable<long>, IEquatable<DateTime>
-    {
-        public long Value { get; set; }
-
-        public const long Jan1st1970Ticks = 621355968000000000; //Jan1st1970.Ticks;
-        public const long Dec31th9999Ticks = 3155378975999990000; //DateTime.MaxValue.Ticks;
-        public const string DefaultFormatString = DateTimeEx.DateTimeFormatEx;
-        public const double MillisecondsPerDay = 86400000.0;
-
-        /// <summary>
-        /// 返回当前时间的毫秒数, 这个毫秒其实就是自1970年1月1日0时起的毫秒数
-        /// </summary>
-        public static long CurrentDateTimeToTicks()
-        {
-            return (DateTime.UtcNow.Ticks - Jan1st1970Ticks) / 10000;
-        }
-
-        public double DoubleValue
-        {
-            get { return Value * 1.0 / MillisecondsPerDay; }
-            set { Value = (long)(value * MillisecondsPerDay); }
-        }
-
-        /// <summary>
-        /// 返回指定时间的毫秒数, 这个毫秒其实就是自1970年1月1日0时起的毫秒数
-        /// </summary>
-        public static long DateTimeToTicks(DateTime datetime)
-        {
-            return (datetime.ToUniversalTime().Ticks - Jan1st1970Ticks) / 10000;
-        }
-
-        /// <summary>
-        /// 从一个代表自1970年1月1日0时起的毫秒数，转换为DateTime (北京时间)
-        /// </summary>
-        public static DateTime TicksToDateTime(long ticks)
-        {
-#pragma warning disable CS0618 // 类型或成员已过时
-            return TimeZone.CurrentTimeZone.ToLocalTime(TicksToUTCDateTime(ticks));
-#pragma warning restore CS0618 // 类型或成员已过时
-        }
-
-        /// <summary>
-        /// 从一个代表自1970年1月1日0时起的毫秒数，转换为DateTime (UTC时间)
-        /// </summary>
-        public static DateTime TicksToUTCDateTime(long ticks)
-        {
-            return new DateTime(ticks * 10000 + Jan1st1970Ticks);
-        }
-
-        public DateTimeInt64(long ticks)
-        {
-            ticks = MakeValidDate(ticks);
-            Value = ticks;
-        }
-
-        public DateTimeInt64(double doubleTicks)
-        {
-            doubleTicks = MakeValidDate((long)(doubleTicks * MillisecondsPerDay));
-            Value = (long)doubleTicks;
-        }
-
-        public DateTimeInt64(DateTime dateTime)
-        {
-            Value = DateTimeToTicks(dateTime);
-        }
-
-        public DateTimeInt64(int year, int month, int day)
-        {
-            Value = DateTimeToTicks(new DateTime(year, month, day));
-        }
-
-        public DateTimeInt64(int year, int month, int day, int hour, int minute, int second)
-        {
-            Value = DateTimeToTicks(new DateTime(year, month, day, hour, minute, second));
-        }
-
-        public DateTimeInt64(int year, int month, int day, int hour, int minute, int second, int millisecond)
-        {
-            Value = DateTimeToTicks(new DateTime(year, month, day, hour, minute, second, millisecond));
-        }
-
-        public DateTimeInt64(DateTimeInt64 dtValue)
-        {
-            Value = dtValue.Value;
-        }
-
-        public bool IsValidDate
-        {
-            get { return Value >= 0 && Value <= Dec31th9999Ticks - Jan1st1970Ticks; }
-        }
-
-        public DateTime DateTime
-        {
-            get { return TicksToDateTime(Value); }
-            set { Value = DateTimeToTicks(value); }
-        }
-
-        public static bool CheckValidDate(long ticks)
-        {
-            return ticks >= 0 && ticks <= Dec31th9999Ticks - Jan1st1970Ticks;
-        }
-
-        public static long MakeValidDate(long ticks)
-        {
-            if (ticks < 0)
-                ticks = 0;
-            if (ticks > Dec31th9999Ticks - Jan1st1970Ticks)
-                ticks = Dec31th9999Ticks - Jan1st1970Ticks;
-
-            return ticks;
-        }
-
-        public void AddMilliseconds(double milliseconds)
-        {
-            Value = DateTimeToTicks(DateTime.AddMilliseconds(milliseconds));
-        }
-
-        public void AddSeconds(double seconds)
-        {
-            Value = DateTimeToTicks(DateTime.AddSeconds(seconds));
-        }
-
-        public void AddMinutes(double minutes)
-        {
-            Value = DateTimeToTicks(DateTime.AddMinutes(minutes));
-        }
-
-        public void AddHours(double hours)
-        {
-            Value = DateTimeToTicks(DateTime.AddHours(hours));
-        }
-
-        public void AddDays(double days)
-        {
-            Value = DateTimeToTicks(DateTime.AddDays(days));
-        }
-
-        public void AddMonths(int months)
-        {
-            Value = DateTimeToTicks(DateTime.AddMonths(months));
-        }
-
-        public void AddYears(int years)
-        {
-            Value = DateTimeToTicks(DateTime.AddYears(years));
-        }
-
-        public static long operator -(DateTimeInt64 dtValue1, DateTimeInt64 dtValue2)
-        {
-            return dtValue1.Value - dtValue2.Value;
-        }
-
-        public static long operator +(DateTimeInt64 dtValue1, DateTimeInt64 dtValue2)
-        {
-            return dtValue1.Value + dtValue2.Value;
-        }
-
-        public static DateTimeInt64 operator -(DateTimeInt64 dtValue1, long dtValue2)
-        {
-            dtValue1.Value -= dtValue2;
-            return dtValue1;
-        }
-
-        public static DateTimeInt64 operator +(DateTimeInt64 dtValue1, long dtValue2)
-        {
-            dtValue1.Value += dtValue2;
-            return dtValue1;
-        }
-
-        public static DateTimeInt64 operator ++(DateTimeInt64 dtValue)
-        {
-            dtValue.AddDays(1);
-            return dtValue;
-        }
-
-        public static DateTimeInt64 operator --(DateTimeInt64 dtValue)
-        {
-            dtValue.AddDays(-1);
-            return dtValue;
-        }
-
-        public static implicit operator long(DateTimeInt64 dtValue)
-        {
-            return dtValue.Value;
-        }
-
-        public static implicit operator DateTimeInt64(long ticks)
-        {
-            return new DateTimeInt64(ticks);
-        }
-
-        public static implicit operator DateTimeInt64(DateTime dt)
-        {
-            return new DateTimeInt64(dt);
-        }
-
-        public static implicit operator DateTime(DateTimeInt64 dt)
-        {
-            return dt.DateTime;
-        }
-
-        public static implicit operator double(DateTimeInt64 dtValue)
-        {
-            return dtValue.DoubleValue;
-        }
-
-        public static implicit operator DateTimeInt64(double ticks)
-        {
-            return new DateTimeInt64(ticks);
-        }
-
-        public static bool operator ==(DateTimeInt64 dtValue1, DateTimeInt64 dtValue2)
-        {
-            return dtValue1.Value == dtValue2.Value;
-        }
-
-        public static bool operator !=(DateTimeInt64 dtValue1, DateTimeInt64 dtValue2)
-        {
-            return dtValue1.Value != dtValue2.Value;
-        }
-
-        public static bool operator ==(DateTimeInt64 dtValue, long ticks)
-        {
-            return dtValue.Value == ticks;
-        }
-
-        public static bool operator !=(DateTimeInt64 dtValue, long ticks)
-        {
-            return dtValue.Value != ticks;
-        }
-
-        public static bool operator <(DateTimeInt64 dtValue1, DateTimeInt64 dtValue2)
-        {
-            return dtValue1.Value < dtValue2.Value;
-        }
-
-        public static bool operator >(DateTimeInt64 dtValue1, DateTimeInt64 dtValue2)
-        {
-            return dtValue1.Value > dtValue2.Value;
-        }
-
-        public static bool operator <=(DateTimeInt64 dtValue1, DateTimeInt64 dtValue2)
-        {
-            return dtValue1.Value <= dtValue2.Value;
-        }
-
-        public static bool operator >=(DateTimeInt64 dtValue1, DateTimeInt64 dtValue2)
-        {
-            return dtValue1.Value >= dtValue2.Value;
-        }
-
-        public static bool operator <(DateTimeInt64 dtValue, long ticks)
-        {
-            return dtValue.Value < ticks;
-        }
-
-        public static bool operator >(DateTimeInt64 dtValue, long ticks)
-        {
-            return dtValue.Value > ticks;
-        }
-
-        public static bool operator <=(DateTimeInt64 dtValue, long ticks)
-        {
-            return dtValue.Value <= ticks;
-        }
-
-        public static bool operator >=(DateTimeInt64 dtValue, long ticks)
-        {
-            return dtValue.Value >= ticks;
-        }
-
-        public override bool Equals(object obj)
-        {
-            if (obj is DateTimeInt64 dtValue)
-            {
-                return dtValue.Value == Value;
-            }
-            else if (obj is long longValue)
-            {
-                return longValue == Value;
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        public override int GetHashCode()
-        {
-            return Value.GetHashCode();
-        }
-
-        int IComparable.CompareTo(object obj)
-        {
-            if (!(obj is DateTimeInt64)) throw new ArgumentException();
-            return (Value).CompareTo(((DateTimeInt64)obj).Value);
-        }
-
-        public string ToString(long ticks)
-        {
-            return ToString(ticks, DefaultFormatString);
-        }
-
-        public override string ToString()
-        {
-            return ToString(Value, DefaultFormatString);
-        }
-
-        public string ToString(string fmtStr)
-        {
-            return ToString(Value, fmtStr);
-        }
-
-        public static string ToString(long dtValue, string fmtStr)
-        {
-            DateTime dt = TicksToDateTime(dtValue);
-            return dt.ToString(fmtStr);
-        }
-
-        public bool Equals(DateTimeInt64 dtValue)
-        {
-            return Value == dtValue.Value;
-        }
-
-        public bool Equals(long ticks)
-        {
-            return Value == ticks;
-        }
-
-        public bool Equals(DateTime datetime)
-        {
-            return Value == (new DateTimeInt64(datetime)).Value;
-        }
-
-        public string DateTimeString => DateTime.DateTimeString();
-
-        public string DateString => DateTime.DateString();
-
-        public string TimeString => DateTime.TimeString();
-
-        public string HourMinuteString => DateTime.ToString("HH:mm");
-
-        public int Year => DateTime.Year;
-        public int Month => DateTime.Month;
-        public int Day => DateTime.Day;
-        public int Hour => DateTime.Hour;
-        public int Minute => DateTime.Minute;
-        public int Second => DateTime.Second;
-        public int Millisecond => DateTime.Millisecond;
-    }
-}

SunnyUI/Common/UDir.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Common/UEnvironment.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Common/UFastBitmap.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Common/UFile.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Common/UGDI.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -382,6 +382,7 @@ namespace Sunny.UI
         /// <summary>
         /// 创建圆角路径
         /// </summary>
+        /// <param name="g">绘图图面</param>
         /// <param name="rect">区域</param>
         /// <param name="radius">圆角大小</param>
         /// <param name="cornerLeftTop">左上角</param>

SunnyUI/Common/UGif.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Common/UGraphics.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -33,70 +33,6 @@ namespace Sunny.UI
     /// </summary>
     public static class GraphicsEx
     {
-        public static string TruncateText(Graphics graphics, string text, Font font, float maxWidth)
-        {
-            // If the text is empty or null, return it as-is.
-            if (string.IsNullOrEmpty(text)) return text;
-
-            // Measure the original string.
-            SizeF size = graphics.MeasureString(text, font);
-
-            // If the original string fits within the width, return it as-is.
-            if (size.Width <= maxWidth) return text;
-
-            // Otherwise, truncate the string until it fits.
-            string truncatedText = text;
-            for (int i = text.Length; i > 0; i--)
-            {
-                truncatedText = text.Left(i) + "...";
-                size = graphics.MeasureString(truncatedText, font);
-                if (size.Width <= maxWidth)
-                    break;
-            }
-
-            return truncatedText;
-        }
-
-        public static void DrawTruncateString(this Graphics g, string text, Font font, Color color, Rectangle rect, float maxWidth, HorizontalAlignment alignment)
-        {
-            text = TruncateText(g, text, font, maxWidth);
-            g.DrawString(text, font, color, rect, alignment.ToContentAlignment());
-        }
-
-        internal static ContentAlignment ToContentAlignment(this HorizontalAlignment alignment)
-        {
-            switch (alignment)
-            {
-                case HorizontalAlignment.Left: return ContentAlignment.MiddleLeft;
-                case HorizontalAlignment.Center: return ContentAlignment.MiddleCenter;
-                case HorizontalAlignment.Right: return ContentAlignment.MiddleRight;
-            }
-
-            return ContentAlignment.MiddleLeft;
-        }
-
-        internal static HorizontalAlignment ToHorizontalAlignment(this ContentAlignment alignment)
-        {
-            switch (alignment)
-            {
-                case ContentAlignment.TopLeft:
-                case ContentAlignment.MiddleLeft:
-                case ContentAlignment.BottomLeft:
-                    return HorizontalAlignment.Left;
-                case ContentAlignment.TopCenter:
-                case ContentAlignment.MiddleCenter:
-                case ContentAlignment.BottomCenter:
-                    return HorizontalAlignment.Center;
-                case ContentAlignment.TopRight:
-                case ContentAlignment.MiddleRight:
-                case ContentAlignment.BottomRight:
-                    return HorizontalAlignment.Right;
-            }
-
-            return HorizontalAlignment.Left;
-        }
-
-
         public static void DrawString(this Graphics g, string text, Font font, Color color, Rectangle rect, ContentAlignment alignment, int offsetX = 0, int offsetY = 0)
         {
             if (text.IsNullOrEmpty()) return;

SunnyUI/Common/UHotKey.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Common/UImage.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Common/UIniConfig.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Common/UIniFile.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -22,6 +22,7 @@
  * 2023-08-11: v3.4.1 增加了文件绝对路径判断和文件夹是否存在判断
 ******************************************************************************/
 
+using Sunny.UI.Win32;
 using System;
 using System.Collections.Specialized;
 using System.ComponentModel;
@@ -30,7 +31,6 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
-using Sunny.UI.Win32;
 
 namespace Sunny.UI
 {
@@ -299,6 +299,29 @@ namespace Sunny.UI
     /// </summary>
     public class IniFile : IniBase
     {
+        /// <summary>
+        /// 写Byte数组
+        /// </summary>
+        /// <param name="section">section</param>
+        /// <param name="key">key</param>
+        /// <param name="value">value</param>
+        public void Write(string section, string key, byte[] value)
+        {
+            Write(section, key, value.ToHexString());
+        }
+
+        /// <summary>
+        /// 读Byte数组
+        /// </summary>
+        /// <param name="section">section</param>
+        /// <param name="key">key</param>
+        /// <param name="Default">Normal</param>
+        /// <returns>结果</returns>
+        public byte[] ReadBytes(string section, string key, byte[] Default)
+        {
+            return Read(section, key, Default.ToHexString()).ToHexBytes();
+        }
+
         /// <summary>
         /// 写Char
         /// </summary>

SunnyUI/Common/UIniFileEx.cs

@@ -1,790 +0,0 @@
-/******************************************************************************
- * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2023 ShenYongHua(沈永华).
- * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
- *
- * Blog:   https://www.cnblogs.com/yhuse
- * Gitee:  https://gitee.com/yhuse/SunnyUI
- * GitHub: https://github.com/yhuse/SunnyUI
- *
- * SunnyUI.dll can be used for free under the GPL-3.0 license.
- * If you use this code, please keep this note.
- * 如果您使用此代码，请保留此说明。
- ******************************************************************************
- * 文件名称: UIniFileEx.cs
- * 文件说明: INI 文件读取类（不用WinAPI）
- * 当前版本: V3.1
- * 创建日期: 2021-10-27
- *
- * 2021-10-27: V2.2.0 增加文件说明
-******************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Drawing;
-using System.Globalization;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-
-namespace Sunny.UI
-{
-    public class IniFileEx
-    {
-        private readonly Dictionary<string, NameValueCollection> data = new Dictionary<string, NameValueCollection>();
-
-        private static readonly Regex regRemoveEmptyLines =
-            new Regex
-            (
-                @"(\s*;[\d\D]*?\r?\n)+|\r?\n(\s*\r?\n)*",
-                RegexOptions.Multiline | RegexOptions.Compiled
-            );
-
-        private static readonly Regex regParseIniData =
-            new Regex
-            (
-                @"
-                (?<IsSection>
-                    ^\s*\[(?<SectionName>[^\]]+)?\]\s*$
-                )
-                |
-                (?<IsKeyValue>
-                    ^\s*(?<Key>[^(\s*\=\s*)]+)?\s*\=\s*(?<Value>[\d\D]*)$
-                )",
-                RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace
-            );
-
-        public IniFileEx(string fileName) : this(fileName, Encoding.Default) { }
-
-        public IniFileEx(string fileName, Encoding encoding)
-        {
-            FileName = fileName;
-            Encoding = encoding;
-            using FileStream fs = new FileStream(fileName, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-            ReadIniData(fs, encoding);
-        }
-
-        /// <summary>
-        /// 文件名
-        /// </summary>
-        [Description("文件名")]
-        public string FileName { get; set; } //INI文件名
-
-        public Encoding Encoding { get; set; }
-
-        private void ReadIniData(Stream stream, Encoding encoding)
-        {
-            string lastSection = string.Empty;
-            data.Add(lastSection, new NameValueCollection());
-            if (stream != null && encoding != null)
-            {
-                using StreamReader reader = new StreamReader(stream, encoding);
-                string iniData = reader.ReadToEnd();
-
-                iniData = regRemoveEmptyLines.Replace(iniData, "\n");
-                string[] lines = iniData.Split(new[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
-
-                foreach (string s in lines)
-                {
-                    Match m = regParseIniData.Match(s);
-                    if (m.Success)
-                    {
-                        if (m.Groups["IsSection"].Length > 0)
-                        {
-                            string sName = m.Groups["SectionName"].Value.ToLowerInvariant();
-                            if (lastSection != sName)
-                            {
-                                lastSection = sName;
-                                if (!data.ContainsKey(sName))
-                                {
-                                    data.Add(sName, new NameValueCollection());
-                                }
-                            }
-                        }
-                        else if (m.Groups["IsKeyValue"].Length > 0)
-                        {
-                            data[lastSection].Add(m.Groups["Key"].Value, m.Groups["Value"].Value);
-                        }
-                    }
-                }
-            }
-        }
-
-        public NameValueCollection this[string section]
-        {
-            get
-            {
-                section = section.ToLowerInvariant();
-                if (!data.ContainsKey(section))
-                    data.Add(section, new NameValueCollection());
-                return data[section];
-            }
-        }
-
-        public string this[string section, string key]
-        {
-            get => this[section][key];
-            set => this[section][key] = value;
-        }
-
-        public object this[string section, string key, Type t]
-        {
-            get
-            {
-                if (t == null || t == (Type)Type.Missing)
-                    return this[section][key];
-                return GetValue(section, key, null, t);
-            }
-            set
-            {
-                if (t == null || t == (Type)Type.Missing)
-                    this[section][key] = string.Empty;
-                else
-                    SetValue(section, key, value);
-            }
-        }
-
-        public string[] KeyNames(string section)
-        {
-            return this[section].AllKeys;
-        }
-
-        public string[] SectionValues(string section)
-        {
-            return this[section].GetValues(0);
-        }
-
-        private object GetValue(string section, string key, object defaultValue, Type t)
-        {
-            section = section.ToLowerInvariant();
-            key = key.ToLowerInvariant();
-            if (!data.ContainsKey(section)) return defaultValue;
-            string v = data[section][key];
-            if (string.IsNullOrEmpty(v)) return defaultValue;
-            TypeConverter conv = TypeDescriptor.GetConverter(t);
-            if (!conv.CanConvertFrom(typeof(string))) return defaultValue;
-
-            try
-            {
-                return conv.ConvertFrom(v);
-            }
-            catch
-            {
-                return defaultValue;
-            }
-        }
-
-        private T GetValue<T>(string section, string key, T defaultValue)
-        {
-            return (T)GetValue(section, key, defaultValue, typeof(T));
-        }
-
-        private void SetValue(string section, string key, object value)
-        {
-            if (value == null)
-            {
-                this[section][key] = string.Empty;
-            }
-            else
-            {
-                TypeConverter conv = TypeDescriptor.GetConverter(value);
-                if (!conv.CanConvertTo(typeof(string)))
-                {
-                    this[section][key] = value.ToString();
-                }
-                else
-                {
-                    this[section][key] = (string)conv.ConvertTo(value, typeof(string));
-                }
-            }
-
-            UpdateFile();
-        }
-
-        public void Write(string section, string key, string value)
-        {
-            SetValue(section, key, value);
-        }
-
-        public string Read(string section, string key, string Default)
-        {
-            return GetValue(section, key, Default);
-        }
-
-        /// <summary>
-        /// 读取指定的Section的所有Value到列表中
-        /// </summary>
-        /// <param name="section">section</param>
-        public NameValueCollection GetSectionValues(string section)
-        {
-            return this[section];
-        }
-
-        public void UpdateFile()
-        {
-            Save();
-        }
-
-        public void Save()
-        {
-            Save(FileName, Encoding);
-        }
-
-        public void Save(string fileName, Encoding encoding)
-        {
-            using FileStream fs = new FileStream(fileName, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-            Save(fs, encoding);
-        }
-
-        private void Save(Stream stream, Encoding encoding)
-        {
-            using StreamWriter sw = new StreamWriter(stream, encoding);
-            foreach (var cur in data)
-            {
-                if (!string.IsNullOrEmpty(cur.Key))
-                {
-                    sw.WriteLine("[{0}]", cur.Key);
-                }
-
-                NameValueCollection col = cur.Value;
-                foreach (string key in col.Keys)
-                {
-                    if (!string.IsNullOrEmpty(key))
-                    {
-                        string value = col[key];
-                        if (!string.IsNullOrEmpty(value))
-                            sw.WriteLine("{0}={1}", key, value);
-                    }
-                }
-            }
-
-            sw.Flush();
-        }
-
-        public bool HasSection(string section)
-        {
-            return data.ContainsKey(section.ToLowerInvariant());
-        }
-
-        public bool HasKey(string section, string key)
-        {
-            return
-                data.ContainsKey(section) &&
-                !string.IsNullOrEmpty(data[section][key]);
-        }
-
-        /// <summary>
-        /// 写结构
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="value">value</param>
-        /// <typeparam name="T">T</typeparam>
-        public void WriteStruct<T>(string section, string key, T value) where T : struct
-        {
-            Write(section, key, value.ToBytes());
-        }
-
-        /// <summary>
-        /// 读结构
-        /// </summary>
-        /// <typeparam name="T">T</typeparam>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="Default">Normal</param>
-        /// <returns>结果</returns>
-        public T ReadStruct<T>(string section, string key, T Default) where T : struct
-        {
-            //得到结构体的大小
-            int size = StructEx.Size(Default);
-            byte[] bytes = Read(section, key, "").ToHexBytes();
-            return size > bytes.Length ? Default : bytes.ToStruct<T>();
-        }
-
-        /// <summary>
-        /// 写Byte数组
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="value">value</param>
-        public void Write(string section, string key, byte[] value)
-        {
-            Write(section, key, value.ToHexString());
-        }
-
-        /// <summary>
-        /// 读Byte数组
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="Default">Normal</param>
-        /// <returns>结果</returns>
-        public byte[] ReadBytes(string section, string key, byte[] Default)
-        {
-            return Read(section, key, Default.ToHexString()).ToHexBytes();
-        }
-
-        /// <summary>
-        /// 写Char
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="value">value</param>
-        public void Write(string section, string key, char value)
-        {
-            Write(section, key, value.ToString());
-        }
-
-        /// <summary>
-        /// 读Char
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="Default">Normal</param>
-        /// <returns>结果</returns>
-        public char ReadChar(string section, string key, char Default = ' ')
-        {
-            return Read(section, key, Default.ToString()).ToChar(Default);
-        }
-
-        /// <summary>
-        /// 写Decimal
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="value">value</param>
-        public void Write(string section, string key, decimal value)
-        {
-            Write(section, key, value.ToString(CultureInfo.InvariantCulture));
-        }
-
-        /// <summary>
-        /// 读Decimal
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="Default">Normal</param>
-        /// <returns>结果</returns>
-        public decimal ReadDecimal(string section, string key, decimal Default = 0)
-        {
-            return Read(section, key, Default.ToString(CultureInfo.InvariantCulture)).ToDecimal(Default);
-        }
-
-        /// <summary>
-        /// 写整数
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="value">value</param>
-        public void Write(string section, string key, short value)
-        {
-            Write(section, key, value.ToString());
-        }
-
-        /// <summary>
-        /// 读整数
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="Default">Normal</param>
-        /// <returns>结果</returns>
-        public short ReadShort(string section, string key, short Default = 0)
-        {
-            return Read(section, key, Default.ToString()).ToShort(Default);
-        }
-
-        /// <summary>
-        /// 写整数
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="value">value</param>
-        public void Write(string section, string key, ushort value)
-        {
-            Write(section, key, value.ToString());
-        }
-
-        /// <summary>
-        /// 读整数
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="Default">Normal</param>
-        /// <returns>结果</returns>
-        public ushort ReadUShort(string section, string key, ushort Default = 0)
-        {
-            return Read(section, key, Default.ToString()).ToUShort(Default);
-        }
-
-        /// <summary>
-        /// 写整数
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="value">value</param>
-        public void Write(string section, string key, int value)
-        {
-            Write(section, key, value.ToString());
-        }
-
-        /// <summary>
-        /// 读整数
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="Default">Normal</param>
-        /// <returns>结果</returns>
-        public int ReadInt(string section, string key, int Default = 0)
-        {
-            return Read(section, key, Default.ToString()).ToInt(Default);
-        }
-
-        /// <summary>
-        /// 写整数
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="value">value</param>
-        public void Write(string section, string key, uint value)
-        {
-            Write(section, key, value.ToString());
-        }
-
-        /// <summary>
-        /// 读整数
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="Default">Normal</param>
-        /// <returns>结果</returns>
-        public uint ReadUInt(string section, string key, uint Default = 0)
-        {
-            return Read(section, key, Default.ToString()).ToUInt(Default);
-        }
-
-        /// <summary>
-        /// 写整数
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="value">value</param>
-        public void Write(string section, string key, ulong value)
-        {
-            Write(section, key, value.ToString());
-        }
-
-        /// <summary>
-        /// 读整数
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="Default">Normal</param>
-        /// <returns>结果</returns>
-        public ulong ReadULong(string section, string key, ulong Default = 0)
-        {
-            return Read(section, key, Default.ToString()).ToULong(Default);
-        }
-
-        /// <summary>
-        /// 写整数
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="value">value</param>
-        public void Write(string section, string key, long value)
-        {
-            Write(section, key, value.ToString());
-        }
-
-        /// <summary>
-        /// 读整数
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="Default">Normal</param>
-        /// <returns>结果</returns>
-        public long ReadLong(string section, string key, long Default = 0)
-        {
-            return Read(section, key, Default.ToString()).ToLong(Default);
-        }
-
-        /// <summary>
-        /// 写布尔
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="value">value</param>
-        public void Write(string section, string key, bool value)
-        {
-            Write(section, key, value ? bool.TrueString : bool.FalseString);
-        }
-
-        /// <summary>
-        /// 读布尔
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="Default">Normal</param>
-        /// <returns>结果</returns>
-        public bool ReadBool(string section, string key, bool Default = false)
-        {
-            string str = Read(section, key, Default.ToString());
-            if (string.Equals(str, bool.TrueString, StringComparison.CurrentCultureIgnoreCase))
-            {
-                return true;
-            }
-
-            if (string.Equals(str, bool.FalseString, StringComparison.CurrentCultureIgnoreCase))
-            {
-                return false;
-            }
-
-            return Default;
-        }
-
-        /// <summary>
-        /// 写Double
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="value">value</param>
-        public void Write(string section, string key, double value)
-        {
-            Write(section, key, value.ToString(CultureInfo.InvariantCulture));
-        }
-
-        /// <summary>
-        /// 读Double
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="Default">Normal</param>
-        /// <returns>结果</returns>
-        public double ReadDouble(string section, string key, double Default = 0)
-        {
-            return Read(section, key, Default.ToString(CultureInfo.InvariantCulture)).ToDouble(Default);
-        }
-
-        /// <summary>
-        /// 写Float
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="value">value</param>
-        public void Write(string section, string key, float value)
-        {
-            Write(section, key, value.ToString(CultureInfo.InvariantCulture));
-        }
-
-        /// <summary>
-        /// 读Float
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="Default">Normal</param>
-        /// <returns>结果</returns>
-        public float ReadFloat(string section, string key, float Default = 0)
-        {
-            return Read(section, key, Default.ToString(CultureInfo.InvariantCulture)).ToFloat(Default);
-        }
-
-        /// <summary>
-        /// 写Byte
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="value">value</param>
-        public void Write(string section, string key, byte value)
-        {
-            Write(section, key, value.ToString());
-        }
-
-        /// <summary>
-        /// 读Byte
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="Default">Normal</param>
-        /// <returns>结果</returns>
-        public byte ReadByte(string section, string key, byte Default = 0)
-        {
-            return Read(section, key, Default.ToString()).ToByte(Default);
-        }
-
-        /// <summary>
-        /// 写SByte
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="value">value</param>
-        public void Write(string section, string key, sbyte value)
-        {
-            Write(section, key, value.ToString());
-        }
-
-        /// <summary>
-        /// 读Byte
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="Default">Normal</param>
-        /// <returns>结果</returns>
-        public sbyte ReadSByte(string section, string key, sbyte Default = 0)
-        {
-            return Read(section, key, Default.ToString()).ToSByte(Default);
-        }
-
-        /// <summary>
-        /// 写DateTime
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="value">value</param>
-        public void Write(string section, string key, DateTime value)
-        {
-            Write(section, key, value.ToString(DateTimeEx.DateTimeFormat));
-        }
-
-        /// <summary>
-        /// 读DateTime
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="Default">Normal</param>
-        /// <returns>结果</returns>
-        public DateTime ReadDateTime(string section, string key, DateTime Default)
-        {
-            string str = Read(section, key, Default.ToString(CultureInfo.InvariantCulture));
-            try
-            {
-                return str.ToDateTime(DateTimeEx.DateTimeFormat);
-            }
-            catch (Exception)
-            {
-                return Default;
-            }
-        }
-
-        /// <summary>
-        /// 写Point
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="value">value</param>
-        public void Write(string section, string key, Point value)
-        {
-            Write(section, key, ConvertEx.ObjectToString(value, typeof(Point)));
-        }
-
-        /// <summary>
-        /// 读Point
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="Default">Normal</param>
-        /// <returns>结果</returns>
-        public Point ReadPoint(string section, string key, Point Default)
-        {
-            string str = Read(section, key, "");
-            return (Point)ConvertEx.StringToObject(str, typeof(Point), Default);
-        }
-
-        /// <summary>
-        /// 写PointF
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="value">value</param>
-        public void Write(string section, string key, PointF value)
-        {
-            Write(section, key, ConvertEx.ObjectToString(value, typeof(PointF)));
-        }
-
-        /// <summary>
-        /// 读PointF
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="Default">Normal</param>
-        /// <returns>结果</returns>
-        public PointF ReadPointF(string section, string key, PointF Default)
-        {
-            string str = Read(section, key, "");
-            return (PointF)ConvertEx.StringToObject(str, typeof(PointF), Default);
-        }
-
-        /// <summary>
-        /// 写Size
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="value">value</param>
-        public void Write(string section, string key, Size value)
-        {
-            Write(section, key, ConvertEx.ObjectToString(value, typeof(Size)));
-        }
-
-        /// <summary>
-        /// 读Size
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="Default">Normal</param>
-        /// <returns>结果</returns>
-        public Size ReadSize(string section, string key, Size Default)
-        {
-            string str = Read(section, key, "");
-            return (Size)ConvertEx.StringToObject(str, typeof(Size), Default);
-        }
-
-        /// <summary>
-        /// 写SizeF
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="value">value</param>
-        public void Write(string section, string key, SizeF value)
-        {
-            Write(section, key, ConvertEx.ObjectToString(value, typeof(SizeF)));
-        }
-
-        /// <summary>
-        /// 读SizeF
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="Default">Normal</param>
-        /// <returns>结果</returns>
-        public SizeF ReadSizeF(string section, string key, SizeF Default)
-        {
-            string str = Read(section, key, "");
-            return (SizeF)ConvertEx.StringToObject(str, typeof(SizeF), Default);
-        }
-
-        /// <summary>
-        /// 写Color
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="value">value</param>
-        public void Write(string section, string key, Color value)
-        {
-            Write(section, key, ConvertEx.ObjectToString(value, typeof(Color)));
-        }
-
-        /// <summary>
-        /// 读Color
-        /// </summary>
-        /// <param name="section">section</param>
-        /// <param name="key">key</param>
-        /// <param name="Default">Normal</param>
-        /// <returns>结果</returns>
-        public Color ReadColor(string section, string key, Color Default)
-        {
-            string str = Read(section, key, "");
-            return (Color)ConvertEx.StringToObject(str, typeof(Color), Default);
-        }
-    }
-}

SunnyUI/Common/UJson.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Common/UMMFile.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Common/UMapper.cs

@@ -1,203 +0,0 @@
-/******************************************************************************
- * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2023 ShenYongHua(沈永华).
- * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
- *
- * Blog:   https://www.cnblogs.com/yhuse
- * Gitee:  https://gitee.com/yhuse/SunnyUI
- * GitHub: https://github.com/yhuse/SunnyUI
- *
- * SunnyUI.dll can be used for free under the GPL-3.0 license.
- * If you use this code, please keep this note.
- * 如果您使用此代码，请保留此说明。
- ******************************************************************************
- * 文件名称: UMapper.cs
- * 文件说明: 轻量级的对象映射框架，可以映射值类型（包括Struct），和以值类型构成的List和数组。
- * 当前版本: V3.1
- * 创建日期: 2021-09-30
- *
- * 2021-09-30: V3.0.7 增加文件说明
-******************************************************************************/
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-
-namespace Sunny.UI
-{
-    /// <summary>
-    /// 轻量级的对象映射框架
-    /// </summary>
-    public static class Mapper
-    {
-        private static void Execute<T1, T2>(T1 source, T2 dest)
-            where T1 : class, new()
-            where T2 : class, new()
-        {
-            if (source == null || dest == null)
-            {
-                return;
-            }
-
-            var listSource = source.GetType().GetNeedProperties().ToDictionary(prop => prop.Name);
-            var listDest = dest.GetType().GetNeedProperties().ToDictionary(prop => prop.Name);
-
-            foreach (var item in listDest)
-            {
-                if (listSource.NotContainsKey(item.Key)) continue;
-
-                var sourceInfo = listSource[item.Key];
-                Type sourceType = sourceInfo.PropertyType;
-                object sourceValue = sourceInfo.GetValue(source, null);
-
-                var destInfo = item.Value;
-                Type destType = item.Value.PropertyType;
-
-                if (!sourceType.Equals(destType)) continue;
-                if (sourceType.IsValueType)
-                {
-                    //Console.WriteLine("ValueType: " + item.Key + ", " + sourceType.FullName);
-                    destInfo.SetValue(dest, sourceValue, null);
-                }
-                else
-                {
-                    if (sourceType == typeof(string))
-                    {
-                        //Console.WriteLine("String: " + item.Key + ", " + sourceType.FullName);
-                        destInfo.SetValue(dest, sourceValue, null);
-                        continue;
-                    }
-
-                    if (sourceType.IsList())
-                    {
-                        //Console.WriteLine("List: " + item.Key + ", " + sourceType.FullName);
-                        Type[] sourceTypes = sourceType.GetGenericArguments();
-                        Type[] destTypes = destType.GetGenericArguments();
-                        if (sourceTypes.Length != 1) continue;
-                        if (destTypes.Length != 1) continue;
-                        if (!sourceTypes[0].Equals(destTypes[0])) continue;
-
-                        if (sourceValue == null)
-                        {
-                            destInfo.SetValue(dest, null, null);
-                        }
-                        else
-                        {
-                            Type typeDataList = typeof(List<>).MakeGenericType(destTypes[0]);
-                            MethodInfo AddInfo = typeDataList.GetMethod("Add", BindingFlags.Public | BindingFlags.Instance);
-                            if (AddInfo == null) continue;
-
-                            if (sourceTypes[0].IsValueType || sourceTypes[0] == typeof(string))
-                            {
-                                object listvalue = typeDataList.InvokeMember(null, BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.CreateInstance, null, null, new object[] { });
-                                IEnumerable sourceList = sourceValue as IEnumerable;
-                                foreach (var listItem in sourceList)
-                                {
-                                    AddInfo.Invoke(listvalue, new[] { listItem });
-                                }
-
-                                destInfo.SetValue(dest, listvalue, null);
-                            }
-                            else
-                            {
-                                //暂时不考虑
-                            }
-                        }
-
-                        continue;
-                    }
-
-                    if (sourceType.IsArray)
-                    {
-                        //Console.WriteLine("Array: " + item.Key + ", " + sourceType.FullName);
-                        if (sourceValue == null)
-                        {
-                            destInfo.SetValue(dest, null, null);
-                        }
-                        else
-                        {
-                            ICollection sourceList = sourceValue as ICollection;
-                            Type type = sourceType.GetElementType();
-                            var array = Array.CreateInstance(type, sourceList.Count);
-
-                            int index = 0;
-                            foreach (var listItem in sourceList)
-                            {
-                                array.SetValue(listItem, index++);
-                            }
-
-                            destInfo.SetValue(dest, array, null);
-                        }
-
-                        continue;
-                    }
-
-                    if (sourceType.IsDictionary())
-                    {
-
-                        continue;
-                    }
-
-                    //类没有无参构造函数的话，创建有问题
-                    //if (sourceType.IsClass)
-                    //{
-                    //    if (sourceValue == null)
-                    //    {
-                    //        destInfo.SetValue(dest, null, null);
-                    //    }
-                    //    else
-                    //    {
-                    //        object obj = Activator.CreateInstance(sourceType, null);
-                    //        obj.MapperFrom(sourceValue);
-                    //        destInfo.SetValue(dest, obj, null);
-                    //    }
-                    //
-                    //    continue;
-                    //}
-                }
-            }
-        }
-
-        /// <summary>
-        /// T1映射到T2
-        /// </summary>
-        /// <typeparam name="T1">T1</typeparam>
-        /// <typeparam name="T2">T2</typeparam>
-        /// <param name="source">源</param>
-        /// <param name="dest">目标</param>
-        public static void MapperTo<T1, T2>(this T1 source, T2 dest)
-            where T1 : class, new()
-            where T2 : class, new()
-        {
-            Execute(source, dest);
-        }
-
-        /// <summary>
-        /// T1从T2映射
-        /// </summary>
-        /// <typeparam name="T1">T1</typeparam>
-        /// <typeparam name="T2">T2</typeparam>
-        /// <param name="source">源</param>
-        /// <param name="dest">目标</param>
-        public static void MapperFrom<T1, T2>(this T1 dest, T2 source)
-            where T1 : class, new()
-            where T2 : class, new()
-        {
-            Execute(source, dest);
-        }
-
-        /// <summary>
-        /// 获取数组的类类型
-        /// </summary>
-        /// <param name="t">类型</param>
-        /// <returns>类类型</returns>
-        public static Type GetArrayElementType(this Type t)
-        {
-            if (!t.IsArray) return null;
-            string name = t.FullName.Replace("[]", string.Empty);
-            return t.Assembly.GetType(name);
-        }
-    }
-}

SunnyUI/Common/UMessageTip.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Common/UPrivilegeAPI.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Common/UScaner.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Common/UScrollBarInfo.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Common/USevenZip.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Common/USyncTime.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Common/USystem.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Common/UThunder.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -22,9 +22,9 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.IO;
 using System.Runtime.InteropServices;
+using System.Windows.Forms;
 
 #pragma warning disable 1591
 
@@ -32,7 +32,7 @@ namespace Sunny.UI
 {
     public class Thunder : IDisposable
     {
-        private readonly System.Windows.Forms.Timer timer;
+        private readonly Timer timer;
         private bool Exit;
 
         public delegate void OnTaskInfoChange(object sender, ThunderTask task);
@@ -52,7 +52,7 @@ namespace Sunny.UI
         public Thunder()
         {
             InitSuccess = ThunderDll.Init();
-            timer = new System.Windows.Forms.Timer();
+            timer = new Timer();
             timer.Interval = 1000;
             timer.Tick += Timer_Tick;
             timer.Start();
@@ -512,7 +512,7 @@ namespace Sunny.UI
 
             public override string ToString()
             {
-                return Status.Description() + "，已完成：" + (Percent * 100.0f).ToString("F2") + "%，速度：" + Speed + "KB/s";
+                return Status.DisplayText() + "，已完成：" + (Percent * 100.0f).ToString("F2") + "%，速度：" + Speed + "KB/s";
             }
         }
 
@@ -524,43 +524,43 @@ namespace Sunny.UI
             /// <summary>
             /// 无
             /// </summary>
-            [Description("无")]
+            [DisplayText("无")]
             NOITEM = 0,
 
             /// <summary>
             /// 错误
             /// </summary>
-            [Description("错误")]
+            [DisplayText("错误")]
             TSC_ERROR,
 
             /// <summary>
             /// 暂停
             /// </summary>
-            [Description("暂停")]
+            [DisplayText("暂停")]
             TSC_PAUSE,
 
             /// <summary>
             /// 下载
             /// </summary>
-            [Description("下载中")]
+            [DisplayText("下载中")]
             TSC_DOWNLOAD,
 
             /// <summary>
             /// 完成
             /// </summary>
-            [Description("完成")]
+            [DisplayText("完成")]
             TSC_COMPLETE,
 
             /// <summary>
             /// 停止开始
             /// </summary>
-            [Description("已开始")]
+            [DisplayText("已开始")]
             TSC_STARTENDING,
 
             /// <summary>
             /// 停止完成
             /// </summary>
-            [Description("已停止")]
+            [DisplayText("已停止")]
             TSC_STOPENDING
         }
 

SunnyUI/Common/UXmlConfig.cs

@@ -1,163 +0,0 @@
-/******************************************************************************
- * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2023 ShenYongHua(沈永华).
- * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
- *
- * Blog:   https://www.cnblogs.com/yhuse
- * Gitee:  https://gitee.com/yhuse/SunnyUI
- * GitHub: https://github.com/yhuse/SunnyUI
- *
- * SunnyUI.Common.dll can be used for free under the MIT license.
- * If you use this code, please keep this note.
- * 如果您使用此代码，请保留此说明。
- ******************************************************************************
- * 文件名称: UXmlConfig.cs
- * 文件说明: XML 配置文件类
- * 当前版本: V3.1
- * 创建日期: 2020-01-01
- *
- * 2020-01-01: V2.2.0 增加文件说明
-******************************************************************************/
-
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Xml;
-
-namespace Sunny.UI
-{
-    /// <summary>
-    /// XML 配置文件类
-    /// </summary>
-    /// <typeparam name="TConfig">类型</typeparam>
-    public class XmlConfig<TConfig> : BaseConfig<TConfig> where TConfig : XmlConfig<TConfig>, new()
-    {
-        #region 加载
-        /// <summary>
-        /// 当前可执行文件路径，末尾包括\
-        /// </summary>
-        /// <returns>结果</returns>
-        private static string CurrentDir()
-        {
-            return Environment.CurrentDirectory.DealPath();
-        }
-
-        /// <summary>加载指定配置文件</summary>
-        /// <param name="filename">文件名</param>
-        /// <returns>结果</returns>
-        public override bool Load(string filename)
-        {
-            if (filename.IsNullOrWhiteSpace())
-            {
-                filename = CurrentDir() + ConfigFile;
-            }
-
-            if (filename.IsNullOrWhiteSpace())
-            {
-                throw new ApplicationException($"未指定{typeof(TConfig).Name}的配置文件路径！");
-            }
-
-            if (!File.Exists(filename))
-            {
-                return false;
-            }
-
-            try
-            {
-                ConcurrentDictionary<string, Ident> idents = ConfigHelper.InitIdents(current);
-
-                XmlDocument doc = new XmlDocument();
-                doc.Load(filename);
-                XmlElement root = doc.DocumentElement;   //获取根节点
-                foreach (Ident ident in idents.Values)
-                {
-                    if (root != null)
-                    {
-                        var elements = root.GetElementsByTagName(ident.Key);
-                        if (elements.Count == 1)
-                        {
-                            if (ident.IsList)
-                            {
-                                ident.Values.Clear();
-                                foreach (XmlNode node in elements[0].ChildNodes)
-                                {
-                                    ident.Values.Add(node.InnerText);
-                                }
-                            }
-                            else
-                            {
-                                ident.Value = elements[0].InnerText;
-                            }
-                        }
-                    }
-                }
-
-                ConfigHelper.LoadConfigValue(current, idents);
-                return true;
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine(ex.Message);
-                return false;
-            }
-        }
-
-        /// <summary>保存到配置文件中去</summary>
-        /// <param name="filename">文件名</param>
-        public override void Save(string filename)
-        {
-            if (filename.IsNullOrWhiteSpace())
-            {
-                filename = CurrentDir() + ConfigFile;
-            }
-
-            if (filename.IsNullOrWhiteSpace())
-            {
-                throw new ApplicationException($"未指定{typeof(TConfig).Name}的配置文件路径！");
-            }
-
-            ConcurrentDictionary<string, Ident> idents = ConfigHelper.InitIdents(current);
-            ConfigHelper.SaveConfigValue(Current, idents);
-
-            List<string> strs = new List<string> { "<?xml version=" + "\"" + "1.0" + "\"" + " encoding=" + "\"" + "utf-8" + "\"" + "?> ", "<!--" + Description + "--> " };
-
-            strs.Add("<" + GetType().Name + ">");
-
-            SortedList<int, Ident> slist = new SortedList<int, Ident>();
-            foreach (var ident in idents.Values)
-            {
-                slist.Add(ident.Index, ident);
-            }
-
-            foreach (var ident in slist.Values)
-            {
-                if (!ident.Description.IsNullOrEmpty())
-                {
-                    strs.Add("    <!--" + ident.Description + "-->");
-                }
-
-                if (!ident.IsList)
-                {
-                    strs.Add("    <" + ident.Key + ">" + ident.Value + "</" + ident.Key + ">");
-                }
-                else
-                {
-                    strs.Add("    <" + ident.Key + ">");
-                    foreach (string value in ident.Values)
-                    {
-                        strs.Add("        <Value>" + value + "</Value>");
-                    }
-
-                    strs.Add("    </" + ident.Key + ">");
-                }
-            }
-
-            strs.Add("</" + GetType().Name + ">");
-            File.WriteAllLines(filename, strs.ToArray(), Encoding.UTF8);
-        }
-
-        #endregion 加载
-    }
-}

SunnyUI/Controls/DropItem/UIColorItem.cs

@@ -49,459 +49,441 @@ namespace Sunny.UI
 
         private void InitializeComponent()
         {
-            m_colorTable = new UIColorTable();
+            this.m_colorTable = new Sunny.UI.UIColorTable();
-            m_colorSample = new LabelRotate();
+            this.m_colorSample = new Sunny.UI.LabelRotate();
-            edtA = new UITextBox();
+            this.edtA = new Sunny.UI.UITextBox();
-            edtR = new UITextBox();
+            this.edtR = new Sunny.UI.UITextBox();
-            edtG = new UITextBox();
+            this.edtG = new Sunny.UI.UITextBox();
-            edtB = new UITextBox();
+            this.edtB = new Sunny.UI.UITextBox();
-            lblA = new UILabel();
+            this.lblA = new Sunny.UI.UILabel();
-            lblR = new UILabel();
+            this.lblR = new Sunny.UI.UILabel();
-            lblG = new UILabel();
+            this.lblG = new Sunny.UI.UILabel();
-            lblB = new UILabel();
+            this.lblB = new Sunny.UI.UILabel();
-            m_colorWheel = new UIColorWheel();
+            this.m_colorWheel = new Sunny.UI.UIColorWheel();
-            m_colorBar = new HSLColorSlider();
+            this.m_colorBar = new Sunny.UI.HSLColorSlider();
-            m_opacitySlider = new ColorSlider();
+            this.m_opacitySlider = new Sunny.UI.ColorSlider();
-            btnOK = new UISymbolButton();
+            this.btnOK = new Sunny.UI.UISymbolButton();
-            btnCancel = new UISymbolButton();
+            this.btnCancel = new Sunny.UI.UISymbolButton();
-            SuspendLayout();
+            this.SuspendLayout();
             //
             // m_colorTable
             //
-            m_colorTable.BackColor = Color.Transparent;
+            this.m_colorTable.BackColor = System.Drawing.Color.Transparent;
-            m_colorTable.Colors = new Color[]
+            this.m_colorTable.Colors = new System.Drawing.Color[] {
-    {
+        System.Drawing.Color.Black,
-    Color.Black,
+        System.Drawing.Color.DarkGreen,
-    Color.DarkGreen,
+        System.Drawing.Color.DarkSlateGray,
-    Color.DarkSlateGray,
+        System.Drawing.Color.Purple,
-    Color.Purple,
+        System.Drawing.Color.Maroon,
-    Color.Maroon,
+        System.Drawing.Color.Teal,
-    Color.Teal,
+        System.Drawing.Color.Green,
-    Color.Green,
+        System.Drawing.Color.Olive,
-    Color.Olive,
+        System.Drawing.Color.Navy,
-    Color.Navy,
+        System.Drawing.Color.Indigo,
-    Color.Indigo,
+        System.Drawing.Color.MidnightBlue,
-    Color.MidnightBlue,
+        System.Drawing.Color.DarkRed,
-    Color.DarkRed,
+        System.Drawing.Color.DarkMagenta,
-    Color.DarkMagenta,
+        System.Drawing.Color.DarkBlue,
-    Color.DarkBlue,
+        System.Drawing.Color.DarkCyan,
-    Color.DarkCyan,
+        System.Drawing.Color.DarkOliveGreen,
-    Color.DarkOliveGreen,
+        System.Drawing.Color.SaddleBrown,
-    Color.SaddleBrown,
+        System.Drawing.Color.ForestGreen,
-    Color.ForestGreen,
+        System.Drawing.Color.OliveDrab,
-    Color.OliveDrab,
+        System.Drawing.Color.SeaGreen,
-    Color.SeaGreen,
+        System.Drawing.Color.DarkGoldenrod,
-    Color.DarkGoldenrod,
+        System.Drawing.Color.DarkSlateBlue,
-    Color.DarkSlateBlue,
+        System.Drawing.Color.MediumBlue,
-    Color.MediumBlue,
+        System.Drawing.Color.Sienna,
-    Color.Sienna,
+        System.Drawing.Color.Brown,
-    Color.Brown,
+        System.Drawing.Color.DarkTurquoise,
-    Color.DarkTurquoise,
+        System.Drawing.Color.DimGray,
-    Color.DimGray,
+        System.Drawing.Color.LightSeaGreen,
-    Color.LightSeaGreen,
+        System.Drawing.Color.DarkViolet,
-    Color.DarkViolet,
+        System.Drawing.Color.Firebrick,
-    Color.Firebrick,
+        System.Drawing.Color.MediumVioletRed,
-    Color.MediumVioletRed,
+        System.Drawing.Color.MediumSeaGreen,
-    Color.MediumSeaGreen,
+        System.Drawing.Color.Crimson,
-    Color.Crimson,
+        System.Drawing.Color.Chocolate,
-    Color.Chocolate,
+        System.Drawing.Color.MediumSpringGreen,
-    Color.MediumSpringGreen,
+        System.Drawing.Color.Goldenrod,
-    Color.Goldenrod,
+        System.Drawing.Color.SteelBlue,
-    Color.SteelBlue,
+        System.Drawing.Color.LawnGreen,
-    Color.LawnGreen,
+        System.Drawing.Color.DarkOrchid,
-    Color.DarkOrchid,
+        System.Drawing.Color.Orange,
-    Color.Orange,
+        System.Drawing.Color.LimeGreen,
-    Color.LimeGreen,
+        System.Drawing.Color.Yellow,
-    Color.Yellow,
+        System.Drawing.Color.Gold,
-    Color.Gold,
+        System.Drawing.Color.Red,
-    Color.Red,
+        System.Drawing.Color.Magenta,
-    Color.Magenta,
+        System.Drawing.Color.Lime,
-    Color.Lime,
+        System.Drawing.Color.SpringGreen,
-    Color.SpringGreen,
+        System.Drawing.Color.YellowGreen,
-    Color.YellowGreen,
+        System.Drawing.Color.Chartreuse,
-    Color.Chartreuse,
+        System.Drawing.Color.DeepSkyBlue,
-    Color.DeepSkyBlue,
+        System.Drawing.Color.Aqua,
-    Color.Aqua,
+        System.Drawing.Color.OrangeRed,
-    Color.OrangeRed,
+        System.Drawing.Color.Blue,
-    Color.Blue,
+        System.Drawing.Color.DarkOrange,
-    Color.DarkOrange,
+        System.Drawing.Color.CadetBlue,
-    Color.CadetBlue,
+        System.Drawing.Color.Cyan,
-    Color.Cyan,
+        System.Drawing.Color.Fuchsia,
-    Color.Fuchsia,
+        System.Drawing.Color.Gray,
-    Color.Gray,
+        System.Drawing.Color.SlateGray,
-    Color.SlateGray,
+        System.Drawing.Color.Peru,
-    Color.Peru,
+        System.Drawing.Color.BlueViolet,
-    Color.BlueViolet,
+        System.Drawing.Color.LightSlateGray,
-    Color.LightSlateGray,
+        System.Drawing.Color.DeepPink,
-    Color.DeepPink,
+        System.Drawing.Color.MediumTurquoise,
-    Color.MediumTurquoise,
+        System.Drawing.Color.DodgerBlue,
-    Color.DodgerBlue,
+        System.Drawing.Color.Turquoise,
-    Color.Turquoise,
+        System.Drawing.Color.RoyalBlue,
-    Color.RoyalBlue,
+        System.Drawing.Color.SlateBlue,
-    Color.SlateBlue,
+        System.Drawing.Color.MediumOrchid,
-    Color.MediumOrchid,
+        System.Drawing.Color.DarkKhaki,
-    Color.DarkKhaki,
+        System.Drawing.Color.IndianRed,
-    Color.IndianRed,
+        System.Drawing.Color.GreenYellow,
-    Color.GreenYellow,
+        System.Drawing.Color.MediumAquamarine,
-    Color.MediumAquamarine,
+        System.Drawing.Color.Tomato,
-    Color.Tomato,
+        System.Drawing.Color.DarkSeaGreen,
-    Color.DarkSeaGreen,
+        System.Drawing.Color.Orchid,
-    Color.Orchid,
+        System.Drawing.Color.RosyBrown,
-    Color.RosyBrown,
+        System.Drawing.Color.PaleVioletRed,
-    Color.PaleVioletRed,
+        System.Drawing.Color.MediumPurple,
-    Color.MediumPurple,
+        System.Drawing.Color.Coral,
-    Color.Coral,
+        System.Drawing.Color.CornflowerBlue,
-    Color.CornflowerBlue,
+        System.Drawing.Color.DarkGray,
-    Color.DarkGray,
+        System.Drawing.Color.SandyBrown,
-    Color.SandyBrown,
+        System.Drawing.Color.MediumSlateBlue,
-    Color.MediumSlateBlue,
+        System.Drawing.Color.Tan,
-    Color.Tan,
+        System.Drawing.Color.DarkSalmon,
-    Color.DarkSalmon,
+        System.Drawing.Color.BurlyWood,
-    Color.BurlyWood,
+        System.Drawing.Color.HotPink,
-    Color.HotPink,
+        System.Drawing.Color.Salmon,
-    Color.Salmon,
+        System.Drawing.Color.Violet,
-    Color.Violet,
+        System.Drawing.Color.LightCoral,
-    Color.LightCoral,
+        System.Drawing.Color.SkyBlue,
-    Color.SkyBlue,
+        System.Drawing.Color.LightSalmon,
-    Color.LightSalmon,
+        System.Drawing.Color.Khaki,
-    Color.Khaki,
+        System.Drawing.Color.Plum,
-    Color.Plum,
+        System.Drawing.Color.LightGreen,
-    Color.LightGreen,
+        System.Drawing.Color.Aquamarine,
-    Color.Aquamarine,
+        System.Drawing.Color.Silver,
-    Color.Silver,
+        System.Drawing.Color.LightSkyBlue,
-    Color.LightSkyBlue,
+        System.Drawing.Color.LightSteelBlue,
-    Color.LightSteelBlue,
+        System.Drawing.Color.LightBlue,
-    Color.LightBlue,
+        System.Drawing.Color.PaleGreen,
-    Color.PaleGreen,
+        System.Drawing.Color.PowderBlue,
-    Color.PowderBlue,
+        System.Drawing.Color.Thistle,
-    Color.Thistle,
+        System.Drawing.Color.PaleGoldenrod,
-    Color.PaleGoldenrod,
+        System.Drawing.Color.PaleTurquoise,
-    Color.PaleTurquoise,
+        System.Drawing.Color.LightGray,
-    Color.LightGray,
+        System.Drawing.Color.Wheat,
-    Color.Wheat,
+        System.Drawing.Color.NavajoWhite,
-    Color.NavajoWhite,
+        System.Drawing.Color.Moccasin,
-    Color.Moccasin,
+        System.Drawing.Color.LightPink,
-    Color.LightPink,
+        System.Drawing.Color.PeachPuff,
-    Color.PeachPuff,
+        System.Drawing.Color.Gainsboro,
-    Color.Gainsboro,
+        System.Drawing.Color.Pink,
-    Color.Pink,
+        System.Drawing.Color.Bisque,
-    Color.Bisque,
+        System.Drawing.Color.LightGoldenrodYellow,
-    Color.LightGoldenrodYellow,
+        System.Drawing.Color.LemonChiffon,
-    Color.LemonChiffon,
+        System.Drawing.Color.BlanchedAlmond,
-    Color.BlanchedAlmond,
+        System.Drawing.Color.Beige,
-    Color.Beige,
+        System.Drawing.Color.AntiqueWhite,
-    Color.AntiqueWhite,
+        System.Drawing.Color.PapayaWhip,
-    Color.PapayaWhip,
+        System.Drawing.Color.Cornsilk,
-    Color.Cornsilk,
+        System.Drawing.Color.LightYellow,
-    Color.LightYellow,
+        System.Drawing.Color.LightCyan,
-    Color.LightCyan,
+        System.Drawing.Color.Lavender,
-    Color.Lavender,
+        System.Drawing.Color.Linen,
-    Color.Linen,
+        System.Drawing.Color.MistyRose,
-    Color.MistyRose,
+        System.Drawing.Color.OldLace,
-    Color.OldLace,
+        System.Drawing.Color.WhiteSmoke,
-    Color.WhiteSmoke,
+        System.Drawing.Color.SeaShell,
-    Color.SeaShell,
+        System.Drawing.Color.Azure,
-    Color.Azure,
+        System.Drawing.Color.Honeydew,
-    Color.Honeydew,
+        System.Drawing.Color.Ivory,
-    Color.Ivory,
+        System.Drawing.Color.LavenderBlush,
-    Color.LavenderBlush,
+        System.Drawing.Color.FloralWhite,
-    Color.FloralWhite,
+        System.Drawing.Color.AliceBlue,
-    Color.AliceBlue,
+        System.Drawing.Color.MintCream,
-    Color.MintCream,
+        System.Drawing.Color.GhostWhite,
-    Color.GhostWhite,
+        System.Drawing.Color.Snow,
-    Color.Snow,
+        System.Drawing.Color.White};
-    Color.White
+            this.m_colorTable.Cols = 16;
-    };
+            this.m_colorTable.FieldSize = new System.Drawing.Size(12, 12);
-            m_colorTable.Cols = 16;
+            this.m_colorTable.FrameColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            m_colorTable.FieldSize = new Size(12, 12);
+            this.m_colorTable.Location = new System.Drawing.Point(10, 8);
-            m_colorTable.FrameColor = Color.FromArgb(80, 160, 255);
+            this.m_colorTable.Name = "m_colorTable";
-            m_colorTable.Location = new Point(10, 8);
+            this.m_colorTable.Padding = new System.Windows.Forms.Padding(8);
-            m_colorTable.Name = "m_colorTable";
+            this.m_colorTable.RotatePointAlignment = System.Drawing.ContentAlignment.MiddleCenter;
-            m_colorTable.Padding = new System.Windows.Forms.Padding(8);
+            this.m_colorTable.SelectedItem = System.Drawing.Color.Black;
-            m_colorTable.RotatePointAlignment = ContentAlignment.MiddleCenter;
+            this.m_colorTable.Size = new System.Drawing.Size(253, 148);
-            m_colorTable.SelectedItem = Color.Black;
+            this.m_colorTable.Style = Sunny.UI.UIStyle.Custom;
-            m_colorTable.Size = new Size(253, 148);
+            this.m_colorTable.StyleCustomMode = false;
-            m_colorTable.Style = UIStyle.Custom;
+            this.m_colorTable.TabIndex = 0;
-            m_colorTable.TabIndex = 0;
+            this.m_colorTable.TagString = null;
-            m_colorTable.Text = "colorTable1";
+            this.m_colorTable.Text = "colorTable1";
-            m_colorTable.TextAlign = ContentAlignment.MiddleLeft;
+            this.m_colorTable.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            m_colorTable.TextAngle = 0F;
+            this.m_colorTable.TextAngle = 0F;
-            m_colorTable.SelectedIndexChanged += m_colorTable_SelectedIndexChanged;
+            this.m_colorTable.SelectedIndexChanged += new System.EventHandler(this.m_colorTable_SelectedIndexChanged);
             //
             // m_colorSample
             //
-            m_colorSample.FrameColor = Color.FromArgb(80, 160, 255);
+            this.m_colorSample.FrameColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            m_colorSample.Location = new Point(10, 163);
+            this.m_colorSample.Location = new System.Drawing.Point(10, 163);
-            m_colorSample.Name = "m_colorSample";
+            this.m_colorSample.Name = "m_colorSample";
-            m_colorSample.RotatePointAlignment = ContentAlignment.MiddleCenter;
+            this.m_colorSample.RotatePointAlignment = System.Drawing.ContentAlignment.MiddleCenter;
-            m_colorSample.Size = new Size(253, 26);
+            this.m_colorSample.Size = new System.Drawing.Size(253, 26);
-            m_colorSample.Style = UIStyle.Custom;
+            this.m_colorSample.Style = Sunny.UI.UIStyle.Custom;
-            m_colorSample.TabIndex = 1;
+            this.m_colorSample.StyleCustomMode = false;
-            m_colorSample.TabStop = false;
+            this.m_colorSample.TabIndex = 1;
-            m_colorSample.TextAlign = ContentAlignment.MiddleLeft;
+            this.m_colorSample.TabStop = false;
-            m_colorSample.TextAngle = 0F;
+            this.m_colorSample.TagString = null;
-            m_colorSample.Paint += m_colorSample_Paint;
+            this.m_colorSample.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.m_colorSample.TextAngle = 0F;
+            this.m_colorSample.Paint += new System.Windows.Forms.PaintEventHandler(this.m_colorSample_Paint);
             //
             // edtA
             //
-            edtA.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.edtA.Cursor = System.Windows.Forms.Cursors.IBeam;
-            edtA.Font = new Font("宋体", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            this.edtA.FillColor = System.Drawing.Color.White;
-            edtA.Location = new Point(29, 197);
+            this.edtA.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            edtA.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.edtA.Location = new System.Drawing.Point(29, 197);
-            edtA.Maximum = 255D;
+            this.edtA.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            edtA.Minimum = 0D;
+            this.edtA.Maximum = 255D;
-            edtA.MinimumSize = new Size(1, 16);
+            this.edtA.Minimum = 0D;
-            edtA.Name = "edtA";
+            this.edtA.Name = "edtA";
-            edtA.Padding = new System.Windows.Forms.Padding(5);
+            this.edtA.Padding = new System.Windows.Forms.Padding(5);
-            edtA.ShowText = false;
+            this.edtA.Size = new System.Drawing.Size(41, 26);
-            edtA.Size = new Size(41, 26);
+            this.edtA.Style = Sunny.UI.UIStyle.Custom;
-            edtA.Style = UIStyle.Custom;
+            this.edtA.TabIndex = 2;
-            edtA.TabIndex = 2;
+            this.edtA.Text = "0";
-            edtA.Text = "0";
+            this.edtA.Type = Sunny.UI.UITextBox.UIEditType.Integer;
-            edtA.TextAlignment = ContentAlignment.MiddleLeft;
-            edtA.Type = UITextBox.UIEditType.Integer;
-            edtA.Watermark = "";
-            edtA.LostFocus += edtA_TextChanged;
             //
             // edtR
             //
-            edtR.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.edtR.Cursor = System.Windows.Forms.Cursors.IBeam;
-            edtR.Font = new Font("宋体", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            this.edtR.FillColor = System.Drawing.Color.White;
-            edtR.Location = new Point(93, 197);
+            this.edtR.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            edtR.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.edtR.Location = new System.Drawing.Point(93, 197);
-            edtR.Maximum = 255D;
+            this.edtR.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            edtR.Minimum = 0D;
+            this.edtR.Maximum = 255D;
-            edtR.MinimumSize = new Size(1, 16);
+            this.edtR.Minimum = 0D;
-            edtR.Name = "edtR";
+            this.edtR.Name = "edtR";
-            edtR.Padding = new System.Windows.Forms.Padding(5);
+            this.edtR.Padding = new System.Windows.Forms.Padding(5);
-            edtR.ShowText = false;
+            this.edtR.Size = new System.Drawing.Size(41, 26);
-            edtR.Size = new Size(41, 26);
+            this.edtR.Style = Sunny.UI.UIStyle.Custom;
-            edtR.Style = UIStyle.Custom;
+            this.edtR.TabIndex = 3;
-            edtR.TabIndex = 3;
+            this.edtR.Text = "0";
-            edtR.Text = "0";
+            this.edtR.Type = Sunny.UI.UITextBox.UIEditType.Integer;
-            edtR.TextAlignment = ContentAlignment.MiddleLeft;
-            edtR.Type = UITextBox.UIEditType.Integer;
-            edtR.Watermark = "";
-            edtR.LostFocus += edtR_TextChanged;
             //
             // edtG
             //
-            edtG.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.edtG.Cursor = System.Windows.Forms.Cursors.IBeam;
-            edtG.Font = new Font("宋体", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            this.edtG.FillColor = System.Drawing.Color.White;
-            edtG.Location = new Point(158, 197);
+            this.edtG.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            edtG.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.edtG.Location = new System.Drawing.Point(158, 197);
-            edtG.Maximum = 255D;
+            this.edtG.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            edtG.Minimum = 0D;
+            this.edtG.Maximum = 255D;
-            edtG.MinimumSize = new Size(1, 16);
+            this.edtG.Minimum = 0D;
-            edtG.Name = "edtG";
+            this.edtG.Name = "edtG";
-            edtG.Padding = new System.Windows.Forms.Padding(5);
+            this.edtG.Padding = new System.Windows.Forms.Padding(5);
-            edtG.ShowText = false;
+            this.edtG.Size = new System.Drawing.Size(41, 26);
-            edtG.Size = new Size(41, 26);
+            this.edtG.Style = Sunny.UI.UIStyle.Custom;
-            edtG.Style = UIStyle.Custom;
+            this.edtG.TabIndex = 4;
-            edtG.TabIndex = 4;
+            this.edtG.Text = "0";
-            edtG.Text = "0";
+            this.edtG.Type = Sunny.UI.UITextBox.UIEditType.Integer;
-            edtG.TextAlignment = ContentAlignment.MiddleLeft;
-            edtG.Type = UITextBox.UIEditType.Integer;
-            edtG.Watermark = "";
-            edtG.LostFocus += edtG_TextChanged;
             //
             // edtB
             //
-            edtB.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.edtB.Cursor = System.Windows.Forms.Cursors.IBeam;
-            edtB.Font = new Font("宋体", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            this.edtB.FillColor = System.Drawing.Color.White;
-            edtB.Location = new Point(222, 197);
+            this.edtB.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            edtB.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.edtB.Location = new System.Drawing.Point(222, 197);
-            edtB.Maximum = 255D;
+            this.edtB.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            edtB.Minimum = 0D;
+            this.edtB.Maximum = 255D;
-            edtB.MinimumSize = new Size(1, 16);
+            this.edtB.Minimum = 0D;
-            edtB.Name = "edtB";
+            this.edtB.Name = "edtB";
-            edtB.Padding = new System.Windows.Forms.Padding(5);
+            this.edtB.Padding = new System.Windows.Forms.Padding(5);
-            edtB.ShowText = false;
+            this.edtB.Size = new System.Drawing.Size(41, 26);
-            edtB.Size = new Size(41, 26);
+            this.edtB.Style = Sunny.UI.UIStyle.Custom;
-            edtB.Style = UIStyle.Custom;
+            this.edtB.TabIndex = 5;
-            edtB.TabIndex = 5;
+            this.edtB.Text = "0";
-            edtB.Text = "0";
+            this.edtB.Type = Sunny.UI.UITextBox.UIEditType.Integer;
-            edtB.TextAlignment = ContentAlignment.MiddleLeft;
-            edtB.Type = UITextBox.UIEditType.Integer;
-            edtB.Watermark = "";
-            edtB.LostFocus += edtB_TextChanged;
             //
             // lblA
             //
-            lblA.AutoSize = true;
+            this.lblA.AutoSize = true;
-            lblA.BackColor = Color.Transparent;
+            this.lblA.BackColor = System.Drawing.Color.Transparent;
-            lblA.Font = new Font("宋体", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            this.lblA.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            lblA.ForeColor = Color.FromArgb(48, 48, 48);
+            this.lblA.Location = new System.Drawing.Point(9, 200);
-            lblA.Location = new Point(9, 200);
+            this.lblA.Name = "lblA";
-            lblA.Name = "lblA";
+            this.lblA.Size = new System.Drawing.Size(19, 20);
-            lblA.Size = new Size(14, 14);
+            this.lblA.Style = Sunny.UI.UIStyle.Custom;
-            lblA.Style = UIStyle.Custom;
+            this.lblA.TabIndex = 6;
-            lblA.TabIndex = 6;
+            this.lblA.Text = "A";
-            lblA.Text = "A";
+            this.lblA.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            lblA.TextAlign = ContentAlignment.MiddleLeft;
             //
             // lblR
             //
-            lblR.AutoSize = true;
+            this.lblR.AutoSize = true;
-            lblR.BackColor = Color.Transparent;
+            this.lblR.BackColor = System.Drawing.Color.Transparent;
-            lblR.Font = new Font("宋体", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            this.lblR.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            lblR.ForeColor = Color.FromArgb(48, 48, 48);
+            this.lblR.Location = new System.Drawing.Point(74, 200);
-            lblR.Location = new Point(74, 200);
+            this.lblR.Name = "lblR";
-            lblR.Name = "lblR";
+            this.lblR.Size = new System.Drawing.Size(18, 20);
-            lblR.Size = new Size(14, 14);
+            this.lblR.Style = Sunny.UI.UIStyle.Custom;
-            lblR.Style = UIStyle.Custom;
+            this.lblR.TabIndex = 7;
-            lblR.TabIndex = 7;
+            this.lblR.Text = "R";
-            lblR.Text = "R";
+            this.lblR.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            lblR.TextAlign = ContentAlignment.MiddleLeft;
             //
             // lblG
             //
-            lblG.AutoSize = true;
+            this.lblG.AutoSize = true;
-            lblG.BackColor = Color.Transparent;
+            this.lblG.BackColor = System.Drawing.Color.Transparent;
-            lblG.Font = new Font("宋体", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            this.lblG.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            lblG.ForeColor = Color.FromArgb(48, 48, 48);
+            this.lblG.Location = new System.Drawing.Point(138, 200);
-            lblG.Location = new Point(138, 200);
+            this.lblG.Name = "lblG";
-            lblG.Name = "lblG";
+            this.lblG.Size = new System.Drawing.Size(19, 20);
-            lblG.Size = new Size(14, 14);
+            this.lblG.Style = Sunny.UI.UIStyle.Custom;
-            lblG.Style = UIStyle.Custom;
+            this.lblG.TabIndex = 8;
-            lblG.TabIndex = 8;
+            this.lblG.Text = "G";
-            lblG.Text = "G";
+            this.lblG.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            lblG.TextAlign = ContentAlignment.MiddleLeft;
             //
             // lblB
             //
-            lblB.AutoSize = true;
+            this.lblB.AutoSize = true;
-            lblB.BackColor = Color.Transparent;
+            this.lblB.BackColor = System.Drawing.Color.Transparent;
-            lblB.Font = new Font("宋体", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            this.lblB.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            lblB.ForeColor = Color.FromArgb(48, 48, 48);
+            this.lblB.Location = new System.Drawing.Point(203, 200);
-            lblB.Location = new Point(203, 200);
+            this.lblB.Name = "lblB";
-            lblB.Name = "lblB";
+            this.lblB.Size = new System.Drawing.Size(18, 20);
-            lblB.Size = new Size(14, 14);
+            this.lblB.Style = Sunny.UI.UIStyle.Custom;
-            lblB.Style = UIStyle.Custom;
+            this.lblB.TabIndex = 9;
-            lblB.TabIndex = 9;
+            this.lblB.Text = "B";
-            lblB.Text = "B";
+            this.lblB.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            lblB.TextAlign = ContentAlignment.MiddleLeft;
             //
             // m_colorWheel
             //
-            m_colorWheel.BackColor = Color.Transparent;
+            this.m_colorWheel.BackColor = System.Drawing.Color.Transparent;
-            m_colorWheel.FrameColor = Color.FromArgb(80, 160, 255);
+            this.m_colorWheel.FrameColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            m_colorWheel.Location = new Point(269, 8);
+            this.m_colorWheel.Location = new System.Drawing.Point(269, 8);
-            m_colorWheel.Name = "m_colorWheel";
+            this.m_colorWheel.Name = "m_colorWheel";
-            m_colorWheel.SelectedColor = Color.FromArgb(254, 235, 205);
+            this.m_colorWheel.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(235)))), ((int)(((byte)(205)))));
-            m_colorWheel.Size = new Size(148, 148);
+            this.m_colorWheel.Size = new System.Drawing.Size(148, 148);
-            m_colorWheel.Style = UIStyle.Custom;
+            this.m_colorWheel.Style = Sunny.UI.UIStyle.Custom;
-            m_colorWheel.TabIndex = 10;
+            this.m_colorWheel.StyleCustomMode = false;
-            m_colorWheel.Text = "colorWheel1";
+            this.m_colorWheel.TabIndex = 10;
-            m_colorWheel.SelectedColorChanged += m_colorWheel_SelectedColorChanged;
+            this.m_colorWheel.TagString = null;
+            this.m_colorWheel.Text = "colorWheel1";
+            this.m_colorWheel.SelectedColorChanged += new System.EventHandler(this.m_colorWheel_SelectedColorChanged);
             //
             // m_colorBar
             //
-            m_colorBar.BackColor = Color.Transparent;
+            this.m_colorBar.BackColor = System.Drawing.Color.Transparent;
-            m_colorBar.BarPadding = new System.Windows.Forms.Padding(12, 5, 32, 10);
+            this.m_colorBar.BarPadding = new System.Windows.Forms.Padding(12, 5, 32, 10);
-            m_colorBar.Color1 = Color.Black;
+            this.m_colorBar.Color1 = System.Drawing.Color.Black;
-            m_colorBar.Color2 = Color.FromArgb(127, 127, 127);
+            this.m_colorBar.Color2 = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(127)))), ((int)(((byte)(127)))));
-            m_colorBar.Color3 = Color.White;
+            this.m_colorBar.Color3 = System.Drawing.Color.White;
-            m_colorBar.Font = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            this.m_colorBar.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            m_colorBar.FrameColor = Color.FromArgb(80, 160, 255);
+            this.m_colorBar.FrameColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            m_colorBar.Location = new Point(422, 8);
+            this.m_colorBar.Location = new System.Drawing.Point(422, 8);
-            m_colorBar.Name = "m_colorBar";
+            this.m_colorBar.Name = "m_colorBar";
-            m_colorBar.NumberOfColors = ColorSlider.eNumberOfColors.Use3Colors;
+            this.m_colorBar.NumberOfColors = Sunny.UI.ColorSlider.eNumberOfColors.Use3Colors;
-            m_colorBar.Orientation = System.Windows.Forms.Orientation.Vertical;
+            this.m_colorBar.Orientation = System.Windows.Forms.Orientation.Vertical;
-            m_colorBar.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0);
+            this.m_colorBar.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0);
-            m_colorBar.Percent = 0F;
+            this.m_colorBar.Percent = 0F;
-            m_colorBar.RotatePointAlignment = ContentAlignment.MiddleRight;
+            this.m_colorBar.RotatePointAlignment = System.Drawing.ContentAlignment.MiddleRight;
-            m_colorBar.Size = new Size(45, 148);
+            this.m_colorBar.Size = new System.Drawing.Size(45, 148);
-            m_colorBar.Style = UIStyle.Custom;
+            this.m_colorBar.Style = Sunny.UI.UIStyle.Custom;
-            m_colorBar.TabIndex = 11;
+            this.m_colorBar.StyleCustomMode = false;
-            m_colorBar.Text = "Lightness";
+            this.m_colorBar.TabIndex = 11;
-            m_colorBar.TextAlign = ContentAlignment.BottomCenter;
+            this.m_colorBar.TagString = null;
-            m_colorBar.TextAngle = 270F;
+            this.m_colorBar.Text = "Lightness";
-            m_colorBar.ValueOrientation = ColorSlider.eValueOrientation.MaxToMin;
+            this.m_colorBar.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
-            m_colorBar.SelectedValueChanged += m_colorBar_SelectedValueChanged;
+            this.m_colorBar.TextAngle = 270F;
+            this.m_colorBar.ValueOrientation = Sunny.UI.ColorSlider.eValueOrientation.MaxToMin;
+            this.m_colorBar.SelectedValueChanged += new System.EventHandler(this.m_colorBar_SelectedValueChanged);
             //
             // m_opacitySlider
             //
-            m_opacitySlider.BackColor = Color.Transparent;
+            this.m_opacitySlider.BackColor = System.Drawing.Color.Transparent;
-            m_opacitySlider.BarPadding = new System.Windows.Forms.Padding(60, 12, 80, 25);
+            this.m_opacitySlider.BarPadding = new System.Windows.Forms.Padding(60, 12, 80, 25);
-            m_opacitySlider.Color1 = Color.White;
+            this.m_opacitySlider.Color1 = System.Drawing.Color.White;
-            m_opacitySlider.Color2 = Color.Black;
+            this.m_opacitySlider.Color2 = System.Drawing.Color.Black;
-            m_opacitySlider.Color3 = Color.Black;
+            this.m_opacitySlider.Color3 = System.Drawing.Color.Black;
-            m_opacitySlider.Font = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 0);
+            this.m_opacitySlider.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            m_opacitySlider.ForeColor = Color.Black;
+            this.m_opacitySlider.ForeColor = System.Drawing.Color.Black;
-            m_opacitySlider.FrameColor = Color.FromArgb(80, 160, 255);
+            this.m_opacitySlider.FrameColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            m_opacitySlider.Location = new Point(269, 163);
+            this.m_opacitySlider.Location = new System.Drawing.Point(269, 163);
-            m_opacitySlider.Name = "m_opacitySlider";
+            this.m_opacitySlider.Name = "m_opacitySlider";
-            m_opacitySlider.NumberOfColors = ColorSlider.eNumberOfColors.Use2Colors;
+            this.m_opacitySlider.NumberOfColors = Sunny.UI.ColorSlider.eNumberOfColors.Use2Colors;
-            m_opacitySlider.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            this.m_opacitySlider.Orientation = System.Windows.Forms.Orientation.Horizontal;
-            m_opacitySlider.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0);
+            this.m_opacitySlider.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0);
-            m_opacitySlider.Percent = 1F;
+            this.m_opacitySlider.Percent = 1F;
-            m_opacitySlider.RotatePointAlignment = ContentAlignment.MiddleCenter;
+            this.m_opacitySlider.RotatePointAlignment = System.Drawing.ContentAlignment.MiddleCenter;
-            m_opacitySlider.Size = new Size(198, 26);
+            this.m_opacitySlider.Size = new System.Drawing.Size(198, 26);
-            m_opacitySlider.Style = UIStyle.Custom;
+            this.m_opacitySlider.Style = Sunny.UI.UIStyle.Custom;
-            m_opacitySlider.TabIndex = 1;
+            this.m_opacitySlider.StyleCustomMode = false;
-            m_opacitySlider.Text = "Opacity";
+            this.m_opacitySlider.TabIndex = 1;
-            m_opacitySlider.TextAlign = ContentAlignment.MiddleLeft;
+            this.m_opacitySlider.TagString = null;
-            m_opacitySlider.TextAngle = 0F;
+            this.m_opacitySlider.Text = "Opacity";
-            m_opacitySlider.ValueOrientation = ColorSlider.eValueOrientation.MinToMax;
+            this.m_opacitySlider.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            m_opacitySlider.SelectedValueChanged += m_opacitySlider_SelectedValueChanged;
+            this.m_opacitySlider.TextAngle = 0F;
+            this.m_opacitySlider.ValueOrientation = Sunny.UI.ColorSlider.eValueOrientation.MinToMax;
+            this.m_opacitySlider.SelectedValueChanged += new System.EventHandler(this.m_opacitySlider_SelectedValueChanged);
             //
             // btnOK
             //
-            btnOK.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnOK.Cursor = System.Windows.Forms.Cursors.Hand;
-            btnOK.Font = new Font("宋体", 12F);
+            this.btnOK.Font = new System.Drawing.Font("宋体", 12F);
-            btnOK.Location = new Point(269, 197);
+            this.btnOK.Location = new System.Drawing.Point(269, 197);
-            btnOK.MinimumSize = new Size(1, 1);
+            this.btnOK.Name = "btnOK";
-            btnOK.Name = "btnOK";
+            this.btnOK.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0);
-            btnOK.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0);
+            this.btnOK.Size = new System.Drawing.Size(95, 26);
-            btnOK.Size = new Size(95, 26);
+            this.btnOK.Style = Sunny.UI.UIStyle.Custom;
-            btnOK.Style = UIStyle.Custom;
+            this.btnOK.TabIndex = 12;
-            btnOK.SymbolOffset = new Point(0, 1);
+            this.btnOK.Text = "确定";
-            btnOK.TabIndex = 12;
+            this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
-            btnOK.Text = "确定";
-            btnOK.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
-            btnOK.Click += btnOK_Click;
             //
             // btnCancel
             //
-            btnCancel.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand;
-            btnCancel.Font = new Font("宋体", 12F);
+            this.btnCancel.Font = new System.Drawing.Font("宋体", 12F);
-            btnCancel.Location = new Point(372, 197);
+            this.btnCancel.Location = new System.Drawing.Point(372, 197);
-            btnCancel.MinimumSize = new Size(1, 1);
+            this.btnCancel.Name = "btnCancel";
-            btnCancel.Name = "btnCancel";
+            this.btnCancel.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0);
-            btnCancel.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0);
+            this.btnCancel.Size = new System.Drawing.Size(95, 26);
-            btnCancel.Size = new Size(95, 26);
+            this.btnCancel.Style = Sunny.UI.UIStyle.Custom;
-            btnCancel.Style = UIStyle.Custom;
+            this.btnCancel.Symbol = 61453;
-            btnCancel.Symbol = 361453;
+            this.btnCancel.TabIndex = 13;
-            btnCancel.SymbolOffset = new Point(0, 1);
+            this.btnCancel.Text = "取消";
-            btnCancel.TabIndex = 13;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
-            btnCancel.Text = "取消";
-            btnCancel.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
-            btnCancel.Click += btnCancel_Click;
             //
             // UIColorItem
             //
-            Controls.Add(btnCancel);
+            this.Controls.Add(this.btnCancel);
-            Controls.Add(btnOK);
+            this.Controls.Add(this.btnOK);
-            Controls.Add(m_opacitySlider);
+            this.Controls.Add(this.m_opacitySlider);
-            Controls.Add(m_colorBar);
+            this.Controls.Add(this.m_colorBar);
-            Controls.Add(m_colorWheel);
+            this.Controls.Add(this.m_colorWheel);
-            Controls.Add(lblB);
+            this.Controls.Add(this.lblB);
-            Controls.Add(lblG);
+            this.Controls.Add(this.lblG);
-            Controls.Add(lblR);
+            this.Controls.Add(this.lblR);
-            Controls.Add(lblA);
+            this.Controls.Add(this.lblA);
-            Controls.Add(edtB);
+            this.Controls.Add(this.edtB);
-            Controls.Add(edtG);
+            this.Controls.Add(this.edtG);
-            Controls.Add(edtR);
+            this.Controls.Add(this.edtR);
-            Controls.Add(edtA);
+            this.Controls.Add(this.edtA);
-            Controls.Add(m_colorSample);
+            this.Controls.Add(this.m_colorSample);
-            Controls.Add(m_colorTable);
+            this.Controls.Add(this.m_colorTable);
-            FillColor = Color.White;
+            this.FillColor = System.Drawing.Color.White;
-            Name = "UIColorItem";
+            this.Name = "UIColorItem";
-            Size = new Size(476, 233);
+            this.Size = new System.Drawing.Size(476, 233);
-            Style = UIStyle.Custom;
+            this.Style = Sunny.UI.UIStyle.Custom;
-            ResumeLayout(false);
+            this.ResumeLayout(false);
-            PerformLayout();
+            this.PerformLayout();
         }
 
         private void m_colorTable_SelectedIndexChanged(object sender, EventArgs e)
@@ -542,19 +524,6 @@ namespace Sunny.UI
             m_colorWheel.SetLightness(m_colorBar.SelectedHSLColor.Lightness);
         }
 
-        private void UpdateInfo()
-        {
-            Color c = Color.FromArgb((int)Math.Floor(255f * m_opacity), m_selectedColor);
-            string info = string.Format("{0} aRGB({1}, {2}, {3}, {4})", m_colorWheel.SelectedHSLColor.ToString(), c.A, c.R, c.G, c.B);
-            updateBox = true;
-            edtA.IntValue = c.A;
-            edtR.IntValue = c.R;
-            edtG.IntValue = c.G;
-            edtB.IntValue = c.B;
-            //m_infoLabel.Text = info;
-            updateBox = false;
-        }
-
         private void m_opacitySlider_SelectedValueChanged(object sender, EventArgs e)
         {
             m_opacity = Math.Max(0, m_opacitySlider.Percent);
@@ -563,6 +532,17 @@ namespace Sunny.UI
             UpdateInfo();
         }
 
+        private void UpdateInfo()
+        {
+            Color c = Color.FromArgb((int)Math.Floor(255f * m_opacity), m_selectedColor);
+            string info = string.Format("{0} aRGB({1}, {2}, {3}, {4})", m_colorWheel.SelectedHSLColor.ToString(), c.A, c.R, c.G, c.B);
+            edtA.IntValue = c.A;
+            edtR.IntValue = c.R;
+            edtG.IntValue = c.G;
+            edtB.IntValue = c.B;
+            //m_infoLabel.Text = info;
+        }
+
         private void m_colorWheel_SelectedColorChanged(object sender, EventArgs e)
         {
             Color selcol = m_colorWheel.SelectedColor;
@@ -578,8 +558,6 @@ namespace Sunny.UI
             UpdateInfo();
         }
 
-        private bool updateBox = false;
-
         private void btnCancel_Click(object sender, EventArgs e)
         {
             Close();
@@ -631,30 +609,5 @@ namespace Sunny.UI
             edtB.SetStyleColor(uiColor);
             lblA.ForeColor = lblR.ForeColor = lblG.ForeColor = lblB.ForeColor = uiColor.PanelForeColor;
         }
-
-        private void edtR_TextChanged(object sender, EventArgs e)
-        {
-            if (updateBox) return;
-            SelectedColor = Color.FromArgb(SelectedColor.A, edtR.IntValue, SelectedColor.G, SelectedColor.B);
-        }
-
-        private void edtG_TextChanged(object sender, EventArgs e)
-        {
-            if (updateBox) return;
-            SelectedColor = Color.FromArgb(SelectedColor.A, SelectedColor.R, edtG.IntValue, SelectedColor.B);
-        }
-
-        private void edtB_TextChanged(object sender, EventArgs e)
-        {
-            if (updateBox) return;
-            SelectedColor = Color.FromArgb(SelectedColor.A, SelectedColor.R, SelectedColor.G, edtB.IntValue);
-        }
-
-        private void edtA_TextChanged(object sender, EventArgs e)
-        {
-            if (updateBox) return;
-            SelectedColor = Color.FromArgb(edtA.IntValue, SelectedColor);
-            UpdateInfo();
-        }
     }
 }

SunnyUI/Controls/DropItem/UIComboBoxItem.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs

@@ -1,6 +1,6 @@
-/******************************************************************************
+/******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -102,11 +102,11 @@ namespace Sunny.UI
 
         private void InitializeComponent()
         {
-            DataGridViewCellStyle dataGridViewCellStyle11 = new DataGridViewCellStyle();
+            DataGridViewCellStyle dataGridViewCellStyle1 = new DataGridViewCellStyle();
-            DataGridViewCellStyle dataGridViewCellStyle12 = new DataGridViewCellStyle();
+            DataGridViewCellStyle dataGridViewCellStyle2 = new DataGridViewCellStyle();
-            DataGridViewCellStyle dataGridViewCellStyle13 = new DataGridViewCellStyle();
+            DataGridViewCellStyle dataGridViewCellStyle3 = new DataGridViewCellStyle();
-            DataGridViewCellStyle dataGridViewCellStyle14 = new DataGridViewCellStyle();
+            DataGridViewCellStyle dataGridViewCellStyle4 = new DataGridViewCellStyle();
-            DataGridViewCellStyle dataGridViewCellStyle15 = new DataGridViewCellStyle();
+            DataGridViewCellStyle dataGridViewCellStyle5 = new DataGridViewCellStyle();
             panel = new UIPanel();
             btnCancel = new UISymbolButton();
             btnOK = new UISymbolButton();
@@ -159,11 +159,9 @@ namespace Sunny.UI
             btnCancel.Size = new System.Drawing.Size(80, 29);
             btnCancel.Style = UIStyle.Custom;
             btnCancel.StyleCustomMode = true;
-            btnCancel.Symbol = 361453;
+            btnCancel.Symbol = 61453;
-            btnCancel.SymbolOffset = new System.Drawing.Point(0, 1);
             btnCancel.TabIndex = 1;
             btnCancel.Text = "取消";
-            btnCancel.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134);
             btnCancel.Click += btnCancel_Click;
             // 
             // btnOK
@@ -175,35 +173,33 @@ namespace Sunny.UI
             btnOK.MinimumSize = new System.Drawing.Size(1, 1);
             btnOK.Name = "btnOK";
             btnOK.Size = new System.Drawing.Size(80, 29);
-            btnOK.SymbolOffset = new System.Drawing.Point(0, 1);
             btnOK.TabIndex = 0;
             btnOK.Text = "确定";
-            btnOK.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134);
             btnOK.Click += btnOK_Click;
             // 
             // dataGridView
             // 
-            dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(243, 249, 255);
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(243, 249, 255);
-            dataGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11;
+            dataGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
             dataGridView.BackgroundColor = System.Drawing.Color.FromArgb(243, 249, 255);
             dataGridView.ColumnHeadersBorderStyle = DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle12.Alignment = DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.Alignment = DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(80, 160, 255);
+            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(80, 160, 255);
-            dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 12F);
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 12F);
-            dataGridViewCellStyle12.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.FromArgb(80, 160, 255);
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(80, 160, 255);
-            dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle12.WrapMode = DataGridViewTriState.True;
+            dataGridViewCellStyle2.WrapMode = DataGridViewTriState.True;
-            dataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12;
+            dataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
             dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridViewCellStyle13.Alignment = DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle3.Alignment = DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle13.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle3.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle13.Font = new System.Drawing.Font("宋体", 12F);
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 12F);
-            dataGridViewCellStyle13.ForeColor = System.Drawing.Color.FromArgb(48, 48, 48);
+            dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(48, 48, 48);
-            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.Color.FromArgb(220, 236, 255);
+            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(220, 236, 255);
-            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.Color.FromArgb(48, 48, 48);
+            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(48, 48, 48);
-            dataGridViewCellStyle13.WrapMode = DataGridViewTriState.False;
+            dataGridViewCellStyle3.WrapMode = DataGridViewTriState.False;
-            dataGridView.DefaultCellStyle = dataGridViewCellStyle13;
+            dataGridView.DefaultCellStyle = dataGridViewCellStyle3;
             dataGridView.Dock = DockStyle.Fill;
             dataGridView.EnableHeadersVisualStyles = false;
             dataGridView.Font = new System.Drawing.Font("宋体", 12F);
@@ -211,19 +207,19 @@ namespace Sunny.UI
             dataGridView.Location = new System.Drawing.Point(0, 44);
             dataGridView.MultiSelect = false;
             dataGridView.Name = "dataGridView";
-            dataGridViewCellStyle14.Alignment = DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle4.Alignment = DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(243, 249, 255);
+            dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(243, 249, 255);
-            dataGridViewCellStyle14.Font = new System.Drawing.Font("宋体", 12F);
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 12F);
-            dataGridViewCellStyle14.ForeColor = System.Drawing.Color.FromArgb(48, 48, 48);
+            dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(48, 48, 48);
-            dataGridViewCellStyle14.SelectionBackColor = System.Drawing.Color.FromArgb(80, 160, 255);
+            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(80, 160, 255);
-            dataGridViewCellStyle14.SelectionForeColor = System.Drawing.Color.FromArgb(48, 48, 48);
+            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.FromArgb(48, 48, 48);
-            dataGridViewCellStyle14.WrapMode = DataGridViewTriState.True;
+            dataGridViewCellStyle4.WrapMode = DataGridViewTriState.True;
-            dataGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle14;
+            dataGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle4;
-            dataGridViewCellStyle15.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle5.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle15.ForeColor = System.Drawing.Color.FromArgb(48, 48, 48);
+            dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(48, 48, 48);
-            dataGridViewCellStyle15.SelectionBackColor = System.Drawing.Color.FromArgb(220, 236, 255);
+            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(220, 236, 255);
-            dataGridViewCellStyle15.SelectionForeColor = System.Drawing.Color.FromArgb(48, 48, 48);
+            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(48, 48, 48);
-            dataGridView.RowsDefaultCellStyle = dataGridViewCellStyle15;
+            dataGridView.RowsDefaultCellStyle = dataGridViewCellStyle5;
             dataGridView.SelectedIndex = -1;
             dataGridView.Size = new System.Drawing.Size(569, 245);
             dataGridView.TabIndex = 3;
@@ -256,12 +252,10 @@ namespace Sunny.UI
             btnClear.MinimumSize = new System.Drawing.Size(1, 1);
             btnClear.Name = "btnClear";
             btnClear.Size = new System.Drawing.Size(80, 29);
-            btnClear.Symbol = 361666;
+            btnClear.Symbol = 61666;
-            btnClear.SymbolOffset = new System.Drawing.Point(0, 1);
             btnClear.SymbolSize = 22;
             btnClear.TabIndex = 2;
             btnClear.Text = "清除";
-            btnClear.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134);
             btnClear.Click += btnClear_Click;
             // 
             // btnSearch
@@ -273,11 +267,9 @@ namespace Sunny.UI
             btnSearch.MinimumSize = new System.Drawing.Size(1, 1);
             btnSearch.Name = "btnSearch";
             btnSearch.Size = new System.Drawing.Size(80, 29);
-            btnSearch.Symbol = 361442;
+            btnSearch.Symbol = 61442;
-            btnSearch.SymbolOffset = new System.Drawing.Point(0, 1);
             btnSearch.TabIndex = 1;
             btnSearch.Text = "搜索";
-            btnSearch.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134);
             btnSearch.Click += btnSearch_Click;
             // 
             // edtFilter

SunnyUI/Controls/DropItem/UIComboTreeViewItem.cs

@@ -78,7 +78,6 @@ namespace Sunny.UI
             treeView.MinimumSize = new System.Drawing.Size(1, 1);
             treeView.Name = "treeView";
             treeView.RadiusSides = UICornerRadiusSides.None;
-            treeView.ScrollBarStyleInherited = false;
             treeView.ShowText = false;
             treeView.Size = new System.Drawing.Size(250, 176);
             treeView.TabIndex = 0;
@@ -130,7 +129,6 @@ namespace Sunny.UI
             btnCancel.Size = new System.Drawing.Size(80, 29);
             btnCancel.StyleCustomMode = true;
             btnCancel.Symbol = 361453;
-            btnCancel.SymbolOffset = new System.Drawing.Point(0, 1);
             btnCancel.SymbolSize = 22;
             btnCancel.TabIndex = 1;
             btnCancel.Text = "取消";
@@ -146,7 +144,6 @@ namespace Sunny.UI
             btnOK.MinimumSize = new System.Drawing.Size(1, 1);
             btnOK.Name = "btnOK";
             btnOK.Size = new System.Drawing.Size(80, 29);
-            btnOK.SymbolOffset = new System.Drawing.Point(0, 1);
             btnOK.SymbolSize = 22;
             btnOK.TabIndex = 0;
             btnOK.Text = "确定";

SunnyUI/Controls/DropItem/UIDateItem.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -270,7 +270,7 @@ namespace Sunny.UI
             tabPage3.Controls.Add(p3);
             tabPage3.Location = new Point(0, 40);
             tabPage3.Name = "tabPage3";
-            tabPage3.Size = new Size(200, 60);
+            tabPage3.Size = new Size(461, 277);
             tabPage3.TabIndex = 2;
             tabPage3.Text = "tabPage3";
             tabPage3.UseVisualStyleBackColor = true;
@@ -285,7 +285,7 @@ namespace Sunny.UI
             p3.MinimumSize = new Size(1, 1);
             p3.Name = "p3";
             p3.RadiusSides = UICornerRadiusSides.None;
-            p3.Size = new Size(200, 60);
+            p3.Size = new Size(461, 277);
             p3.Style = UIStyle.Custom;
             p3.TabIndex = 2;
             p3.Text = null;

SunnyUI/Controls/DropItem/UIDateTimeItem.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Controls/DropItem/UIDropControl.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Controls/DropItem/UIDropDown.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Controls/DropItem/UIDropDownItem.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Controls/DropItem/UITimeItem.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Controls/DropItem/UIToolStripDropDown.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Controls/TypeEditor/UIDropEditor.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Controls/TypeEditor/UIRadiusSidesEditor.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Controls/UIAnalogMeter.cs

@@ -1,7 +1,7 @@
-/******************************************************************************
+/******************************************************************************
- * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
+ * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
- * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
+ * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
  * Gitee:  https://gitee.com/yhuse/SunnyUI
@@ -9,13 +9,13 @@
  *
  * SunnyUI can be used for free under the GPL-3.0 license.
  * If you use this code, please keep this note.
- * 如果您使用此代码，请保留此说明。
+ * 如果您使用此代码，请保留此说明。
  ******************************************************************************
- * 文件名称: UIAnalogMeter.cs
+ * 文件名称: UIAnalogMeter.cs
- * 文件说明: 仪表
+ * 文件说明: 仪表
- * 文件作者: Luca Bonotto
+ * 文件作者: Luca Bonotto
- * 开源协议: CPOL
+ * 开源协议: CPOL
- * 引用地址: https://www.codeproject.com/Articles/24945/Analog-Meter
+ * 引用地址: https://www.codeproject.com/Articles/24945/Analog-Meter
 ******************************************************************************/
 
 /*
@@ -42,7 +42,6 @@ namespace Sunny.UI
     [ToolboxItem(true)]
     [DefaultEvent("ValueChanged")]
     [DefaultProperty("Value")]
-    [Description("仪表控件")]
     public class UIAnalogMeter : UIControl
     {
         #region Enumerator
@@ -321,9 +320,9 @@ namespace Sunny.UI
         #region Events delegates
 
         /// <summary>
-        /// 重载控件尺寸变更
+        /// 重载控件尺寸变更
         /// </summary>
-        /// <param name="e">参数</param>
+        /// <param name="e">参数</param>
         protected override void OnSizeChanged(EventArgs e)
         {
             base.OnSizeChanged(e);
@@ -334,9 +333,9 @@ namespace Sunny.UI
         }
 
         /// <summary>
-        /// 重载绘图
+        /// 重载绘图
         /// </summary>
-        /// <param name="e">绘图参数</param>
+        /// <param name="e">绘图参数</param>
         protected override void OnPaint(PaintEventArgs e)
         {
             if (Width <= 0 || Height <= 0) return;

SunnyUI/Controls/UIAnalogMeterRender.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Controls/UIAvatar.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -37,7 +37,6 @@ namespace Sunny.UI
     [DefaultEvent("Click")]
     [DefaultProperty("Symbol")]
     [ToolboxItem(true)]
-    [Description("头像控件")]
     public sealed class UIAvatar : UIControl, ISymbol, IZoomScale
     {
         /// <summary>

SunnyUI/Controls/UIBattery.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -20,7 +20,6 @@
  * 2021-06-18: V3.0.4 修改可自定义背景色
  * 2022-03-19: V3.1.1 重构主题配色
  * 2023-11-16: V3.5.2 重构主题
- * 2025-03-04: V3.8.1 增加图标旋转角度，增加图标偏移位置，调整图标最大值
 ******************************************************************************/
 
 using System;
@@ -35,7 +34,6 @@ namespace Sunny.UI
     /// </summary>
     [DefaultProperty("Power")]
     [ToolboxItem(true)]
-    [Description("电池电量控件")]
     public sealed class UIBattery : UIControl
     {
         private Color colorDanger = UIColor.Orange;
@@ -87,44 +85,7 @@ namespace Sunny.UI
             set
             {
                 symbolSize = Math.Max(value, 16);
-                symbolSize = Math.Min(value, 256);
+                symbolSize = Math.Min(value, 128);
-                Invalidate();
-            }
-        }
-
-        private int _symbolRotate = 0;
-
-        /// <summary>
-        /// 字体图标旋转角度
-        /// </summary>
-        [DefaultValue(0)]
-        [Description("字体图标旋转角度"), Category("SunnyUI")]
-        public int SymbolRotate
-        {
-            get => _symbolRotate;
-            set
-            {
-                if (_symbolRotate != value)
-                {
-                    _symbolRotate = value;
-                    Invalidate();
-                }
-            }
-        }
-
-        private Point symbolOffset = new Point(0, 0);
-
-        /// <summary>
-        /// 字体图标的偏移位置
-        /// </summary>
-        [DefaultValue(typeof(Point), "0, 0")]
-        [Description("字体图标的偏移位置"), Category("SunnyUI")]
-        public Point SymbolOffset
-        {
-            get => symbolOffset;
-            set
-            {
-                symbolOffset = value;
                 Invalidate();
             }
         }
@@ -258,7 +219,7 @@ namespace Sunny.UI
                 if (multiColor) color = ColorEmpty;
             }
 
-            g.DrawFontImage(ShowSymbol, SymbolSize, color, new Rectangle(0, 0, Width, Height), SymbolOffset.X, SymbolOffset.Y, SymbolRotate);
+            g.DrawFontImage(ShowSymbol, SymbolSize, color, new Rectangle(0, 0, Width, Height));
         }
     }
 }

SunnyUI/Controls/UIBreadcrumb.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -22,7 +22,6 @@
  * 2022-03-19: V3.1.1 重构主题配色
  * 2023-05-12: V3.3.6 重构DrawString函数
  * 2023-09-17: V3.4.2 增加Readonly，禁用鼠标点击，可通过代码设置ItemIndex
- * 2025-04-03: V3.8.2 增加SetItemColor，设置单个节点颜色，可以用RemoveItemColor移除
 ******************************************************************************/
 
 using System;
@@ -42,7 +41,6 @@ namespace Sunny.UI
     [ToolboxItem(true)]
     [DefaultEvent("ItemIndexChanged")]
     [DefaultProperty("ItemIndex")]
-    [Description("面包屑导航条控件")]
     public class UIBreadcrumb : UIControl
     {
         /// <summary>
@@ -113,20 +111,6 @@ namespace Sunny.UI
 
         private readonly ConcurrentDictionary<int, Point[]> ClickArea = new ConcurrentDictionary<int, Point[]>();
 
-        private readonly ConcurrentDictionary<int, Color> ItemsColor = new();
-
-        public void SetItemColor(int index, Color color)
-        {
-            ItemsColor[index] = color;
-            Invalidate();
-        }
-
-        public void RemoveItemColor(int index)
-        {
-            ItemsColor.TryRemove(index, out _);
-            Invalidate();
-        }
-
         /// <summary>
         /// 步骤个数
         /// </summary>
@@ -246,9 +230,7 @@ namespace Sunny.UI
                         ClickArea[index] = pts;
                     }
 
-                    Color color = index <= ItemIndex ? SelectedColor : UnSelectedColor;
+                    using Brush br = new SolidBrush(index <= ItemIndex ? SelectedColor : UnSelectedColor);
-                    if (ItemsColor.TryGetValue(index, out var cc)) color = cc;
-                    using Brush br = new SolidBrush(color);
                     g.FillPolygon(br, points.ToArray());
 
                     g.DrawString(item.ToString(), Font, index <= ItemIndex ? ForeColor : UnSelectedForeColor,

SunnyUI/Controls/UIButton.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -52,7 +52,6 @@ namespace Sunny.UI
     [DefaultEvent("Click")]
     [DefaultProperty("Text")]
     [ToolboxItem(true)]
-    [Description("按钮控件")]
     public class UIButton : UIControl, IButtonControl
     {
         /// <summary>
@@ -64,7 +63,7 @@ namespace Sunny.UI
             TabStop = true;
             Width = 100;
             Height = 35;
-            base.Cursor = Cursors.Hand;
+            Cursor = Cursors.Hand;
 
             plainColor = UIStyles.Blue.PlainColor;
 

SunnyUI/Controls/UICalendar.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -19,7 +19,6 @@
  * 2022-06-28: V3.2.0 增加文件说明
  * 2023-05-13: V3.3.6 重构DrawString函数
  * 2023-11-13: V3.5.2 重构主题
- * 2024-12-02: V3.8.0 切换语言实时刷新
 ******************************************************************************/
 
 using System;
@@ -30,8 +29,7 @@ using System.Windows.Forms;
 
 namespace Sunny.UI
 {
-    [Description("日历控件")]
+    public class UICalendar : UIUserControl
-    public class UICalendar : UIUserControl, ITranslate
     {
         public UICalendar()
         {
@@ -332,10 +330,6 @@ namespace Sunny.UI
             months.Add(UIStyles.CurrentResources.October);
             months.Add(UIStyles.CurrentResources.November);
             months.Add(UIStyles.CurrentResources.December);
-
-            p1.Invalidate();
-            p2.Invalidate();
-            p3.Invalidate();
         }
 
         private void TopPanel_Click(object sender, EventArgs e)

SunnyUI/Controls/UICheckBox.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -42,7 +42,6 @@ namespace Sunny.UI
     [DefaultEvent("CheckedChanged")]
     [DefaultProperty("Checked")]
     [ToolboxItem(true)]
-    [Description("复选框控件")]
     public class UICheckBox : UIControl
     {
         /// <summary>

SunnyUI/Controls/UICheckBoxGroup.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -27,7 +27,6 @@
  * 2023-11-07: V3.5.2 重写UICheckBoxGroup
  * 2023-12-04: V3.6.1 增加属性可修改图标大小
  * 2024-09-09: V3.7.0 更改计算节点位置的方法，解决问题：#IAPY94
- * 2024-11-29: V3.8.0 修复TitleTop为0时，条目显示错位的问题 #IB7STO
 ******************************************************************************/
 
 using System;
@@ -44,7 +43,6 @@ namespace Sunny.UI
     /// </summary>
     [DefaultProperty("Items")]
     [DefaultEvent("ValueChanged")]
-    [Description("多选框组控件")]
     public class UICheckBoxGroup : UIGroupBox
     {
         /// <summary>
@@ -208,13 +206,11 @@ namespace Sunny.UI
         protected override void OnPaint(PaintEventArgs e)
         {
             base.OnPaint(e);
-            if (TitleTop == 0 && Text.IsValid()) Text = "";
             if (Items.Count == 0) return;
-            InitRects();
 
-            if (activeIndex >= 0 && CheckBoxRects.TryGetValue(activeIndex, out Rectangle boxRect))
+            if (activeIndex >= 0 && CheckBoxRects.ContainsKey(activeIndex))
             {
-                e.Graphics.FillRectangle(hoverColor, boxRect);
+                e.Graphics.FillRectangle(hoverColor, CheckBoxRects[activeIndex]);
             }
 
             int startX = StartPos.X;

SunnyUI/Controls/UIColorPicker.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -41,7 +41,6 @@ namespace Sunny.UI
     /// </summary>
     [DefaultProperty("ValueChanged")]
     [ToolboxItem(true)]
-    [Description("颜色选择框控件")]
     public sealed class UIColorPicker : UIDropControl
     {
         private void InitializeComponent()
@@ -78,7 +77,7 @@ namespace Sunny.UI
         }
 
         [Browsable(false)]
-        public override string[] FormTranslatorProperties => null;
+        public override string[] FormTranslatorProperties { get; }
 
         /// <summary>
         /// 颜色改变事件

SunnyUI/Controls/UIComboBox.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -43,7 +43,6 @@
  * 2024-10-28: V3.7.2 增加了SelectionChangeCommitted事件，下拉框显示鼠标点击条目时响应
  * 2024-11-10: V3.7.2 增加StyleDropDown属性，手动修改Style时设置此属性以修改下拉框主题
  * 2024-11-10: V3.7.2 删除ScrollBarColor、ScrollBarBackColor、ScrollBarStyleInherited属性
- * 2025-03-18: V3.8.2 修复过滤下拉框跟随主题配色
 ******************************************************************************/
 
 using System;
@@ -61,7 +60,6 @@ namespace Sunny.UI
     [DefaultProperty("Items")]
     [DefaultEvent("SelectedIndexChanged")]
     [ToolboxItem(true)]
-    [Description("组合框控件")]
     [LookupBindingProperties("DataSource", "DisplayMember", "ValueMember", "SelectedValue")]
     public sealed partial class UIComboBox : UIDropControl, IToolTip, IHideDropDown
     {
@@ -102,7 +100,7 @@ namespace Sunny.UI
         public event EventHandler SelectionChangeCommitted;
 
         [Browsable(false)]
-        public override string[] FormTranslatorProperties => null;
+        public override string[] FormTranslatorProperties { get; }
 
         [DefaultValue(0), Category("SunnyUI"), Description("垂直滚动条宽度，最小为原生滚动条宽度")]
         public int ScrollBarWidth
@@ -159,10 +157,7 @@ namespace Sunny.UI
             if (!FilterItemForm.Visible)
             {
                 filterForm.Style = StyleDropDown;
-                if (StyleDropDown != UIStyle.Inherited)
+                if (StyleDropDown != UIStyle.Inherited) filterForm.Style = StyleDropDown;
-                    filterForm.Style = StyleDropDown;
-                else
-                    filterForm.Style = UIStyles.Style;
                 FilterItemForm.Show(this, new Size(DropDownWidth < Width ? Width : DropDownWidth, CalcItemFormHeight()));
                 edit.Focus();
             }
@@ -740,7 +735,6 @@ namespace Sunny.UI
             }
             else
             {
-                if (StyleDropDown != UIStyle.Inherited) filterForm.Style = StyleDropDown;
                 if (FilterItemForm.Visible)
                 {
                     FilterItemForm.Close();
@@ -962,7 +956,7 @@ namespace Sunny.UI
         public Color ItemRectColor
         {
             get => ListBox.RectColor;
-            set => FilterListBox.RectColor = ListBox.RectColor = value;
+            set => ListBox.RectColor = value;
         }
     }
 }

SunnyUI/Controls/UIComboDataGridView.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -32,8 +32,6 @@
  * 2024-03-22: V3.6.5 增加ShowDropDown()
  * 2024-11-10: V3.7.2 增加StyleDropDown属性，手动修改Style时设置此属性以修改下拉框主题
  * 2024-11-12: V3.7.2 增加下拉框滚动条宽度调整属性
- * 2024-11-28: V3.8.0 解决下拉框显示过滤编辑框不能一直显示 #IB7AFB
- * 2024-12-04: V3.8.0 修复一个报错 #IB8YK9
 ******************************************************************************/
 
 using System;
@@ -46,7 +44,6 @@ namespace Sunny.UI
 {
     [DefaultProperty("ValueChanged")]
     [ToolboxItem(true)]
-    [Description("表格列表框控件")]
     public class UIComboDataGridView : UIDropControl, IToolTip
     {
         private void InitializeComponent()
@@ -83,7 +80,7 @@ namespace Sunny.UI
         }
 
         [Browsable(false)]
-        public override string[] FormTranslatorProperties => null;
+        public override string[] FormTranslatorProperties { get; }
 
         [DefaultValue(true), Description("过滤框输入逐一过滤"), Category("SunnyUI")]
         public bool Filter1by1 { get; set; } = true;
@@ -175,7 +172,11 @@ namespace Sunny.UI
         }
 
         [DefaultValue(true), Description("下拉框显示过滤编辑框"), Category("SunnyUI")]
-        public bool ShowFilter { get; set; } = true;
+        public bool ShowFilter
+        {
+            get => item.ShowFilter;
+            set => item.ShowFilter = value;
+        }
 
         private readonly UIComboDataGridViewItem item = new UIComboDataGridViewItem();
 
@@ -210,7 +211,7 @@ namespace Sunny.UI
                 if (ShowFilter)
                     ValueChanged?.Invoke(this, value);
                 else
-                    SelectIndexChange?.Invoke(this, value.ToString().ToInt());
+                    SelectIndexChange(this, value.ToString().ToInt());
             }
         }
 

SunnyUI/Controls/UIComboTreeView.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -41,7 +41,6 @@ namespace Sunny.UI
     [DefaultEvent("NodeSelected")]
     [DefaultProperty("Nodes")]
     [ToolboxItem(true)]
-    [Description("树形列表框控件")]
     public class UIComboTreeView : UIDropControl, IToolTip
     {
         public UIComboTreeView()
@@ -87,7 +86,7 @@ namespace Sunny.UI
         }
 
         [Browsable(false)]
-        public override string[] FormTranslatorProperties => null;
+        public override string[] FormTranslatorProperties { get; }
 
         [DefaultValue(false)]
         [Description("显示清除按钮"), Category("SunnyUI")]

SunnyUI/Controls/UIContextMenuStrip.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -31,7 +31,6 @@ using System.Windows.Forms;
 
 namespace Sunny.UI
 {
-    [Description("上下文菜单")]
     public sealed class UIContextMenuStrip : ContextMenuStrip, IStyleInterface, IZoomScale
     {
         private ContextMenuColorTable ColorTable = new ContextMenuColorTable();

SunnyUI/Controls/UIControl.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -56,7 +56,7 @@ namespace Sunny.UI
 
         [Browsable(false)]
         [Description("控件在界面显示时需要多语翻译的属性名称数组"), Category("SunnyUI")]
-        public virtual string[] FormTranslatorProperties => null;
+        public virtual string[] FormTranslatorProperties { get; }
 
         [DefaultValue(true)]
         [Description("控件在界面显示时需要多语翻译"), Category("SunnyUI")]

SunnyUI/Controls/UIDataGridView.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -50,7 +50,6 @@
  * 2024-06-19: V3.6.7 增加AddDateTimeColumn，解决默认时间列不显示秒数的问题
  * 2024-08-27: V3.7.0 增加属性AutoScrollToBottom，数据更新时是否自动滚动到最后一行
  * 2024-09-04: V3.7.0 解决有隐藏行时，滚动条滚动时出错的问题
- * 2025-04-21: V3.8.3 修复数据更新时是否自动滚动到最后一行
 ******************************************************************************/
 
 using System;
@@ -61,7 +60,6 @@ using System.Windows.Forms;
 
 namespace Sunny.UI
 {
-    [Description("表格控件")]
     public class UIDataGridView : DataGridView, IStyleInterface, IZoomScale
     {
         private readonly UIScrollBar VBar = new UIScrollBar();
@@ -1097,7 +1095,7 @@ namespace Sunny.UI
                 //选中最后一行
                 this.Rows[this.RowCount - 1].Selected = true;
                 //滚动到最后一行
-                this.FirstDisplayedScrollingRowIndex = this.RowCount - 1;
+                SetRowHeight(this.RowCount - 1);
                 //如果需要滚动到底部（右侧），使用下面的代码
                 //this.FirstDisplayedCell = this.Rows[this.RowCount - 1].Cells[this.Columns.Count - 1];
             }

SunnyUI/Controls/UIDataGridViewFooter.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -33,7 +33,6 @@ using System.Windows.Forms;
 namespace Sunny.UI
 {
     [ToolboxItem(true)]
-    [Description("表格页脚控件")]
     public sealed class UIDataGridViewFooter : UIControl
     {
         public UIDataGridViewFooter()

SunnyUI/Controls/UIDatePicker.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -40,7 +40,6 @@ namespace Sunny.UI
     [ToolboxItem(true)]
     [DefaultProperty("Value")]
     [DefaultEvent("ValueChanged")]
-    [Description("日期选择框控件")]
     public sealed partial class UIDatePicker : UIDropControl, IToolTip
     {
         public delegate void OnDateTimeChanged(object sender, DateTime value);

SunnyUI/Controls/UIDateTimePicker.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -38,7 +38,6 @@ namespace Sunny.UI
     [ToolboxItem(true)]
     [DefaultProperty("Value")]
     [DefaultEvent("ValueChanged")]
-    [Description("日期时间选择框控件")]
     public sealed class UIDatetimePicker : UIDropControl, IToolTip
     {
         private void InitializeComponent()

SunnyUI/Controls/UIDigitalLabel.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -19,7 +19,6 @@
  * 2023-12-01: V3.6.1 增加文件说明
  * 2024-01-23: V3.6.3 更新绘制
  * 2024-10-22: V3.7.2 增加DPI支持
- * 2025-04-08: V3.8.2 增加ShowText属性，可以显示文字 #IBY64V
 ******************************************************************************/
 
 /******************************************************************************
@@ -41,7 +40,6 @@ namespace Sunny.UI
     [DefaultEvent("ValueChanged")]
     [DefaultProperty("Value")]
     [ToolboxItem(true)]
-    [Description("冷液晶显示LCD标签控件")]
     public class UIDigitalLabel : UIControl
     {
         public UIDigitalLabel()
@@ -54,22 +52,6 @@ namespace Sunny.UI
             BackColor = Color.Black;
         }
 
-        private bool _showText = false;
-
-        [Description("是否显示文字"), Category("SunnyUI"), DefaultValue(false)]
-        public new bool ShowText
-        {
-            get => _showText;
-            set
-            {
-                if (_showText != value)
-                {
-                    _showText = value;
-                    Invalidate();
-                }
-            }
-        }
-
         private double digitalValue;
 
         [Description("浮点数"), Category("SunnyUI")]
@@ -124,8 +106,7 @@ namespace Sunny.UI
             using Font font = DigitalFont.Instance.GetFont(UIStyles.DPIScale ? DigitalSize / UIDPIScale.SystemDPIScale : DigitalSize);
             using Brush br = new SolidBrush(ForeColor);
 
-            string text = ShowText ? Text : Value.ToString("F" + DecimalPlaces);
+            string text = Value.ToString("F" + DecimalPlaces);
-
             SizeF sf = e.Graphics.MeasureString(text, font);
             float y = (Height - sf.Height) / 2.0f + 1 + Padding.Top;
             float x = Padding.Left;

SunnyUI/Controls/UIDoubleUpDown.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -31,8 +31,7 @@
  * 2023-03-24: V3.3.3 删除ForbidInput属性，使用Inputable属性
  * 2023-12-28: V3.6.2 修复设置Style时按钮颜色不一致
  * 2024-08-27: V3.6.9 修改编辑框字体与显示字体一致
- * 2024-08-27: V3.7.0 增加按钮字体图标的偏移位置
+ * 2024-08-27: V3.7.0 增加加按钮字体图标的偏移位置
- * 2025-03-16: V3.8.2 增加按钮字体图标的大小属性
 ******************************************************************************/
 
 using System;
@@ -44,7 +43,6 @@ namespace Sunny.UI
 {
     [DefaultEvent("ValueChanged")]
     [DefaultProperty("Value")]
-    [Description("数字上下选择框控件")]
     public sealed partial class UIDoubleUpDown : UIPanel, IToolTip
     {
         public delegate void OnValueChanged(object sender, double value);
@@ -68,7 +66,7 @@ namespace Sunny.UI
         }
 
         [Browsable(false)]
-        public override string[] FormTranslatorProperties => null;
+        public override string[] FormTranslatorProperties { get; }
 
         /// <summary>
         /// 需要额外设置ToolTip的控件
@@ -159,14 +157,6 @@ namespace Sunny.UI
             set => step = Math.Abs(value);
         }
 
-        [DefaultValue(24)]
-        [Description("按钮字体图标大小"), Category("SunnyUI")]
-        public int ButtonSymbolSize
-        {
-            get => btnDec.SymbolSize;
-            set => btnDec.SymbolSize = btnAdd.SymbolSize = value;
-        }
-
         private void btnAdd_Click(object sender, EventArgs e)
         {
             if (ReadOnly) return;

SunnyUI/Controls/UIDoubleUpDown.designer.cs

@@ -46,7 +46,7 @@
             btnDec.Padding = new System.Windows.Forms.Padding(26, 4, 0, 0);
             btnDec.RadiusSides = UICornerRadiusSides.LeftTop | UICornerRadiusSides.LeftBottom;
             btnDec.Size = new System.Drawing.Size(29, 29);
-            btnDec.Symbol = 361544;
+            btnDec.Symbol = 61544;
             btnDec.TabIndex = 0;
             btnDec.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134);
             btnDec.TipsText = null;
@@ -65,7 +65,7 @@
             btnAdd.Padding = new System.Windows.Forms.Padding(26, 3, 0, 0);
             btnAdd.RadiusSides = UICornerRadiusSides.RightTop | UICornerRadiusSides.RightBottom;
             btnAdd.Size = new System.Drawing.Size(29, 29);
-            btnAdd.Symbol = 361543;
+            btnAdd.Symbol = 61543;
             btnAdd.TabIndex = 1;
             btnAdd.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134);
             btnAdd.TipsText = null;

SunnyUI/Controls/UIEdit.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse

SunnyUI/Controls/UIFlowLayoutPanel.cs

@@ -1,6 +1,6 @@
 /******************************************************************************
  * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
- * CopyRight (C) 2012-2025 ShenYongHua(沈永华).
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
  * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
  *
  * Blog:   https://www.cnblogs.com/yhuse
@@ -42,7 +42,6 @@ using System.Windows.Forms;
 
 namespace Sunny.UI
 {
-    [Description("滚动容器控件")]
     public class UIFlowLayoutPanel : UIPanel, IToolTip
     {
         private UIVerScrollBarEx VBar;
@@ -75,7 +74,7 @@ namespace Sunny.UI
         }
 
         [Browsable(false)]
-        public override string[] FormTranslatorProperties => null;
+        public override string[] FormTranslatorProperties { get; }
 
         public void Render()
         {