diff --git a/SunnyUI.Demo/Bin/SunnyUI.Demo.exe b/SunnyUI.Demo/Bin/SunnyUI.Demo.exe index ea9646a0..c90ecb87 100644 Binary files a/SunnyUI.Demo/Bin/SunnyUI.Demo.exe and b/SunnyUI.Demo/Bin/SunnyUI.Demo.exe differ diff --git a/SunnyUI.Demo/Controls/FCombobox.cs b/SunnyUI.Demo/Controls/FCombobox.cs index 4bce727f..bac0a127 100644 --- a/SunnyUI.Demo/Controls/FCombobox.cs +++ b/SunnyUI.Demo/Controls/FCombobox.cs @@ -57,6 +57,10 @@ namespace Sunny.UI.Demo uiComboDataGridView2.FilterColumnName = "Column1"; //不设置则全部列过滤 uiComboBox1.SetTipsText(uiToolTip1, "Hello World."); + + //日期选择框文本设置为空 + uiDatePicker3.CanEmpty = true; + uiDatePicker3.Text = ""; } private void UiComboDataGridView1_SelectIndexChange(object sender, int index) diff --git a/SunnyUI.Demo/FMain.cs b/SunnyUI.Demo/FMain.cs index e7403a4f..75c0dfea 100644 --- a/SunnyUI.Demo/FMain.cs +++ b/SunnyUI.Demo/FMain.cs @@ -89,8 +89,11 @@ namespace Sunny.UI.Demo } uiNavBar1.CreateChildNode(uiNavBar1.Nodes[4], "多彩主题", UIStyle.Colorful.Value()); + //左侧导航主节点关联页面 + uiNavMenu1.CreateNode(AddPage(new FColorful())); + //直接增加一个页面，不在左侧列表显示 - AddPage(new FColorful()); + //AddPage(new FColorful()); AddPage(new FCommon()); //选中第一个节点 @@ -132,8 +135,7 @@ namespace Sunny.UI.Demo if (style != UIStyle.Colorful) StyleManager.Style = style; else - SelectPage(pageIndex); - + uiNavMenu1.SelectPage(pageIndex); break; default: uiNavMenu1.SelectPage(pageIndex); diff --git a/SunnyUI.Demo/Forms/FColorful.Designer.cs b/SunnyUI.Demo/Forms/FColorful.Designer.cs index c6b3c3f6..38cd74de 100644 --- a/SunnyUI.Demo/Forms/FColorful.Designer.cs +++ b/SunnyUI.Demo/Forms/FColorful.Designer.cs @@ -47,7 +47,6 @@ namespace Sunny.UI.Demo // uiPanel1 // this.uiPanel1.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(190)))), ((int)(((byte)(172))))); - this.uiPanel1.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255))))); this.uiPanel1.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiPanel1.ForeColor = System.Drawing.Color.White; this.uiPanel1.Location = new System.Drawing.Point(173, 56); @@ -66,7 +65,6 @@ namespace Sunny.UI.Demo // uiPanel2 // this.uiPanel2.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(184)))), ((int)(((byte)(0))))); - this.uiPanel2.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255))))); this.uiPanel2.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiPanel2.ForeColor = System.Drawing.Color.White; this.uiPanel2.Location = new System.Drawing.Point(323, 56); @@ -85,7 +83,6 @@ namespace Sunny.UI.Demo // uiPanel3 // this.uiPanel3.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(121)))), ((int)(((byte)(190)))), ((int)(((byte)(60))))); - this.uiPanel3.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255))))); this.uiPanel3.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiPanel3.ForeColor = System.Drawing.Color.White; this.uiPanel3.Location = new System.Drawing.Point(473, 174); @@ -104,7 +101,6 @@ namespace Sunny.UI.Demo // uiPanel4 // this.uiPanel4.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(140)))), ((int)(((byte)(100)))), ((int)(((byte)(80))))); - this.uiPanel4.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255))))); this.uiPanel4.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiPanel4.ForeColor = System.Drawing.Color.White; this.uiPanel4.Location = new System.Drawing.Point(623, 174); @@ -123,7 +119,6 @@ namespace Sunny.UI.Demo // uiPanel5 // this.uiPanel5.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(98)))), ((int)(((byte)(161))))); - this.uiPanel5.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255))))); this.uiPanel5.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiPanel5.ForeColor = System.Drawing.Color.White; this.uiPanel5.Location = new System.Drawing.Point(623, 56); @@ -142,7 +137,6 @@ namespace Sunny.UI.Demo // uiPanel6 // this.uiPanel6.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); - this.uiPanel6.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255))))); this.uiPanel6.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiPanel6.ForeColor = System.Drawing.Color.White; this.uiPanel6.Location = new System.Drawing.Point(473, 56); @@ -161,7 +155,6 @@ namespace Sunny.UI.Demo // uiPanel7 // this.uiPanel7.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(126)))), ((int)(((byte)(164))))); - this.uiPanel7.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255))))); this.uiPanel7.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiPanel7.ForeColor = System.Drawing.Color.White; this.uiPanel7.Location = new System.Drawing.Point(323, 174); @@ -180,7 +173,6 @@ namespace Sunny.UI.Demo // uiPanel8 // this.uiPanel8.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(188)))), ((int)(((byte)(212))))); - this.uiPanel8.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255))))); this.uiPanel8.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiPanel8.ForeColor = System.Drawing.Color.White; this.uiPanel8.Location = new System.Drawing.Point(173, 174); @@ -199,7 +191,6 @@ namespace Sunny.UI.Demo // uiPanel9 // this.uiPanel9.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(130)))), ((int)(((byte)(58)))), ((int)(((byte)(183))))); - this.uiPanel9.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255))))); this.uiPanel9.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiPanel9.ForeColor = System.Drawing.Color.White; this.uiPanel9.Location = new System.Drawing.Point(23, 174); @@ -218,7 +209,6 @@ namespace Sunny.UI.Demo // uiPanel10 // this.uiPanel10.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(150)))), ((int)(((byte)(136))))); - this.uiPanel10.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255))))); this.uiPanel10.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiPanel10.ForeColor = System.Drawing.Color.White; this.uiPanel10.Location = new System.Drawing.Point(23, 56); @@ -247,7 +237,6 @@ namespace Sunny.UI.Demo // uiPanel11 // this.uiPanel11.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(130)))), ((int)(((byte)(58)))), ((int)(((byte)(183))))); - this.uiPanel11.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255))))); this.uiPanel11.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiPanel11.ForeColor = System.Drawing.Color.White; this.uiPanel11.Location = new System.Drawing.Point(23, 340); @@ -295,6 +284,7 @@ namespace Sunny.UI.Demo this.Padding = new System.Windows.Forms.Padding(0, 35, 0, 0); this.PageIndex = 999; this.ShowTitle = true; + this.Symbol = 262210; this.Text = "多彩主题"; this.ResumeLayout(false);