V3.4.0

SunnyUI.Demo/FMain.Designer.cs

@@ -39,8 +39,13 @@
             this.uiPanel1 = new Sunny.UI.UIPanel();
             this.uiNavMenu1 = new Sunny.UI.UINavMenu();
             this.uiTabControl1 = new Sunny.UI.UITabControl();
+            this.uiPanel2 = new Sunny.UI.UIPanel();
+            this.uiPanel3 = new Sunny.UI.UIPanel();
+            this.timer1 = new System.Windows.Forms.Timer(this.components);
+            this.uiPanel4 = new Sunny.UI.UIPanel();
             this.uiContextMenuStrip1.SuspendLayout();
             this.uiNavBar1.SuspendLayout();
+            this.uiPanel1.SuspendLayout();
             this.SuspendLayout();
             // 
             // uiContextMenuStrip1
@@ -116,6 +121,9 @@
             // 
             // uiPanel1
             // 
+            this.uiPanel1.Controls.Add(this.uiPanel4);
+            this.uiPanel1.Controls.Add(this.uiPanel3);
+            this.uiPanel1.Controls.Add(this.uiPanel2);
             this.uiPanel1.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.uiPanel1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.uiPanel1.Location = new System.Drawing.Point(2, 734);
@@ -162,6 +170,52 @@
             this.uiTabControl1.TabVisible = false;
             this.uiTabControl1.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             // 
+            // uiPanel2
+            // 
+            this.uiPanel2.Dock = System.Windows.Forms.DockStyle.Left;
+            this.uiPanel2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiPanel2.Location = new System.Drawing.Point(0, 0);
+            this.uiPanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiPanel2.MinimumSize = new System.Drawing.Size(1, 1);
+            this.uiPanel2.Name = "uiPanel2";
+            this.uiPanel2.RadiusSides = Sunny.UI.UICornerRadiusSides.None;
+            this.uiPanel2.RectSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((System.Windows.Forms.ToolStripStatusLabelBorderSides.Top | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)));
+            this.uiPanel2.Size = new System.Drawing.Size(286, 32);
+            this.uiPanel2.TabIndex = 0;
+            this.uiPanel2.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // uiPanel3
+            // 
+            this.uiPanel3.Dock = System.Windows.Forms.DockStyle.Right;
+            this.uiPanel3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiPanel3.Location = new System.Drawing.Point(810, 0);
+            this.uiPanel3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiPanel3.MinimumSize = new System.Drawing.Size(1, 1);
+            this.uiPanel3.Name = "uiPanel3";
+            this.uiPanel3.RadiusSides = Sunny.UI.UICornerRadiusSides.None;
+            this.uiPanel3.RectSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top)));
+            this.uiPanel3.Size = new System.Drawing.Size(286, 32);
+            this.uiPanel3.TabIndex = 1;
+            this.uiPanel3.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // timer1
+            // 
+            this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+            // 
+            // uiPanel4
+            // 
+            this.uiPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.uiPanel4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiPanel4.Location = new System.Drawing.Point(286, 0);
+            this.uiPanel4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiPanel4.MinimumSize = new System.Drawing.Size(1, 1);
+            this.uiPanel4.Name = "uiPanel4";
+            this.uiPanel4.RadiusSides = Sunny.UI.UICornerRadiusSides.None;
+            this.uiPanel4.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Top;
+            this.uiPanel4.Size = new System.Drawing.Size(524, 32);
+            this.uiPanel4.TabIndex = 2;
+            this.uiPanel4.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
             // FMain
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -184,6 +238,7 @@
             this.ReceiveParams += new Sunny.UI.OnReceiveParams(this.Form1_ReceiveParams);
             this.uiContextMenuStrip1.ResumeLayout(false);
             this.uiNavBar1.ResumeLayout(false);
+            this.uiPanel1.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -200,5 +255,9 @@
         private UITabControl uiTabControl1;
         private UILogo uiLogo1;
         private UIAvatar uiAvatar1;
+        private UIPanel uiPanel2;
+        private UIPanel uiPanel3;
+        private System.Windows.Forms.Timer timer1;
+        private UIPanel uiPanel4;
     }
 }

SunnyUI.Demo/FMain.cs

@@ -80,6 +80,7 @@ namespace Sunny.UI.Demo
             uiNavMenu1.CreateChildNode(parent, AddPage(CreateInstance<UIPage>("Sunny.UI.Demo.FMeter")));
             uiNavMenu1.CreateChildNode(parent, AddPage(CreateInstance<UIPage>("Sunny.UI.Demo.FLed")));
             uiNavMenu1.CreateChildNode(parent, AddPage(CreateInstance<UIPage>("Sunny.UI.Demo.FLight")));
+            uiNavMenu1.CreateChildNode(parent, AddPage(CreateInstance<UIPage>("Sunny.UI.Demo.FSwitch")));
 
             uiNavBar1.SetNodeSymbol(uiNavBar1.Nodes[4], 61502);
             var styles = UIStyles.PopularStyles();
@@ -99,7 +100,7 @@ namespace Sunny.UI.Demo
             //选中第一个节点
             uiNavMenu1.SelectPage(1002);
 
-            Text = Version;
+            uiPanel2.Text = Text = Version;
             RegisterHotKey(UI.ModifierKeys.Shift, Keys.F8);
 
             //根据页面类型获取页面
@@ -111,6 +112,8 @@ namespace Sunny.UI.Demo
             UIPage page1 = GetPage(1002);
             if (page1 != null)
                 page1.Text.WriteConsole();
+
+            timer1.Start();
         }
 
         /// <summary>
@@ -172,5 +175,10 @@ namespace Sunny.UI.Demo
             Text = e.Value.ToString();
             SendParamToPage(1001, "传值给页面");
         }
+
+        private void timer1_Tick(object sender, EventArgs e)
+        {
+            uiPanel3.Text = DateTime.Now.DateTimeString();
+        }
     }
 }

SunnyUI.Demo/FMain.resx

@@ -123,4 +123,7 @@
   <metadata name="StyleManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>506, 17</value>
   </metadata>
+  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>639, 17</value>
+  </metadata>
 </root>

SunnyUI.Demo/Industrial/FSwitch.Designer.cs

@@ -0,0 +1,96 @@
+namespace Sunny.UI.Demo
+{
+    partial class FSwitch
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.uiLine1 = new Sunny.UI.UILine();
+            this.uiTurnSwitch1 = new Sunny.UI.UITurnSwitch();
+            this.uiTurnSwitch2 = new Sunny.UI.UITurnSwitch();
+            this.SuspendLayout();
+            // 
+            // uiLine1
+            // 
+            this.uiLine1.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.uiLine1.Location = new System.Drawing.Point(30, 55);
+            this.uiLine1.MinimumSize = new System.Drawing.Size(16, 16);
+            this.uiLine1.Name = "uiLine1";
+            this.uiLine1.Size = new System.Drawing.Size(670, 20);
+            this.uiLine1.TabIndex = 78;
+            this.uiLine1.Text = "UITurnSwitch";
+            this.uiLine1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // uiTurnSwitch1
+            // 
+            this.uiTurnSwitch1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiTurnSwitch1.Location = new System.Drawing.Point(33, 96);
+            this.uiTurnSwitch1.MinimumSize = new System.Drawing.Size(1, 1);
+            this.uiTurnSwitch1.Name = "uiTurnSwitch1";
+            this.uiTurnSwitch1.Size = new System.Drawing.Size(160, 160);
+            this.uiTurnSwitch1.TabIndex = 79;
+            this.uiTurnSwitch1.Text = "uiTurnSwitch1";
+            this.uiTurnSwitch1.ValueChanged += new Sunny.UI.UITurnSwitch.OnValueChanged(this.uiTurnSwitch1_ValueChanged);
+            // 
+            // uiTurnSwitch2
+            // 
+            this.uiTurnSwitch2.ActiveAngle = 0;
+            this.uiTurnSwitch2.BackInnerSize = 60;
+            this.uiTurnSwitch2.BackSize = 80;
+            this.uiTurnSwitch2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiTurnSwitch2.InActiveAngle = 90;
+            this.uiTurnSwitch2.InActiveColor = System.Drawing.Color.Fuchsia;
+            this.uiTurnSwitch2.Location = new System.Drawing.Point(216, 96);
+            this.uiTurnSwitch2.MinimumSize = new System.Drawing.Size(1, 1);
+            this.uiTurnSwitch2.Name = "uiTurnSwitch2";
+            this.uiTurnSwitch2.Size = new System.Drawing.Size(160, 160);
+            this.uiTurnSwitch2.TabIndex = 80;
+            this.uiTurnSwitch2.Text = "uiTurnSwitch2";
+            // 
+            // FSwitch
+            // 
+            this.AllowShowTitle = true;
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Controls.Add(this.uiTurnSwitch2);
+            this.Controls.Add(this.uiTurnSwitch1);
+            this.Controls.Add(this.uiLine1);
+            this.Name = "FSwitch";
+            this.Padding = new System.Windows.Forms.Padding(0, 35, 0, 0);
+            this.ShowTitle = true;
+            this.Symbol = 361956;
+            this.Text = "Switch";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private UILine uiLine1;
+        private UITurnSwitch uiTurnSwitch1;
+        private UITurnSwitch uiTurnSwitch2;
+    }
+}

SunnyUI.Demo/Industrial/FSwitch.cs

@@ -0,0 +1,15 @@
+namespace Sunny.UI.Demo
+{
+    public partial class FSwitch : UIPage
+    {
+        public FSwitch()
+        {
+            InitializeComponent();
+        }
+
+        private void uiTurnSwitch1_ValueChanged(object sender, bool value)
+        {
+            ShowInfoTip(value.ToString());
+        }
+    }
+}

SunnyUI.Demo/Industrial/FSwitch.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

SunnyUI.Demo/SunnyUI.Demo.csproj

@@ -41,11 +41,11 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="SunnyUI, Version=3.3.9.0, Culture=neutral, PublicKeyToken=27d7d2e821d97aeb, processorArchitecture=MSIL">
+    <Reference Include="SunnyUI, Version=3.4.0.0, Culture=neutral, PublicKeyToken=27d7d2e821d97aeb, processorArchitecture=MSIL">
-      <HintPath>..\packages\SunnyUI.3.3.9\lib\net472\SunnyUI.dll</HintPath>
+      <HintPath>..\packages\SunnyUI.3.4.0\lib\net472\SunnyUI.dll</HintPath>
     </Reference>
-    <Reference Include="SunnyUI.Common, Version=3.3.9.0, Culture=neutral, PublicKeyToken=5a271fb7ba597231, processorArchitecture=MSIL">
+    <Reference Include="SunnyUI.Common, Version=3.4.0.0, Culture=neutral, PublicKeyToken=5a271fb7ba597231, processorArchitecture=MSIL">
-      <HintPath>..\packages\SunnyUI.Common.3.3.9\lib\net472\SunnyUI.Common.dll</HintPath>
+      <HintPath>..\packages\SunnyUI.Common.3.4.0\lib\net472\SunnyUI.Common.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -139,6 +139,12 @@
     <Compile Include="Forms\Frames\FCustomMain.Designer.cs">
       <DependentUpon>FCustomMain.cs</DependentUpon>
     </Compile>
+    <Compile Include="Industrial\FSwitch.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Industrial\FSwitch.Designer.cs">
+      <DependentUpon>FSwitch.cs</DependentUpon>
+    </Compile>
     <Compile Include="Industrial\FLight.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -526,6 +532,9 @@
     <EmbeddedResource Include="Controls\FOther.resx">
       <DependentUpon>FOther.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Industrial\FSwitch.resx">
+      <DependentUpon>FSwitch.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

SunnyUI.Demo/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SunnyUI" version="3.3.9" targetFramework="net472" />
+  <package id="SunnyUI" version="3.4.0" targetFramework="net472" />
-  <package id="SunnyUI.Common" version="3.3.9" targetFramework="net472" />
+  <package id="SunnyUI.Common" version="3.4.0" targetFramework="net472" />
 </packages>

SunnyUI/SunnyUI.csproj

@@ -9,7 +9,7 @@
         <Description>SunnyUI.Net 是基于.Net Framework 4.0~4.8、.Net6、.Net7 框架的 C# WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。</Description>
         <Copyright>CopyRight © SunnyUI.Net 2012-2023</Copyright>
         <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
-        <Version>3.3.9.0</Version>
+        <Version>3.4.0.0</Version>
         <Authors>ShenYonghua</Authors>
         <Company>SunnyUI.Net</Company>
         <PackageId>SunnyUI</PackageId>
@@ -77,7 +77,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="SunnyUI.Common" Version="3.3.9" />
+      <PackageReference Include="SunnyUI.Common" Version="3.4.0" />
     </ItemGroup>
 
     <ItemGroup>