diff --git a/SunnyUI/Forms/UIBaseForm.cs b/SunnyUI/Forms/UIBaseForm.cs index b454638e..27e5ec97 100644 --- a/SunnyUI/Forms/UIBaseForm.cs +++ b/SunnyUI/Forms/UIBaseForm.cs @@ -55,7 +55,6 @@ namespace Sunny.UI if (AutoScaleMode == AutoScaleMode.Font) AutoScaleMode = AutoScaleMode.None; if (base.BackColor == SystemColors.Control) base.BackColor = UIStyles.Blue.PageBackColor; - SetPadding(); Render(); CalcSystemBoxPos(); diff --git a/SunnyUI/Forms/UIEditForm.Designer.cs b/SunnyUI/Forms/UIEditForm.Designer.cs index 4c0e5ce3..db4b0d2a 100644 --- a/SunnyUI/Forms/UIEditForm.Designer.cs +++ b/SunnyUI/Forms/UIEditForm.Designer.cs @@ -28,80 +28,83 @@ /// private void InitializeComponent() { - this.pnlBtm = new Sunny.UI.UIPanel(); - this.btnCancel = new Sunny.UI.UISymbolButton(); - this.btnOK = new Sunny.UI.UISymbolButton(); - this.pnlBtm.SuspendLayout(); - this.SuspendLayout(); + pnlBtm = new UIPanel(); + btnCancel = new UISymbolButton(); + btnOK = new UISymbolButton(); + pnlBtm.SuspendLayout(); + SuspendLayout(); // // pnlBtm // - this.pnlBtm.BackColor = System.Drawing.Color.Transparent; - this.pnlBtm.Controls.Add(this.btnCancel); - this.pnlBtm.Controls.Add(this.btnOK); - this.pnlBtm.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pnlBtm.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.pnlBtm.Location = new System.Drawing.Point(1, 392); - this.pnlBtm.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.pnlBtm.MinimumSize = new System.Drawing.Size(1, 1); - this.pnlBtm.Name = "pnlBtm"; - this.pnlBtm.RadiusSides = Sunny.UI.UICornerRadiusSides.None; - this.pnlBtm.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Top; - this.pnlBtm.Size = new System.Drawing.Size(598, 55); - this.pnlBtm.TabIndex = 1; - this.pnlBtm.Text = null; - this.pnlBtm.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; + pnlBtm.BackColor = System.Drawing.Color.Transparent; + pnlBtm.Controls.Add(btnCancel); + pnlBtm.Controls.Add(btnOK); + pnlBtm.Dock = System.Windows.Forms.DockStyle.Bottom; + pnlBtm.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + pnlBtm.Location = new System.Drawing.Point(1, 392); + pnlBtm.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + pnlBtm.MinimumSize = new System.Drawing.Size(1, 1); + pnlBtm.Name = "pnlBtm"; + pnlBtm.RadiusSides = UICornerRadiusSides.None; + pnlBtm.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Top; + pnlBtm.Size = new System.Drawing.Size(598, 55); + pnlBtm.TabIndex = 1; + pnlBtm.Text = null; + pnlBtm.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; // // btnCancel // - this.btnCancel.BackColor = System.Drawing.Color.Transparent; - this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnCancel.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.btnCancel.Location = new System.Drawing.Point(470, 12); - this.btnCancel.Margin = new System.Windows.Forms.Padding(0); - this.btnCancel.MinimumSize = new System.Drawing.Size(1, 1); - this.btnCancel.Name = "btnCancel"; - this.btnCancel.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0); - this.btnCancel.ShowFocusColor = true; - this.btnCancel.Size = new System.Drawing.Size(100, 35); - this.btnCancel.Symbol = 61453; - this.btnCancel.TabIndex = 1; - this.btnCancel.Text = "取消"; - this.btnCancel.TipsText = null; - this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); + btnCancel.BackColor = System.Drawing.Color.Transparent; + btnCancel.Cursor = System.Windows.Forms.Cursors.Hand; + btnCancel.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + btnCancel.Location = new System.Drawing.Point(470, 12); + btnCancel.Margin = new System.Windows.Forms.Padding(0); + btnCancel.MinimumSize = new System.Drawing.Size(1, 1); + btnCancel.Name = "btnCancel"; + btnCancel.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0); + btnCancel.ShowFocusColor = true; + btnCancel.Size = new System.Drawing.Size(100, 35); + btnCancel.Symbol = 61453; + btnCancel.TabIndex = 1; + btnCancel.Text = "取消"; + btnCancel.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + btnCancel.TipsText = null; + btnCancel.Click += btnCancel_Click; // // btnOK // - this.btnOK.BackColor = System.Drawing.Color.Transparent; - this.btnOK.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnOK.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.btnOK.Location = new System.Drawing.Point(355, 12); - this.btnOK.Margin = new System.Windows.Forms.Padding(0); - this.btnOK.MinimumSize = new System.Drawing.Size(1, 1); - this.btnOK.Name = "btnOK"; - this.btnOK.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0); - this.btnOK.ShowFocusColor = true; - this.btnOK.Size = new System.Drawing.Size(100, 35); - this.btnOK.TabIndex = 0; - this.btnOK.Text = "确定"; - this.btnOK.TipsText = null; - this.btnOK.Click += new System.EventHandler(this.btnOK_Click); + btnOK.BackColor = System.Drawing.Color.Transparent; + btnOK.Cursor = System.Windows.Forms.Cursors.Hand; + btnOK.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + btnOK.Location = new System.Drawing.Point(355, 12); + btnOK.Margin = new System.Windows.Forms.Padding(0); + btnOK.MinimumSize = new System.Drawing.Size(1, 1); + btnOK.Name = "btnOK"; + btnOK.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0); + btnOK.ShowFocusColor = true; + btnOK.Size = new System.Drawing.Size(100, 35); + btnOK.TabIndex = 0; + btnOK.Text = "确定"; + btnOK.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + btnOK.TipsText = null; + btnOK.Click += btnOK_Click; // // UIEditForm // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(600, 450); - this.Controls.Add(this.pnlBtm); - this.EscClose = true; - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "UIEditForm"; - this.Padding = new System.Windows.Forms.Padding(1, 35, 1, 3); - this.ShowInTaskbar = false; - this.Text = "UIEditForm"; - this.pnlBtm.ResumeLayout(false); - this.ResumeLayout(false); - + AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + ClientSize = new System.Drawing.Size(600, 450); + Controls.Add(pnlBtm); + EscClose = true; + MaximizeBox = false; + MinimizeBox = false; + Name = "UIEditForm"; + Padding = new System.Windows.Forms.Padding(1, 35, 1, 3); + ShowIcon = false; + ShowInTaskbar = false; + Text = "UIEditForm"; + ZoomScaleRect = new System.Drawing.Rectangle(15, 15, 600, 450); + pnlBtm.ResumeLayout(false); + ResumeLayout(false); } #endregion diff --git a/SunnyUI/Forms/UIEditForm.resx b/SunnyUI/Forms/UIEditForm.resx index f298a7be..af32865e 100644 --- a/SunnyUI/Forms/UIEditForm.resx +++ b/SunnyUI/Forms/UIEditForm.resx @@ -1,4 +1,64 @@ - + + + diff --git a/SunnyUI/Forms/UIInputForm.Designer.cs b/SunnyUI/Forms/UIInputForm.Designer.cs index 54aae011..5d00a6ed 100644 --- a/SunnyUI/Forms/UIInputForm.Designer.cs +++ b/SunnyUI/Forms/UIInputForm.Designer.cs @@ -28,71 +28,73 @@ /// private void InitializeComponent() { - this.label = new Sunny.UI.UILabel(); - this.edit = new Sunny.UI.UITextBox(); - this.pnlBtm.SuspendLayout(); - this.SuspendLayout(); + label = new UILabel(); + edit = new UITextBox(); + pnlBtm.SuspendLayout(); + SuspendLayout(); // // pnlBtm // - this.pnlBtm.Location = new System.Drawing.Point(1, 124); - this.pnlBtm.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; - this.pnlBtm.Size = new System.Drawing.Size(471, 55); - this.pnlBtm.TabIndex = 2; + pnlBtm.Location = new System.Drawing.Point(0, 135); + pnlBtm.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom; + pnlBtm.Size = new System.Drawing.Size(473, 55); + pnlBtm.TabIndex = 2; // // btnCancel // - this.btnCancel.Location = new System.Drawing.Point(343, 12); + btnCancel.Location = new System.Drawing.Point(343, 4); // // btnOK // - this.btnOK.Location = new System.Drawing.Point(228, 12); + btnOK.Location = new System.Drawing.Point(228, 4); // // label // - this.label.AutoSize = true; - this.label.BackColor = System.Drawing.Color.Transparent; - this.label.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.label.Location = new System.Drawing.Point(29, 57); - this.label.Name = "label"; - this.label.Size = new System.Drawing.Size(218, 21); - this.label.TabIndex = 1; - this.label.Text = "请在下方编辑框中输入数值:"; - this.label.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + label.AutoSize = true; + label.BackColor = System.Drawing.Color.Transparent; + label.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + label.ForeColor = System.Drawing.Color.FromArgb(48, 48, 48); + label.Location = new System.Drawing.Point(28, 57); + label.Name = "label"; + label.Size = new System.Drawing.Size(215, 16); + label.TabIndex = 1; + label.Text = "请在下方编辑框中输入数值:"; + label.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // edit // - this.edit.Cursor = System.Windows.Forms.Cursors.IBeam; - this.edit.FillColor = System.Drawing.Color.White; - this.edit.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.edit.Location = new System.Drawing.Point(29, 92); - this.edit.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.edit.Maximum = 2147483647D; - this.edit.Minimum = -2147483648D; - this.edit.MinimumSize = new System.Drawing.Size(1, 1); - this.edit.Name = "edit"; - this.edit.Padding = new System.Windows.Forms.Padding(5); - this.edit.RadiusSides = Sunny.UI.UICornerRadiusSides.None; - this.edit.Size = new System.Drawing.Size(415, 29); - this.edit.TabIndex = 0; - this.edit.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + edit.Cursor = System.Windows.Forms.Cursors.IBeam; + edit.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + edit.Location = new System.Drawing.Point(29, 92); + edit.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + edit.MinimumSize = new System.Drawing.Size(1, 1); + edit.Name = "edit"; + edit.Padding = new System.Windows.Forms.Padding(5); + edit.RadiusSides = UICornerRadiusSides.None; + edit.ShowText = false; + edit.Size = new System.Drawing.Size(415, 29); + edit.TabIndex = 0; + edit.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + edit.Watermark = ""; // // UIInputForm // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(473, 182); - this.Controls.Add(this.edit); - this.Controls.Add(this.label); - this.Name = "UIInputForm"; - this.Text = "输入"; - this.Shown += new System.EventHandler(this.UIInputForm_Shown); - this.Controls.SetChildIndex(this.pnlBtm, 0); - this.Controls.SetChildIndex(this.label, 0); - this.Controls.SetChildIndex(this.edit, 0); - this.pnlBtm.ResumeLayout(false); - this.ResumeLayout(false); - this.PerformLayout(); - + AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + ClientSize = new System.Drawing.Size(473, 190); + Controls.Add(edit); + Controls.Add(label); + Name = "UIInputForm"; + Padding = new System.Windows.Forms.Padding(0, 35, 0, 0); + ShowIcon = false; + Text = "输入"; + ZoomScaleRect = new System.Drawing.Rectangle(15, 15, 473, 182); + Shown += UIInputForm_Shown; + Controls.SetChildIndex(pnlBtm, 0); + Controls.SetChildIndex(label, 0); + Controls.SetChildIndex(edit, 0); + pnlBtm.ResumeLayout(false); + ResumeLayout(false); + PerformLayout(); } #endregion diff --git a/SunnyUI/Forms/UIInputForm.resx b/SunnyUI/Forms/UIInputForm.resx index f298a7be..af32865e 100644 --- a/SunnyUI/Forms/UIInputForm.resx +++ b/SunnyUI/Forms/UIInputForm.resx @@ -1,4 +1,64 @@ - + + + diff --git a/SunnyUI/Forms/UILoginForm.Designer.cs b/SunnyUI/Forms/UILoginForm.Designer.cs index e66105cc..8ee0588f 100644 --- a/SunnyUI/Forms/UILoginForm.Designer.cs +++ b/SunnyUI/Forms/UILoginForm.Designer.cs @@ -115,7 +115,6 @@ btnLogin.Size = new System.Drawing.Size(86, 29); btnLogin.TabIndex = 2; btnLogin.Text = "登录"; - btnLogin.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); btnLogin.Click += btnLogin_Click; // // btnCancel @@ -142,7 +141,6 @@ btnCancel.Symbol = 61453; btnCancel.TabIndex = 3; btnCancel.Text = "取消"; - btnCancel.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); btnCancel.Click += btnCancel_Click; // // lblTitle @@ -209,6 +207,7 @@ MinimumSize = new System.Drawing.Size(750, 450); Name = "UILoginForm"; Padding = new System.Windows.Forms.Padding(0); + ShowIcon = false; ShowInTaskbar = false; ShowTitle = false; Text = "UILogin"; diff --git a/SunnyUI/Forms/UIMessageForm.Designer.cs b/SunnyUI/Forms/UIMessageForm.Designer.cs index f0db66a0..6fb5b32e 100644 --- a/SunnyUI/Forms/UIMessageForm.Designer.cs +++ b/SunnyUI/Forms/UIMessageForm.Designer.cs @@ -48,7 +48,6 @@ btnCancel.Style = UIStyle.Custom; btnCancel.TabIndex = 6; btnCancel.Text = "取消"; - btnCancel.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); btnCancel.TipsText = null; btnCancel.Click += btnCancel_Click; // @@ -65,7 +64,6 @@ btnOK.Style = UIStyle.Custom; btnOK.TabIndex = 5; btnOK.Text = "确定"; - btnOK.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); btnOK.TipsText = null; btnOK.Click += btnOK_Click; // @@ -105,7 +103,7 @@ MaximizeBox = false; MinimizeBox = false; Name = "UIMessageForm"; - Padding = new System.Windows.Forms.Padding(1, 35, 1, 3); + ShowIcon = false; ShowInTaskbar = false; Text = "UIMsgBox"; ZoomScaleRect = new System.Drawing.Rectangle(15, 15, 450, 270); diff --git a/SunnyUI/Forms/UISelectForm.Designer.cs b/SunnyUI/Forms/UISelectForm.Designer.cs index 64aa5c32..761103f4 100644 --- a/SunnyUI/Forms/UISelectForm.Designer.cs +++ b/SunnyUI/Forms/UISelectForm.Designer.cs @@ -28,68 +28,74 @@ /// private void InitializeComponent() { - this.label = new Sunny.UI.UILabel(); - this.ComboBox = new Sunny.UI.UIComboBox(); - this.pnlBtm.SuspendLayout(); - this.SuspendLayout(); + label = new UILabel(); + ComboBox = new UIComboBox(); + pnlBtm.SuspendLayout(); + SuspendLayout(); // // pnlBtm // - this.pnlBtm.Location = new System.Drawing.Point(1, 124); - this.pnlBtm.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; - this.pnlBtm.Size = new System.Drawing.Size(471, 55); + pnlBtm.Location = new System.Drawing.Point(1, 134); + pnlBtm.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; + pnlBtm.Size = new System.Drawing.Size(471, 55); // // btnCancel // - this.btnCancel.Location = new System.Drawing.Point(343, 12); + btnCancel.Location = new System.Drawing.Point(343, 4); // // btnOK // - this.btnOK.Location = new System.Drawing.Point(228, 12); + btnOK.Location = new System.Drawing.Point(228, 4); // // label // - this.label.AutoSize = true; - this.label.BackColor = System.Drawing.Color.Transparent; - this.label.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.label.Location = new System.Drawing.Point(29, 57); - this.label.Name = "label"; - this.label.Size = new System.Drawing.Size(186, 21); - this.label.TabIndex = 3; - this.label.Text = "请在下方编辑框中选择:"; - this.label.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + label.AutoSize = true; + label.BackColor = System.Drawing.Color.Transparent; + label.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + label.ForeColor = System.Drawing.Color.FromArgb(48, 48, 48); + label.Location = new System.Drawing.Point(29, 57); + label.Name = "label"; + label.Size = new System.Drawing.Size(183, 16); + label.TabIndex = 3; + label.Text = "请在下方编辑框中选择:"; + label.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // ComboBox // - this.ComboBox.DataSource = null; - this.ComboBox.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.ComboBox.FillColor = System.Drawing.Color.White; - this.ComboBox.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.ComboBox.Location = new System.Drawing.Point(29, 92); - this.ComboBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.ComboBox.MinimumSize = new System.Drawing.Size(63, 0); - this.ComboBox.Name = "ComboBox"; - this.ComboBox.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.ComboBox.Size = new System.Drawing.Size(415, 29); - this.ComboBox.TabIndex = 4; - this.ComboBox.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + ComboBox.DataSource = null; + ComboBox.DropDownStyle = UIDropDownStyle.DropDownList; + ComboBox.FillColor = System.Drawing.Color.White; + ComboBox.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + ComboBox.ItemHoverColor = System.Drawing.Color.FromArgb(155, 200, 255); + ComboBox.ItemSelectForeColor = System.Drawing.Color.FromArgb(235, 243, 255); + ComboBox.Location = new System.Drawing.Point(29, 92); + ComboBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + ComboBox.MinimumSize = new System.Drawing.Size(63, 0); + ComboBox.Name = "ComboBox"; + ComboBox.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); + ComboBox.Size = new System.Drawing.Size(415, 29); + ComboBox.SymbolSize = 24; + ComboBox.TabIndex = 4; + ComboBox.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + ComboBox.Watermark = ""; // // UISelectForm // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(473, 182); - this.Controls.Add(this.label); - this.Controls.Add(this.ComboBox); - this.EscClose = true; - this.Name = "UISelectForm"; - this.Text = "选择"; - this.Controls.SetChildIndex(this.ComboBox, 0); - this.Controls.SetChildIndex(this.pnlBtm, 0); - this.Controls.SetChildIndex(this.label, 0); - this.pnlBtm.ResumeLayout(false); - this.ResumeLayout(false); - this.PerformLayout(); - + AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + ClientSize = new System.Drawing.Size(473, 190); + Controls.Add(label); + Controls.Add(ComboBox); + Name = "UISelectForm"; + Padding = new System.Windows.Forms.Padding(1, 35, 1, 1); + ShowIcon = false; + Text = "选择"; + ZoomScaleRect = new System.Drawing.Rectangle(15, 15, 473, 182); + Controls.SetChildIndex(ComboBox, 0); + Controls.SetChildIndex(pnlBtm, 0); + Controls.SetChildIndex(label, 0); + pnlBtm.ResumeLayout(false); + ResumeLayout(false); + PerformLayout(); } #endregion diff --git a/SunnyUI/Forms/UISelectForm.resx b/SunnyUI/Forms/UISelectForm.resx index f298a7be..af32865e 100644 --- a/SunnyUI/Forms/UISelectForm.resx +++ b/SunnyUI/Forms/UISelectForm.resx @@ -1,4 +1,64 @@ - + + + diff --git a/SunnyUI/Forms/UIStatusForm.Designer.cs b/SunnyUI/Forms/UIStatusForm.Designer.cs index b4da89f4..25940684 100644 --- a/SunnyUI/Forms/UIStatusForm.Designer.cs +++ b/SunnyUI/Forms/UIStatusForm.Designer.cs @@ -39,6 +39,7 @@ labelDescription.AutoSize = true; labelDescription.BackColor = System.Drawing.Color.Transparent; labelDescription.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + labelDescription.ForeColor = System.Drawing.Color.FromArgb(48, 48, 48); labelDescription.Location = new System.Drawing.Point(32, 55); labelDescription.Name = "labelDescription"; labelDescription.Size = new System.Drawing.Size(207, 16); @@ -48,6 +49,7 @@ // // processBar // + processBar.FillColor = System.Drawing.Color.FromArgb(235, 243, 255); processBar.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); processBar.Location = new System.Drawing.Point(32, 91); processBar.MinimumSize = new System.Drawing.Size(70, 23); @@ -73,6 +75,7 @@ MaximizeBox = false; MinimizeBox = false; Name = "UIStatusForm"; + ShowIcon = false; Text = "提示"; TopMost = true; ZoomScaleRect = new System.Drawing.Rectangle(15, 15, 473, 153); diff --git a/SunnyUI/Forms/UIWaitForm.designer.cs b/SunnyUI/Forms/UIWaitForm.designer.cs index 470b412d..6d32a8a0 100644 --- a/SunnyUI/Forms/UIWaitForm.designer.cs +++ b/SunnyUI/Forms/UIWaitForm.designer.cs @@ -28,50 +28,53 @@ /// private void InitializeComponent() { - this.labelDescription = new Sunny.UI.UILabel(); - this.Bar = new Sunny.UI.UIWaitingBar(); - this.SuspendLayout(); + labelDescription = new UILabel(); + Bar = new UIWaitingBar(); + SuspendLayout(); // // labelDescription // - this.labelDescription.AutoSize = true; - this.labelDescription.BackColor = System.Drawing.Color.Transparent; - this.labelDescription.Font = new System.Drawing.Font("宋体", 12F); - this.labelDescription.Location = new System.Drawing.Point(32, 55); - this.labelDescription.Name = "labelDescription"; - this.labelDescription.Size = new System.Drawing.Size(178, 21); - this.labelDescription.TabIndex = 4; - this.labelDescription.Text = "系统正在处理中,请稍候..."; - this.labelDescription.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + labelDescription.AutoSize = true; + labelDescription.BackColor = System.Drawing.Color.Transparent; + labelDescription.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + labelDescription.ForeColor = System.Drawing.Color.FromArgb(48, 48, 48); + labelDescription.Location = new System.Drawing.Point(32, 55); + labelDescription.Name = "labelDescription"; + labelDescription.Size = new System.Drawing.Size(207, 16); + labelDescription.TabIndex = 4; + labelDescription.Text = "系统正在处理中,请稍候..."; + labelDescription.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // Bar // - this.Bar.Font = new System.Drawing.Font("宋体", 12F); - this.Bar.Location = new System.Drawing.Point(32, 91); - this.Bar.MinimumSize = new System.Drawing.Size(70, 23); - this.Bar.Name = "Bar"; - this.Bar.Size = new System.Drawing.Size(409, 29); - this.Bar.TabIndex = 6; - this.Bar.Text = "uiWaitingBar1"; - this.Bar.Tick += new System.EventHandler(this.Bar_Tick); + Bar.FillColor = System.Drawing.Color.FromArgb(243, 249, 255); + Bar.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + Bar.ForeColor = System.Drawing.Color.FromArgb(80, 160, 255); + Bar.Location = new System.Drawing.Point(32, 91); + Bar.MinimumSize = new System.Drawing.Size(70, 23); + Bar.Name = "Bar"; + Bar.Size = new System.Drawing.Size(409, 29); + Bar.TabIndex = 6; + Bar.Text = "uiWaitingBar1"; + Bar.Tick += Bar_Tick; // // UIWaitForm // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(473, 153); - this.ControlBox = false; - this.Controls.Add(this.labelDescription); - this.Controls.Add(this.Bar); - this.EscClose = false; - this.IsForbidAltF4 = true; - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "UIWaitForm"; - this.Text = "提示"; - this.TopMost = true; - this.ResumeLayout(false); - this.PerformLayout(); - + AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + ClientSize = new System.Drawing.Size(473, 153); + ControlBox = false; + Controls.Add(labelDescription); + Controls.Add(Bar); + IsForbidAltF4 = true; + MaximizeBox = false; + MinimizeBox = false; + Name = "UIWaitForm"; + ShowIcon = false; + Text = "提示"; + TopMost = true; + ZoomScaleRect = new System.Drawing.Rectangle(15, 15, 473, 153); + ResumeLayout(false); + PerformLayout(); } #endregion diff --git a/SunnyUI/Forms/UIWaitForm.resx b/SunnyUI/Forms/UIWaitForm.resx index 1af7de15..af32865e 100644 --- a/SunnyUI/Forms/UIWaitForm.resx +++ b/SunnyUI/Forms/UIWaitForm.resx @@ -1,17 +1,17 @@  -