diff --git a/SunnyUI/Controls/DropItem/UIColorItem.cs b/SunnyUI/Controls/DropItem/UIColorItem.cs index 41100672..c38a496b 100644 --- a/SunnyUI/Controls/DropItem/UIColorItem.cs +++ b/SunnyUI/Controls/DropItem/UIColorItem.cs @@ -258,7 +258,7 @@ namespace Sunny.UI // this.edtA.Cursor = System.Windows.Forms.Cursors.IBeam; this.edtA.FillColor = System.Drawing.Color.White; - this.edtA.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.edtA.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.edtA.Location = new System.Drawing.Point(29, 197); this.edtA.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.edtA.Maximum = 255D; @@ -275,7 +275,7 @@ namespace Sunny.UI // this.edtR.Cursor = System.Windows.Forms.Cursors.IBeam; this.edtR.FillColor = System.Drawing.Color.White; - this.edtR.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.edtR.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.edtR.Location = new System.Drawing.Point(93, 197); this.edtR.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.edtR.Maximum = 255D; @@ -292,7 +292,7 @@ namespace Sunny.UI // this.edtG.Cursor = System.Windows.Forms.Cursors.IBeam; this.edtG.FillColor = System.Drawing.Color.White; - this.edtG.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.edtG.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.edtG.Location = new System.Drawing.Point(158, 197); this.edtG.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.edtG.Maximum = 255D; @@ -309,7 +309,7 @@ namespace Sunny.UI // this.edtB.Cursor = System.Windows.Forms.Cursors.IBeam; this.edtB.FillColor = System.Drawing.Color.White; - this.edtB.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.edtB.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.edtB.Location = new System.Drawing.Point(222, 197); this.edtB.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.edtB.Maximum = 255D; @@ -326,7 +326,7 @@ namespace Sunny.UI // this.lblA.AutoSize = true; this.lblA.BackColor = System.Drawing.Color.Transparent; - this.lblA.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lblA.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblA.Location = new System.Drawing.Point(9, 200); this.lblA.Name = "lblA"; this.lblA.Size = new System.Drawing.Size(19, 20); @@ -339,7 +339,7 @@ namespace Sunny.UI // this.lblR.AutoSize = true; this.lblR.BackColor = System.Drawing.Color.Transparent; - this.lblR.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lblR.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblR.Location = new System.Drawing.Point(74, 200); this.lblR.Name = "lblR"; this.lblR.Size = new System.Drawing.Size(18, 20); @@ -352,7 +352,7 @@ namespace Sunny.UI // this.lblG.AutoSize = true; this.lblG.BackColor = System.Drawing.Color.Transparent; - this.lblG.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lblG.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblG.Location = new System.Drawing.Point(138, 200); this.lblG.Name = "lblG"; this.lblG.Size = new System.Drawing.Size(19, 20); @@ -365,7 +365,7 @@ namespace Sunny.UI // this.lblB.AutoSize = true; this.lblB.BackColor = System.Drawing.Color.Transparent; - this.lblB.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lblB.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblB.Location = new System.Drawing.Point(203, 200); this.lblB.Name = "lblB"; this.lblB.Size = new System.Drawing.Size(18, 20); @@ -396,7 +396,7 @@ namespace Sunny.UI this.m_colorBar.Color1 = System.Drawing.Color.Black; this.m_colorBar.Color2 = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(127)))), ((int)(((byte)(127))))); this.m_colorBar.Color3 = System.Drawing.Color.White; - this.m_colorBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.m_colorBar.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.m_colorBar.FrameColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.m_colorBar.Location = new System.Drawing.Point(422, 8); this.m_colorBar.Name = "m_colorBar"; @@ -423,7 +423,7 @@ namespace Sunny.UI this.m_opacitySlider.Color1 = System.Drawing.Color.White; this.m_opacitySlider.Color2 = System.Drawing.Color.Black; this.m_opacitySlider.Color3 = System.Drawing.Color.Black; - this.m_opacitySlider.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.m_opacitySlider.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.m_opacitySlider.ForeColor = System.Drawing.Color.Black; this.m_opacitySlider.FrameColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.m_opacitySlider.Location = new System.Drawing.Point(269, 163); @@ -447,7 +447,7 @@ namespace Sunny.UI // btnOK // this.btnOK.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnOK.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnOK.Font = new System.Drawing.Font("宋体", 12F); this.btnOK.Location = new System.Drawing.Point(269, 197); this.btnOK.Name = "btnOK"; this.btnOK.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0); @@ -460,7 +460,7 @@ namespace Sunny.UI // btnCancel // this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnCancel.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnCancel.Font = new System.Drawing.Font("宋体", 12F); this.btnCancel.Location = new System.Drawing.Point(372, 197); this.btnCancel.Name = "btnCancel"; this.btnCancel.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0); diff --git a/SunnyUI/Controls/DropItem/UIComboBoxItem.Designer.cs b/SunnyUI/Controls/DropItem/UIComboBoxItem.Designer.cs index 9acd0262..5fda19b7 100644 --- a/SunnyUI/Controls/DropItem/UIComboBoxItem.Designer.cs +++ b/SunnyUI/Controls/DropItem/UIComboBoxItem.Designer.cs @@ -36,7 +36,7 @@ this.listBox.BackColor = System.Drawing.Color.Transparent; this.listBox.Dock = System.Windows.Forms.DockStyle.Fill; this.listBox.FillColor = System.Drawing.Color.White; - this.listBox.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.listBox.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.listBox.FormatString = ""; this.listBox.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.listBox.Location = new System.Drawing.Point(0, 0); diff --git a/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs b/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs index 8b1f2b12..3ed53f6f 100644 --- a/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs +++ b/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs @@ -122,7 +122,7 @@ namespace Sunny.UI panel.Controls.Add(btnCancel); panel.Controls.Add(btnOK); panel.Dock = DockStyle.Bottom; - panel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + panel.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); panel.Location = new System.Drawing.Point(0, 289); panel.Margin = new Padding(4, 5, 4, 5); panel.MinimumSize = new System.Drawing.Size(1, 1); @@ -144,7 +144,7 @@ namespace Sunny.UI btnCancel.FillHoverColor = System.Drawing.Color.FromArgb(235, 115, 115); btnCancel.FillPressColor = System.Drawing.Color.FromArgb(184, 64, 64); btnCancel.FillSelectedColor = System.Drawing.Color.FromArgb(184, 64, 64); - btnCancel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + btnCancel.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); btnCancel.Location = new System.Drawing.Point(478, 8); btnCancel.MinimumSize = new System.Drawing.Size(1, 1); btnCancel.Name = "btnCancel"; @@ -158,21 +158,21 @@ namespace Sunny.UI btnCancel.Symbol = 61453; btnCancel.TabIndex = 1; btnCancel.Text = "取消"; - btnCancel.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + btnCancel.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); btnCancel.Click += btnCancel_Click; // // btnOK // btnOK.Anchor = AnchorStyles.Top | AnchorStyles.Right; btnOK.Cursor = Cursors.Hand; - btnOK.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + btnOK.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); btnOK.Location = new System.Drawing.Point(389, 8); btnOK.MinimumSize = new System.Drawing.Size(1, 1); btnOK.Name = "btnOK"; btnOK.Size = new System.Drawing.Size(80, 29); btnOK.TabIndex = 0; btnOK.Text = "确定"; - btnOK.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + btnOK.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); btnOK.Click += btnOK_Click; // // dataGridView @@ -183,7 +183,7 @@ namespace Sunny.UI dataGridView.ColumnHeadersBorderStyle = DataGridViewHeaderBorderStyle.Single; dataGridViewCellStyle2.Alignment = DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(80, 160, 255); - dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White; dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(80, 160, 255); dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; @@ -192,7 +192,7 @@ namespace Sunny.UI dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridViewCellStyle3.Alignment = DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle3.BackColor = System.Drawing.Color.White; - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(48, 48, 48); dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(220, 236, 255); dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(48, 48, 48); @@ -200,14 +200,14 @@ namespace Sunny.UI dataGridView.DefaultCellStyle = dataGridViewCellStyle3; dataGridView.Dock = DockStyle.Fill; dataGridView.EnableHeadersVisualStyles = false; - dataGridView.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + dataGridView.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); dataGridView.GridColor = System.Drawing.Color.FromArgb(104, 173, 255); dataGridView.Location = new System.Drawing.Point(0, 44); dataGridView.MultiSelect = false; dataGridView.Name = "dataGridView"; dataGridViewCellStyle4.Alignment = DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(243, 249, 255); - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(48, 48, 48); dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(80, 160, 255); dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.FromArgb(48, 48, 48); @@ -231,7 +231,7 @@ namespace Sunny.UI pFilter.Controls.Add(btnSearch); pFilter.Controls.Add(edtFilter); pFilter.Dock = DockStyle.Top; - pFilter.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + pFilter.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); pFilter.Location = new System.Drawing.Point(0, 0); pFilter.Margin = new Padding(4, 5, 4, 5); pFilter.MinimumSize = new System.Drawing.Size(1, 1); @@ -247,7 +247,7 @@ namespace Sunny.UI // btnClear.Anchor = AnchorStyles.Top | AnchorStyles.Right; btnClear.Cursor = Cursors.Hand; - btnClear.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + btnClear.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); btnClear.Location = new System.Drawing.Point(478, 8); btnClear.MinimumSize = new System.Drawing.Size(1, 1); btnClear.Name = "btnClear"; @@ -256,14 +256,14 @@ namespace Sunny.UI btnClear.SymbolSize = 22; btnClear.TabIndex = 2; btnClear.Text = "清除"; - btnClear.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + btnClear.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); btnClear.Click += btnClear_Click; // // btnSearch // btnSearch.Anchor = AnchorStyles.Top | AnchorStyles.Right; btnSearch.Cursor = Cursors.Hand; - btnSearch.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + btnSearch.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); btnSearch.Location = new System.Drawing.Point(389, 8); btnSearch.MinimumSize = new System.Drawing.Size(1, 1); btnSearch.Name = "btnSearch"; @@ -271,7 +271,7 @@ namespace Sunny.UI btnSearch.Symbol = 61442; btnSearch.TabIndex = 1; btnSearch.Text = "搜索"; - btnSearch.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + btnSearch.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); btnSearch.Click += btnSearch_Click; // // edtFilter @@ -279,7 +279,7 @@ namespace Sunny.UI edtFilter.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; edtFilter.ButtonSymbolOffset = new System.Drawing.Point(0, 0); edtFilter.Cursor = Cursors.IBeam; - edtFilter.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + edtFilter.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); edtFilter.Location = new System.Drawing.Point(17, 10); edtFilter.Margin = new Padding(4, 5, 4, 5); edtFilter.MinimumSize = new System.Drawing.Size(1, 16); diff --git a/SunnyUI/Controls/DropItem/UIComboTreeViewItem.cs b/SunnyUI/Controls/DropItem/UIComboTreeViewItem.cs index 7278ff95..c2e1c2af 100644 --- a/SunnyUI/Controls/DropItem/UIComboTreeViewItem.cs +++ b/SunnyUI/Controls/DropItem/UIComboTreeViewItem.cs @@ -69,7 +69,7 @@ namespace Sunny.UI // this.treeView.Dock = System.Windows.Forms.DockStyle.Fill; this.treeView.FillColor = System.Drawing.Color.White; - this.treeView.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.treeView.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.treeView.LineColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); this.treeView.Location = new System.Drawing.Point(0, 0); this.treeView.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); @@ -90,7 +90,7 @@ namespace Sunny.UI this.panel.Controls.Add(this.btnCancel); this.panel.Controls.Add(this.btnOK); this.panel.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.panel.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.panel.Location = new System.Drawing.Point(0, 176); this.panel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.panel.MinimumSize = new System.Drawing.Size(1, 1); @@ -114,7 +114,7 @@ namespace Sunny.UI this.btnCancel.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(115)))), ((int)(((byte)(115))))); this.btnCancel.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(184)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.btnCancel.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(184)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.btnCancel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.btnCancel.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.btnCancel.Location = new System.Drawing.Point(159, 8); this.btnCancel.MinimumSize = new System.Drawing.Size(1, 1); this.btnCancel.Name = "btnCancel"; @@ -135,7 +135,7 @@ namespace Sunny.UI // this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnOK.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnOK.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.btnOK.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.btnOK.Location = new System.Drawing.Point(70, 8); this.btnOK.MinimumSize = new System.Drawing.Size(1, 1); this.btnOK.Name = "btnOK"; @@ -148,7 +148,7 @@ namespace Sunny.UI // uiCheckBox1 // this.uiCheckBox1.BackColor = System.Drawing.Color.Transparent; - this.uiCheckBox1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.uiCheckBox1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.uiCheckBox1.Location = new System.Drawing.Point(3, 8); this.uiCheckBox1.MinimumSize = new System.Drawing.Size(1, 1); this.uiCheckBox1.Name = "uiCheckBox1"; diff --git a/SunnyUI/Controls/DropItem/UIDateItem.cs b/SunnyUI/Controls/DropItem/UIDateItem.cs index d8a9efff..c1ef318d 100644 --- a/SunnyUI/Controls/DropItem/UIDateItem.cs +++ b/SunnyUI/Controls/DropItem/UIDateItem.cs @@ -76,7 +76,7 @@ namespace Sunny.UI this.TopPanel.Controls.Add(this.b1); this.TopPanel.Dock = System.Windows.Forms.DockStyle.Top; this.TopPanel.FillColor = System.Drawing.Color.White; - this.TopPanel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.TopPanel.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.TopPanel.Location = new System.Drawing.Point(0, 0); this.TopPanel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.TopPanel.MinimumSize = new System.Drawing.Size(1, 1); @@ -99,7 +99,7 @@ namespace Sunny.UI this.b4.Cursor = System.Windows.Forms.Cursors.Hand; this.b4.FillColor = System.Drawing.Color.White; this.b4.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.b4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b4.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.b4.ImageInterval = 0; this.b4.Location = new System.Drawing.Point(427, 4); @@ -123,7 +123,7 @@ namespace Sunny.UI this.b3.Cursor = System.Windows.Forms.Cursors.Hand; this.b3.FillColor = System.Drawing.Color.White; this.b3.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.b3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.b3.ImageInterval = 0; this.b3.Location = new System.Drawing.Point(391, 4); @@ -146,7 +146,7 @@ namespace Sunny.UI this.b2.Cursor = System.Windows.Forms.Cursors.Hand; this.b2.FillColor = System.Drawing.Color.White; this.b2.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.b2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.b2.ImageInterval = 0; this.b2.Location = new System.Drawing.Point(40, 4); @@ -169,7 +169,7 @@ namespace Sunny.UI this.b1.Cursor = System.Windows.Forms.Cursors.Hand; this.b1.FillColor = System.Drawing.Color.White; this.b1.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.b1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.b1.ImageInterval = 0; this.b1.Location = new System.Drawing.Point(4, 4); @@ -193,7 +193,7 @@ namespace Sunny.UI this.TabControl.Controls.Add(this.tabPage3); this.TabControl.Dock = System.Windows.Forms.DockStyle.Fill; this.TabControl.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed; - this.TabControl.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.TabControl.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.TabControl.ItemSize = new System.Drawing.Size(150, 40); this.TabControl.Location = new System.Drawing.Point(0, 31); this.TabControl.MainPage = ""; @@ -220,7 +220,7 @@ namespace Sunny.UI // this.p1.Dock = System.Windows.Forms.DockStyle.Fill; this.p1.FillColor = System.Drawing.Color.White; - this.p1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.p1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.p1.Location = new System.Drawing.Point(0, 0); this.p1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.p1.MinimumSize = new System.Drawing.Size(1, 1); @@ -250,7 +250,7 @@ namespace Sunny.UI // this.p2.Dock = System.Windows.Forms.DockStyle.Fill; this.p2.FillColor = System.Drawing.Color.White; - this.p2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.p2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.p2.Location = new System.Drawing.Point(0, 0); this.p2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.p2.MinimumSize = new System.Drawing.Size(1, 1); @@ -280,7 +280,7 @@ namespace Sunny.UI // this.p3.Dock = System.Windows.Forms.DockStyle.Fill; this.p3.FillColor = System.Drawing.Color.White; - this.p3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.p3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.p3.Location = new System.Drawing.Point(0, 0); this.p3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.p3.MinimumSize = new System.Drawing.Size(1, 1); @@ -778,7 +778,7 @@ namespace Sunny.UI if (ShowToday) { - using (Font SubFont = new Font("微软雅黑", 10.5f / UIDPIScale.DPIScale())) + using (Font SubFont = new Font("宋体", 10.5f / UIDPIScale.DPIScale())) { e.Graphics.FillRectangle(p3.FillColor, p3.Width - width * 4 + 1, p3.Height - height + 1, width * 4 - 2, height - 2); e.Graphics.FillRoundRectangle(PrimaryColor, new Rectangle(p3.Width - width * 4 + 6, p3.Height - height + 3, 8, height - 10), 3); diff --git a/SunnyUI/Controls/DropItem/UIDateTimeItem.cs b/SunnyUI/Controls/DropItem/UIDateTimeItem.cs index 0761b114..48997c5f 100644 --- a/SunnyUI/Controls/DropItem/UIDateTimeItem.cs +++ b/SunnyUI/Controls/DropItem/UIDateTimeItem.cs @@ -115,7 +115,7 @@ namespace Sunny.UI this.TopPanel.Controls.Add(this.b1); this.TopPanel.Dock = System.Windows.Forms.DockStyle.Top; this.TopPanel.FillColor = System.Drawing.Color.White; - this.TopPanel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.TopPanel.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.TopPanel.Location = new System.Drawing.Point(0, 0); this.TopPanel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.TopPanel.MinimumSize = new System.Drawing.Size(1, 1); @@ -138,7 +138,7 @@ namespace Sunny.UI this.b4.Cursor = System.Windows.Forms.Cursors.Hand; this.b4.FillColor = System.Drawing.Color.White; this.b4.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.b4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b4.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.b4.ImageInterval = 0; this.b4.Location = new System.Drawing.Point(250, 4); @@ -162,7 +162,7 @@ namespace Sunny.UI this.b3.Cursor = System.Windows.Forms.Cursors.Hand; this.b3.FillColor = System.Drawing.Color.White; this.b3.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.b3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.b3.ImageInterval = 0; this.b3.Location = new System.Drawing.Point(214, 4); @@ -185,7 +185,7 @@ namespace Sunny.UI this.b2.Cursor = System.Windows.Forms.Cursors.Hand; this.b2.FillColor = System.Drawing.Color.White; this.b2.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.b2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.b2.ImageInterval = 0; this.b2.Location = new System.Drawing.Point(40, 4); @@ -208,7 +208,7 @@ namespace Sunny.UI this.b1.Cursor = System.Windows.Forms.Cursors.Hand; this.b1.FillColor = System.Drawing.Color.White; this.b1.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.b1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.b1.ImageInterval = 0; this.b1.Location = new System.Drawing.Point(4, 4); @@ -232,7 +232,7 @@ namespace Sunny.UI this.TabControl.Controls.Add(this.tabPage3); this.TabControl.Dock = System.Windows.Forms.DockStyle.Fill; this.TabControl.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed; - this.TabControl.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.TabControl.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.TabControl.ItemSize = new System.Drawing.Size(150, 40); this.TabControl.Location = new System.Drawing.Point(0, 31); this.TabControl.MainPage = ""; @@ -260,7 +260,7 @@ namespace Sunny.UI // this.p1.Dock = System.Windows.Forms.DockStyle.Fill; this.p1.FillColor = System.Drawing.Color.White; - this.p1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.p1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.p1.Location = new System.Drawing.Point(0, 0); this.p1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.p1.MinimumSize = new System.Drawing.Size(1, 1); @@ -290,7 +290,7 @@ namespace Sunny.UI // this.p2.Dock = System.Windows.Forms.DockStyle.Fill; this.p2.FillColor = System.Drawing.Color.White; - this.p2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.p2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.p2.Location = new System.Drawing.Point(0, 0); this.p2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.p2.MinimumSize = new System.Drawing.Size(1, 1); @@ -320,7 +320,7 @@ namespace Sunny.UI // this.p3.Dock = System.Windows.Forms.DockStyle.Fill; this.p3.FillColor = System.Drawing.Color.White; - this.p3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.p3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.p3.Location = new System.Drawing.Point(0, 0); this.p3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.p3.MinimumSize = new System.Drawing.Size(1, 1); @@ -339,7 +339,7 @@ namespace Sunny.UI // sb // this.sb.BackColor = System.Drawing.Color.Transparent; - this.sb.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.sb.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.sb.ForeColor = System.Drawing.Color.DarkGray; this.sb.Location = new System.Drawing.Point(398, 103); this.sb.Name = "sb"; @@ -352,7 +352,7 @@ namespace Sunny.UI // mb // this.mb.BackColor = System.Drawing.Color.Transparent; - this.mb.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.mb.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.mb.ForeColor = System.Drawing.Color.DarkGray; this.mb.Location = new System.Drawing.Point(345, 103); this.mb.Name = "mb"; @@ -365,7 +365,7 @@ namespace Sunny.UI // hb // this.hb.BackColor = System.Drawing.Color.Transparent; - this.hb.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.hb.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.hb.ForeColor = System.Drawing.Color.DarkGray; this.hb.Location = new System.Drawing.Point(292, 103); this.hb.Name = "hb"; @@ -378,7 +378,7 @@ namespace Sunny.UI // st // this.st.BackColor = System.Drawing.Color.Transparent; - this.st.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.st.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.st.ForeColor = System.Drawing.Color.DarkGray; this.st.Location = new System.Drawing.Point(398, 31); this.st.Name = "st"; @@ -391,7 +391,7 @@ namespace Sunny.UI // mt // this.mt.BackColor = System.Drawing.Color.Transparent; - this.mt.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.mt.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.mt.ForeColor = System.Drawing.Color.DarkGray; this.mt.Location = new System.Drawing.Point(345, 31); this.mt.Name = "mt"; @@ -404,7 +404,7 @@ namespace Sunny.UI // ht // this.ht.BackColor = System.Drawing.Color.Transparent; - this.ht.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.ht.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.ht.ForeColor = System.Drawing.Color.DarkGray; this.ht.Location = new System.Drawing.Point(292, 31); this.ht.Name = "ht"; @@ -417,7 +417,7 @@ namespace Sunny.UI // sc // this.sc.BackColor = System.Drawing.Color.Transparent; - this.sc.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.sc.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.sc.Location = new System.Drawing.Point(398, 65); this.sc.Name = "sc"; this.sc.Size = new System.Drawing.Size(46, 27); @@ -430,7 +430,7 @@ namespace Sunny.UI // mc // this.mc.BackColor = System.Drawing.Color.Transparent; - this.mc.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.mc.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.mc.Location = new System.Drawing.Point(345, 65); this.mc.Name = "mc"; this.mc.Size = new System.Drawing.Size(46, 27); @@ -443,7 +443,7 @@ namespace Sunny.UI // hc // this.hc.BackColor = System.Drawing.Color.Transparent; - this.hc.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.hc.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.hc.Location = new System.Drawing.Point(292, 65); this.hc.Name = "hc"; this.hc.Size = new System.Drawing.Size(46, 27); @@ -456,7 +456,7 @@ namespace Sunny.UI // btnCancel // 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.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.btnCancel.Location = new System.Drawing.Point(370, 162); this.btnCancel.MinimumSize = new System.Drawing.Size(1, 1); this.btnCancel.Name = "btnCancel"; @@ -471,7 +471,7 @@ namespace Sunny.UI // btnOK // 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.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.btnOK.Location = new System.Drawing.Point(291, 162); this.btnOK.MinimumSize = new System.Drawing.Size(1, 1); this.btnOK.Name = "btnOK"; @@ -489,7 +489,7 @@ namespace Sunny.UI this.s2.Cursor = System.Windows.Forms.Cursors.Hand; this.s2.FillColor = System.Drawing.Color.White; this.s2.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.s2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.s2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.s2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.s2.ImageInterval = 0; this.s2.Location = new System.Drawing.Point(405, 129); @@ -513,7 +513,7 @@ namespace Sunny.UI this.mm2.Cursor = System.Windows.Forms.Cursors.Hand; this.mm2.FillColor = System.Drawing.Color.White; this.mm2.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.mm2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.mm2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.mm2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.mm2.ImageInterval = 0; this.mm2.Location = new System.Drawing.Point(352, 129); @@ -537,7 +537,7 @@ namespace Sunny.UI this.h2.Cursor = System.Windows.Forms.Cursors.Hand; this.h2.FillColor = System.Drawing.Color.White; this.h2.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.h2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.h2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.h2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.h2.ImageInterval = 0; this.h2.Location = new System.Drawing.Point(299, 128); @@ -561,7 +561,7 @@ namespace Sunny.UI this.s1.Cursor = System.Windows.Forms.Cursors.Hand; this.s1.FillColor = System.Drawing.Color.White; this.s1.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.s1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.s1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.s1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.s1.ImageInterval = 0; this.s1.Location = new System.Drawing.Point(405, 4); @@ -585,7 +585,7 @@ namespace Sunny.UI this.mm1.Cursor = System.Windows.Forms.Cursors.Hand; this.mm1.FillColor = System.Drawing.Color.White; this.mm1.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.mm1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.mm1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.mm1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.mm1.ImageInterval = 0; this.mm1.Location = new System.Drawing.Point(352, 4); @@ -609,7 +609,7 @@ namespace Sunny.UI this.h1.Cursor = System.Windows.Forms.Cursors.Hand; this.h1.FillColor = System.Drawing.Color.White; this.h1.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.h1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.h1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.h1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.h1.ImageInterval = 0; this.h1.Location = new System.Drawing.Point(299, 4); @@ -631,7 +631,7 @@ namespace Sunny.UI // this.uiLine2.BackColor = System.Drawing.Color.Transparent; this.uiLine2.FillColor = System.Drawing.Color.White; - this.uiLine2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.uiLine2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.uiLine2.LineColor = System.Drawing.Color.Silver; this.uiLine2.LineDashStyle = Sunny.UI.UILineDashStyle.None; this.uiLine2.Location = new System.Drawing.Point(289, 88); @@ -648,7 +648,7 @@ namespace Sunny.UI // this.uiLine3.BackColor = System.Drawing.Color.Transparent; this.uiLine3.FillColor = System.Drawing.Color.White; - this.uiLine3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.uiLine3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.uiLine3.LineColor = System.Drawing.Color.Silver; this.uiLine3.LineDashStyle = Sunny.UI.UILineDashStyle.None; this.uiLine3.Location = new System.Drawing.Point(289, 54); @@ -668,7 +668,7 @@ namespace Sunny.UI this.uiPanel1.Controls.Add(this.TopPanel); this.uiPanel1.Dock = System.Windows.Forms.DockStyle.Left; this.uiPanel1.FillColor = System.Drawing.Color.White; - this.uiPanel1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.uiPanel1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.uiPanel1.Location = new System.Drawing.Point(0, 0); this.uiPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiPanel1.MinimumSize = new System.Drawing.Size(1, 1); @@ -1271,7 +1271,7 @@ namespace Sunny.UI if (ShowToday) { - using (Font SubFont = new Font("微软雅黑", 10.5f / UIDPIScale.DPIScale())) + using (Font SubFont = new Font("宋体", 10.5f / UIDPIScale.DPIScale())) { e.Graphics.FillRectangle(p3.FillColor, p3.Width - width * 4 + 1, p3.Height - height + 1, width * 4 - 2, height - 2); e.Graphics.FillRoundRectangle(PrimaryColor, new Rectangle((int)(p3.Width - width * 4 + 6), p3.Height - height + 3, 8, height - 10), 3); diff --git a/SunnyUI/Controls/DropItem/UINumPadItem.cs b/SunnyUI/Controls/DropItem/UINumPadItem.cs index 734c3045..3f70fcd3 100644 --- a/SunnyUI/Controls/DropItem/UINumPadItem.cs +++ b/SunnyUI/Controls/DropItem/UINumPadItem.cs @@ -67,7 +67,7 @@ namespace Sunny.UI // // uiSymbolButton1 // - uiSymbolButton1.Font = new Font("微软雅黑", 12F, FontStyle.Regular, GraphicsUnit.Point); + uiSymbolButton1.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point); uiSymbolButton1.Location = new Point(244, 13); uiSymbolButton1.MinimumSize = new Size(1, 1); uiSymbolButton1.Name = "uiSymbolButton1"; @@ -80,7 +80,7 @@ namespace Sunny.UI // // uiSymbolButton2 // - uiSymbolButton2.Font = new Font("微软雅黑", 12F, FontStyle.Regular, GraphicsUnit.Point); + uiSymbolButton2.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point); uiSymbolButton2.Location = new Point(244, 93); uiSymbolButton2.MinimumSize = new Size(1, 1); uiSymbolButton2.Name = "uiSymbolButton2"; @@ -92,7 +92,7 @@ namespace Sunny.UI // // uiSymbolButton3 // - uiSymbolButton3.Font = new Font("微软雅黑", 12F, FontStyle.Regular, GraphicsUnit.Point); + uiSymbolButton3.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point); uiSymbolButton3.Location = new Point(244, 173); uiSymbolButton3.MinimumSize = new Size(1, 1); uiSymbolButton3.Name = "uiSymbolButton3"; @@ -104,7 +104,7 @@ namespace Sunny.UI // // uiSymbolButton4 // - uiSymbolButton4.Font = new Font("微软雅黑", 18F, FontStyle.Regular, GraphicsUnit.Point); + uiSymbolButton4.Font = new Font("宋体", 18F, FontStyle.Regular, GraphicsUnit.Point); uiSymbolButton4.Location = new Point(167, 253); uiSymbolButton4.MinimumSize = new Size(1, 1); uiSymbolButton4.Name = "uiSymbolButton4"; @@ -117,7 +117,7 @@ namespace Sunny.UI // // uiSymbolButton6 // - uiSymbolButton6.Font = new Font("微软雅黑", 18F, FontStyle.Regular, GraphicsUnit.Point); + uiSymbolButton6.Font = new Font("宋体", 18F, FontStyle.Regular, GraphicsUnit.Point); uiSymbolButton6.Location = new Point(167, 173); uiSymbolButton6.MinimumSize = new Size(1, 1); uiSymbolButton6.Name = "uiSymbolButton6"; @@ -130,7 +130,7 @@ namespace Sunny.UI // // uiSymbolButton7 // - uiSymbolButton7.Font = new Font("微软雅黑", 18F, FontStyle.Regular, GraphicsUnit.Point); + uiSymbolButton7.Font = new Font("宋体", 18F, FontStyle.Regular, GraphicsUnit.Point); uiSymbolButton7.Location = new Point(167, 93); uiSymbolButton7.MinimumSize = new Size(1, 1); uiSymbolButton7.Name = "uiSymbolButton7"; @@ -143,7 +143,7 @@ namespace Sunny.UI // // uiSymbolButton8 // - uiSymbolButton8.Font = new Font("微软雅黑", 18F, FontStyle.Regular, GraphicsUnit.Point); + uiSymbolButton8.Font = new Font("宋体", 18F, FontStyle.Regular, GraphicsUnit.Point); uiSymbolButton8.Location = new Point(167, 13); uiSymbolButton8.MinimumSize = new Size(1, 1); uiSymbolButton8.Name = "uiSymbolButton8"; @@ -157,7 +157,7 @@ namespace Sunny.UI // // uiSymbolButton9 // - uiSymbolButton9.Font = new Font("微软雅黑", 18F, FontStyle.Regular, GraphicsUnit.Point); + uiSymbolButton9.Font = new Font("宋体", 18F, FontStyle.Regular, GraphicsUnit.Point); uiSymbolButton9.Location = new Point(90, 253); uiSymbolButton9.MinimumSize = new Size(1, 1); uiSymbolButton9.Name = "uiSymbolButton9"; @@ -170,7 +170,7 @@ namespace Sunny.UI // // uiSymbolButton10 // - uiSymbolButton10.Font = new Font("微软雅黑", 18F, FontStyle.Regular, GraphicsUnit.Point); + uiSymbolButton10.Font = new Font("宋体", 18F, FontStyle.Regular, GraphicsUnit.Point); uiSymbolButton10.Location = new Point(90, 173); uiSymbolButton10.MinimumSize = new Size(1, 1); uiSymbolButton10.Name = "uiSymbolButton10"; @@ -183,7 +183,7 @@ namespace Sunny.UI // // uiSymbolButton11 // - uiSymbolButton11.Font = new Font("微软雅黑", 18F, FontStyle.Regular, GraphicsUnit.Point); + uiSymbolButton11.Font = new Font("宋体", 18F, FontStyle.Regular, GraphicsUnit.Point); uiSymbolButton11.Location = new Point(90, 93); uiSymbolButton11.MinimumSize = new Size(1, 1); uiSymbolButton11.Name = "uiSymbolButton11"; @@ -196,7 +196,7 @@ namespace Sunny.UI // // uiSymbolButton12 // - uiSymbolButton12.Font = new Font("微软雅黑", 18F, FontStyle.Regular, GraphicsUnit.Point); + uiSymbolButton12.Font = new Font("宋体", 18F, FontStyle.Regular, GraphicsUnit.Point); uiSymbolButton12.Location = new Point(90, 13); uiSymbolButton12.MinimumSize = new Size(1, 1); uiSymbolButton12.Name = "uiSymbolButton12"; @@ -210,7 +210,7 @@ namespace Sunny.UI // // uiSymbolButton13 // - uiSymbolButton13.Font = new Font("微软雅黑", 18F, FontStyle.Regular, GraphicsUnit.Point); + uiSymbolButton13.Font = new Font("宋体", 18F, FontStyle.Regular, GraphicsUnit.Point); uiSymbolButton13.Location = new Point(13, 253); uiSymbolButton13.MinimumSize = new Size(1, 1); uiSymbolButton13.Name = "uiSymbolButton13"; @@ -223,7 +223,7 @@ namespace Sunny.UI // // uiSymbolButton14 // - uiSymbolButton14.Font = new Font("微软雅黑", 18F, FontStyle.Regular, GraphicsUnit.Point); + uiSymbolButton14.Font = new Font("宋体", 18F, FontStyle.Regular, GraphicsUnit.Point); uiSymbolButton14.Location = new Point(13, 173); uiSymbolButton14.MinimumSize = new Size(1, 1); uiSymbolButton14.Name = "uiSymbolButton14"; @@ -236,7 +236,7 @@ namespace Sunny.UI // // uiSymbolButton15 // - uiSymbolButton15.Font = new Font("微软雅黑", 18F, FontStyle.Regular, GraphicsUnit.Point); + uiSymbolButton15.Font = new Font("宋体", 18F, FontStyle.Regular, GraphicsUnit.Point); uiSymbolButton15.Location = new Point(13, 93); uiSymbolButton15.MinimumSize = new Size(1, 1); uiSymbolButton15.Name = "uiSymbolButton15"; @@ -249,7 +249,7 @@ namespace Sunny.UI // // uiSymbolButton16 // - uiSymbolButton16.Font = new Font("微软雅黑", 18F, FontStyle.Regular, GraphicsUnit.Point); + uiSymbolButton16.Font = new Font("宋体", 18F, FontStyle.Regular, GraphicsUnit.Point); uiSymbolButton16.Location = new Point(13, 13); uiSymbolButton16.MinimumSize = new Size(1, 1); uiSymbolButton16.Name = "uiSymbolButton16"; diff --git a/SunnyUI/Controls/DropItem/UITimeItem.cs b/SunnyUI/Controls/DropItem/UITimeItem.cs index 0813edc9..5e21de9a 100644 --- a/SunnyUI/Controls/DropItem/UITimeItem.cs +++ b/SunnyUI/Controls/DropItem/UITimeItem.cs @@ -75,7 +75,7 @@ namespace Sunny.UI // this.uiLine1.BackColor = System.Drawing.Color.Transparent; this.uiLine1.FillColor = System.Drawing.Color.White; - this.uiLine1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.uiLine1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.uiLine1.LineColor = System.Drawing.Color.Silver; this.uiLine1.Location = new System.Drawing.Point(6, 54); this.uiLine1.MinimumSize = new System.Drawing.Size(16, 16); @@ -91,7 +91,7 @@ namespace Sunny.UI // this.uiLine2.BackColor = System.Drawing.Color.Transparent; this.uiLine2.FillColor = System.Drawing.Color.White; - this.uiLine2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.uiLine2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.uiLine2.LineColor = System.Drawing.Color.Silver; this.uiLine2.Location = new System.Drawing.Point(6, 88); this.uiLine2.MinimumSize = new System.Drawing.Size(16, 16); @@ -109,7 +109,7 @@ namespace Sunny.UI this.s1.Cursor = System.Windows.Forms.Cursors.Hand; this.s1.FillColor = System.Drawing.Color.White; this.s1.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.s1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.s1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.s1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.s1.ImageInterval = 0; this.s1.Location = new System.Drawing.Point(122, 4); @@ -133,7 +133,7 @@ namespace Sunny.UI this.m1.Cursor = System.Windows.Forms.Cursors.Hand; this.m1.FillColor = System.Drawing.Color.White; this.m1.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.m1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.m1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.m1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.m1.ImageInterval = 0; this.m1.Location = new System.Drawing.Point(69, 4); @@ -157,7 +157,7 @@ namespace Sunny.UI this.h1.Cursor = System.Windows.Forms.Cursors.Hand; this.h1.FillColor = System.Drawing.Color.White; this.h1.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.h1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.h1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.h1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.h1.ImageInterval = 0; this.h1.Location = new System.Drawing.Point(16, 4); @@ -181,7 +181,7 @@ namespace Sunny.UI this.s2.Cursor = System.Windows.Forms.Cursors.Hand; this.s2.FillColor = System.Drawing.Color.White; this.s2.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.s2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.s2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.s2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.s2.ImageInterval = 0; this.s2.Location = new System.Drawing.Point(122, 129); @@ -205,7 +205,7 @@ namespace Sunny.UI this.m2.Cursor = System.Windows.Forms.Cursors.Hand; this.m2.FillColor = System.Drawing.Color.White; this.m2.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.m2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.m2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.m2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.m2.ImageInterval = 0; this.m2.Location = new System.Drawing.Point(69, 129); @@ -229,7 +229,7 @@ namespace Sunny.UI this.h2.Cursor = System.Windows.Forms.Cursors.Hand; this.h2.FillColor = System.Drawing.Color.White; this.h2.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.h2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.h2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.h2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.h2.ImageInterval = 0; this.h2.Location = new System.Drawing.Point(16, 128); @@ -250,7 +250,7 @@ namespace Sunny.UI // btnOK // 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.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.btnOK.Location = new System.Drawing.Point(8, 162); this.btnOK.MinimumSize = new System.Drawing.Size(1, 1); this.btnOK.Name = "btnOK"; @@ -265,7 +265,7 @@ namespace Sunny.UI // btnCancel // 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.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.btnCancel.Location = new System.Drawing.Point(87, 162); this.btnCancel.MinimumSize = new System.Drawing.Size(1, 1); this.btnCancel.Name = "btnCancel"; @@ -280,7 +280,7 @@ namespace Sunny.UI // hc // this.hc.BackColor = System.Drawing.Color.Transparent; - this.hc.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.hc.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.hc.Location = new System.Drawing.Point(9, 65); this.hc.Name = "hc"; this.hc.Size = new System.Drawing.Size(46, 27); @@ -293,7 +293,7 @@ namespace Sunny.UI // mc // this.mc.BackColor = System.Drawing.Color.Transparent; - this.mc.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.mc.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.mc.Location = new System.Drawing.Point(62, 65); this.mc.Name = "mc"; this.mc.Size = new System.Drawing.Size(46, 27); @@ -306,7 +306,7 @@ namespace Sunny.UI // sc // this.sc.BackColor = System.Drawing.Color.Transparent; - this.sc.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.sc.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.sc.Location = new System.Drawing.Point(115, 65); this.sc.Name = "sc"; this.sc.Size = new System.Drawing.Size(46, 27); @@ -319,7 +319,7 @@ namespace Sunny.UI // st // this.st.BackColor = System.Drawing.Color.Transparent; - this.st.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.st.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.st.ForeColor = System.Drawing.Color.DarkGray; this.st.Location = new System.Drawing.Point(115, 31); this.st.Name = "st"; @@ -332,7 +332,7 @@ namespace Sunny.UI // mt // this.mt.BackColor = System.Drawing.Color.Transparent; - this.mt.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.mt.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.mt.ForeColor = System.Drawing.Color.DarkGray; this.mt.Location = new System.Drawing.Point(62, 31); this.mt.Name = "mt"; @@ -345,7 +345,7 @@ namespace Sunny.UI // ht // this.ht.BackColor = System.Drawing.Color.Transparent; - this.ht.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.ht.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.ht.ForeColor = System.Drawing.Color.DarkGray; this.ht.Location = new System.Drawing.Point(9, 31); this.ht.Name = "ht"; @@ -358,7 +358,7 @@ namespace Sunny.UI // sb // this.sb.BackColor = System.Drawing.Color.Transparent; - this.sb.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.sb.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.sb.ForeColor = System.Drawing.Color.DarkGray; this.sb.Location = new System.Drawing.Point(115, 103); this.sb.Name = "sb"; @@ -371,7 +371,7 @@ namespace Sunny.UI // mb // this.mb.BackColor = System.Drawing.Color.Transparent; - this.mb.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.mb.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.mb.ForeColor = System.Drawing.Color.DarkGray; this.mb.Location = new System.Drawing.Point(62, 103); this.mb.Name = "mb"; @@ -384,7 +384,7 @@ namespace Sunny.UI // hb // this.hb.BackColor = System.Drawing.Color.Transparent; - this.hb.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.hb.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.hb.ForeColor = System.Drawing.Color.DarkGray; this.hb.Location = new System.Drawing.Point(9, 103); this.hb.Name = "hb"; diff --git a/SunnyUI/Controls/UICalendar.cs b/SunnyUI/Controls/UICalendar.cs index 06eab6fc..2892886f 100644 --- a/SunnyUI/Controls/UICalendar.cs +++ b/SunnyUI/Controls/UICalendar.cs @@ -87,7 +87,7 @@ namespace Sunny.UI this.TopPanel.Controls.Add(this.b2); this.TopPanel.Controls.Add(this.b1); this.TopPanel.Dock = System.Windows.Forms.DockStyle.Top; - this.TopPanel.Font = new System.Drawing.Font("微软雅黑", 12F); + this.TopPanel.Font = new System.Drawing.Font("宋体", 12F); this.TopPanel.Location = new System.Drawing.Point(0, 0); this.TopPanel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.TopPanel.MinimumSize = new System.Drawing.Size(1, 1); @@ -110,7 +110,7 @@ namespace Sunny.UI this.b4.Cursor = System.Windows.Forms.Cursors.Hand; this.b4.FillColor = System.Drawing.Color.White; this.b4.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.b4.Font = new System.Drawing.Font("微软雅黑", 12F); + this.b4.Font = new System.Drawing.Font("宋体", 12F); this.b4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.b4.ImageInterval = 0; this.b4.Location = new System.Drawing.Point(427, 4); @@ -125,7 +125,7 @@ namespace Sunny.UI this.b4.StyleCustomMode = true; this.b4.Symbol = 61697; this.b4.TabIndex = 3; - this.b4.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.b4.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.b4.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); this.b4.Click += new System.EventHandler(this.b4_Click); // @@ -136,7 +136,7 @@ namespace Sunny.UI this.b3.Cursor = System.Windows.Forms.Cursors.Hand; this.b3.FillColor = System.Drawing.Color.White; this.b3.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.b3.Font = new System.Drawing.Font("微软雅黑", 12F); + this.b3.Font = new System.Drawing.Font("宋体", 12F); this.b3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.b3.ImageInterval = 0; this.b3.Location = new System.Drawing.Point(391, 4); @@ -151,7 +151,7 @@ namespace Sunny.UI this.b3.StyleCustomMode = true; this.b3.Symbol = 61701; this.b3.TabIndex = 2; - this.b3.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.b3.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.b3.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); this.b3.Click += new System.EventHandler(this.b3_Click); // @@ -161,7 +161,7 @@ namespace Sunny.UI this.b2.Cursor = System.Windows.Forms.Cursors.Hand; this.b2.FillColor = System.Drawing.Color.White; this.b2.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.b2.Font = new System.Drawing.Font("微软雅黑", 12F); + this.b2.Font = new System.Drawing.Font("宋体", 12F); this.b2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.b2.ImageInterval = 0; this.b2.Location = new System.Drawing.Point(40, 4); @@ -176,7 +176,7 @@ namespace Sunny.UI this.b2.StyleCustomMode = true; this.b2.Symbol = 61700; this.b2.TabIndex = 1; - this.b2.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.b2.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.b2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); this.b2.Click += new System.EventHandler(this.b2_Click); // @@ -186,7 +186,7 @@ namespace Sunny.UI this.b1.Cursor = System.Windows.Forms.Cursors.Hand; this.b1.FillColor = System.Drawing.Color.White; this.b1.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.b1.Font = new System.Drawing.Font("微软雅黑", 12F); + this.b1.Font = new System.Drawing.Font("宋体", 12F); this.b1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.b1.ImageInterval = 0; this.b1.Location = new System.Drawing.Point(4, 4); @@ -201,7 +201,7 @@ namespace Sunny.UI this.b1.StyleCustomMode = true; this.b1.Symbol = 61696; this.b1.TabIndex = 0; - this.b1.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.b1.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.b1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); this.b1.Click += new System.EventHandler(this.b1_Click); // @@ -212,7 +212,7 @@ namespace Sunny.UI this.TabControl.Controls.Add(this.tabPage3); this.TabControl.Dock = System.Windows.Forms.DockStyle.Fill; this.TabControl.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed; - this.TabControl.Font = new System.Drawing.Font("微软雅黑", 12F); + this.TabControl.Font = new System.Drawing.Font("宋体", 12F); this.TabControl.ItemSize = new System.Drawing.Size(150, 40); this.TabControl.Location = new System.Drawing.Point(0, 31); this.TabControl.MainPage = ""; @@ -222,7 +222,7 @@ namespace Sunny.UI this.TabControl.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; this.TabControl.Style = Sunny.UI.UIStyle.Custom; this.TabControl.TabIndex = 1; - this.TabControl.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.TabControl.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.TabControl.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); this.TabControl.SelectedIndexChanged += new System.EventHandler(this.TabControl_SelectedIndexChanged); // @@ -240,7 +240,7 @@ namespace Sunny.UI // this.p1.Dock = System.Windows.Forms.DockStyle.Fill; this.p1.FillColor = System.Drawing.Color.White; - this.p1.Font = new System.Drawing.Font("微软雅黑", 12F); + this.p1.Font = new System.Drawing.Font("宋体", 12F); this.p1.Location = new System.Drawing.Point(0, 0); this.p1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.p1.MinimumSize = new System.Drawing.Size(1, 1); @@ -271,7 +271,7 @@ namespace Sunny.UI // this.p2.Dock = System.Windows.Forms.DockStyle.Fill; this.p2.FillColor = System.Drawing.Color.White; - this.p2.Font = new System.Drawing.Font("微软雅黑", 12F); + this.p2.Font = new System.Drawing.Font("宋体", 12F); this.p2.Location = new System.Drawing.Point(0, 0); this.p2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.p2.MinimumSize = new System.Drawing.Size(1, 1); @@ -302,7 +302,7 @@ namespace Sunny.UI // this.p3.Dock = System.Windows.Forms.DockStyle.Fill; this.p3.FillColor = System.Drawing.Color.White; - this.p3.Font = new System.Drawing.Font("微软雅黑", 12F); + this.p3.Font = new System.Drawing.Font("宋体", 12F); this.p3.Location = new System.Drawing.Point(0, 0); this.p3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.p3.MinimumSize = new System.Drawing.Size(1, 1); diff --git a/SunnyUI/Controls/UIDoubleUpDown.designer.cs b/SunnyUI/Controls/UIDoubleUpDown.designer.cs index cbba2349..7591714a 100644 --- a/SunnyUI/Controls/UIDoubleUpDown.designer.cs +++ b/SunnyUI/Controls/UIDoubleUpDown.designer.cs @@ -37,7 +37,7 @@ // this.btnDec.Cursor = System.Windows.Forms.Cursors.Hand; this.btnDec.Dock = System.Windows.Forms.DockStyle.Left; - this.btnDec.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnDec.Font = new System.Drawing.Font("宋体", 12F); this.btnDec.ImageInterval = 1; this.btnDec.Location = new System.Drawing.Point(0, 0); this.btnDec.Margin = new System.Windows.Forms.Padding(0); @@ -55,7 +55,7 @@ // this.btnAdd.Cursor = System.Windows.Forms.Cursors.Hand; this.btnAdd.Dock = System.Windows.Forms.DockStyle.Right; - this.btnAdd.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnAdd.Font = new System.Drawing.Font("宋体", 12F); this.btnAdd.ImageInterval = 1; this.btnAdd.Location = new System.Drawing.Point(87, 0); this.btnAdd.Margin = new System.Windows.Forms.Padding(0); @@ -72,7 +72,7 @@ // pnlValue // this.pnlValue.Dock = System.Windows.Forms.DockStyle.Fill; - this.pnlValue.Font = new System.Drawing.Font("微软雅黑", 12F); + this.pnlValue.Font = new System.Drawing.Font("宋体", 12F); this.pnlValue.Location = new System.Drawing.Point(29, 0); this.pnlValue.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.pnlValue.MinimumSize = new System.Drawing.Size(1, 1); diff --git a/SunnyUI/Controls/UIFlowLayoutPanel.cs b/SunnyUI/Controls/UIFlowLayoutPanel.cs index 8723db10..b2a5e84e 100644 --- a/SunnyUI/Controls/UIFlowLayoutPanel.cs +++ b/SunnyUI/Controls/UIFlowLayoutPanel.cs @@ -513,7 +513,7 @@ namespace Sunny.UI // VBar // this.VBar.BoundsHeight = 10; - this.VBar.Font = new Font("微软雅黑", 12F, FontStyle.Regular, GraphicsUnit.Point); + this.VBar.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point); this.VBar.LargeChange = 10; this.VBar.Location = new Point(410, 5); this.VBar.Maximum = 100; @@ -529,7 +529,7 @@ namespace Sunny.UI // HBar // this.HBar.BoundsWidth = 10; - this.HBar.Font = new Font("微软雅黑", 12F, FontStyle.Regular, GraphicsUnit.Point); + this.HBar.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point); this.HBar.LargeChange = 10; this.HBar.Location = new Point(5, 364); this.HBar.Maximum = 100; diff --git a/SunnyUI/Controls/UIIntegerUpDown.designer.cs b/SunnyUI/Controls/UIIntegerUpDown.designer.cs index 250fb306..d23b035a 100644 --- a/SunnyUI/Controls/UIIntegerUpDown.designer.cs +++ b/SunnyUI/Controls/UIIntegerUpDown.designer.cs @@ -37,7 +37,7 @@ // this.btnDec.Cursor = System.Windows.Forms.Cursors.Hand; this.btnDec.Dock = System.Windows.Forms.DockStyle.Left; - this.btnDec.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnDec.Font = new System.Drawing.Font("宋体", 12F); this.btnDec.ImageInterval = 1; this.btnDec.Location = new System.Drawing.Point(0, 0); this.btnDec.Margin = new System.Windows.Forms.Padding(0); @@ -55,7 +55,7 @@ // this.btnAdd.Cursor = System.Windows.Forms.Cursors.Hand; this.btnAdd.Dock = System.Windows.Forms.DockStyle.Right; - this.btnAdd.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnAdd.Font = new System.Drawing.Font("宋体", 12F); this.btnAdd.ImageInterval = 1; this.btnAdd.Location = new System.Drawing.Point(87, 0); this.btnAdd.Margin = new System.Windows.Forms.Padding(0); @@ -72,7 +72,7 @@ // pnlValue // this.pnlValue.Dock = System.Windows.Forms.DockStyle.Fill; - this.pnlValue.Font = new System.Drawing.Font("微软雅黑", 12F); + this.pnlValue.Font = new System.Drawing.Font("宋体", 12F); this.pnlValue.Location = new System.Drawing.Point(29, 0); this.pnlValue.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.pnlValue.MinimumSize = new System.Drawing.Size(1, 1); diff --git a/SunnyUI/Controls/UIMiniPagination.cs b/SunnyUI/Controls/UIMiniPagination.cs index 75ab19db..2d4f9f80 100644 --- a/SunnyUI/Controls/UIMiniPagination.cs +++ b/SunnyUI/Controls/UIMiniPagination.cs @@ -358,7 +358,7 @@ namespace Sunny.UI // b0 // this.b0.Cursor = System.Windows.Forms.Cursors.Hand; - this.b0.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b0.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b0.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.b0.Location = new System.Drawing.Point(3, 4); this.b0.MinimumSize = new System.Drawing.Size(1, 1); @@ -375,7 +375,7 @@ namespace Sunny.UI // b1 // this.b1.Cursor = System.Windows.Forms.Cursors.Hand; - this.b1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b1.Location = new System.Drawing.Point(81, 4); this.b1.MinimumSize = new System.Drawing.Size(1, 1); this.b1.Name = "b1"; @@ -389,7 +389,7 @@ namespace Sunny.UI // b3 // this.b3.Cursor = System.Windows.Forms.Cursors.Hand; - this.b3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b3.Location = new System.Drawing.Point(145, 4); this.b3.MinimumSize = new System.Drawing.Size(1, 1); this.b3.Name = "b3"; @@ -403,7 +403,7 @@ namespace Sunny.UI // b2 // this.b2.Cursor = System.Windows.Forms.Cursors.Hand; - this.b2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b2.Location = new System.Drawing.Point(113, 4); this.b2.MinimumSize = new System.Drawing.Size(1, 1); this.b2.Name = "b2"; @@ -417,7 +417,7 @@ namespace Sunny.UI // b7 // this.b7.Cursor = System.Windows.Forms.Cursors.Hand; - this.b7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b7.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b7.Location = new System.Drawing.Point(273, 4); this.b7.MinimumSize = new System.Drawing.Size(1, 1); this.b7.Name = "b7"; @@ -431,7 +431,7 @@ namespace Sunny.UI // b6 // this.b6.Cursor = System.Windows.Forms.Cursors.Hand; - this.b6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b6.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b6.Location = new System.Drawing.Point(241, 4); this.b6.MinimumSize = new System.Drawing.Size(1, 1); this.b6.Name = "b6"; @@ -445,7 +445,7 @@ namespace Sunny.UI // b5 // this.b5.Cursor = System.Windows.Forms.Cursors.Hand; - this.b5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b5.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b5.Location = new System.Drawing.Point(209, 4); this.b5.MinimumSize = new System.Drawing.Size(1, 1); this.b5.Name = "b5"; @@ -459,7 +459,7 @@ namespace Sunny.UI // b4 // this.b4.Cursor = System.Windows.Forms.Cursors.Hand; - this.b4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b4.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b4.Location = new System.Drawing.Point(177, 4); this.b4.MinimumSize = new System.Drawing.Size(1, 1); this.b4.Name = "b4"; @@ -473,7 +473,7 @@ namespace Sunny.UI // b15 // this.b15.Cursor = System.Windows.Forms.Cursors.Hand; - this.b15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b15.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b15.Location = new System.Drawing.Point(529, 4); this.b15.MinimumSize = new System.Drawing.Size(1, 1); this.b15.Name = "b15"; @@ -487,7 +487,7 @@ namespace Sunny.UI // b14 // this.b14.Cursor = System.Windows.Forms.Cursors.Hand; - this.b14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b14.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b14.Location = new System.Drawing.Point(497, 4); this.b14.MinimumSize = new System.Drawing.Size(1, 1); this.b14.Name = "b14"; @@ -501,7 +501,7 @@ namespace Sunny.UI // b13 // this.b13.Cursor = System.Windows.Forms.Cursors.Hand; - this.b13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b13.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b13.Location = new System.Drawing.Point(465, 4); this.b13.MinimumSize = new System.Drawing.Size(1, 1); this.b13.Name = "b13"; @@ -515,7 +515,7 @@ namespace Sunny.UI // b12 // this.b12.Cursor = System.Windows.Forms.Cursors.Hand; - this.b12.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b12.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b12.Location = new System.Drawing.Point(433, 4); this.b12.MinimumSize = new System.Drawing.Size(1, 1); this.b12.Name = "b12"; @@ -529,7 +529,7 @@ namespace Sunny.UI // b11 // this.b11.Cursor = System.Windows.Forms.Cursors.Hand; - this.b11.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b11.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b11.Location = new System.Drawing.Point(401, 4); this.b11.MinimumSize = new System.Drawing.Size(1, 1); this.b11.Name = "b11"; @@ -543,7 +543,7 @@ namespace Sunny.UI // b10 // this.b10.Cursor = System.Windows.Forms.Cursors.Hand; - this.b10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b10.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b10.Location = new System.Drawing.Point(369, 4); this.b10.MinimumSize = new System.Drawing.Size(1, 1); this.b10.Name = "b10"; @@ -557,7 +557,7 @@ namespace Sunny.UI // b9 // this.b9.Cursor = System.Windows.Forms.Cursors.Hand; - this.b9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b9.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b9.Location = new System.Drawing.Point(337, 4); this.b9.MinimumSize = new System.Drawing.Size(1, 1); this.b9.Name = "b9"; @@ -571,7 +571,7 @@ namespace Sunny.UI // b8 // this.b8.Cursor = System.Windows.Forms.Cursors.Hand; - this.b8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b8.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b8.Location = new System.Drawing.Point(305, 4); this.b8.MinimumSize = new System.Drawing.Size(1, 1); this.b8.Name = "b8"; @@ -585,7 +585,7 @@ namespace Sunny.UI // b16 // this.b16.Cursor = System.Windows.Forms.Cursors.Hand; - this.b16.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b16.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b16.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.b16.Location = new System.Drawing.Point(561, 4); this.b16.MinimumSize = new System.Drawing.Size(1, 1); diff --git a/SunnyUI/Controls/UIPagination.cs b/SunnyUI/Controls/UIPagination.cs index 52544c40..3f1ebec0 100644 --- a/SunnyUI/Controls/UIPagination.cs +++ b/SunnyUI/Controls/UIPagination.cs @@ -403,7 +403,7 @@ namespace Sunny.UI // b0 // this.b0.Cursor = System.Windows.Forms.Cursors.Hand; - this.b0.Font = new System.Drawing.Font("微软雅黑", 10.5F); + this.b0.Font = new System.Drawing.Font("宋体", 10.5F); this.b0.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.b0.Location = new System.Drawing.Point(3, 3); this.b0.MinimumSize = new System.Drawing.Size(1, 1); @@ -416,13 +416,13 @@ namespace Sunny.UI this.b0.TagString = "<"; this.b0.Text = "上一页"; this.b0.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.b0.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.b0.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.b0.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // // b1 // this.b1.Cursor = System.Windows.Forms.Cursors.Hand; - this.b1.Font = new System.Drawing.Font("微软雅黑", 12F); + this.b1.Font = new System.Drawing.Font("宋体", 12F); this.b1.Location = new System.Drawing.Point(81, 3); this.b1.MinimumSize = new System.Drawing.Size(1, 1); this.b1.Name = "b1"; @@ -431,13 +431,13 @@ namespace Sunny.UI this.b1.Symbol = 0; this.b1.TabIndex = 1; this.b1.Text = "0"; - this.b1.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.b1.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.b1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // // b3 // this.b3.Cursor = System.Windows.Forms.Cursors.Hand; - this.b3.Font = new System.Drawing.Font("微软雅黑", 12F); + this.b3.Font = new System.Drawing.Font("宋体", 12F); this.b3.Location = new System.Drawing.Point(145, 3); this.b3.MinimumSize = new System.Drawing.Size(1, 1); this.b3.Name = "b3"; @@ -446,13 +446,13 @@ namespace Sunny.UI this.b3.Symbol = 0; this.b3.TabIndex = 3; this.b3.Text = "0"; - this.b3.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.b3.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.b3.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // // b2 // this.b2.Cursor = System.Windows.Forms.Cursors.Hand; - this.b2.Font = new System.Drawing.Font("微软雅黑", 12F); + this.b2.Font = new System.Drawing.Font("宋体", 12F); this.b2.Location = new System.Drawing.Point(113, 3); this.b2.MinimumSize = new System.Drawing.Size(1, 1); this.b2.Name = "b2"; @@ -461,13 +461,13 @@ namespace Sunny.UI this.b2.Symbol = 0; this.b2.TabIndex = 2; this.b2.Text = "0"; - this.b2.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.b2.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.b2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // // b7 // this.b7.Cursor = System.Windows.Forms.Cursors.Hand; - this.b7.Font = new System.Drawing.Font("微软雅黑", 12F); + this.b7.Font = new System.Drawing.Font("宋体", 12F); this.b7.Location = new System.Drawing.Point(273, 3); this.b7.MinimumSize = new System.Drawing.Size(1, 1); this.b7.Name = "b7"; @@ -476,13 +476,13 @@ namespace Sunny.UI this.b7.Symbol = 0; this.b7.TabIndex = 7; this.b7.Text = "0"; - this.b7.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.b7.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.b7.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // // b6 // this.b6.Cursor = System.Windows.Forms.Cursors.Hand; - this.b6.Font = new System.Drawing.Font("微软雅黑", 12F); + this.b6.Font = new System.Drawing.Font("宋体", 12F); this.b6.Location = new System.Drawing.Point(241, 3); this.b6.MinimumSize = new System.Drawing.Size(1, 1); this.b6.Name = "b6"; @@ -491,13 +491,13 @@ namespace Sunny.UI this.b6.Symbol = 0; this.b6.TabIndex = 6; this.b6.Text = "0"; - this.b6.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.b6.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.b6.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // // b5 // this.b5.Cursor = System.Windows.Forms.Cursors.Hand; - this.b5.Font = new System.Drawing.Font("微软雅黑", 12F); + this.b5.Font = new System.Drawing.Font("宋体", 12F); this.b5.Location = new System.Drawing.Point(209, 3); this.b5.MinimumSize = new System.Drawing.Size(1, 1); this.b5.Name = "b5"; @@ -506,13 +506,13 @@ namespace Sunny.UI this.b5.Symbol = 0; this.b5.TabIndex = 5; this.b5.Text = "0"; - this.b5.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.b5.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.b5.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // // b4 // this.b4.Cursor = System.Windows.Forms.Cursors.Hand; - this.b4.Font = new System.Drawing.Font("微软雅黑", 12F); + this.b4.Font = new System.Drawing.Font("宋体", 12F); this.b4.Location = new System.Drawing.Point(177, 3); this.b4.MinimumSize = new System.Drawing.Size(1, 1); this.b4.Name = "b4"; @@ -521,13 +521,13 @@ namespace Sunny.UI this.b4.Symbol = 0; this.b4.TabIndex = 4; this.b4.Text = "0"; - this.b4.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.b4.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.b4.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // // b15 // this.b15.Cursor = System.Windows.Forms.Cursors.Hand; - this.b15.Font = new System.Drawing.Font("微软雅黑", 12F); + this.b15.Font = new System.Drawing.Font("宋体", 12F); this.b15.Location = new System.Drawing.Point(529, 3); this.b15.MinimumSize = new System.Drawing.Size(1, 1); this.b15.Name = "b15"; @@ -536,13 +536,13 @@ namespace Sunny.UI this.b15.Symbol = 0; this.b15.TabIndex = 15; this.b15.Text = "0"; - this.b15.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.b15.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.b15.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // // b14 // this.b14.Cursor = System.Windows.Forms.Cursors.Hand; - this.b14.Font = new System.Drawing.Font("微软雅黑", 12F); + this.b14.Font = new System.Drawing.Font("宋体", 12F); this.b14.Location = new System.Drawing.Point(497, 3); this.b14.MinimumSize = new System.Drawing.Size(1, 1); this.b14.Name = "b14"; @@ -551,13 +551,13 @@ namespace Sunny.UI this.b14.Symbol = 0; this.b14.TabIndex = 14; this.b14.Text = "0"; - this.b14.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.b14.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.b14.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // // b13 // this.b13.Cursor = System.Windows.Forms.Cursors.Hand; - this.b13.Font = new System.Drawing.Font("微软雅黑", 12F); + this.b13.Font = new System.Drawing.Font("宋体", 12F); this.b13.Location = new System.Drawing.Point(465, 3); this.b13.MinimumSize = new System.Drawing.Size(1, 1); this.b13.Name = "b13"; @@ -566,13 +566,13 @@ namespace Sunny.UI this.b13.Symbol = 0; this.b13.TabIndex = 13; this.b13.Text = "0"; - this.b13.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.b13.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.b13.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // // b12 // this.b12.Cursor = System.Windows.Forms.Cursors.Hand; - this.b12.Font = new System.Drawing.Font("微软雅黑", 12F); + this.b12.Font = new System.Drawing.Font("宋体", 12F); this.b12.Location = new System.Drawing.Point(433, 3); this.b12.MinimumSize = new System.Drawing.Size(1, 1); this.b12.Name = "b12"; @@ -581,13 +581,13 @@ namespace Sunny.UI this.b12.Symbol = 0; this.b12.TabIndex = 12; this.b12.Text = "0"; - this.b12.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.b12.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.b12.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // // b11 // this.b11.Cursor = System.Windows.Forms.Cursors.Hand; - this.b11.Font = new System.Drawing.Font("微软雅黑", 12F); + this.b11.Font = new System.Drawing.Font("宋体", 12F); this.b11.Location = new System.Drawing.Point(401, 3); this.b11.MinimumSize = new System.Drawing.Size(1, 1); this.b11.Name = "b11"; @@ -596,13 +596,13 @@ namespace Sunny.UI this.b11.Symbol = 0; this.b11.TabIndex = 11; this.b11.Text = "0"; - this.b11.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.b11.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.b11.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // // b10 // this.b10.Cursor = System.Windows.Forms.Cursors.Hand; - this.b10.Font = new System.Drawing.Font("微软雅黑", 12F); + this.b10.Font = new System.Drawing.Font("宋体", 12F); this.b10.Location = new System.Drawing.Point(369, 3); this.b10.MinimumSize = new System.Drawing.Size(1, 1); this.b10.Name = "b10"; @@ -611,13 +611,13 @@ namespace Sunny.UI this.b10.Symbol = 0; this.b10.TabIndex = 10; this.b10.Text = "0"; - this.b10.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.b10.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.b10.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // // b9 // this.b9.Cursor = System.Windows.Forms.Cursors.Hand; - this.b9.Font = new System.Drawing.Font("微软雅黑", 12F); + this.b9.Font = new System.Drawing.Font("宋体", 12F); this.b9.Location = new System.Drawing.Point(337, 3); this.b9.MinimumSize = new System.Drawing.Size(1, 1); this.b9.Name = "b9"; @@ -626,13 +626,13 @@ namespace Sunny.UI this.b9.Symbol = 0; this.b9.TabIndex = 9; this.b9.Text = "0"; - this.b9.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.b9.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.b9.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // // b8 // this.b8.Cursor = System.Windows.Forms.Cursors.Hand; - this.b8.Font = new System.Drawing.Font("微软雅黑", 12F); + this.b8.Font = new System.Drawing.Font("宋体", 12F); this.b8.Location = new System.Drawing.Point(305, 3); this.b8.MinimumSize = new System.Drawing.Size(1, 1); this.b8.Name = "b8"; @@ -641,13 +641,13 @@ namespace Sunny.UI this.b8.Symbol = 0; this.b8.TabIndex = 8; this.b8.Text = "0"; - this.b8.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.b8.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.b8.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // // b16 // this.b16.Cursor = System.Windows.Forms.Cursors.Hand; - this.b16.Font = new System.Drawing.Font("微软雅黑", 10.5F); + this.b16.Font = new System.Drawing.Font("宋体", 10.5F); this.b16.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.b16.Location = new System.Drawing.Point(561, 3); this.b16.MinimumSize = new System.Drawing.Size(1, 1); @@ -660,7 +660,7 @@ namespace Sunny.UI this.b16.TagString = ">"; this.b16.Text = "下一页"; this.b16.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.b16.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.b16.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.b16.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); this.b16.LocationChanged += new System.EventHandler(this.b16_LocationChanged); // @@ -670,7 +670,7 @@ namespace Sunny.UI this.p1.Controls.Add(this.btnSelect); this.p1.Controls.Add(this.uiLabel2); this.p1.Controls.Add(this.uiLabel1); - this.p1.Font = new System.Drawing.Font("微软雅黑", 12F); + this.p1.Font = new System.Drawing.Font("宋体", 12F); this.p1.Location = new System.Drawing.Point(727, 3); this.p1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.p1.MinimumSize = new System.Drawing.Size(1, 1); @@ -688,7 +688,7 @@ namespace Sunny.UI // this.edtPage.Cursor = System.Windows.Forms.Cursors.IBeam; this.edtPage.DoubleValue = 10D; - this.edtPage.Font = new System.Drawing.Font("微软雅黑", 12F); + this.edtPage.Font = new System.Drawing.Font("宋体", 12F); this.edtPage.IntValue = 10; this.edtPage.Location = new System.Drawing.Point(28, 0); this.edtPage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); @@ -707,7 +707,7 @@ namespace Sunny.UI // btnSelect // this.btnSelect.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnSelect.Font = new System.Drawing.Font("微软雅黑", 10.5F); + this.btnSelect.Font = new System.Drawing.Font("宋体", 10.5F); this.btnSelect.Location = new System.Drawing.Point(111, 0); this.btnSelect.MinimumSize = new System.Drawing.Size(1, 1); this.btnSelect.Name = "btnSelect"; @@ -715,7 +715,7 @@ namespace Sunny.UI this.btnSelect.Symbol = 0; this.btnSelect.TabIndex = 3; this.btnSelect.Text = "确定"; - this.btnSelect.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSelect.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSelect.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click); // @@ -723,7 +723,7 @@ namespace Sunny.UI // this.uiLabel2.AutoSize = true; this.uiLabel2.BackColor = System.Drawing.Color.Transparent; - this.uiLabel2.Font = new System.Drawing.Font("微软雅黑", 10.5F); + this.uiLabel2.Font = new System.Drawing.Font("宋体", 10.5F); this.uiLabel2.Location = new System.Drawing.Point(81, 4); this.uiLabel2.Name = "uiLabel2"; this.uiLabel2.Size = new System.Drawing.Size(23, 20); @@ -736,7 +736,7 @@ namespace Sunny.UI // this.uiLabel1.AutoSize = true; this.uiLabel1.BackColor = System.Drawing.Color.Transparent; - this.uiLabel1.Font = new System.Drawing.Font("微软雅黑", 10.5F); + this.uiLabel1.Font = new System.Drawing.Font("宋体", 10.5F); this.uiLabel1.Location = new System.Drawing.Point(5, 4); this.uiLabel1.Name = "uiLabel1"; this.uiLabel1.Size = new System.Drawing.Size(23, 20); diff --git a/SunnyUI/Controls/UIRichTextBox.cs b/SunnyUI/Controls/UIRichTextBox.cs index 1f0cb0ae..cfd4f748 100644 --- a/SunnyUI/Controls/UIRichTextBox.cs +++ b/SunnyUI/Controls/UIRichTextBox.cs @@ -502,7 +502,7 @@ namespace Sunny.UI // // bar // - this.bar.Font = new System.Drawing.Font("微软雅黑", 12F); + this.bar.Font = new System.Drawing.Font("宋体", 12F); this.bar.Location = new System.Drawing.Point(247, 4); this.bar.Name = "bar"; this.bar.Size = new System.Drawing.Size(19, 173); diff --git a/SunnyUI/Controls/UIToolTip.cs b/SunnyUI/Controls/UIToolTip.cs index 3bfe6686..79311943 100644 --- a/SunnyUI/Controls/UIToolTip.cs +++ b/SunnyUI/Controls/UIToolTip.cs @@ -58,10 +58,10 @@ namespace Sunny.UI } [DefaultValue(typeof(Font), "微软雅黑, 9pt"), Description("字体"), Category("SunnyUI")] - public Font Font { get; set; } = new Font("微软雅黑", 9); + public Font Font { get; set; } = new Font("宋体", 9); [DefaultValue(typeof(Font), "微软雅黑, 12pt"), Description("标题字体"), Category("SunnyUI")] - public Font TitleFont { get; set; } = new Font("微软雅黑", 12); + public Font TitleFont { get; set; } = new Font("宋体", 12); [DefaultValue(typeof(Color), "239, 239, 239"), Description("边框颜色"), Category("SunnyUI")] public Color RectColor { get; set; } = UIChartStyles.Dark.ForeColor; diff --git a/SunnyUI/Controls/UITransfer.Designer.cs b/SunnyUI/Controls/UITransfer.Designer.cs index 080a184b..b8c8aabe 100644 --- a/SunnyUI/Controls/UITransfer.Designer.cs +++ b/SunnyUI/Controls/UITransfer.Designer.cs @@ -42,7 +42,7 @@ namespace Sunny.UI // this.b1.BackColor = System.Drawing.Color.Transparent; this.b1.Cursor = System.Windows.Forms.Cursors.Hand; - this.b1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b1.Location = new System.Drawing.Point(228, 85); this.b1.Margin = new System.Windows.Forms.Padding(0); this.b1.MinimumSize = new System.Drawing.Size(1, 1); @@ -59,7 +59,7 @@ namespace Sunny.UI // this.b2.BackColor = System.Drawing.Color.Transparent; this.b2.Cursor = System.Windows.Forms.Cursors.Hand; - this.b2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b2.Location = new System.Drawing.Point(228, 135); this.b2.Margin = new System.Windows.Forms.Padding(0); this.b2.MinimumSize = new System.Drawing.Size(1, 1); @@ -76,7 +76,7 @@ namespace Sunny.UI // this.b3.BackColor = System.Drawing.Color.Transparent; this.b3.Cursor = System.Windows.Forms.Cursors.Hand; - this.b3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b3.Location = new System.Drawing.Point(228, 183); this.b3.Margin = new System.Windows.Forms.Padding(0); this.b3.MinimumSize = new System.Drawing.Size(1, 1); @@ -93,7 +93,7 @@ namespace Sunny.UI // this.b4.BackColor = System.Drawing.Color.Transparent; this.b4.Cursor = System.Windows.Forms.Cursors.Hand; - this.b4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.b4.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.b4.Location = new System.Drawing.Point(228, 233); this.b4.Margin = new System.Windows.Forms.Padding(0); this.b4.MinimumSize = new System.Drawing.Size(1, 1); @@ -111,7 +111,7 @@ namespace Sunny.UI this.l1.BackColor = System.Drawing.Color.Transparent; this.l1.Dock = System.Windows.Forms.DockStyle.Left; this.l1.FillColor = System.Drawing.Color.White; - this.l1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.l1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.l1.Location = new System.Drawing.Point(1, 1); this.l1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.l1.MinimumSize = new System.Drawing.Size(1, 1); @@ -131,7 +131,7 @@ namespace Sunny.UI this.l2.BackColor = System.Drawing.Color.Transparent; this.l2.Dock = System.Windows.Forms.DockStyle.Right; this.l2.FillColor = System.Drawing.Color.White; - this.l2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.l2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.l2.Location = new System.Drawing.Point(289, 1); this.l2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.l2.MinimumSize = new System.Drawing.Size(1, 1); diff --git a/SunnyUI/Controls/UITreeView.cs b/SunnyUI/Controls/UITreeView.cs index c7937c1d..8970235f 100644 --- a/SunnyUI/Controls/UITreeView.cs +++ b/SunnyUI/Controls/UITreeView.cs @@ -839,7 +839,7 @@ namespace Sunny.UI // // Bar // - Bar.Font = new Font("微软雅黑", 12F); + Bar.Font = new Font("宋体", 12F); Bar.Location = new Point(247, 3); Bar.Name = "Bar"; Bar.Size = new Size(19, 173); @@ -851,7 +851,7 @@ namespace Sunny.UI // // HBar // - HBar.Font = new Font("微软雅黑", 12F); + HBar.Font = new Font("宋体", 12F); HBar.Location = new Point(247, 3); HBar.Name = "HBar"; HBar.Size = new Size(173, 19); diff --git a/SunnyUI/Forms/UIDataGridViewForm.Designer.cs b/SunnyUI/Forms/UIDataGridViewForm.Designer.cs index d45719ea..b4860d3a 100644 --- a/SunnyUI/Forms/UIDataGridViewForm.Designer.cs +++ b/SunnyUI/Forms/UIDataGridViewForm.Designer.cs @@ -51,7 +51,7 @@ this.Grid.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White; dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; @@ -60,7 +60,7 @@ this.Grid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); @@ -68,13 +68,13 @@ this.Grid.DefaultCellStyle = dataGridViewCellStyle3; this.Grid.Dock = System.Windows.Forms.DockStyle.Fill; this.Grid.EnableHeadersVisualStyles = false; - this.Grid.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.Grid.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.Grid.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.Grid.Location = new System.Drawing.Point(0, 35); this.Grid.Name = "Grid"; dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.White; @@ -94,7 +94,7 @@ this.Panel.Controls.Add(this.uiSymbolButton2); this.Panel.Controls.Add(this.uiSymbolButton1); this.Panel.Dock = System.Windows.Forms.DockStyle.Bottom; - this.Panel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.Panel.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.Panel.Location = new System.Drawing.Point(0, 546); this.Panel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.Panel.MinimumSize = new System.Drawing.Size(1, 1); @@ -110,7 +110,7 @@ // uiSymbolButton4 // this.uiSymbolButton4.Cursor = System.Windows.Forms.Cursors.Hand; - this.uiSymbolButton4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.uiSymbolButton4.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.uiSymbolButton4.Location = new System.Drawing.Point(345, 10); this.uiSymbolButton4.MinimumSize = new System.Drawing.Size(1, 1); this.uiSymbolButton4.Name = "uiSymbolButton4"; @@ -124,7 +124,7 @@ // uiSymbolButton3 // this.uiSymbolButton3.Cursor = System.Windows.Forms.Cursors.Hand; - this.uiSymbolButton3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.uiSymbolButton3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.uiSymbolButton3.Location = new System.Drawing.Point(235, 10); this.uiSymbolButton3.MinimumSize = new System.Drawing.Size(1, 1); this.uiSymbolButton3.Name = "uiSymbolButton3"; @@ -137,7 +137,7 @@ // uiSymbolButton2 // this.uiSymbolButton2.Cursor = System.Windows.Forms.Cursors.Hand; - this.uiSymbolButton2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.uiSymbolButton2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.uiSymbolButton2.Location = new System.Drawing.Point(125, 10); this.uiSymbolButton2.MinimumSize = new System.Drawing.Size(1, 1); this.uiSymbolButton2.Name = "uiSymbolButton2"; @@ -150,7 +150,7 @@ // uiSymbolButton1 // this.uiSymbolButton1.Cursor = System.Windows.Forms.Cursors.Hand; - this.uiSymbolButton1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.uiSymbolButton1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.uiSymbolButton1.Location = new System.Drawing.Point(15, 10); this.uiSymbolButton1.MinimumSize = new System.Drawing.Size(1, 1); this.uiSymbolButton1.Name = "uiSymbolButton1"; diff --git a/SunnyUI/Forms/UIEditForm.Designer.cs b/SunnyUI/Forms/UIEditForm.Designer.cs index 0316c65a..4c0e5ce3 100644 --- a/SunnyUI/Forms/UIEditForm.Designer.cs +++ b/SunnyUI/Forms/UIEditForm.Designer.cs @@ -40,7 +40,7 @@ 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.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); @@ -56,7 +56,7 @@ // 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.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); @@ -74,7 +74,7 @@ // 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.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); diff --git a/SunnyUI/Forms/UIForm.designer.cs b/SunnyUI/Forms/UIForm.designer.cs index 70c40661..9da7ea6e 100644 --- a/SunnyUI/Forms/UIForm.designer.cs +++ b/SunnyUI/Forms/UIForm.designer.cs @@ -48,7 +48,7 @@ namespace Sunny.UI this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.ClientSize = new System.Drawing.Size(800, 480); this.DoubleBuffered = true; - this.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Name = "UIForm"; this.Padding = new System.Windows.Forms.Padding(0, 35, 0, 0); diff --git a/SunnyUI/Forms/UIInputForm.Designer.cs b/SunnyUI/Forms/UIInputForm.Designer.cs index c7bf58dc..54aae011 100644 --- a/SunnyUI/Forms/UIInputForm.Designer.cs +++ b/SunnyUI/Forms/UIInputForm.Designer.cs @@ -52,7 +52,7 @@ // 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.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); @@ -64,7 +64,7 @@ // 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.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; diff --git a/SunnyUI/Forms/UILoginForm.Designer.cs b/SunnyUI/Forms/UILoginForm.Designer.cs index b79c0acb..4ce59ed2 100644 --- a/SunnyUI/Forms/UILoginForm.Designer.cs +++ b/SunnyUI/Forms/UILoginForm.Designer.cs @@ -43,7 +43,7 @@ // uiAvatar1 // uiAvatar1.BackColor = System.Drawing.Color.Transparent; - uiAvatar1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + uiAvatar1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); uiAvatar1.Location = new System.Drawing.Point(65, 16); uiAvatar1.MinimumSize = new System.Drawing.Size(1, 1); uiAvatar1.Name = "uiAvatar1"; @@ -56,7 +56,7 @@ // uiLine1.BackColor = System.Drawing.Color.White; uiLine1.FillColor = System.Drawing.Color.White; - uiLine1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + uiLine1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); uiLine1.LineColor2 = System.Drawing.Color.FromArgb(80, 160, 255); uiLine1.Location = new System.Drawing.Point(4, 85); uiLine1.MinimumSize = new System.Drawing.Size(2, 2); @@ -73,7 +73,7 @@ // edtUser.Cursor = System.Windows.Forms.Cursors.IBeam; edtUser.EnterAsTab = true; - edtUser.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + edtUser.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); edtUser.Location = new System.Drawing.Point(4, 121); edtUser.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); edtUser.MinimumSize = new System.Drawing.Size(1, 1); @@ -91,7 +91,7 @@ // edtPassword // edtPassword.Cursor = System.Windows.Forms.Cursors.IBeam; - edtPassword.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + edtPassword.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); edtPassword.Location = new System.Drawing.Point(4, 162); edtPassword.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); edtPassword.MinimumSize = new System.Drawing.Size(1, 1); @@ -111,7 +111,7 @@ // btnLogin // btnLogin.Cursor = System.Windows.Forms.Cursors.Hand; - btnLogin.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + btnLogin.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); btnLogin.Location = new System.Drawing.Point(4, 206); btnLogin.MinimumSize = new System.Drawing.Size(1, 1); btnLogin.Name = "btnLogin"; @@ -131,7 +131,7 @@ btnCancel.FillHoverColor = System.Drawing.Color.FromArgb(235, 115, 115); btnCancel.FillPressColor = System.Drawing.Color.FromArgb(184, 64, 64); btnCancel.FillSelectedColor = System.Drawing.Color.FromArgb(184, 64, 64); - btnCancel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + btnCancel.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); btnCancel.Location = new System.Drawing.Point(100, 206); btnCancel.MinimumSize = new System.Drawing.Size(1, 1); btnCancel.Name = "btnCancel"; @@ -152,7 +152,7 @@ // lblTitle // lblTitle.BackColor = System.Drawing.Color.Transparent; - lblTitle.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + lblTitle.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); lblTitle.ForeColor = System.Drawing.Color.Navy; lblTitle.Location = new System.Drawing.Point(44, 35); lblTitle.Name = "lblTitle"; @@ -167,7 +167,7 @@ // lblSubText.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; lblSubText.BackColor = System.Drawing.Color.Transparent; - lblSubText.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + lblSubText.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); lblSubText.Location = new System.Drawing.Point(426, 421); lblSubText.Name = "lblSubText"; lblSubText.Size = new System.Drawing.Size(310, 26); @@ -184,7 +184,7 @@ uiPanel1.Controls.Add(btnCancel); uiPanel1.Controls.Add(btnLogin); uiPanel1.FillColor = System.Drawing.Color.White; - uiPanel1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + uiPanel1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); uiPanel1.Location = new System.Drawing.Point(433, 126); uiPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); uiPanel1.MinimumSize = new System.Drawing.Size(1, 1); diff --git a/SunnyUI/Forms/UIMessageForm.Designer.cs b/SunnyUI/Forms/UIMessageForm.Designer.cs index ba003e0a..b7c97a49 100644 --- a/SunnyUI/Forms/UIMessageForm.Designer.cs +++ b/SunnyUI/Forms/UIMessageForm.Designer.cs @@ -37,7 +37,7 @@ // 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.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); btnCancel.Location = new System.Drawing.Point(224, 220); btnCancel.Margin = new System.Windows.Forms.Padding(0); btnCancel.MinimumSize = new System.Drawing.Size(1, 1); @@ -45,7 +45,7 @@ btnCancel.Size = new System.Drawing.Size(224, 48); btnCancel.TabIndex = 6; btnCancel.Text = "取消"; - btnCancel.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + btnCancel.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); btnCancel.TipsText = null; btnCancel.Click += btnCancel_Click; btnCancel.MouseEnter += btnOK_MouseEnter; @@ -55,7 +55,7 @@ // 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.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); btnOK.Location = new System.Drawing.Point(2, 220); btnOK.Margin = new System.Windows.Forms.Padding(0); btnOK.MinimumSize = new System.Drawing.Size(1, 1); @@ -63,7 +63,7 @@ btnOK.Size = new System.Drawing.Size(223, 48); btnOK.TabIndex = 5; btnOK.Text = "确定"; - btnOK.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + btnOK.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); btnOK.TipsText = null; btnOK.Click += btnOK_Click; btnOK.MouseEnter += btnOK_MouseEnter; @@ -73,7 +73,7 @@ // lbMsg.BackColor = System.Drawing.Color.FromArgb(235, 243, 255); lbMsg.FillColor = System.Drawing.Color.White; - lbMsg.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + lbMsg.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); lbMsg.Location = new System.Drawing.Point(14, 50); lbMsg.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); lbMsg.MinimumSize = new System.Drawing.Size(1, 1); diff --git a/SunnyUI/Forms/UINotifier.designer.cs b/SunnyUI/Forms/UINotifier.designer.cs index 56f0ceb2..bb0442b7 100644 --- a/SunnyUI/Forms/UINotifier.designer.cs +++ b/SunnyUI/Forms/UINotifier.designer.cs @@ -48,7 +48,7 @@ // // noteContent // - this.noteContent.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); + this.noteContent.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); this.noteContent.Image = global::Sunny.UI.Properties.Resources.notifier; this.noteContent.Location = new System.Drawing.Point(43, 30); this.noteContent.Name = "noteContent"; @@ -116,7 +116,7 @@ // noteTitle // this.noteTitle.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(140)))), ((int)(((byte)(230))))); - this.noteTitle.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); + this.noteTitle.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); this.noteTitle.ForeColor = System.Drawing.Color.White; this.noteTitle.Location = new System.Drawing.Point(2, 2); this.noteTitle.Name = "noteTitle"; @@ -140,7 +140,7 @@ // icon // this.icon.BackColor = System.Drawing.Color.White; - this.icon.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.icon.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.icon.Location = new System.Drawing.Point(10, 51); this.icon.MinimumSize = new System.Drawing.Size(1, 1); this.icon.Name = "icon"; diff --git a/SunnyUI/Forms/UIProcessIndicatorForm.Designer.cs b/SunnyUI/Forms/UIProcessIndicatorForm.Designer.cs index 8cbea115..ac1ccdea 100644 --- a/SunnyUI/Forms/UIProcessIndicatorForm.Designer.cs +++ b/SunnyUI/Forms/UIProcessIndicatorForm.Designer.cs @@ -38,7 +38,7 @@ this.uiProgressIndicator1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.uiProgressIndicator1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.uiProgressIndicator1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.uiProgressIndicator1.Location = new System.Drawing.Point(5, 5); this.uiProgressIndicator1.MinimumSize = new System.Drawing.Size(1, 1); this.uiProgressIndicator1.Name = "uiProgressIndicator1"; diff --git a/SunnyUI/Forms/UISelectForm.Designer.cs b/SunnyUI/Forms/UISelectForm.Designer.cs index 155b50e2..64aa5c32 100644 --- a/SunnyUI/Forms/UISelectForm.Designer.cs +++ b/SunnyUI/Forms/UISelectForm.Designer.cs @@ -51,7 +51,7 @@ // 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.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); @@ -64,7 +64,7 @@ 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.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); diff --git a/SunnyUI/Forms/UIStatusForm.Designer.cs b/SunnyUI/Forms/UIStatusForm.Designer.cs index d8c631fd..f3efcebf 100644 --- a/SunnyUI/Forms/UIStatusForm.Designer.cs +++ b/SunnyUI/Forms/UIStatusForm.Designer.cs @@ -36,7 +36,7 @@ // this.labelDescription.AutoSize = true; this.labelDescription.BackColor = System.Drawing.Color.Transparent; - this.labelDescription.Font = new System.Drawing.Font("微软雅黑", 12F); + 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); @@ -46,7 +46,7 @@ // // processBar // - this.processBar.Font = new System.Drawing.Font("微软雅黑", 12F); + this.processBar.Font = new System.Drawing.Font("宋体", 12F); this.processBar.Location = new System.Drawing.Point(32, 91); this.processBar.MinimumSize = new System.Drawing.Size(70, 23); this.processBar.Name = "processBar"; diff --git a/SunnyUI/Forms/UIWaitForm.designer.cs b/SunnyUI/Forms/UIWaitForm.designer.cs index f8da3174..470b412d 100644 --- a/SunnyUI/Forms/UIWaitForm.designer.cs +++ b/SunnyUI/Forms/UIWaitForm.designer.cs @@ -36,7 +36,7 @@ // this.labelDescription.AutoSize = true; this.labelDescription.BackColor = System.Drawing.Color.Transparent; - this.labelDescription.Font = new System.Drawing.Font("微软雅黑", 12F); + 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); @@ -46,7 +46,7 @@ // // Bar // - this.Bar.Font = new System.Drawing.Font("微软雅黑", 12F); + 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"; diff --git a/SunnyUI/Frames/UIAsideHeaderMainFooterFrame.Designer.cs b/SunnyUI/Frames/UIAsideHeaderMainFooterFrame.Designer.cs index 1c822109..2af9fbae 100644 --- a/SunnyUI/Frames/UIAsideHeaderMainFooterFrame.Designer.cs +++ b/SunnyUI/Frames/UIAsideHeaderMainFooterFrame.Designer.cs @@ -34,7 +34,7 @@ // Footer // this.Footer.Dock = System.Windows.Forms.DockStyle.Bottom; - this.Footer.Font = new System.Drawing.Font("微软雅黑", 12F); + this.Footer.Font = new System.Drawing.Font("宋体", 12F); this.Footer.Location = new System.Drawing.Point(250, 394); this.Footer.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.Footer.Name = "Footer"; diff --git a/SunnyUI/Frames/UIAsideHeaderMainFrame.Designer.cs b/SunnyUI/Frames/UIAsideHeaderMainFrame.Designer.cs index 55d963e3..7387e97c 100644 --- a/SunnyUI/Frames/UIAsideHeaderMainFrame.Designer.cs +++ b/SunnyUI/Frames/UIAsideHeaderMainFrame.Designer.cs @@ -38,7 +38,7 @@ // Header // this.Header.Dock = System.Windows.Forms.DockStyle.Top; - this.Header.Font = new System.Drawing.Font("微软雅黑", 12F); + this.Header.Font = new System.Drawing.Font("宋体", 12F); this.Header.Location = new System.Drawing.Point(250, 35); this.Header.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.Header.Name = "Header"; diff --git a/SunnyUI/Frames/UIAsideMainFrame.Designer.cs b/SunnyUI/Frames/UIAsideMainFrame.Designer.cs index 9593e926..e3373968 100644 --- a/SunnyUI/Frames/UIAsideMainFrame.Designer.cs +++ b/SunnyUI/Frames/UIAsideMainFrame.Designer.cs @@ -37,7 +37,7 @@ this.Aside.BorderStyle = System.Windows.Forms.BorderStyle.None; this.Aside.Dock = System.Windows.Forms.DockStyle.Left; this.Aside.DrawMode = System.Windows.Forms.TreeViewDrawMode.OwnerDrawAll; - this.Aside.Font = new System.Drawing.Font("微软雅黑", 12F); + this.Aside.Font = new System.Drawing.Font("宋体", 12F); this.Aside.ItemHeight = 50; this.Aside.Location = new System.Drawing.Point(0, 35); this.Aside.Name = "Aside"; diff --git a/SunnyUI/Frames/UIHeaderAsideMainFooterFrame.Designer.cs b/SunnyUI/Frames/UIHeaderAsideMainFooterFrame.Designer.cs index ea6393b0..5486c9a5 100644 --- a/SunnyUI/Frames/UIHeaderAsideMainFooterFrame.Designer.cs +++ b/SunnyUI/Frames/UIHeaderAsideMainFooterFrame.Designer.cs @@ -38,7 +38,7 @@ // Footer // this.Footer.Dock = System.Windows.Forms.DockStyle.Bottom; - this.Footer.Font = new System.Drawing.Font("微软雅黑", 12F); + this.Footer.Font = new System.Drawing.Font("宋体", 12F); this.Footer.Location = new System.Drawing.Point(250, 394); this.Footer.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.Footer.Name = "Footer"; diff --git a/SunnyUI/Frames/UIHeaderAsideMainFrame.Designer.cs b/SunnyUI/Frames/UIHeaderAsideMainFrame.Designer.cs index 030fddae..aae635c5 100644 --- a/SunnyUI/Frames/UIHeaderAsideMainFrame.Designer.cs +++ b/SunnyUI/Frames/UIHeaderAsideMainFrame.Designer.cs @@ -42,7 +42,7 @@ this.Aside.BorderStyle = System.Windows.Forms.BorderStyle.None; this.Aside.Dock = System.Windows.Forms.DockStyle.Left; this.Aside.DrawMode = System.Windows.Forms.TreeViewDrawMode.OwnerDrawAll; - this.Aside.Font = new System.Drawing.Font("微软雅黑", 12F); + this.Aside.Font = new System.Drawing.Font("宋体", 12F); this.Aside.ItemHeight = 50; this.Aside.Location = new System.Drawing.Point(0, 145); this.Aside.Name = "Aside"; diff --git a/SunnyUI/Frames/UIHeaderMainFooterFrame.Designer.cs b/SunnyUI/Frames/UIHeaderMainFooterFrame.Designer.cs index c80e86b5..02393dfd 100644 --- a/SunnyUI/Frames/UIHeaderMainFooterFrame.Designer.cs +++ b/SunnyUI/Frames/UIHeaderMainFooterFrame.Designer.cs @@ -40,7 +40,7 @@ // this.Footer.Dock = System.Windows.Forms.DockStyle.Bottom; this.Footer.FillColor = System.Drawing.Color.White; - this.Footer.Font = new System.Drawing.Font("微软雅黑", 12F); + this.Footer.Font = new System.Drawing.Font("宋体", 12F); this.Footer.Location = new System.Drawing.Point(0, 394); this.Footer.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.Footer.Name = "Footer"; diff --git a/SunnyUI/Frames/UIHeaderMainFrame.Designer.cs b/SunnyUI/Frames/UIHeaderMainFrame.Designer.cs index 549bd86e..2c0c7177 100644 --- a/SunnyUI/Frames/UIHeaderMainFrame.Designer.cs +++ b/SunnyUI/Frames/UIHeaderMainFrame.Designer.cs @@ -34,7 +34,7 @@ // Header // this.Header.Dock = System.Windows.Forms.DockStyle.Top; - this.Header.Font = new System.Drawing.Font("微软雅黑", 12F); + this.Header.Font = new System.Drawing.Font("宋体", 12F); this.Header.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); this.Header.Location = new System.Drawing.Point(1, 35); this.Header.MenuHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); diff --git a/SunnyUI/Frames/UIMainFrame.Designer.cs b/SunnyUI/Frames/UIMainFrame.Designer.cs index 6d1834ae..d296ac2a 100644 --- a/SunnyUI/Frames/UIMainFrame.Designer.cs +++ b/SunnyUI/Frames/UIMainFrame.Designer.cs @@ -40,7 +40,7 @@ this.MainContainer.Controls.Add(this.tabPage2); this.MainContainer.Dock = System.Windows.Forms.DockStyle.Fill; this.MainContainer.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed; - this.MainContainer.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.MainContainer.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.MainContainer.ItemSize = new System.Drawing.Size(150, 40); this.MainContainer.Location = new System.Drawing.Point(0, 35); this.MainContainer.MainPage = ""; diff --git a/SunnyUI/Frames/UIPage.Designer.cs b/SunnyUI/Frames/UIPage.Designer.cs index 961bf6a2..906532a0 100644 --- a/SunnyUI/Frames/UIPage.Designer.cs +++ b/SunnyUI/Frames/UIPage.Designer.cs @@ -37,7 +37,7 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.ClientSize = new System.Drawing.Size(802, 460); this.DoubleBuffered = true; - this.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Margin = new System.Windows.Forms.Padding(5); this.Name = "UIPage"; diff --git a/SunnyUI/Style/UIDPIScale.cs b/SunnyUI/Style/UIDPIScale.cs index 8ce3233c..2bc96bbb 100644 --- a/SunnyUI/Style/UIDPIScale.cs +++ b/SunnyUI/Style/UIDPIScale.cs @@ -39,7 +39,7 @@ namespace Sunny.UI using Bitmap bmp = new Bitmap(1, 1); using Graphics g = bmp.Graphics(); dpiScale = g.DpiX / 96.0f; - if (UIStyles.GlobalFont) dpiScale = dpiScale / (UIStyles.FontScale / 100.0f); + if (UIStyles.GlobalFont) dpiScale = dpiScale / (UIStyles.GlobalFontScale / 100.0f); return dpiScale; } @@ -67,25 +67,17 @@ namespace Sunny.UI { if (UIStyles.GlobalFont) { - if (font.GdiCharSet == 134) - return new Font(UIStyles.FontName, fontSize / DPIScale(), font.Style, font.Unit, font.GdiCharSet); - else - return new Font(UIStyles.FontName, fontSize / DPIScale()); + byte gdiCharSet = UIStyles.GetGdiCharSet(UIStyles.GlobalFontName); + return new Font(UIStyles.GlobalFontName, fontSize / DPIScale(), font.Style, font.Unit, gdiCharSet); } else { - if (font.GdiCharSet == 134) - return new Font(font.FontFamily, fontSize / DPIScale(), font.Style, font.Unit, font.GdiCharSet); - else - return new Font(font.FontFamily, fontSize / DPIScale()); + return new Font(font.FontFamily, fontSize / DPIScale(), font.Style, font.Unit, font.GdiCharSet); } } else { - if (font.GdiCharSet == 134) - return new Font(font.FontFamily, fontSize, font.Style, font.Unit, font.GdiCharSet); - else - return new Font(font.FontFamily, fontSize); + return new Font(font.FontFamily, fontSize, font.Style, font.Unit, font.GdiCharSet); } } diff --git a/SunnyUI/Style/UIStyleManager.cs b/SunnyUI/Style/UIStyleManager.cs index b6ecd869..05c0a38a 100644 --- a/SunnyUI/Style/UIStyleManager.cs +++ b/SunnyUI/Style/UIStyleManager.cs @@ -81,20 +81,20 @@ namespace Sunny.UI [Editor("System.Drawing.Design.FontNameEditor", "System.Drawing.Design.UITypeEditor")] [TypeConverter(typeof(FontNameConverter))] - [DefaultValue("微软雅黑")] + [DefaultValue("宋体")] [Description("全局字体设置开启后,可调字体名称"), Category("SunnyUI")] public string GlobalFontName { - get => UIStyles.FontName; - set => UIStyles.FontName = value; + get => UIStyles.GlobalFontName; + set => UIStyles.GlobalFontName = value; } [DefaultValue(100)] [Description("全局字体设置开启后,可调字体大小缩放百分比,默认100%"), Category("SunnyUI")] public int GlobalFontScale { - get => UIStyles.FontScale; - set => UIStyles.FontScale = value; + get => UIStyles.GlobalFontScale; + set => UIStyles.GlobalFontScale = value; } [DefaultValue(false)] diff --git a/SunnyUI/Style/UIStyles.cs b/SunnyUI/Style/UIStyles.cs index 070bc801..21572f82 100644 --- a/SunnyUI/Style/UIStyles.cs +++ b/SunnyUI/Style/UIStyles.cs @@ -21,6 +21,7 @@ * 2021-07-18: V3.0.5 增加多彩主题,以颜色深色,文字白色为主 * 2021-09-24: V3.0.7 修改默认字体的GdiCharSet * 2021-10-16: V3.0.8 增加系统DPI缩放自适应 + * 2023-08-28: V3.4.2 修改全局字体为系统默认:System.Drawing.SystemFonts.DefaultFont ******************************************************************************/ using System; @@ -49,9 +50,9 @@ namespace Sunny.UI [Editor("System.Drawing.Design.FontNameEditor", "System.Drawing.Design.UITypeEditor")] [TypeConverter(typeof(FontNameConverter))] - internal static string FontName { get; set; } = "微软雅黑"; + public static string GlobalFontName { get; set; } = "宋体"; - internal static int FontScale { get; set; } = 100; + public static int GlobalFontScale { get; set; } = 100; private static readonly ConcurrentDictionary FontCharSets = new ConcurrentDictionary(); @@ -110,14 +111,15 @@ namespace Sunny.UI } internal static float DefaultFontSize = 12; - public static float DefaultSubFontSize = 9; + internal static float DefaultSubFontSize = 9; + /// /// 默认字体 /// internal static Font Font() { - byte gdiCharSet = GetGdiCharSet("微软雅黑"); - return new Font(familyName: "微软雅黑", DefaultFontSize, FontStyle.Regular, GraphicsUnit.Point, gdiCharSet); + byte gdiCharSet = GetGdiCharSet(System.Drawing.SystemFonts.DefaultFont.Name); + return new Font(familyName: System.Drawing.SystemFonts.DefaultFont.Name, DefaultFontSize, FontStyle.Regular, GraphicsUnit.Point, gdiCharSet); } /// @@ -125,8 +127,8 @@ namespace Sunny.UI /// internal static Font SubFont() { - byte gdiCharSet = GetGdiCharSet("微软雅黑"); - return new Font("微软雅黑", DefaultSubFontSize, FontStyle.Regular, GraphicsUnit.Point, gdiCharSet); + byte gdiCharSet = GetGdiCharSet(System.Drawing.SystemFonts.DefaultFont.Name); + return new Font(System.Drawing.SystemFonts.DefaultFont.Name, DefaultSubFontSize, FontStyle.Regular, GraphicsUnit.Point, gdiCharSet); } public static List PopularStyles()