+ UILoginForm：新增两张背景图

SunnyUI.Demo/Forms/FLogin.Designer.cs

@@ -1,4 +1,4 @@
-namespace Sunny.UI.Demo.Forms
+namespace Sunny.UI.Demo
 {
     partial class FLogin
     {
@@ -29,24 +29,11 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FLogin));
-            this.pictureBox1 = new System.Windows.Forms.PictureBox();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.SuspendLayout();
             // 
             // lblTitle
             // 
-            this.lblTitle.Text = "SunnyUI.Net Login Form";
+            this.lblTitle.Text = "FLogin";
-            // 
-            // pictureBox1
-            // 
-            this.pictureBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(171)))), ((int)(((byte)(208)))), ((int)(((byte)(250)))));
-            this.pictureBox1.Image = global::Sunny.UI.Demo.Properties.Resources.SunnyLogin;
-            this.pictureBox1.Location = new System.Drawing.Point(180, 208);
-            this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(71, 71);
-            this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.pictureBox1.TabIndex = 9;
-            this.pictureBox1.TabStop = false;
             // 
             // FLogin
             // 
@@ -54,20 +41,15 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage")));
             this.ClientSize = new System.Drawing.Size(750, 450);
-            this.Controls.Add(this.pictureBox1);
+            this.LoginImage = Sunny.UI.UILoginForm.UILoginImage.Login5;
             this.Name = "FLogin";
-            this.Text = "SunnyUI.Net Login Form";
+            this.Text = "FLogin";
             this.ButtonLoginClick += new System.EventHandler(this.FLogin_ButtonLoginClick);
-            this.Controls.SetChildIndex(this.lblTitle, 0);
-            this.Controls.SetChildIndex(this.pictureBox1, 0);
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
         }
 
         #endregion
-
-        private System.Windows.Forms.PictureBox pictureBox1;
     }
 }

SunnyUI.Demo/Forms/FLogin.cs

@@ -1,4 +1,4 @@
-namespace Sunny.UI.Demo.Forms
+namespace Sunny.UI.Demo
 {
     public partial class FLogin : UILoginForm
     {

SunnyUI.Demo/SunnyUI.Demo.csproj

@@ -131,6 +131,12 @@
     <Compile Include="Controls\FCombobox.Designer.cs">
       <DependentUpon>FCombobox.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\FLogin.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\FLogin.Designer.cs">
+      <DependentUpon>FLogin.cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\FEdit.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -143,12 +149,6 @@
     <Compile Include="Forms\FEditor.Designer.cs">
       <DependentUpon>FEditor.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\FLogin.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\FLogin.Designer.cs">
-      <DependentUpon>FLogin.cs</DependentUpon>
-    </Compile>
     <Compile Include="Forms\Frames\FAsideHeaderMainFooter.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -334,15 +334,15 @@
     <EmbeddedResource Include="Controls\FContextMenuStrip.resx">
       <DependentUpon>FContextMenuStrip.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\FLogin.resx">
+      <DependentUpon>FLogin.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\FEdit.resx">
       <DependentUpon>FEdit.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\FEditor.resx">
       <DependentUpon>FEditor.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\FLogin.resx">
-      <DependentUpon>FLogin.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Forms\Frames\FAsideHeaderMainFooter.resx">
       <DependentUpon>FAsideHeaderMainFooter.cs</DependentUpon>
     </EmbeddedResource>

SunnyUI/Forms/UILoginForm.cs

@@ -37,18 +37,13 @@ namespace Sunny.UI
                 {
                     loginImage = value;
 
-                    if (loginImage == UILoginImage.Login1)
+                    if (loginImage == UILoginImage.Login1) BackgroundImage = Resources.Login1;
-                        BackgroundImage = Resources.Login1;
+                    if (loginImage == UILoginImage.Login2) BackgroundImage = Resources.Login2;
-
+                    if (loginImage == UILoginImage.Login3) BackgroundImage = Resources.Login3;
-                    if (loginImage == UILoginImage.Login2)
+                    if (loginImage == UILoginImage.Login4) BackgroundImage = Resources.Login4;
-                        BackgroundImage = Resources.Login2;
+                    if (loginImage == UILoginImage.Login5) BackgroundImage = Resources.Login5;
-
+                    if (loginImage == UILoginImage.Login6) BackgroundImage = Resources.Login6;
-                    if (loginImage == UILoginImage.Login3)
+ }
-                        BackgroundImage = Resources.Login3;
-
-                    if (loginImage == UILoginImage.Login4)
-                        BackgroundImage = Resources.Login4;
-                }
             }
         }
 
@@ -57,7 +52,9 @@ namespace Sunny.UI
             Login1,
             Login2,
             Login3,
-            Login4
+            Login4,
+            Login5,
+            Login6
         }
 
         private void btnCancel_Click(object sender, EventArgs e)

SunnyUI/Properties/Resources.Designer.cs

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

SunnyUI/Properties/Resources.resx

@@ -145,6 +145,12 @@
   <data name="Login4" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Login4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Login5" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Login5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Login6" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Login6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="menu" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\menu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>

SunnyUI/SunnyUI.csproj

@@ -662,6 +662,15 @@
   <ItemGroup>
     <None Include="Resources\Login4.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Login5.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Login6.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Login7.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Updates.txt

@@ -1,7 +1,11 @@
 + 增加； - 删除； * 修改 
 
+2020.06.26
++ UIDoughnutChart：增加控件：环状图
++ UILoginForm：新增两张背景图
+
 2020.06.25
-+ UIScrollingText：增加控件
++ UIScrollingText：增加控件：滚动文字
 
 2020.06.24
 + UICheckBoxGroup：增加全选、全不选、反选