diff --git a/SunnyUI.Demo/Bin/SunnyUI.Common.dll b/SunnyUI.Demo/Bin/SunnyUI.Common.dll
index fb9e95a6..8359cd3a 100644
Binary files a/SunnyUI.Demo/Bin/SunnyUI.Common.dll and b/SunnyUI.Demo/Bin/SunnyUI.Common.dll differ
diff --git a/SunnyUI.Demo/Bin/SunnyUI.Demo.exe b/SunnyUI.Demo/Bin/SunnyUI.Demo.exe
index 62efa521..2a563b9a 100644
Binary files a/SunnyUI.Demo/Bin/SunnyUI.Demo.exe and b/SunnyUI.Demo/Bin/SunnyUI.Demo.exe differ
diff --git a/SunnyUI.Demo/Bin/SunnyUI.dll b/SunnyUI.Demo/Bin/SunnyUI.dll
index 2393fa32..a52e6fea 100644
Binary files a/SunnyUI.Demo/Bin/SunnyUI.dll and b/SunnyUI.Demo/Bin/SunnyUI.dll differ
diff --git a/SunnyUI.Demo/Controls/FButton.Designer.cs b/SunnyUI.Demo/Controls/FButton.Designer.cs
index baa9cada..23a2def2 100644
--- a/SunnyUI.Demo/Controls/FButton.Designer.cs
+++ b/SunnyUI.Demo/Controls/FButton.Designer.cs
@@ -277,7 +277,7 @@ namespace Sunny.UI.Demo
this.uiSymbolButton24.RectSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)(((System.Windows.Forms.ToolStripStatusLabelBorderSides.Top | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)
| System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom)));
this.uiSymbolButton24.Size = new System.Drawing.Size(46, 35);
- this.uiSymbolButton24.Symbol = 61473;
+ this.uiSymbolButton24.Symbol = 361473;
this.uiSymbolButton24.TabIndex = 103;
this.uiSymbolButton24.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
//
@@ -290,7 +290,7 @@ namespace Sunny.UI.Demo
this.uiSymbolButton23.Name = "uiSymbolButton23";
this.uiSymbolButton23.RadiusSides = Sunny.UI.UICornerRadiusSides.None;
this.uiSymbolButton23.Size = new System.Drawing.Size(46, 35);
- this.uiSymbolButton23.Symbol = 61544;
+ this.uiSymbolButton23.Symbol = 361544;
this.uiSymbolButton23.TabIndex = 102;
this.uiSymbolButton23.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
//
@@ -303,7 +303,7 @@ namespace Sunny.UI.Demo
this.uiSymbolButton22.Name = "uiSymbolButton22";
this.uiSymbolButton22.RadiusSides = Sunny.UI.UICornerRadiusSides.None;
this.uiSymbolButton22.Size = new System.Drawing.Size(46, 35);
- this.uiSymbolButton22.Symbol = 61508;
+ this.uiSymbolButton22.Symbol = 361508;
this.uiSymbolButton22.TabIndex = 101;
this.uiSymbolButton22.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
//
@@ -316,7 +316,7 @@ namespace Sunny.UI.Demo
this.uiSymbolButton19.Name = "uiSymbolButton19";
this.uiSymbolButton19.RadiusSides = ((Sunny.UI.UICornerRadiusSides)((Sunny.UI.UICornerRadiusSides.LeftTop | Sunny.UI.UICornerRadiusSides.LeftBottom)));
this.uiSymbolButton19.Size = new System.Drawing.Size(46, 35);
- this.uiSymbolButton19.Symbol = 61543;
+ this.uiSymbolButton19.Symbol = 361543;
this.uiSymbolButton19.TabIndex = 100;
this.uiSymbolButton19.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
//
@@ -329,7 +329,7 @@ namespace Sunny.UI.Demo
this.uiSymbolButton20.Name = "uiSymbolButton20";
this.uiSymbolButton20.RadiusSides = ((Sunny.UI.UICornerRadiusSides)((Sunny.UI.UICornerRadiusSides.RightTop | Sunny.UI.UICornerRadiusSides.RightBottom)));
this.uiSymbolButton20.Size = new System.Drawing.Size(46, 35);
- this.uiSymbolButton20.Symbol = 61522;
+ this.uiSymbolButton20.Symbol = 361522;
this.uiSymbolButton20.TabIndex = 99;
this.uiSymbolButton20.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
//
@@ -342,7 +342,7 @@ namespace Sunny.UI.Demo
this.uiSymbolButton21.Name = "uiSymbolButton21";
this.uiSymbolButton21.RadiusSides = Sunny.UI.UICornerRadiusSides.None;
this.uiSymbolButton21.Size = new System.Drawing.Size(46, 35);
- this.uiSymbolButton21.Symbol = 61520;
+ this.uiSymbolButton21.Symbol = 361520;
this.uiSymbolButton21.TabIndex = 98;
this.uiSymbolButton21.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
//
@@ -355,7 +355,7 @@ namespace Sunny.UI.Demo
this.uiSymbolButton13.Name = "uiSymbolButton13";
this.uiSymbolButton13.RadiusSides = Sunny.UI.UICornerRadiusSides.None;
this.uiSymbolButton13.Size = new System.Drawing.Size(46, 35);
- this.uiSymbolButton13.Symbol = 61518;
+ this.uiSymbolButton13.Symbol = 361518;
this.uiSymbolButton13.TabIndex = 97;
this.uiSymbolButton13.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
//
@@ -368,7 +368,7 @@ namespace Sunny.UI.Demo
this.uiSymbolButton14.Name = "uiSymbolButton14";
this.uiSymbolButton14.RadiusSides = Sunny.UI.UICornerRadiusSides.None;
this.uiSymbolButton14.Size = new System.Drawing.Size(46, 35);
- this.uiSymbolButton14.Symbol = 61514;
+ this.uiSymbolButton14.Symbol = 361514;
this.uiSymbolButton14.TabIndex = 96;
this.uiSymbolButton14.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
//
@@ -381,7 +381,7 @@ namespace Sunny.UI.Demo
this.uiSymbolButton15.Name = "uiSymbolButton15";
this.uiSymbolButton15.RadiusSides = Sunny.UI.UICornerRadiusSides.None;
this.uiSymbolButton15.Size = new System.Drawing.Size(46, 35);
- this.uiSymbolButton15.Symbol = 61513;
+ this.uiSymbolButton15.Symbol = 361513;
this.uiSymbolButton15.TabIndex = 95;
this.uiSymbolButton15.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
//
@@ -394,7 +394,7 @@ namespace Sunny.UI.Demo
this.uiSymbolButton16.Name = "uiSymbolButton16";
this.uiSymbolButton16.RadiusSides = Sunny.UI.UICornerRadiusSides.None;
this.uiSymbolButton16.Size = new System.Drawing.Size(46, 35);
- this.uiSymbolButton16.Symbol = 61517;
+ this.uiSymbolButton16.Symbol = 361517;
this.uiSymbolButton16.TabIndex = 94;
this.uiSymbolButton16.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
//
@@ -407,7 +407,7 @@ namespace Sunny.UI.Demo
this.uiSymbolButton17.Name = "uiSymbolButton17";
this.uiSymbolButton17.RadiusSides = Sunny.UI.UICornerRadiusSides.None;
this.uiSymbolButton17.Size = new System.Drawing.Size(46, 35);
- this.uiSymbolButton17.Symbol = 61516;
+ this.uiSymbolButton17.Symbol = 361516;
this.uiSymbolButton17.TabIndex = 93;
this.uiSymbolButton17.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
//
@@ -420,7 +420,7 @@ namespace Sunny.UI.Demo
this.uiSymbolButton18.Name = "uiSymbolButton18";
this.uiSymbolButton18.RadiusSides = ((Sunny.UI.UICornerRadiusSides)((Sunny.UI.UICornerRadiusSides.LeftTop | Sunny.UI.UICornerRadiusSides.LeftBottom)));
this.uiSymbolButton18.Size = new System.Drawing.Size(46, 35);
- this.uiSymbolButton18.Symbol = 61515;
+ this.uiSymbolButton18.Symbol = 361515;
this.uiSymbolButton18.TabIndex = 92;
this.uiSymbolButton18.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
//
@@ -586,7 +586,7 @@ namespace Sunny.UI.Demo
this.uiSymbolButton6.Size = new System.Drawing.Size(100, 35);
this.uiSymbolButton6.Style = Sunny.UI.UIStyle.Custom;
this.uiSymbolButton6.StyleCustomMode = true;
- this.uiSymbolButton6.Symbol = 61532;
+ this.uiSymbolButton6.Symbol = 361532;
this.uiSymbolButton6.TabIndex = 84;
this.uiSymbolButton6.Text = "Error";
this.uiSymbolButton6.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -610,7 +610,7 @@ namespace Sunny.UI.Demo
this.uiSymbolButton5.Size = new System.Drawing.Size(100, 35);
this.uiSymbolButton5.Style = Sunny.UI.UIStyle.Custom;
this.uiSymbolButton5.StyleCustomMode = true;
- this.uiSymbolButton5.Symbol = 61553;
+ this.uiSymbolButton5.Symbol = 361553;
this.uiSymbolButton5.TabIndex = 83;
this.uiSymbolButton5.Text = "Warn";
this.uiSymbolButton5.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -634,7 +634,7 @@ namespace Sunny.UI.Demo
this.uiSymbolButton3.Size = new System.Drawing.Size(100, 35);
this.uiSymbolButton3.Style = Sunny.UI.UIStyle.Custom;
this.uiSymbolButton3.StyleCustomMode = true;
- this.uiSymbolButton3.Symbol = 61530;
+ this.uiSymbolButton3.Symbol = 361530;
this.uiSymbolButton3.TabIndex = 82;
this.uiSymbolButton3.Text = "Success";
this.uiSymbolButton3.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -649,7 +649,7 @@ namespace Sunny.UI.Demo
this.uiSymbolButton4.Size = new System.Drawing.Size(100, 35);
this.uiSymbolButton4.Style = Sunny.UI.UIStyle.Custom;
this.uiSymbolButton4.StyleCustomMode = true;
- this.uiSymbolButton4.Symbol = 61529;
+ this.uiSymbolButton4.Symbol = 361529;
this.uiSymbolButton4.TabIndex = 81;
this.uiSymbolButton4.Text = "Query";
this.uiSymbolButton4.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -673,7 +673,7 @@ namespace Sunny.UI.Demo
this.uiSymbolButton2.Size = new System.Drawing.Size(100, 35);
this.uiSymbolButton2.Style = Sunny.UI.UIStyle.Custom;
this.uiSymbolButton2.StyleCustomMode = true;
- this.uiSymbolButton2.Symbol = 61453;
+ this.uiSymbolButton2.Symbol = 361453;
this.uiSymbolButton2.TabIndex = 80;
this.uiSymbolButton2.Text = "Cancel";
this.uiSymbolButton2.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
diff --git a/SunnyUI.Demo/Controls/FCombobox.Designer.cs b/SunnyUI.Demo/Controls/FCombobox.Designer.cs
index bc8a76d1..f3b9ec2f 100644
--- a/SunnyUI.Demo/Controls/FCombobox.Designer.cs
+++ b/SunnyUI.Demo/Controls/FCombobox.Designer.cs
@@ -109,6 +109,11 @@ namespace Sunny.UI.Demo
this.uiNumPadTextBox2 = new Sunny.UI.UINumPadTextBox();
this.uiNumPadTextBox3 = new Sunny.UI.UINumPadTextBox();
this.uiNumPadTextBox4 = new Sunny.UI.UINumPadTextBox();
+ this.uiLine11 = new Sunny.UI.UILine();
+ this.uiDatePicker4 = new Sunny.UI.UIDatePicker();
+ this.uiDatetimePicker2 = new Sunny.UI.UIDatetimePicker();
+ this.uiTimePicker2 = new Sunny.UI.UITimePicker();
+ this.uiNumPadTextBox5 = new Sunny.UI.UINumPadTextBox();
this.SuspendLayout();
//
// uiComboTreeView3
@@ -153,6 +158,7 @@ namespace Sunny.UI.Demo
this.uiComboTreeView3.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
this.uiComboTreeView3.ShowLines = true;
this.uiComboTreeView3.Size = new System.Drawing.Size(150, 29);
+ this.uiComboTreeView3.SymbolSize = 24;
this.uiComboTreeView3.TabIndex = 67;
this.uiComboTreeView3.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
this.uiComboTreeView3.Watermark = "";
@@ -198,6 +204,7 @@ namespace Sunny.UI.Demo
this.uiComboTreeView4.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
this.uiComboTreeView4.ShowLines = true;
this.uiComboTreeView4.Size = new System.Drawing.Size(150, 29);
+ this.uiComboTreeView4.SymbolSize = 24;
this.uiComboTreeView4.TabIndex = 66;
this.uiComboTreeView4.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
this.uiComboTreeView4.Watermark = "";
@@ -227,6 +234,7 @@ namespace Sunny.UI.Demo
treeNode28});
this.uiComboTreeView2.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
this.uiComboTreeView2.Size = new System.Drawing.Size(150, 29);
+ this.uiComboTreeView2.SymbolSize = 24;
this.uiComboTreeView2.TabIndex = 65;
this.uiComboTreeView2.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
this.uiComboTreeView2.Watermark = "水印文字";
@@ -234,7 +242,9 @@ namespace Sunny.UI.Demo
//
// 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(386, 294);
this.uiLine1.MinimumSize = new System.Drawing.Size(16, 16);
this.uiLine1.Name = "uiLine1";
@@ -267,13 +277,16 @@ namespace Sunny.UI.Demo
treeNode32});
this.uiComboTreeView1.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
this.uiComboTreeView1.Size = new System.Drawing.Size(150, 29);
+ this.uiComboTreeView1.SymbolSize = 24;
this.uiComboTreeView1.TabIndex = 63;
this.uiComboTreeView1.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
this.uiComboTreeView1.Watermark = "";
//
// 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(30, 337);
this.uiLine8.MinimumSize = new System.Drawing.Size(16, 16);
this.uiLine8.Name = "uiLine8";
@@ -296,6 +309,7 @@ namespace Sunny.UI.Demo
this.uiDatetimePicker1.Size = new System.Drawing.Size(308, 29);
this.uiDatetimePicker1.SymbolDropDown = 61555;
this.uiDatetimePicker1.SymbolNormal = 61555;
+ this.uiDatetimePicker1.SymbolSize = 24;
this.uiDatetimePicker1.TabIndex = 61;
this.uiDatetimePicker1.Text = "2020-06-02 17:57:28";
this.uiDatetimePicker1.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
@@ -314,6 +328,7 @@ namespace Sunny.UI.Demo
this.uiColorPicker1.Name = "uiColorPicker1";
this.uiColorPicker1.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
this.uiColorPicker1.Size = new System.Drawing.Size(150, 29);
+ this.uiColorPicker1.SymbolSize = 24;
this.uiColorPicker1.TabIndex = 60;
this.uiColorPicker1.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
this.uiColorPicker1.Watermark = "";
@@ -322,7 +337,9 @@ namespace Sunny.UI.Demo
//
// uiLine7
//
+ this.uiLine7.BackColor = System.Drawing.Color.Transparent;
this.uiLine7.Font = new System.Drawing.Font("宋体", 12F);
+ this.uiLine7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
this.uiLine7.Location = new System.Drawing.Point(388, 55);
this.uiLine7.MinimumSize = new System.Drawing.Size(16, 16);
this.uiLine7.Name = "uiLine7";
@@ -333,7 +350,9 @@ namespace Sunny.UI.Demo
//
// 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, 416);
this.uiLine6.MinimumSize = new System.Drawing.Size(16, 16);
this.uiLine6.Name = "uiLine6";
@@ -356,6 +375,7 @@ namespace Sunny.UI.Demo
this.uiTimePicker1.Size = new System.Drawing.Size(150, 29);
this.uiTimePicker1.SymbolDropDown = 61555;
this.uiTimePicker1.SymbolNormal = 61555;
+ this.uiTimePicker1.SymbolSize = 24;
this.uiTimePicker1.TabIndex = 57;
this.uiTimePicker1.Text = "23:41:39";
this.uiTimePicker1.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
@@ -365,7 +385,9 @@ namespace Sunny.UI.Demo
//
// uiLine3
//
+ this.uiLine3.BackColor = System.Drawing.Color.Transparent;
this.uiLine3.Font = new System.Drawing.Font("宋体", 12F);
+ this.uiLine3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
this.uiLine3.Location = new System.Drawing.Point(30, 214);
this.uiLine3.MinimumSize = new System.Drawing.Size(16, 16);
this.uiLine3.Name = "uiLine3";
@@ -376,7 +398,9 @@ 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";
@@ -402,6 +426,7 @@ namespace Sunny.UI.Demo
this.uiDatePicker1.Size = new System.Drawing.Size(150, 29);
this.uiDatePicker1.SymbolDropDown = 61555;
this.uiDatePicker1.SymbolNormal = 61555;
+ this.uiDatePicker1.SymbolSize = 24;
this.uiDatePicker1.TabIndex = 54;
this.uiDatePicker1.Text = "2020";
this.uiDatePicker1.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
@@ -417,6 +442,8 @@ namespace Sunny.UI.Demo
this.uiComboBox2.FillColor = System.Drawing.Color.White;
this.uiComboBox2.FilterMaxCount = 50;
this.uiComboBox2.Font = new System.Drawing.Font("宋体", 12F);
+ this.uiComboBox2.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255)))));
+ this.uiComboBox2.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
this.uiComboBox2.Location = new System.Drawing.Point(188, 89);
this.uiComboBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiComboBox2.MinimumSize = new System.Drawing.Size(63, 0);
@@ -424,6 +451,7 @@ namespace Sunny.UI.Demo
this.uiComboBox2.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
this.uiComboBox2.ShowClearButton = true;
this.uiComboBox2.Size = new System.Drawing.Size(150, 29);
+ this.uiComboBox2.SymbolSize = 24;
this.uiComboBox2.TabIndex = 53;
this.uiComboBox2.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
this.uiComboBox2.Watermark = "水印文字";
@@ -434,6 +462,7 @@ namespace Sunny.UI.Demo
this.uiComboBox1.FillColor = System.Drawing.Color.White;
this.uiComboBox1.FilterMaxCount = 50;
this.uiComboBox1.Font = new System.Drawing.Font("宋体", 12F);
+ this.uiComboBox1.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255)))));
this.uiComboBox1.Items.AddRange(new object[] {
"1",
"2",
@@ -447,6 +476,7 @@ namespace Sunny.UI.Demo
"14",
"15",
"16"});
+ this.uiComboBox1.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
this.uiComboBox1.Location = new System.Drawing.Point(30, 90);
this.uiComboBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiComboBox1.MinimumSize = new System.Drawing.Size(63, 0);
@@ -455,6 +485,7 @@ namespace Sunny.UI.Demo
this.uiComboBox1.RadiusSides = Sunny.UI.UICornerRadiusSides.None;
this.uiComboBox1.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom;
this.uiComboBox1.Size = new System.Drawing.Size(150, 29);
+ this.uiComboBox1.SymbolSize = 24;
this.uiComboBox1.TabIndex = 52;
this.uiComboBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
this.uiComboBox1.Watermark = "水印文字";
@@ -477,6 +508,7 @@ namespace Sunny.UI.Demo
this.uiDatePicker2.Size = new System.Drawing.Size(150, 29);
this.uiDatePicker2.SymbolDropDown = 61555;
this.uiDatePicker2.SymbolNormal = 61555;
+ this.uiDatePicker2.SymbolSize = 24;
this.uiDatePicker2.TabIndex = 71;
this.uiDatePicker2.Text = "2020-04";
this.uiDatePicker2.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
@@ -498,6 +530,7 @@ namespace Sunny.UI.Demo
this.uiDatePicker3.Size = new System.Drawing.Size(150, 29);
this.uiDatePicker3.SymbolDropDown = 61555;
this.uiDatePicker3.SymbolNormal = 61555;
+ this.uiDatePicker3.SymbolSize = 24;
this.uiDatePicker3.TabIndex = 72;
this.uiDatePicker3.Text = "2020-04-16";
this.uiDatePicker3.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
@@ -507,7 +540,9 @@ namespace Sunny.UI.Demo
//
// uiLine4
//
+ this.uiLine4.BackColor = System.Drawing.Color.Transparent;
this.uiLine4.Font = new System.Drawing.Font("宋体", 12F);
+ this.uiLine4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
this.uiLine4.Location = new System.Drawing.Point(386, 134);
this.uiLine4.MinimumSize = new System.Drawing.Size(16, 16);
this.uiLine4.Name = "uiLine4";
@@ -527,6 +562,7 @@ namespace Sunny.UI.Demo
this.uiComboDataGridView1.Name = "uiComboDataGridView1";
this.uiComboDataGridView1.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
this.uiComboDataGridView1.Size = new System.Drawing.Size(308, 29);
+ this.uiComboDataGridView1.SymbolSize = 24;
this.uiComboDataGridView1.TabIndex = 74;
this.uiComboDataGridView1.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
this.uiComboDataGridView1.Watermark = "";
@@ -535,7 +571,9 @@ namespace Sunny.UI.Demo
//
// uiLine5
//
+ this.uiLine5.BackColor = System.Drawing.Color.Transparent;
this.uiLine5.Font = new System.Drawing.Font("宋体", 12F);
+ this.uiLine5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
this.uiLine5.Location = new System.Drawing.Point(30, 134);
this.uiLine5.MinimumSize = new System.Drawing.Size(16, 16);
this.uiLine5.Name = "uiLine5";
@@ -551,6 +589,8 @@ namespace Sunny.UI.Demo
this.uiComboBox3.FillColor = System.Drawing.Color.White;
this.uiComboBox3.FilterMaxCount = 50;
this.uiComboBox3.Font = new System.Drawing.Font("宋体", 12F);
+ this.uiComboBox3.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255)))));
+ this.uiComboBox3.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
this.uiComboBox3.Location = new System.Drawing.Point(188, 168);
this.uiComboBox3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiComboBox3.MinimumSize = new System.Drawing.Size(63, 0);
@@ -558,6 +598,7 @@ namespace Sunny.UI.Demo
this.uiComboBox3.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
this.uiComboBox3.ShowFilter = true;
this.uiComboBox3.Size = new System.Drawing.Size(150, 29);
+ this.uiComboBox3.SymbolSize = 24;
this.uiComboBox3.TabIndex = 76;
this.uiComboBox3.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
this.uiComboBox3.Watermark = "";
@@ -569,6 +610,7 @@ namespace Sunny.UI.Demo
this.uiComboBox4.FillColor = System.Drawing.Color.White;
this.uiComboBox4.FilterMaxCount = 50;
this.uiComboBox4.Font = new System.Drawing.Font("宋体", 12F);
+ this.uiComboBox4.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255)))));
this.uiComboBox4.Items.AddRange(new object[] {
"1",
"2",
@@ -588,6 +630,7 @@ namespace Sunny.UI.Demo
"114",
"115",
"116"});
+ this.uiComboBox4.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
this.uiComboBox4.Location = new System.Drawing.Point(30, 169);
this.uiComboBox4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiComboBox4.MinimumSize = new System.Drawing.Size(63, 0);
@@ -597,6 +640,7 @@ namespace Sunny.UI.Demo
this.uiComboBox4.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom;
this.uiComboBox4.ShowFilter = true;
this.uiComboBox4.Size = new System.Drawing.Size(150, 29);
+ this.uiComboBox4.SymbolSize = 24;
this.uiComboBox4.TabIndex = 75;
this.uiComboBox4.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
this.uiComboBox4.Watermark = "水印文字";
@@ -613,6 +657,7 @@ namespace Sunny.UI.Demo
this.uiComboDataGridView2.Name = "uiComboDataGridView2";
this.uiComboDataGridView2.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
this.uiComboDataGridView2.Size = new System.Drawing.Size(308, 29);
+ this.uiComboDataGridView2.SymbolSize = 24;
this.uiComboDataGridView2.TabIndex = 79;
this.uiComboDataGridView2.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
this.uiComboDataGridView2.Watermark = "";
@@ -620,7 +665,9 @@ namespace Sunny.UI.Demo
//
// uiLine9
//
+ this.uiLine9.BackColor = System.Drawing.Color.Transparent;
this.uiLine9.Font = new System.Drawing.Font("宋体", 12F);
+ this.uiLine9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
this.uiLine9.Location = new System.Drawing.Point(386, 214);
this.uiLine9.MinimumSize = new System.Drawing.Size(16, 16);
this.uiLine9.Name = "uiLine9";
@@ -637,7 +684,9 @@ namespace Sunny.UI.Demo
//
// uiLine10
//
+ this.uiLine10.BackColor = System.Drawing.Color.Transparent;
this.uiLine10.Font = new System.Drawing.Font("宋体", 12F);
+ this.uiLine10.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
this.uiLine10.Location = new System.Drawing.Point(386, 416);
this.uiLine10.MinimumSize = new System.Drawing.Size(16, 16);
this.uiLine10.Name = "uiLine10";
@@ -656,6 +705,7 @@ namespace Sunny.UI.Demo
this.uiNumPadTextBox1.Name = "uiNumPadTextBox1";
this.uiNumPadTextBox1.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
this.uiNumPadTextBox1.Size = new System.Drawing.Size(150, 29);
+ this.uiNumPadTextBox1.SymbolSize = 24;
this.uiNumPadTextBox1.TabIndex = 81;
this.uiNumPadTextBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
this.uiNumPadTextBox1.Watermark = "";
@@ -671,6 +721,7 @@ namespace Sunny.UI.Demo
this.uiNumPadTextBox2.NumPadType = Sunny.UI.NumPadType.Integer;
this.uiNumPadTextBox2.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
this.uiNumPadTextBox2.Size = new System.Drawing.Size(150, 29);
+ this.uiNumPadTextBox2.SymbolSize = 24;
this.uiNumPadTextBox2.TabIndex = 82;
this.uiNumPadTextBox2.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
this.uiNumPadTextBox2.Watermark = "";
@@ -687,6 +738,7 @@ namespace Sunny.UI.Demo
this.uiNumPadTextBox3.NumPadType = Sunny.UI.NumPadType.IDNumber;
this.uiNumPadTextBox3.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
this.uiNumPadTextBox3.Size = new System.Drawing.Size(150, 29);
+ this.uiNumPadTextBox3.SymbolSize = 24;
this.uiNumPadTextBox3.TabIndex = 84;
this.uiNumPadTextBox3.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
this.uiNumPadTextBox3.Watermark = "";
@@ -702,15 +754,118 @@ namespace Sunny.UI.Demo
this.uiNumPadTextBox4.NumPadType = Sunny.UI.NumPadType.Double;
this.uiNumPadTextBox4.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
this.uiNumPadTextBox4.Size = new System.Drawing.Size(150, 29);
+ this.uiNumPadTextBox4.SymbolSize = 24;
this.uiNumPadTextBox4.TabIndex = 83;
this.uiNumPadTextBox4.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
this.uiNumPadTextBox4.Watermark = "";
//
+ // uiLine11
+ //
+ this.uiLine11.BackColor = System.Drawing.Color.Transparent;
+ this.uiLine11.Font = new System.Drawing.Font("宋体", 12F);
+ this.uiLine11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+ this.uiLine11.Location = new System.Drawing.Point(30, 543);
+ this.uiLine11.MinimumSize = new System.Drawing.Size(16, 16);
+ this.uiLine11.Name = "uiLine11";
+ this.uiLine11.Size = new System.Drawing.Size(664, 20);
+ this.uiLine11.TabIndex = 85;
+ this.uiLine11.Text = "2X";
+ this.uiLine11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // uiDatePicker4
+ //
+ this.uiDatePicker4.CanEmpty = true;
+ this.uiDatePicker4.FillColor = System.Drawing.Color.White;
+ this.uiDatePicker4.Font = new System.Drawing.Font("宋体", 12F);
+ this.uiDatePicker4.Location = new System.Drawing.Point(30, 580);
+ this.uiDatePicker4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.uiDatePicker4.MaxLength = 10;
+ this.uiDatePicker4.MinimumSize = new System.Drawing.Size(63, 0);
+ this.uiDatePicker4.Name = "uiDatePicker4";
+ this.uiDatePicker4.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
+ this.uiDatePicker4.ShowToday = true;
+ this.uiDatePicker4.Size = new System.Drawing.Size(150, 29);
+ this.uiDatePicker4.SizeMultiple = 2;
+ this.uiDatePicker4.SymbolDropDown = 61555;
+ this.uiDatePicker4.SymbolNormal = 61555;
+ this.uiDatePicker4.SymbolSize = 24;
+ this.uiDatePicker4.TabIndex = 86;
+ this.uiDatePicker4.Text = "2020-04-16";
+ this.uiDatePicker4.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+ this.uiDatePicker4.Value = new System.DateTime(2020, 4, 16, 0, 0, 0, 0);
+ this.uiDatePicker4.Watermark = "";
+ //
+ // uiDatetimePicker2
+ //
+ this.uiDatetimePicker2.CanEmpty = true;
+ this.uiDatetimePicker2.FillColor = System.Drawing.Color.White;
+ this.uiDatetimePicker2.Font = new System.Drawing.Font("宋体", 12F);
+ this.uiDatetimePicker2.Location = new System.Drawing.Point(30, 619);
+ this.uiDatetimePicker2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.uiDatetimePicker2.MaxLength = 19;
+ this.uiDatetimePicker2.MinimumSize = new System.Drawing.Size(63, 0);
+ this.uiDatetimePicker2.Name = "uiDatetimePicker2";
+ this.uiDatetimePicker2.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
+ this.uiDatetimePicker2.Size = new System.Drawing.Size(308, 29);
+ this.uiDatetimePicker2.SizeMultiple = 2;
+ this.uiDatetimePicker2.SymbolDropDown = 61555;
+ this.uiDatetimePicker2.SymbolNormal = 61555;
+ this.uiDatetimePicker2.SymbolSize = 24;
+ this.uiDatetimePicker2.TabIndex = 87;
+ this.uiDatetimePicker2.Text = "2020-06-02 17:57:28";
+ this.uiDatetimePicker2.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+ this.uiDatetimePicker2.Value = new System.DateTime(2020, 6, 2, 17, 57, 28, 203);
+ this.uiDatetimePicker2.Watermark = "";
+ //
+ // uiTimePicker2
+ //
+ this.uiTimePicker2.CanEmpty = true;
+ this.uiTimePicker2.FillColor = System.Drawing.Color.White;
+ this.uiTimePicker2.Font = new System.Drawing.Font("宋体", 12F);
+ this.uiTimePicker2.Location = new System.Drawing.Point(188, 580);
+ this.uiTimePicker2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.uiTimePicker2.MaxLength = 8;
+ this.uiTimePicker2.MinimumSize = new System.Drawing.Size(63, 0);
+ this.uiTimePicker2.Name = "uiTimePicker2";
+ this.uiTimePicker2.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
+ this.uiTimePicker2.Size = new System.Drawing.Size(150, 29);
+ this.uiTimePicker2.SizeMultiple = 2;
+ this.uiTimePicker2.SymbolDropDown = 61555;
+ this.uiTimePicker2.SymbolNormal = 61555;
+ this.uiTimePicker2.SymbolSize = 24;
+ this.uiTimePicker2.TabIndex = 88;
+ this.uiTimePicker2.Text = "23:41:39";
+ this.uiTimePicker2.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+ this.uiTimePicker2.Value = new System.DateTime(2020, 5, 29, 23, 41, 39, 684);
+ this.uiTimePicker2.Watermark = "";
+ //
+ // uiNumPadTextBox5
+ //
+ this.uiNumPadTextBox5.FillColor = System.Drawing.Color.White;
+ this.uiNumPadTextBox5.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiNumPadTextBox5.Location = new System.Drawing.Point(386, 580);
+ this.uiNumPadTextBox5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.uiNumPadTextBox5.MinimumSize = new System.Drawing.Size(63, 0);
+ this.uiNumPadTextBox5.Name = "uiNumPadTextBox5";
+ this.uiNumPadTextBox5.NumPadType = Sunny.UI.NumPadType.Double;
+ this.uiNumPadTextBox5.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
+ this.uiNumPadTextBox5.Size = new System.Drawing.Size(150, 29);
+ this.uiNumPadTextBox5.SizeMultiple = 2;
+ this.uiNumPadTextBox5.SymbolSize = 24;
+ this.uiNumPadTextBox5.TabIndex = 89;
+ this.uiNumPadTextBox5.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+ this.uiNumPadTextBox5.Watermark = "";
+ //
// FCombobox
//
this.AllowShowTitle = true;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
- this.ClientSize = new System.Drawing.Size(765, 593);
+ this.ClientSize = new System.Drawing.Size(765, 665);
+ this.Controls.Add(this.uiNumPadTextBox5);
+ this.Controls.Add(this.uiTimePicker2);
+ this.Controls.Add(this.uiDatetimePicker2);
+ this.Controls.Add(this.uiDatePicker4);
+ this.Controls.Add(this.uiLine11);
this.Controls.Add(this.uiNumPadTextBox3);
this.Controls.Add(this.uiNumPadTextBox4);
this.Controls.Add(this.uiNumPadTextBox2);
@@ -782,5 +937,10 @@ namespace Sunny.UI.Demo
private UINumPadTextBox uiNumPadTextBox2;
private UINumPadTextBox uiNumPadTextBox3;
private UINumPadTextBox uiNumPadTextBox4;
+ private UILine uiLine11;
+ private UIDatePicker uiDatePicker4;
+ private UIDatetimePicker uiDatetimePicker2;
+ private UITimePicker uiTimePicker2;
+ private UINumPadTextBox uiNumPadTextBox5;
}
}
\ No newline at end of file
diff --git a/SunnyUI.Demo/Controls/FCombobox.cs b/SunnyUI.Demo/Controls/FCombobox.cs
index 8388f0e5..cd8b31c4 100644
--- a/SunnyUI.Demo/Controls/FCombobox.cs
+++ b/SunnyUI.Demo/Controls/FCombobox.cs
@@ -36,21 +36,21 @@ namespace Sunny.UI.Demo
uiComboDataGridView1.DataGridView.Init();
uiComboDataGridView1.ItemSize = new System.Drawing.Size(360, 240);
- uiComboDataGridView1.DataGridView.AddColumn("Column1", "Column1");
- uiComboDataGridView1.DataGridView.AddColumn("Column2", "Column2");
- uiComboDataGridView1.DataGridView.AddColumn("Column3", "Column3");
+ uiComboDataGridView1.DataGridView.AddColumn("数据列1", "Column1");
+ 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;
- uiComboDataGridView1.FilterColumnName = "Column1"; //不设置则全部列过滤
+ uiComboDataGridView1.FilterColumnName = "Column1;Column3"; //不设置则全部列过滤，可加分号过滤多列
uiComboDataGridView2.DataGridView.Init();
uiComboDataGridView2.DataGridView.MultiSelect = true;//设置可多选
uiComboDataGridView2.ItemSize = new System.Drawing.Size(360, 240);
- uiComboDataGridView2.DataGridView.AddColumn("Column1", "Column1");
- uiComboDataGridView2.DataGridView.AddColumn("Column2", "Column2");
- uiComboDataGridView2.DataGridView.AddColumn("Column3", "Column3");
+ uiComboDataGridView2.DataGridView.AddColumn("数据列1", "Column1");
+ uiComboDataGridView2.DataGridView.AddColumn("数据列2", "Column2");
+ uiComboDataGridView2.DataGridView.AddColumn("数据列3", "Column3");
uiComboDataGridView2.DataGridView.ReadOnly = true;
uiComboDataGridView2.ShowFilter = true;
uiComboDataGridView2.DataGridView.DataSource = dt;
@@ -61,6 +61,10 @@ namespace Sunny.UI.Demo
//日期选择框文本设置为空
uiDatePicker3.CanEmpty = true;
uiDatePicker3.Text = "";
+
+ uiDatePicker4.Value = uiDatePicker1.Value = uiDatePicker2.Value = uiDatePicker3.Value = DateTime.Now.Date;
+ uiDatetimePicker2.Value = uiDatetimePicker1.Value = DateTime.Now;
+ uiTimePicker1.Value = uiTimePicker2.Value = DateTime.Now;
}
private void UiComboDataGridView1_SelectIndexChange(object sender, int index)
@@ -134,7 +138,6 @@ namespace Sunny.UI.Demo
private void uiDatePicker3_ValueChanged(object sender, DateTime value)
{
- this.ShowInfoTip(uiDatePicker3.Value.DateString());
Console.WriteLine(uiDatePicker3.Value);
}
diff --git a/SunnyUI.Demo/Controls/FDataGridView.Designer.cs b/SunnyUI.Demo/Controls/FDataGridView.Designer.cs
index 28d72c14..a2c91368 100644
--- a/SunnyUI.Demo/Controls/FDataGridView.Designer.cs
+++ b/SunnyUI.Demo/Controls/FDataGridView.Designer.cs
@@ -36,12 +36,12 @@ namespace Sunny.UI.Demo
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
this.uiDataGridViewFooter1 = new Sunny.UI.UIDataGridViewFooter();
this.uiDataGridView1 = new Sunny.UI.UIDataGridView();
+ this.uiPagination1 = new Sunny.UI.UIPagination();
+ this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.uiPagination1 = new Sunny.UI.UIPagination();
- this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
((System.ComponentModel.ISupportInitialize)(this.uiDataGridView1)).BeginInit();
this.SuspendLayout();
//
@@ -117,37 +117,10 @@ namespace Sunny.UI.Demo
this.uiDataGridView1.Size = new System.Drawing.Size(800, 351);
this.uiDataGridView1.TabIndex = 6;
//
- // Column1
- //
- this.Column1.DataPropertyName = "Column1";
- this.Column1.HeaderText = "Column1";
- this.Column1.Name = "Column1";
- this.Column1.Width = 300;
- //
- // Column2
- //
- this.Column2.DataPropertyName = "Column2";
- this.Column2.HeaderText = "Column2";
- this.Column2.Name = "Column2";
- this.Column2.Width = 200;
- //
- // Column3
- //
- this.Column3.DataPropertyName = "Column3";
- this.Column3.HeaderText = "Column3";
- this.Column3.Name = "Column3";
- this.Column3.Width = 200;
- //
- // Column4
- //
- this.Column4.DataPropertyName = "Column4";
- this.Column4.HeaderText = "Column4";
- this.Column4.Name = "Column4";
- this.Column4.Width = 200;
- //
// uiPagination1
//
this.uiPagination1.ActivePage = 20;
+ this.uiPagination1.ButtonFillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(128)))), ((int)(((byte)(204)))));
this.uiPagination1.CausesValidation = false;
this.uiPagination1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.uiPagination1.Font = new System.Drawing.Font("宋体", 12F);
@@ -167,6 +140,34 @@ namespace Sunny.UI.Demo
this.uiPagination1.TotalCount = 40000;
this.uiPagination1.PageChanged += new Sunny.UI.UIPagination.OnPageChangeEventHandler(this.uiPagination1_PageChanged);
//
+ // Column1
+ //
+ this.Column1.DataPropertyName = "Column1";
+ this.Column1.HeaderText = "数据列1";
+ this.Column1.Name = "Column1";
+ this.Column1.Width = 300;
+ //
+ // Column2
+ //
+ this.Column2.DataPropertyName = "Column2";
+ this.Column2.HeaderText = "数据列2";
+ this.Column2.Name = "Column2";
+ this.Column2.Width = 200;
+ //
+ // Column3
+ //
+ this.Column3.DataPropertyName = "Column3";
+ this.Column3.HeaderText = "数据列3";
+ this.Column3.Name = "Column3";
+ this.Column3.Width = 200;
+ //
+ // Column4
+ //
+ this.Column4.DataPropertyName = "Column4";
+ this.Column4.HeaderText = "数据列4";
+ this.Column4.Name = "Column4";
+ this.Column4.Width = 200;
+ //
// FDataGridView
//
this.AllowShowTitle = true;
diff --git a/SunnyUI.Demo/Controls/FDataGridView.cs b/SunnyUI.Demo/Controls/FDataGridView.cs
index f17e7a85..3ddc47d6 100644
--- a/SunnyUI.Demo/Controls/FDataGridView.cs
+++ b/SunnyUI.Demo/Controls/FDataGridView.cs
@@ -22,10 +22,10 @@ namespace Sunny.UI.Demo
dataList.Add(data);
}
- dataTable.Columns.Add("Column1");
- dataTable.Columns.Add("Column2");
- dataTable.Columns.Add("Column3");
- dataTable.Columns.Add("Column4");
+ dataTable.Columns.Add("Column1", typeof(string));
+ dataTable.Columns.Add("Column2", typeof(string));
+ dataTable.Columns.Add("Column3", typeof(string));
+ dataTable.Columns.Add("Column4", typeof(int));
uiDataGridView1.DataSource = dataTable;
//不自动生成列
@@ -74,7 +74,7 @@ namespace Sunny.UI.Demo
private void uiPagination1_PageChanged(object sender, object pagingSource, int pageIndex, int count)
{
//未连接数据库，通过模拟数据来实现
- //一般通过ORM的分页去取数据来填充
+ //一般通过ORM的分页、或者SQL语句分页去取数据来填充dataTable
//pageIndex：第几页，和界面对应，从1开始，取数据可能要用pageIndex - 1
//count：单页数据量，也就是PageSize值
diff --git a/SunnyUI.Demo/Controls/FProcess.cs b/SunnyUI.Demo/Controls/FProcess.cs
index feac851a..c25aaa91 100644
--- a/SunnyUI.Demo/Controls/FProcess.cs
+++ b/SunnyUI.Demo/Controls/FProcess.cs
@@ -19,7 +19,7 @@
{
value++;
uiTrackBar8.Value = uiTrackBar2.Value = uiTrackBar1.Value = value;
- uiProcessBar2.Value = uiProcessBar1.Value = value;
+ uiProcessBar4.Value = uiProcessBar2.Value = uiProcessBar1.Value = value;
uiRoundProcess4.Value = uiRoundProcess3.Value = uiProcessBar3.Value = uiRoundProcess2.Value = uiRoundProcess1.Value = value;
}
diff --git a/SunnyUI.Demo/Controls/FProcess.designer.cs b/SunnyUI.Demo/Controls/FProcess.designer.cs
index 695c9a77..080b6087 100644
--- a/SunnyUI.Demo/Controls/FProcess.designer.cs
+++ b/SunnyUI.Demo/Controls/FProcess.designer.cs
@@ -61,6 +61,7 @@ namespace Sunny.UI.Demo
this.uiTrackBar3 = new Sunny.UI.UITrackBar();
this.uiTrackBar2 = new Sunny.UI.UITrackBar();
this.uiTrackBar1 = new Sunny.UI.UITrackBar();
+ this.uiProcessBar4 = new Sunny.UI.UIProcessBar();
this.SuspendLayout();
//
// uiLine2
@@ -165,7 +166,9 @@ namespace Sunny.UI.Demo
//
// uiWaitingBar1
//
+ this.uiWaitingBar1.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
this.uiWaitingBar1.Font = new System.Drawing.Font("宋体", 12F);
+ this.uiWaitingBar1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
this.uiWaitingBar1.Location = new System.Drawing.Point(411, 88);
this.uiWaitingBar1.MinimumSize = new System.Drawing.Size(70, 23);
this.uiWaitingBar1.Name = "uiWaitingBar1";
@@ -457,11 +460,25 @@ namespace Sunny.UI.Demo
this.uiTrackBar1.TabIndex = 113;
this.uiTrackBar1.Text = "uiTrackBar1";
//
+ // uiProcessBar4
+ //
+ this.uiProcessBar4.Direction = Sunny.UI.UILine.LineDirection.Vertical;
+ this.uiProcessBar4.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
+ this.uiProcessBar4.Font = new System.Drawing.Font("宋体", 12F);
+ this.uiProcessBar4.Location = new System.Drawing.Point(706, 325);
+ this.uiProcessBar4.MinimumSize = new System.Drawing.Size(3, 1);
+ this.uiProcessBar4.Name = "uiProcessBar4";
+ this.uiProcessBar4.Radius = 3;
+ this.uiProcessBar4.Size = new System.Drawing.Size(3, 219);
+ this.uiProcessBar4.TabIndex = 126;
+ this.uiProcessBar4.Value = 50;
+ //
// FProcess
//
this.AllowShowTitle = true;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(800, 635);
+ this.Controls.Add(this.uiProcessBar4);
this.Controls.Add(this.uiRuler5);
this.Controls.Add(this.uiRuler6);
this.Controls.Add(this.uiRuler4);
@@ -533,5 +550,6 @@ namespace Sunny.UI.Demo
private UITrackBar uiTrackBar3;
private UITrackBar uiTrackBar2;
private UITrackBar uiTrackBar1;
+ private UIProcessBar uiProcessBar4;
}
}
\ No newline at end of file
diff --git a/SunnyUI.Demo/Forms/FDialogs.Designer.cs b/SunnyUI.Demo/Forms/FDialogs.Designer.cs
index d2964bc6..0f587fb8 100644
--- a/SunnyUI.Demo/Forms/FDialogs.Designer.cs
+++ b/SunnyUI.Demo/Forms/FDialogs.Designer.cs
@@ -32,7 +32,6 @@
this.btnWarn = new Sunny.UI.UISymbolButton();
this.btnSuccess = new Sunny.UI.UISymbolButton();
this.btnAsk = new Sunny.UI.UISymbolButton();
- this.btnAuto = new Sunny.UI.UISymbolButton();
this.btnStatus2 = new Sunny.UI.UISymbolButton();
this.btnInfo = new Sunny.UI.UISymbolButton();
this.btnPasswordInput = new Sunny.UI.UISymbolButton();
@@ -154,7 +153,6 @@
this.btnAsk.Name = "btnAsk";
this.btnAsk.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0);
this.btnAsk.Size = new System.Drawing.Size(100, 35);
- this.btnAsk.Style = Sunny.UI.UIStyle.Custom;
this.btnAsk.StyleCustomMode = true;
this.btnAsk.Symbol = 61529;
this.btnAsk.TabIndex = 26;
@@ -162,21 +160,6 @@
this.btnAsk.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAsk.Click += new System.EventHandler(this.btnAsk_Click);
//
- // btnAuto
- //
- this.btnAuto.Cursor = System.Windows.Forms.Cursors.Hand;
- this.btnAuto.Font = new System.Drawing.Font("宋体", 12F);
- this.btnAuto.Location = new System.Drawing.Point(30, 88);
- this.btnAuto.MinimumSize = new System.Drawing.Size(1, 1);
- this.btnAuto.Name = "btnAuto";
- this.btnAuto.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0);
- this.btnAuto.Size = new System.Drawing.Size(100, 35);
- this.btnAuto.Symbol = 61732;
- this.btnAuto.TabIndex = 31;
- this.btnAuto.Text = "Auto";
- this.btnAuto.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnAuto.Click += new System.EventHandler(this.btnAuto_Click);
- //
// btnStatus2
//
this.btnStatus2.Cursor = System.Windows.Forms.Cursors.Hand;
@@ -195,22 +178,12 @@
// btnInfo
//
this.btnInfo.Cursor = System.Windows.Forms.Cursors.Hand;
- this.btnInfo.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(140)))), ((int)(((byte)(140)))), ((int)(((byte)(140)))));
- this.btnInfo.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(140)))), ((int)(((byte)(140)))), ((int)(((byte)(140)))));
- this.btnInfo.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(163)))), ((int)(((byte)(163)))), ((int)(((byte)(163)))));
- this.btnInfo.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(112)))), ((int)(((byte)(112)))), ((int)(((byte)(112)))));
- this.btnInfo.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(112)))), ((int)(((byte)(112)))), ((int)(((byte)(112)))));
this.btnInfo.Font = new System.Drawing.Font("宋体", 12F);
- this.btnInfo.Location = new System.Drawing.Point(258, 88);
+ this.btnInfo.Location = new System.Drawing.Point(30, 88);
this.btnInfo.MinimumSize = new System.Drawing.Size(1, 1);
this.btnInfo.Name = "btnInfo";
this.btnInfo.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0);
- this.btnInfo.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(140)))), ((int)(((byte)(140)))), ((int)(((byte)(140)))));
- this.btnInfo.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(163)))), ((int)(((byte)(163)))), ((int)(((byte)(163)))));
- this.btnInfo.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(112)))), ((int)(((byte)(112)))), ((int)(((byte)(112)))));
- this.btnInfo.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(112)))), ((int)(((byte)(112)))), ((int)(((byte)(112)))));
this.btnInfo.Size = new System.Drawing.Size(100, 35);
- this.btnInfo.Style = Sunny.UI.UIStyle.Custom;
this.btnInfo.StyleCustomMode = true;
this.btnInfo.Symbol = 61530;
this.btnInfo.TabIndex = 37;
@@ -740,7 +713,6 @@
this.Controls.Add(this.uiSymbolButton1);
this.Controls.Add(this.uiLine8);
this.Controls.Add(this.uiLine6);
- this.Controls.Add(this.btnAuto);
this.Controls.Add(this.uiLine3);
this.Controls.Add(this.uiSymbolButton3);
this.Controls.Add(this.btnCH);
@@ -772,7 +744,6 @@
private UISymbolButton btnWarn;
private UISymbolButton btnSuccess;
private UISymbolButton btnAsk;
- private UISymbolButton btnAuto;
private UISymbolButton btnStatus2;
private UISymbolButton btnInfo;
private UISymbolButton btnPasswordInput;
diff --git a/SunnyUI.Demo/Forms/FDialogs.cs b/SunnyUI.Demo/Forms/FDialogs.cs
index 5f827eb7..d4bbd818 100644
--- a/SunnyUI.Demo/Forms/FDialogs.cs
+++ b/SunnyUI.Demo/Forms/FDialogs.cs
@@ -11,6 +11,12 @@ namespace Sunny.UI.Demo
InitializeComponent();
}
+ private void btnInfo_Click(object sender, EventArgs e)
+ {
+ this.ShowInfoDialog("默认信息提示框");
+ this.ShowInfoDialog2("默认信息提示框");
+ }
+
private void btnAsk_Click(object sender, EventArgs e)
{
if (this.ShowAskDialog("确认信息提示框"))
@@ -21,26 +27,33 @@ namespace Sunny.UI.Demo
{
this.ShowErrorTip("您点击了取消按钮");
}
- }
- private void btnAuto_Click(object sender, EventArgs e)
- {
- UIMessageBox.Show("跟随界面主题风格信息提示框", UILocalize.InfoTitle, Style);
+ if (this.ShowAskDialog2("确认信息提示框"))
+ {
+ this.ShowSuccessTip("您点击了确定按钮");
+ }
+ else
+ {
+ this.ShowErrorTip("您点击了取消按钮");
+ }
}
private void btnSuccess_Click(object sender, EventArgs e)
{
- this.ShowSuccessDialog("正确信息提示框", false, 5000);
+ this.ShowSuccessDialog("正确信息提示框", false, 3000);
+ this.ShowSuccessDialog2("正确信息提示框", false, 3000);
}
private void btnWarn_Click(object sender, EventArgs e)
{
this.ShowWarningDialog("警告信息提示框");
+ this.ShowWarningDialog2("警告信息提示框");
}
private void btnError_Click(object sender, EventArgs e)
{
this.ShowErrorDialog("错误信息提示框");
+ this.ShowErrorDialog2("错误信息提示框");
}
private void btnStatus2_Click(object sender, EventArgs e)
@@ -56,11 +69,6 @@ namespace Sunny.UI.Demo
this.HideStatusForm();
}
- private void btnInfo_Click(object sender, EventArgs e)
- {
- this.ShowInfoDialog("默认信息提示框");
- }
-
private void btnStringInput_Click(object sender, EventArgs e)
{
string value = "请输入字符串";
diff --git a/SunnyUI.Demo/SunnyUI.Demo.csproj b/SunnyUI.Demo/SunnyUI.Demo.csproj
index 21474620..44715f84 100644
--- a/SunnyUI.Demo/SunnyUI.Demo.csproj
+++ b/SunnyUI.Demo/SunnyUI.Demo.csproj
@@ -41,11 +41,11 @@
app.manifest
-
- ..\packages\SunnyUI.3.6.6\lib\net472\SunnyUI.dll
+
+ ..\packages\SunnyUI.3.6.7\lib\net472\SunnyUI.dll
-
- ..\packages\SunnyUI.Common.3.6.6\lib\net472\SunnyUI.Common.dll
+
+ ..\packages\SunnyUI.Common.3.6.7\lib\net472\SunnyUI.Common.dll
diff --git a/SunnyUI.Demo/packages.config b/SunnyUI.Demo/packages.config
index 5c94585c..05f70375 100644
--- a/SunnyUI.Demo/packages.config
+++ b/SunnyUI.Demo/packages.config
@@ -1,5 +1,5 @@
-
-
+
+
\ No newline at end of file
diff --git a/SunnyUI/SunnyUI.csproj b/SunnyUI/SunnyUI.csproj
index 96db7ad8..d2c1bb1e 100644
--- a/SunnyUI/SunnyUI.csproj
+++ b/SunnyUI/SunnyUI.csproj
@@ -9,7 +9,7 @@
SunnyUI.Net 是基于.Net Framework 4.0~4.8、.Net6、.Net8 框架的 C# WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。
CopyRight © SunnyUI.Net 2012-2024
GPL-3.0-only
- 3.6.6.0
+ 3.6.7.0
ShenYonghua
SunnyUI.Net
SunnyUI
@@ -17,10 +17,10 @@
https://gitee.com/yhuse/SunnyUI
True
SunnyUI.png
- True
+ False
D:\MyDocuments\Key\SunnyUI.pfx
False
- True
+ False
False
README.md
@@ -74,7 +74,7 @@
-
+