diff --git a/SunnyUI/Controls/UIAvatar.resx b/SunnyUI/Controls/UIAvatar.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/SunnyUI/Controls/UIAvatar.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SunnyUI/Controls/UICalendar.cs b/SunnyUI/Controls/UICalendar.cs index ce2fb4d4..60ada0da 100644 --- a/SunnyUI/Controls/UICalendar.cs +++ b/SunnyUI/Controls/UICalendar.cs @@ -98,6 +98,7 @@ namespace Sunny.UI TopPanel.Name = "TopPanel"; TopPanel.RadiusSides = UICornerRadiusSides.None; TopPanel.RectSides = ToolStripStatusLabelBorderSides.Left | ToolStripStatusLabelBorderSides.Top | ToolStripStatusLabelBorderSides.Right; + TopPanel.ShowBuiltInResources = true; TopPanel.Size = new Size(461, 31); TopPanel.TabIndex = 0; TopPanel.Text = "2020-05-05"; @@ -222,6 +223,7 @@ namespace Sunny.UI p1.MinimumSize = new Size(1, 1); p1.Name = "p1"; p1.RadiusSides = UICornerRadiusSides.None; + p1.ShowBuiltInResources = true; p1.Size = new Size(461, 277); p1.TabIndex = 0; p1.Text = null; @@ -236,7 +238,7 @@ namespace Sunny.UI tabPage2.Controls.Add(p2); tabPage2.Location = new Point(0, 40); tabPage2.Name = "tabPage2"; - tabPage2.Size = new Size(200, 60); + tabPage2.Size = new Size(461, 277); tabPage2.TabIndex = 1; tabPage2.Text = "tabPage2"; tabPage2.UseVisualStyleBackColor = true; @@ -251,7 +253,8 @@ namespace Sunny.UI p2.MinimumSize = new Size(1, 1); p2.Name = "p2"; p2.RadiusSides = UICornerRadiusSides.None; - p2.Size = new Size(200, 60); + p2.ShowBuiltInResources = true; + p2.Size = new Size(461, 277); p2.TabIndex = 1; p2.Text = null; p2.TextAlignment = ContentAlignment.MiddleCenter; @@ -265,7 +268,7 @@ namespace Sunny.UI tabPage3.Controls.Add(p3); tabPage3.Location = new Point(0, 40); tabPage3.Name = "tabPage3"; - tabPage3.Size = new Size(200, 60); + tabPage3.Size = new Size(461, 277); tabPage3.TabIndex = 2; tabPage3.Text = "tabPage3"; tabPage3.UseVisualStyleBackColor = true; @@ -280,7 +283,8 @@ namespace Sunny.UI p3.MinimumSize = new Size(1, 1); p3.Name = "p3"; p3.RadiusSides = UICornerRadiusSides.None; - p3.Size = new Size(200, 60); + p3.ShowBuiltInResources = true; + p3.Size = new Size(461, 277); p3.TabIndex = 2; p3.Text = null; p3.TextAlignment = ContentAlignment.MiddleCenter; @@ -295,6 +299,7 @@ namespace Sunny.UI Controls.Add(TopPanel); FillColor = Color.White; Name = "UICalendar"; + ShowBuiltInResources = true; Size = new Size(461, 348); TopPanel.ResumeLayout(false); TabControl.ResumeLayout(false); diff --git a/SunnyUI/Controls/UIColorPicker.cs b/SunnyUI/Controls/UIColorPicker.cs index 4f4bc880..102f2046 100644 --- a/SunnyUI/Controls/UIColorPicker.cs +++ b/SunnyUI/Controls/UIColorPicker.cs @@ -44,16 +44,16 @@ namespace Sunny.UI { private void InitializeComponent() { - this.SuspendLayout(); - // + SuspendLayout(); + // // UIColorPicker - // - this.DropDownStyle = UIDropDownStyle.DropDownList; - this.Name = "UIColorPicker"; - this.Padding = new Padding(0, 0, 30, 0); - this.ButtonClick += this.UIColorPicker_ButtonClick; - this.ResumeLayout(false); - this.PerformLayout(); + // + DropDownStyle = UIDropDownStyle.DropDownList; + Name = "UIColorPicker"; + ShowBuiltInResources = true; + ButtonClick += UIColorPicker_ButtonClick; + ResumeLayout(false); + PerformLayout(); } /// diff --git a/SunnyUI/Controls/UIColorPicker.resx b/SunnyUI/Controls/UIColorPicker.resx index 1af7de15..8b2ff64a 100644 --- a/SunnyUI/Controls/UIColorPicker.resx +++ b/SunnyUI/Controls/UIColorPicker.resx @@ -1,17 +1,17 @@  - diff --git a/SunnyUI/Controls/UIComboBox.Designer.cs b/SunnyUI/Controls/UIComboBox.Designer.cs index bb148e6e..3e120a25 100644 --- a/SunnyUI/Controls/UIComboBox.Designer.cs +++ b/SunnyUI/Controls/UIComboBox.Designer.cs @@ -43,6 +43,7 @@ // AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; Name = "UIComboBox"; + ShowBuiltInResources = true; KeyDown += UIComboBox_KeyDown; ButtonClick += UIComboBox_ButtonClick; FontChanged += UIComboBox_FontChanged; diff --git a/SunnyUI/Controls/UIComboBox.resx b/SunnyUI/Controls/UIComboBox.resx index f298a7be..8b2ff64a 100644 --- a/SunnyUI/Controls/UIComboBox.resx +++ b/SunnyUI/Controls/UIComboBox.resx @@ -1,4 +1,64 @@ - + + + diff --git a/SunnyUI/Controls/UIComboDataGridView.cs b/SunnyUI/Controls/UIComboDataGridView.cs index 8e9c97d1..cc4d38d9 100644 --- a/SunnyUI/Controls/UIComboDataGridView.cs +++ b/SunnyUI/Controls/UIComboDataGridView.cs @@ -46,16 +46,16 @@ namespace Sunny.UI { private void InitializeComponent() { - this.SuspendLayout(); + SuspendLayout(); // - // UIComboTreeView + // UIComboDataGridView // - this.DropDownStyle = UIDropDownStyle.DropDownList; - this.Name = "UIComboTreeView"; - this.Padding = new Padding(0, 0, 30, 0); - this.ButtonClick += UIComboDataGridView_ButtonClick; - this.ResumeLayout(false); - this.PerformLayout(); + DropDownStyle = UIDropDownStyle.DropDownList; + Name = "UIComboDataGridView"; + ShowBuiltInResources = true; + ButtonClick += UIComboDataGridView_ButtonClick; + ResumeLayout(false); + PerformLayout(); } /// diff --git a/SunnyUI/Controls/UIComboDataGridView.resx b/SunnyUI/Controls/UIComboDataGridView.resx index 1af7de15..8b2ff64a 100644 --- a/SunnyUI/Controls/UIComboDataGridView.resx +++ b/SunnyUI/Controls/UIComboDataGridView.resx @@ -1,17 +1,17 @@  - diff --git a/SunnyUI/Controls/UIComboTreeView.cs b/SunnyUI/Controls/UIComboTreeView.cs index 22a6a49c..2aac043c 100644 --- a/SunnyUI/Controls/UIComboTreeView.cs +++ b/SunnyUI/Controls/UIComboTreeView.cs @@ -53,16 +53,16 @@ namespace Sunny.UI private void InitializeComponent() { - this.SuspendLayout(); + SuspendLayout(); // // UIComboTreeView // - this.DropDownStyle = UIDropDownStyle.DropDownList; - this.Name = "UIComboTreeView"; - this.Padding = new Padding(0, 0, 30, 0); - this.ButtonClick += this.UIComboTreeView_ButtonClick; - this.ResumeLayout(false); - this.PerformLayout(); + DropDownStyle = UIDropDownStyle.DropDownList; + Name = "UIComboTreeView"; + ShowBuiltInResources = true; + ButtonClick += UIComboTreeView_ButtonClick; + ResumeLayout(false); + PerformLayout(); } /// diff --git a/SunnyUI/Controls/UIComboTreeView.resx b/SunnyUI/Controls/UIComboTreeView.resx index 1af7de15..8b2ff64a 100644 --- a/SunnyUI/Controls/UIComboTreeView.resx +++ b/SunnyUI/Controls/UIComboTreeView.resx @@ -1,17 +1,17 @@  - diff --git a/SunnyUI/Controls/UIControl.cs b/SunnyUI/Controls/UIControl.cs index b801fd09..89b02e6a 100644 --- a/SunnyUI/Controls/UIControl.cs +++ b/SunnyUI/Controls/UIControl.cs @@ -29,6 +29,7 @@ using System; using System.ComponentModel; +using System.Diagnostics; using System.Drawing; using System.Drawing.Drawing2D; using System.Runtime.InteropServices; @@ -136,16 +137,9 @@ namespace Sunny.UI { get { - if (LicenseManager.UsageMode == LicenseUsageMode.Designtime) - { - return true; - } - - if (System.Diagnostics.Process.GetCurrentProcess().ProcessName == "devenv") - { - return true; - } - + if (DesignMode) return true; + if (LicenseManager.UsageMode == LicenseUsageMode.Designtime) return true; + if (Process.GetCurrentProcess().ProcessName == "devenv") return true; return false; } } diff --git a/SunnyUI/Controls/UIDatePicker.Designer.cs b/SunnyUI/Controls/UIDatePicker.Designer.cs index b89c7310..82683e1e 100644 --- a/SunnyUI/Controls/UIDatePicker.Designer.cs +++ b/SunnyUI/Controls/UIDatePicker.Designer.cs @@ -30,19 +30,18 @@ /// private void InitializeComponent() { - this.SuspendLayout(); + SuspendLayout(); // // UIDatePicker // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.Name = "UIDatePicker"; - this.Padding = new System.Windows.Forms.Padding(0, 0, 30, 0); - this.SymbolDropDown = 61555; - this.SymbolNormal = 61555; - this.ButtonClick += new System.EventHandler(this.UIDatetimePicker_ButtonClick); - this.ResumeLayout(false); - this.PerformLayout(); - + AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + Name = "UIDatePicker"; + ShowBuiltInResources = true; + SymbolDropDown = 61555; + SymbolNormal = 61555; + ButtonClick += UIDatetimePicker_ButtonClick; + ResumeLayout(false); + PerformLayout(); } #endregion diff --git a/SunnyUI/Controls/UIDatePicker.cs b/SunnyUI/Controls/UIDatePicker.cs index 761b4448..ee3d28ed 100644 --- a/SunnyUI/Controls/UIDatePicker.cs +++ b/SunnyUI/Controls/UIDatePicker.cs @@ -58,7 +58,7 @@ namespace Sunny.UI private DateTime min = DateTime.MinValue; [Browsable(false)] - public override string[] FormTranslatorProperties { get; } + public override string[] FormTranslatorProperties => ["DateYearFormat", "DateYearMonthFormat", "DateFormat"]; static internal DateTime EffectiveMaxDate(DateTime maxDate) { diff --git a/SunnyUI/Controls/UIDatePicker.resx b/SunnyUI/Controls/UIDatePicker.resx index 1af7de15..8b2ff64a 100644 --- a/SunnyUI/Controls/UIDatePicker.resx +++ b/SunnyUI/Controls/UIDatePicker.resx @@ -1,17 +1,17 @@  - diff --git a/SunnyUI/Controls/UIDateTimePicker.cs b/SunnyUI/Controls/UIDateTimePicker.cs index ed5a4a8c..c7145a3c 100644 --- a/SunnyUI/Controls/UIDateTimePicker.cs +++ b/SunnyUI/Controls/UIDateTimePicker.cs @@ -41,22 +41,21 @@ namespace Sunny.UI { private void InitializeComponent() { - this.SuspendLayout(); + SuspendLayout(); // // UIDatetimePicker // - this.Name = "UIDatetimePicker"; - this.Padding = new Padding(0, 0, 30, 0); - this.SymbolDropDown = 61555; - this.SymbolNormal = 61555; - this.ButtonClick += this.UIDatetimePicker_ButtonClick; - this.ResumeLayout(false); - this.PerformLayout(); - + Name = "UIDatetimePicker"; + ShowBuiltInResources = true; + SymbolDropDown = 61555; + SymbolNormal = 61555; + ButtonClick += UIDatetimePicker_ButtonClick; + ResumeLayout(false); + PerformLayout(); } [Browsable(false)] - public override string[] FormTranslatorProperties { get; } + public override string[] FormTranslatorProperties => ["DateFormat"]; /// /// 必需的设计器变量。 diff --git a/SunnyUI/Controls/UIDateTimePicker.resx b/SunnyUI/Controls/UIDateTimePicker.resx index 1af7de15..8b2ff64a 100644 --- a/SunnyUI/Controls/UIDateTimePicker.resx +++ b/SunnyUI/Controls/UIDateTimePicker.resx @@ -1,17 +1,17 @@  - diff --git a/SunnyUI/Controls/UIDoubleUpDown.cs b/SunnyUI/Controls/UIDoubleUpDown.cs index d4b27e9f..8f7c8a27 100644 --- a/SunnyUI/Controls/UIDoubleUpDown.cs +++ b/SunnyUI/Controls/UIDoubleUpDown.cs @@ -65,6 +65,9 @@ namespace Sunny.UI btnDec.Style = UIStyle.Custom; } + [Browsable(false)] + public override string[] FormTranslatorProperties { get; } + /// /// 需要额外设置ToolTip的控件 /// diff --git a/SunnyUI/Controls/UIDoubleUpDown.designer.cs b/SunnyUI/Controls/UIDoubleUpDown.designer.cs index 7591714a..a73445b0 100644 --- a/SunnyUI/Controls/UIDoubleUpDown.designer.cs +++ b/SunnyUI/Controls/UIDoubleUpDown.designer.cs @@ -28,73 +28,79 @@ /// private void InitializeComponent() { - this.btnDec = new Sunny.UI.UISymbolButton(); - this.btnAdd = new Sunny.UI.UISymbolButton(); - this.pnlValue = new Sunny.UI.UIPanel(); - this.SuspendLayout(); + btnDec = new UISymbolButton(); + btnAdd = new UISymbolButton(); + pnlValue = new UIPanel(); + SuspendLayout(); // // btnDec // - 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.ImageInterval = 1; - this.btnDec.Location = new System.Drawing.Point(0, 0); - this.btnDec.Margin = new System.Windows.Forms.Padding(0); - this.btnDec.MinimumSize = new System.Drawing.Size(1, 1); - this.btnDec.Name = "btnDec"; - this.btnDec.Padding = new System.Windows.Forms.Padding(26, 4, 0, 0); - this.btnDec.RadiusSides = ((Sunny.UI.UICornerRadiusSides)((Sunny.UI.UICornerRadiusSides.LeftTop | Sunny.UI.UICornerRadiusSides.LeftBottom))); - this.btnDec.Size = new System.Drawing.Size(29, 29); - this.btnDec.Symbol = 61544; - this.btnDec.TabIndex = 0; - this.btnDec.TipsText = null; - this.btnDec.Click += new System.EventHandler(this.btnDec_Click); + btnDec.Cursor = System.Windows.Forms.Cursors.Hand; + btnDec.Dock = System.Windows.Forms.DockStyle.Left; + btnDec.Font = new System.Drawing.Font("宋体", 12F); + btnDec.ImageInterval = 1; + btnDec.Location = new System.Drawing.Point(0, 0); + btnDec.Margin = new System.Windows.Forms.Padding(0); + btnDec.MinimumSize = new System.Drawing.Size(1, 1); + btnDec.Name = "btnDec"; + btnDec.Padding = new System.Windows.Forms.Padding(26, 4, 0, 0); + btnDec.RadiusSides = UICornerRadiusSides.LeftTop | UICornerRadiusSides.LeftBottom; + btnDec.ShowBuiltInResources = true; + btnDec.Size = new System.Drawing.Size(29, 29); + btnDec.Symbol = 61544; + btnDec.TabIndex = 0; + btnDec.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); + btnDec.TipsText = null; + btnDec.Click += btnDec_Click; // // btnAdd // - 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.ImageInterval = 1; - this.btnAdd.Location = new System.Drawing.Point(87, 0); - this.btnAdd.Margin = new System.Windows.Forms.Padding(0); - this.btnAdd.MinimumSize = new System.Drawing.Size(1, 1); - this.btnAdd.Name = "btnAdd"; - this.btnAdd.Padding = new System.Windows.Forms.Padding(26, 3, 0, 0); - this.btnAdd.RadiusSides = ((Sunny.UI.UICornerRadiusSides)((Sunny.UI.UICornerRadiusSides.RightTop | Sunny.UI.UICornerRadiusSides.RightBottom))); - this.btnAdd.Size = new System.Drawing.Size(29, 29); - this.btnAdd.Symbol = 61543; - this.btnAdd.TabIndex = 1; - this.btnAdd.TipsText = null; - this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); + btnAdd.Cursor = System.Windows.Forms.Cursors.Hand; + btnAdd.Dock = System.Windows.Forms.DockStyle.Right; + btnAdd.Font = new System.Drawing.Font("宋体", 12F); + btnAdd.ImageInterval = 1; + btnAdd.Location = new System.Drawing.Point(87, 0); + btnAdd.Margin = new System.Windows.Forms.Padding(0); + btnAdd.MinimumSize = new System.Drawing.Size(1, 1); + btnAdd.Name = "btnAdd"; + btnAdd.Padding = new System.Windows.Forms.Padding(26, 3, 0, 0); + btnAdd.RadiusSides = UICornerRadiusSides.RightTop | UICornerRadiusSides.RightBottom; + btnAdd.ShowBuiltInResources = true; + btnAdd.Size = new System.Drawing.Size(29, 29); + btnAdd.Symbol = 61543; + btnAdd.TabIndex = 1; + btnAdd.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); + btnAdd.TipsText = null; + btnAdd.Click += btnAdd_Click; // // pnlValue // - this.pnlValue.Dock = System.Windows.Forms.DockStyle.Fill; - 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); - this.pnlValue.Name = "pnlValue"; - this.pnlValue.RadiusSides = Sunny.UI.UICornerRadiusSides.None; - this.pnlValue.RectSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((System.Windows.Forms.ToolStripStatusLabelBorderSides.Top | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom))); - this.pnlValue.Size = new System.Drawing.Size(58, 29); - this.pnlValue.TabIndex = 2; - this.pnlValue.Text = "0"; - this.pnlValue.Click += new System.EventHandler(this.pnlValue_DoubleClick); + pnlValue.Dock = System.Windows.Forms.DockStyle.Fill; + pnlValue.Font = new System.Drawing.Font("宋体", 12F); + pnlValue.Location = new System.Drawing.Point(29, 0); + pnlValue.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + pnlValue.MinimumSize = new System.Drawing.Size(1, 1); + pnlValue.Name = "pnlValue"; + pnlValue.RadiusSides = UICornerRadiusSides.None; + pnlValue.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Top | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom; + pnlValue.ShowBuiltInResources = true; + pnlValue.Size = new System.Drawing.Size(58, 29); + pnlValue.TabIndex = 2; + pnlValue.Text = "0"; + pnlValue.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; + pnlValue.Click += pnlValue_DoubleClick; // // UIDoubleUpDown // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.Controls.Add(this.pnlValue); - this.Controls.Add(this.btnAdd); - this.Controls.Add(this.btnDec); - this.MinimumSize = new System.Drawing.Size(100, 0); - this.Name = "UIDoubleUpDown"; - this.Size = new System.Drawing.Size(116, 29); - this.ResumeLayout(false); - + AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + Controls.Add(pnlValue); + Controls.Add(btnAdd); + Controls.Add(btnDec); + MinimumSize = new System.Drawing.Size(100, 0); + Name = "UIDoubleUpDown"; + ShowBuiltInResources = true; + Size = new System.Drawing.Size(116, 29); + ResumeLayout(false); } #endregion diff --git a/SunnyUI/Controls/UIDoubleUpDown.resx b/SunnyUI/Controls/UIDoubleUpDown.resx index 1af7de15..8b2ff64a 100644 --- a/SunnyUI/Controls/UIDoubleUpDown.resx +++ b/SunnyUI/Controls/UIDoubleUpDown.resx @@ -1,17 +1,17 @@  - diff --git a/SunnyUI/Controls/UIEdit.resx b/SunnyUI/Controls/UIEdit.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/SunnyUI/Controls/UIEdit.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SunnyUI/Controls/UIFlowLayoutPanel.cs b/SunnyUI/Controls/UIFlowLayoutPanel.cs index cf1f04fd..c902cdb8 100644 --- a/SunnyUI/Controls/UIFlowLayoutPanel.cs +++ b/SunnyUI/Controls/UIFlowLayoutPanel.cs @@ -73,6 +73,9 @@ namespace Sunny.UI timer.Start(); } + [Browsable(false)] + public override string[] FormTranslatorProperties { get; } + public void Render() { if (Panel == null) return; @@ -514,63 +517,57 @@ namespace Sunny.UI private void InitializeComponent() { - this.flowLayoutPanel = new FlowLayoutPanel(); - this.VBar = new UIVerScrollBarEx(); - this.HBar = new UIHorScrollBarEx(); - this.SuspendLayout(); + flowLayoutPanel = new FlowLayoutPanel(); + VBar = new UIVerScrollBarEx(); + HBar = new UIHorScrollBarEx(); + SuspendLayout(); // // flowLayoutPanel // - this.flowLayoutPanel.BackColor = Color.FromArgb(235, 243, 255); - this.flowLayoutPanel.Dock = DockStyle.Fill; - this.flowLayoutPanel.Location = new Point(2, 2); - this.flowLayoutPanel.Name = "flowLayoutPanel"; - this.flowLayoutPanel.Size = new Size(429, 383); - this.flowLayoutPanel.TabIndex = 0; - this.flowLayoutPanel.Tag = "69605093-6397-AD32-9F69-3C29F642F87E"; + flowLayoutPanel.BackColor = Color.FromArgb(235, 243, 255); + flowLayoutPanel.Dock = DockStyle.Fill; + flowLayoutPanel.Location = new Point(2, 2); + flowLayoutPanel.Name = "flowLayoutPanel"; + flowLayoutPanel.Size = new Size(429, 383); + flowLayoutPanel.TabIndex = 0; + flowLayoutPanel.Tag = "69605093-6397-AD32-9F69-3C29F642F87E"; // // VBar // - this.VBar.BoundsHeight = 10; - 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; - this.VBar.MinimumSize = new Size(1, 1); - this.VBar.Name = "VBar"; - this.VBar.Size = new Size(18, 377); - this.VBar.TabIndex = 1; - this.VBar.TagString = "63FD1249-41D3-E08A-F8F5-CC41CC30FD03"; - this.VBar.Text = "uiVerScrollBarEx1"; - this.VBar.Value = 0; - this.VBar.Visible = false; + VBar.Font = new Font("宋体", 12F); + VBar.Location = new Point(410, 5); + VBar.MinimumSize = new Size(1, 1); + VBar.Name = "VBar"; + VBar.ShowBuiltInResources = true; + VBar.Size = new Size(18, 377); + VBar.TabIndex = 1; + VBar.TagString = "63FD1249-41D3-E08A-F8F5-CC41CC30FD03"; + VBar.Text = "uiVerScrollBarEx1"; + VBar.Visible = false; // // HBar // - this.HBar.BoundsWidth = 10; - 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; - this.HBar.MinimumSize = new Size(1, 1); - this.HBar.Name = "HBar"; - this.HBar.Size = new Size(399, 18); - this.HBar.TabIndex = 2; - this.HBar.TagString = "79E1E7DD-3E4D-916B-C8F1-F45B579C290C"; - this.HBar.Text = "uiHorScrollBarEx1"; - this.HBar.Value = 0; - this.HBar.Visible = false; + HBar.Font = new Font("宋体", 12F); + HBar.Location = new Point(5, 364); + HBar.MinimumSize = new Size(1, 1); + HBar.Name = "HBar"; + HBar.ShowBuiltInResources = true; + HBar.Size = new Size(399, 18); + HBar.TabIndex = 2; + HBar.TagString = "79E1E7DD-3E4D-916B-C8F1-F45B579C290C"; + HBar.Text = "uiHorScrollBarEx1"; + HBar.Visible = false; // // UIFlowLayoutPanel // - this.Controls.Add(this.HBar); - this.Controls.Add(this.VBar); - this.Controls.Add(this.flowLayoutPanel); - this.Name = "UIFlowLayoutPanel"; - this.Padding = new Padding(2); - this.Size = new Size(433, 387); - this.ResumeLayout(false); - + Controls.Add(HBar); + Controls.Add(VBar); + Controls.Add(flowLayoutPanel); + Name = "UIFlowLayoutPanel"; + Padding = new Padding(2); + ShowBuiltInResources = true; + Size = new Size(433, 387); + ResumeLayout(false); } /// diff --git a/SunnyUI/Controls/UIFlowLayoutPanel.resx b/SunnyUI/Controls/UIFlowLayoutPanel.resx index f298a7be..8b2ff64a 100644 --- a/SunnyUI/Controls/UIFlowLayoutPanel.resx +++ b/SunnyUI/Controls/UIFlowLayoutPanel.resx @@ -1,4 +1,64 @@ - + + + diff --git a/SunnyUI/Controls/UIIPTextBox.cs b/SunnyUI/Controls/UIIPTextBox.cs index 6fba5d3b..56b40ab6 100644 --- a/SunnyUI/Controls/UIIPTextBox.cs +++ b/SunnyUI/Controls/UIIPTextBox.cs @@ -62,6 +62,9 @@ namespace Sunny.UI fillColor = UIStyles.Blue.EditorBackColor; } + [Browsable(false)] + public override string[] FormTranslatorProperties { get; } + public event EventHandler ValueChanged; private void Txt_Leave(object sender, EventArgs e) @@ -363,7 +366,7 @@ namespace Sunny.UI txt1.Margin = new Padding(3, 3, 10, 3); txt1.MaxLength = 3; txt1.Name = "txt1"; - txt1.Size = new Size(40, 22); + txt1.Size = new Size(40, 19); txt1.TabIndex = 0; txt1.TextAlign = HorizontalAlignment.Center; // @@ -376,7 +379,7 @@ namespace Sunny.UI txt2.Margin = new Padding(3, 3, 10, 3); txt2.MaxLength = 3; txt2.Name = "txt2"; - txt2.Size = new Size(40, 22); + txt2.Size = new Size(40, 19); txt2.TabIndex = 0; txt2.TabStop = false; txt2.TextAlign = HorizontalAlignment.Center; @@ -390,7 +393,7 @@ namespace Sunny.UI txt3.Margin = new Padding(3, 3, 10, 3); txt3.MaxLength = 3; txt3.Name = "txt3"; - txt3.Size = new Size(40, 22); + txt3.Size = new Size(40, 19); txt3.TabIndex = 0; txt3.TabStop = false; txt3.TextAlign = HorizontalAlignment.Center; @@ -404,7 +407,7 @@ namespace Sunny.UI txt4.Margin = new Padding(3, 3, 10, 3); txt4.MaxLength = 3; txt4.Name = "txt4"; - txt4.Size = new Size(40, 22); + txt4.Size = new Size(40, 19); txt4.TabIndex = 0; txt4.TabStop = false; txt4.TextAlign = HorizontalAlignment.Center; @@ -419,6 +422,7 @@ namespace Sunny.UI FillColor2 = Color.FromArgb(235, 243, 255); Name = "UIIPTextBox"; Padding = new Padding(1); + ShowBuiltInResources = true; Size = new Size(219, 29); SizeChanged += UIIPTextBox_SizeChanged; ResumeLayout(false); diff --git a/SunnyUI/Controls/UIIPTextBox.resx b/SunnyUI/Controls/UIIPTextBox.resx index f298a7be..8b2ff64a 100644 --- a/SunnyUI/Controls/UIIPTextBox.resx +++ b/SunnyUI/Controls/UIIPTextBox.resx @@ -1,4 +1,64 @@ - + + + diff --git a/SunnyUI/Controls/UIImageButton.cs b/SunnyUI/Controls/UIImageButton.cs index 74c525ad..bf2096dd 100644 --- a/SunnyUI/Controls/UIImageButton.cs +++ b/SunnyUI/Controls/UIImageButton.cs @@ -32,7 +32,7 @@ namespace Sunny.UI /// /// 图像按钮 /// - public sealed class UIImageButton : PictureBox, IStyleInterface, IZoomScale + public sealed class UIImageButton : PictureBox, IStyleInterface, IZoomScale, IFormTranslator { private bool IsPress; private bool IsHover; @@ -48,6 +48,15 @@ namespace Sunny.UI private bool isClick; + [Browsable(false)] + [Description("控件在界面显示时需要多语翻译的属性名称数组"), Category("SunnyUI")] + public string[] FormTranslatorProperties => ["Text"]; + + [DefaultValue(false)] + [Description("控件是否显示多语内置资源"), Category("SunnyUI")] + public bool ShowBuiltInResources { get; set; } = false; + + /// /// 调用点击事件 /// diff --git a/SunnyUI/Controls/UIImageListBox.cs b/SunnyUI/Controls/UIImageListBox.cs index 87170e47..15161d5e 100644 --- a/SunnyUI/Controls/UIImageListBox.cs +++ b/SunnyUI/Controls/UIImageListBox.cs @@ -79,12 +79,20 @@ namespace Sunny.UI listbox.DrawItem += Listbox_DrawItem; } + [Browsable(false)] + public override string[] FormTranslatorProperties { get; } + public override void SetDPIScale() { base.SetDPIScale(); listbox.SetDPIScale(); } + private void InitializeComponent() + { + + } + protected override void Dispose(bool disposing) { base.Dispose(disposing); diff --git a/SunnyUI/Controls/UIImageListBox.resx b/SunnyUI/Controls/UIImageListBox.resx index 1af7de15..8b2ff64a 100644 --- a/SunnyUI/Controls/UIImageListBox.resx +++ b/SunnyUI/Controls/UIImageListBox.resx @@ -1,17 +1,17 @@  - diff --git a/SunnyUI/Controls/UIIntegerUpDown.cs b/SunnyUI/Controls/UIIntegerUpDown.cs index b8eb8cf4..eefbd26e 100644 --- a/SunnyUI/Controls/UIIntegerUpDown.cs +++ b/SunnyUI/Controls/UIIntegerUpDown.cs @@ -62,6 +62,9 @@ namespace Sunny.UI btnDec.Style = UIStyle.Custom; } + [Browsable(false)] + public override string[] FormTranslatorProperties { get; } + /// /// 需要额外设置ToolTip的控件 /// diff --git a/SunnyUI/Controls/UIIntegerUpDown.designer.cs b/SunnyUI/Controls/UIIntegerUpDown.designer.cs index d23b035a..fac3a457 100644 --- a/SunnyUI/Controls/UIIntegerUpDown.designer.cs +++ b/SunnyUI/Controls/UIIntegerUpDown.designer.cs @@ -28,73 +28,79 @@ /// private void InitializeComponent() { - this.btnDec = new Sunny.UI.UISymbolButton(); - this.btnAdd = new Sunny.UI.UISymbolButton(); - this.pnlValue = new Sunny.UI.UIPanel(); - this.SuspendLayout(); + btnDec = new UISymbolButton(); + btnAdd = new UISymbolButton(); + pnlValue = new UIPanel(); + SuspendLayout(); // // btnDec // - 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.ImageInterval = 1; - this.btnDec.Location = new System.Drawing.Point(0, 0); - this.btnDec.Margin = new System.Windows.Forms.Padding(0); - this.btnDec.MinimumSize = new System.Drawing.Size(1, 1); - this.btnDec.Name = "btnDec"; - this.btnDec.Padding = new System.Windows.Forms.Padding(26, 4, 0, 0); - this.btnDec.RadiusSides = ((Sunny.UI.UICornerRadiusSides)((Sunny.UI.UICornerRadiusSides.LeftTop | Sunny.UI.UICornerRadiusSides.LeftBottom))); - this.btnDec.Size = new System.Drawing.Size(29, 29); - this.btnDec.Symbol = 61544; - this.btnDec.TabIndex = 0; - this.btnDec.TipsText = null; - this.btnDec.Click += new System.EventHandler(this.btnDec_Click); + btnDec.Cursor = System.Windows.Forms.Cursors.Hand; + btnDec.Dock = System.Windows.Forms.DockStyle.Left; + btnDec.Font = new System.Drawing.Font("宋体", 12F); + btnDec.ImageInterval = 1; + btnDec.Location = new System.Drawing.Point(0, 0); + btnDec.Margin = new System.Windows.Forms.Padding(0); + btnDec.MinimumSize = new System.Drawing.Size(1, 1); + btnDec.Name = "btnDec"; + btnDec.Padding = new System.Windows.Forms.Padding(26, 4, 0, 0); + btnDec.RadiusSides = UICornerRadiusSides.LeftTop | UICornerRadiusSides.LeftBottom; + btnDec.ShowBuiltInResources = true; + btnDec.Size = new System.Drawing.Size(29, 29); + btnDec.Symbol = 61544; + btnDec.TabIndex = 0; + btnDec.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); + btnDec.TipsText = null; + btnDec.Click += btnDec_Click; // // btnAdd // - 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.ImageInterval = 1; - this.btnAdd.Location = new System.Drawing.Point(87, 0); - this.btnAdd.Margin = new System.Windows.Forms.Padding(0); - this.btnAdd.MinimumSize = new System.Drawing.Size(1, 1); - this.btnAdd.Name = "btnAdd"; - this.btnAdd.Padding = new System.Windows.Forms.Padding(26, 3, 0, 0); - this.btnAdd.RadiusSides = ((Sunny.UI.UICornerRadiusSides)((Sunny.UI.UICornerRadiusSides.RightTop | Sunny.UI.UICornerRadiusSides.RightBottom))); - this.btnAdd.Size = new System.Drawing.Size(29, 29); - this.btnAdd.Symbol = 61543; - this.btnAdd.TabIndex = 1; - this.btnAdd.TipsText = null; - this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); + btnAdd.Cursor = System.Windows.Forms.Cursors.Hand; + btnAdd.Dock = System.Windows.Forms.DockStyle.Right; + btnAdd.Font = new System.Drawing.Font("宋体", 12F); + btnAdd.ImageInterval = 1; + btnAdd.Location = new System.Drawing.Point(87, 0); + btnAdd.Margin = new System.Windows.Forms.Padding(0); + btnAdd.MinimumSize = new System.Drawing.Size(1, 1); + btnAdd.Name = "btnAdd"; + btnAdd.Padding = new System.Windows.Forms.Padding(26, 3, 0, 0); + btnAdd.RadiusSides = UICornerRadiusSides.RightTop | UICornerRadiusSides.RightBottom; + btnAdd.ShowBuiltInResources = true; + btnAdd.Size = new System.Drawing.Size(29, 29); + btnAdd.Symbol = 61543; + btnAdd.TabIndex = 1; + btnAdd.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); + btnAdd.TipsText = null; + btnAdd.Click += btnAdd_Click; // // pnlValue // - this.pnlValue.Dock = System.Windows.Forms.DockStyle.Fill; - 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); - this.pnlValue.Name = "pnlValue"; - this.pnlValue.RadiusSides = Sunny.UI.UICornerRadiusSides.None; - this.pnlValue.RectSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((System.Windows.Forms.ToolStripStatusLabelBorderSides.Top | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom))); - this.pnlValue.Size = new System.Drawing.Size(58, 29); - this.pnlValue.TabIndex = 2; - this.pnlValue.Text = "0"; - this.pnlValue.Click += new System.EventHandler(this.pnlValue_DoubleClick); + pnlValue.Dock = System.Windows.Forms.DockStyle.Fill; + pnlValue.Font = new System.Drawing.Font("宋体", 12F); + pnlValue.Location = new System.Drawing.Point(29, 0); + pnlValue.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + pnlValue.MinimumSize = new System.Drawing.Size(1, 1); + pnlValue.Name = "pnlValue"; + pnlValue.RadiusSides = UICornerRadiusSides.None; + pnlValue.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Top | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom; + pnlValue.ShowBuiltInResources = true; + pnlValue.Size = new System.Drawing.Size(58, 29); + pnlValue.TabIndex = 2; + pnlValue.Text = "0"; + pnlValue.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; + pnlValue.Click += pnlValue_DoubleClick; // // UIIntegerUpDown // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.Controls.Add(this.pnlValue); - this.Controls.Add(this.btnAdd); - this.Controls.Add(this.btnDec); - this.MinimumSize = new System.Drawing.Size(100, 0); - this.Name = "UIIntegerUpDown"; - this.Size = new System.Drawing.Size(116, 29); - this.ResumeLayout(false); - + AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + Controls.Add(pnlValue); + Controls.Add(btnAdd); + Controls.Add(btnDec); + MinimumSize = new System.Drawing.Size(100, 0); + Name = "UIIntegerUpDown"; + ShowBuiltInResources = true; + Size = new System.Drawing.Size(116, 29); + ResumeLayout(false); } #endregion diff --git a/SunnyUI/Controls/UIIntegerUpDown.resx b/SunnyUI/Controls/UIIntegerUpDown.resx index 1af7de15..8b2ff64a 100644 --- a/SunnyUI/Controls/UIIntegerUpDown.resx +++ b/SunnyUI/Controls/UIIntegerUpDown.resx @@ -1,17 +1,17 @@  - diff --git a/SunnyUI/Controls/UILedDisplay.cs b/SunnyUI/Controls/UILedDisplay.cs index 5304e4db..a910970c 100644 --- a/SunnyUI/Controls/UILedDisplay.cs +++ b/SunnyUI/Controls/UILedDisplay.cs @@ -31,7 +31,7 @@ namespace Sunny.UI /// LED显示屏 /// [DefaultProperty("Text")] - public class UILedDisplay : Control, IFormTranslator + public class UILedDisplay : Control { #region 组件设计器生成的代码 @@ -85,14 +85,6 @@ namespace Sunny.UI Version = UIGlobal.Version; } - [Browsable(false)] - [Description("控件在界面显示时需要多语翻译的属性名称数组"), Category("SunnyUI")] - public string[] FormTranslatorProperties => ["Text"]; - - [DefaultValue(false)] - [Description("控件是否显示多语内置资源"), Category("SunnyUI")] - public bool ShowBuiltInResources { get; set; } = false; - public string Version { get; } /// diff --git a/SunnyUI/Controls/UILedLabel.cs b/SunnyUI/Controls/UILedLabel.cs index ffd30274..733d9da5 100644 --- a/SunnyUI/Controls/UILedLabel.cs +++ b/SunnyUI/Controls/UILedLabel.cs @@ -39,9 +39,6 @@ namespace Sunny.UI foreColor = UIStyles.Blue.LedLabelForeColor; } - [Browsable(false)] - public override string[] FormTranslatorProperties => ["Text"]; - /// /// 重载绘图 /// diff --git a/SunnyUI/Controls/UIListBox.cs b/SunnyUI/Controls/UIListBox.cs index 72179bec..f0e062cd 100644 --- a/SunnyUI/Controls/UIListBox.cs +++ b/SunnyUI/Controls/UIListBox.cs @@ -97,6 +97,9 @@ namespace Sunny.UI timer.Start(); } + [Browsable(false)] + public override string[] FormTranslatorProperties { get; } + public override void SetDPIScale() { base.SetDPIScale(); @@ -737,5 +740,10 @@ namespace Sunny.UI if (index < 0 || index >= Items.Count) return string.Empty; return GetItemText(Items[index]); } + + private void InitializeComponent() + { + + } } } \ No newline at end of file diff --git a/SunnyUI/Controls/UIListBox.resx b/SunnyUI/Controls/UIListBox.resx index 1af7de15..8b2ff64a 100644 --- a/SunnyUI/Controls/UIListBox.resx +++ b/SunnyUI/Controls/UIListBox.resx @@ -1,17 +1,17 @@  - diff --git a/SunnyUI/Controls/UIMiniPagination.cs b/SunnyUI/Controls/UIMiniPagination.cs index 8ea3e670..8b8b7c3b 100644 --- a/SunnyUI/Controls/UIMiniPagination.cs +++ b/SunnyUI/Controls/UIMiniPagination.cs @@ -315,294 +315,294 @@ namespace Sunny.UI private void InitializeComponent() { - this.b0 = new Sunny.UI.UISymbolButton(); - this.b1 = new Sunny.UI.UISymbolButton(); - this.b3 = new Sunny.UI.UISymbolButton(); - this.b2 = new Sunny.UI.UISymbolButton(); - this.b7 = new Sunny.UI.UISymbolButton(); - this.b6 = new Sunny.UI.UISymbolButton(); - this.b5 = new Sunny.UI.UISymbolButton(); - this.b4 = new Sunny.UI.UISymbolButton(); - this.b15 = new Sunny.UI.UISymbolButton(); - this.b14 = new Sunny.UI.UISymbolButton(); - this.b13 = new Sunny.UI.UISymbolButton(); - this.b12 = new Sunny.UI.UISymbolButton(); - this.b11 = new Sunny.UI.UISymbolButton(); - this.b10 = new Sunny.UI.UISymbolButton(); - this.b9 = new Sunny.UI.UISymbolButton(); - this.b8 = new Sunny.UI.UISymbolButton(); - this.b16 = new Sunny.UI.UISymbolButton(); - this.SuspendLayout(); + b0 = new UISymbolButton(); + b1 = new UISymbolButton(); + b3 = new UISymbolButton(); + b2 = new UISymbolButton(); + b7 = new UISymbolButton(); + b6 = new UISymbolButton(); + b5 = new UISymbolButton(); + b4 = new UISymbolButton(); + b15 = new UISymbolButton(); + b14 = new UISymbolButton(); + b13 = new UISymbolButton(); + b12 = new UISymbolButton(); + b11 = new UISymbolButton(); + b10 = new UISymbolButton(); + b9 = new UISymbolButton(); + b8 = new UISymbolButton(); + b16 = new UISymbolButton(); + SuspendLayout(); // // 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.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.b0.Location = new System.Drawing.Point(3, 4); - this.b0.MinimumSize = new System.Drawing.Size(1, 1); - this.b0.Name = "b0"; - this.b0.Padding = new System.Windows.Forms.Padding(5, 0, 5, 0); - this.b0.Radius = 2; - this.b0.Size = new System.Drawing.Size(32, 32); - this.b0.Symbol = 61700; - this.b0.TabIndex = 0; - this.b0.TagString = "<"; - this.b0.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.b0.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); + b0.Cursor = Cursors.Hand; + b0.Font = new Font("宋体", 10.5F); + b0.ImageAlign = ContentAlignment.MiddleLeft; + b0.Location = new Point(3, 4); + b0.MinimumSize = new Size(1, 1); + b0.Name = "b0"; + b0.Padding = new Padding(5, 0, 5, 0); + b0.Radius = 2; + b0.Size = new Size(32, 32); + b0.Symbol = 61700; + b0.TabIndex = 0; + b0.TagString = "<"; + b0.TextAlign = ContentAlignment.MiddleRight; + b0.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); // // 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.Location = new System.Drawing.Point(81, 4); - this.b1.MinimumSize = new System.Drawing.Size(1, 1); - this.b1.Name = "b1"; - this.b1.Radius = 2; - this.b1.Size = new System.Drawing.Size(29, 29); - this.b1.Symbol = 0; - this.b1.TabIndex = 1; - this.b1.Text = "0"; - this.b1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); + b1.Cursor = Cursors.Hand; + b1.Font = new Font("宋体", 12F); + b1.Location = new Point(81, 4); + b1.MinimumSize = new Size(1, 1); + b1.Name = "b1"; + b1.Radius = 2; + b1.Size = new Size(29, 29); + b1.Symbol = 0; + b1.TabIndex = 1; + b1.Text = "0"; + b1.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); // // 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.Location = new System.Drawing.Point(145, 4); - this.b3.MinimumSize = new System.Drawing.Size(1, 1); - this.b3.Name = "b3"; - this.b3.Radius = 2; - this.b3.Size = new System.Drawing.Size(29, 29); - this.b3.Symbol = 0; - this.b3.TabIndex = 3; - this.b3.Text = "0"; - this.b3.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); + b3.Cursor = Cursors.Hand; + b3.Font = new Font("宋体", 12F); + b3.Location = new Point(145, 4); + b3.MinimumSize = new Size(1, 1); + b3.Name = "b3"; + b3.Radius = 2; + b3.Size = new Size(29, 29); + b3.Symbol = 0; + b3.TabIndex = 3; + b3.Text = "0"; + b3.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); // // 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.Location = new System.Drawing.Point(113, 4); - this.b2.MinimumSize = new System.Drawing.Size(1, 1); - this.b2.Name = "b2"; - this.b2.Radius = 2; - this.b2.Size = new System.Drawing.Size(29, 29); - this.b2.Symbol = 0; - this.b2.TabIndex = 2; - this.b2.Text = "0"; - this.b2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); + b2.Cursor = Cursors.Hand; + b2.Font = new Font("宋体", 12F); + b2.Location = new Point(113, 4); + b2.MinimumSize = new Size(1, 1); + b2.Name = "b2"; + b2.Radius = 2; + b2.Size = new Size(29, 29); + b2.Symbol = 0; + b2.TabIndex = 2; + b2.Text = "0"; + b2.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); // // 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.Location = new System.Drawing.Point(273, 4); - this.b7.MinimumSize = new System.Drawing.Size(1, 1); - this.b7.Name = "b7"; - this.b7.Radius = 2; - this.b7.Size = new System.Drawing.Size(29, 29); - this.b7.Symbol = 0; - this.b7.TabIndex = 7; - this.b7.Text = "0"; - this.b7.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); + b7.Cursor = Cursors.Hand; + b7.Font = new Font("宋体", 12F); + b7.Location = new Point(273, 4); + b7.MinimumSize = new Size(1, 1); + b7.Name = "b7"; + b7.Radius = 2; + b7.Size = new Size(29, 29); + b7.Symbol = 0; + b7.TabIndex = 7; + b7.Text = "0"; + b7.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); // // 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.Location = new System.Drawing.Point(241, 4); - this.b6.MinimumSize = new System.Drawing.Size(1, 1); - this.b6.Name = "b6"; - this.b6.Radius = 2; - this.b6.Size = new System.Drawing.Size(29, 29); - this.b6.Symbol = 0; - this.b6.TabIndex = 6; - this.b6.Text = "0"; - this.b6.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); + b6.Cursor = Cursors.Hand; + b6.Font = new Font("宋体", 12F); + b6.Location = new Point(241, 4); + b6.MinimumSize = new Size(1, 1); + b6.Name = "b6"; + b6.Radius = 2; + b6.Size = new Size(29, 29); + b6.Symbol = 0; + b6.TabIndex = 6; + b6.Text = "0"; + b6.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); // // 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.Location = new System.Drawing.Point(209, 4); - this.b5.MinimumSize = new System.Drawing.Size(1, 1); - this.b5.Name = "b5"; - this.b5.Radius = 2; - this.b5.Size = new System.Drawing.Size(29, 29); - this.b5.Symbol = 0; - this.b5.TabIndex = 5; - this.b5.Text = "0"; - this.b5.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); + b5.Cursor = Cursors.Hand; + b5.Font = new Font("宋体", 12F); + b5.Location = new Point(209, 4); + b5.MinimumSize = new Size(1, 1); + b5.Name = "b5"; + b5.Radius = 2; + b5.Size = new Size(29, 29); + b5.Symbol = 0; + b5.TabIndex = 5; + b5.Text = "0"; + b5.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); // // 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.Location = new System.Drawing.Point(177, 4); - this.b4.MinimumSize = new System.Drawing.Size(1, 1); - this.b4.Name = "b4"; - this.b4.Radius = 2; - this.b4.Size = new System.Drawing.Size(29, 29); - this.b4.Symbol = 0; - this.b4.TabIndex = 4; - this.b4.Text = "0"; - this.b4.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); + b4.Cursor = Cursors.Hand; + b4.Font = new Font("宋体", 12F); + b4.Location = new Point(177, 4); + b4.MinimumSize = new Size(1, 1); + b4.Name = "b4"; + b4.Radius = 2; + b4.Size = new Size(29, 29); + b4.Symbol = 0; + b4.TabIndex = 4; + b4.Text = "0"; + b4.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); // // 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.Location = new System.Drawing.Point(529, 4); - this.b15.MinimumSize = new System.Drawing.Size(1, 1); - this.b15.Name = "b15"; - this.b15.Radius = 2; - this.b15.Size = new System.Drawing.Size(29, 29); - this.b15.Symbol = 0; - this.b15.TabIndex = 15; - this.b15.Text = "0"; - this.b15.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); + b15.Cursor = Cursors.Hand; + b15.Font = new Font("宋体", 12F); + b15.Location = new Point(529, 4); + b15.MinimumSize = new Size(1, 1); + b15.Name = "b15"; + b15.Radius = 2; + b15.Size = new Size(29, 29); + b15.Symbol = 0; + b15.TabIndex = 15; + b15.Text = "0"; + b15.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); // // 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.Location = new System.Drawing.Point(497, 4); - this.b14.MinimumSize = new System.Drawing.Size(1, 1); - this.b14.Name = "b14"; - this.b14.Radius = 2; - this.b14.Size = new System.Drawing.Size(29, 29); - this.b14.Symbol = 0; - this.b14.TabIndex = 14; - this.b14.Text = "0"; - this.b14.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); + b14.Cursor = Cursors.Hand; + b14.Font = new Font("宋体", 12F); + b14.Location = new Point(497, 4); + b14.MinimumSize = new Size(1, 1); + b14.Name = "b14"; + b14.Radius = 2; + b14.Size = new Size(29, 29); + b14.Symbol = 0; + b14.TabIndex = 14; + b14.Text = "0"; + b14.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); // // 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.Location = new System.Drawing.Point(465, 4); - this.b13.MinimumSize = new System.Drawing.Size(1, 1); - this.b13.Name = "b13"; - this.b13.Radius = 2; - this.b13.Size = new System.Drawing.Size(29, 29); - this.b13.Symbol = 0; - this.b13.TabIndex = 13; - this.b13.Text = "0"; - this.b13.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); + b13.Cursor = Cursors.Hand; + b13.Font = new Font("宋体", 12F); + b13.Location = new Point(465, 4); + b13.MinimumSize = new Size(1, 1); + b13.Name = "b13"; + b13.Radius = 2; + b13.Size = new Size(29, 29); + b13.Symbol = 0; + b13.TabIndex = 13; + b13.Text = "0"; + b13.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); // // 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.Location = new System.Drawing.Point(433, 4); - this.b12.MinimumSize = new System.Drawing.Size(1, 1); - this.b12.Name = "b12"; - this.b12.Radius = 2; - this.b12.Size = new System.Drawing.Size(29, 29); - this.b12.Symbol = 0; - this.b12.TabIndex = 12; - this.b12.Text = "0"; - this.b12.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); + b12.Cursor = Cursors.Hand; + b12.Font = new Font("宋体", 12F); + b12.Location = new Point(433, 4); + b12.MinimumSize = new Size(1, 1); + b12.Name = "b12"; + b12.Radius = 2; + b12.Size = new Size(29, 29); + b12.Symbol = 0; + b12.TabIndex = 12; + b12.Text = "0"; + b12.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); // // 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.Location = new System.Drawing.Point(401, 4); - this.b11.MinimumSize = new System.Drawing.Size(1, 1); - this.b11.Name = "b11"; - this.b11.Radius = 2; - this.b11.Size = new System.Drawing.Size(29, 29); - this.b11.Symbol = 0; - this.b11.TabIndex = 11; - this.b11.Text = "0"; - this.b11.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); + b11.Cursor = Cursors.Hand; + b11.Font = new Font("宋体", 12F); + b11.Location = new Point(401, 4); + b11.MinimumSize = new Size(1, 1); + b11.Name = "b11"; + b11.Radius = 2; + b11.Size = new Size(29, 29); + b11.Symbol = 0; + b11.TabIndex = 11; + b11.Text = "0"; + b11.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); // // 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.Location = new System.Drawing.Point(369, 4); - this.b10.MinimumSize = new System.Drawing.Size(1, 1); - this.b10.Name = "b10"; - this.b10.Radius = 2; - this.b10.Size = new System.Drawing.Size(29, 29); - this.b10.Symbol = 0; - this.b10.TabIndex = 10; - this.b10.Text = "0"; - this.b10.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); + b10.Cursor = Cursors.Hand; + b10.Font = new Font("宋体", 12F); + b10.Location = new Point(369, 4); + b10.MinimumSize = new Size(1, 1); + b10.Name = "b10"; + b10.Radius = 2; + b10.Size = new Size(29, 29); + b10.Symbol = 0; + b10.TabIndex = 10; + b10.Text = "0"; + b10.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); // // 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.Location = new System.Drawing.Point(337, 4); - this.b9.MinimumSize = new System.Drawing.Size(1, 1); - this.b9.Name = "b9"; - this.b9.Radius = 2; - this.b9.Size = new System.Drawing.Size(29, 29); - this.b9.Symbol = 0; - this.b9.TabIndex = 9; - this.b9.Text = "0"; - this.b9.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); + b9.Cursor = Cursors.Hand; + b9.Font = new Font("宋体", 12F); + b9.Location = new Point(337, 4); + b9.MinimumSize = new Size(1, 1); + b9.Name = "b9"; + b9.Radius = 2; + b9.Size = new Size(29, 29); + b9.Symbol = 0; + b9.TabIndex = 9; + b9.Text = "0"; + b9.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); // // 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.Location = new System.Drawing.Point(305, 4); - this.b8.MinimumSize = new System.Drawing.Size(1, 1); - this.b8.Name = "b8"; - this.b8.Radius = 2; - this.b8.Size = new System.Drawing.Size(29, 29); - this.b8.Symbol = 0; - this.b8.TabIndex = 8; - this.b8.Text = "0"; - this.b8.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); + b8.Cursor = Cursors.Hand; + b8.Font = new Font("宋体", 12F); + b8.Location = new Point(305, 4); + b8.MinimumSize = new Size(1, 1); + b8.Name = "b8"; + b8.Radius = 2; + b8.Size = new Size(29, 29); + b8.Symbol = 0; + b8.TabIndex = 8; + b8.Text = "0"; + b8.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); // // 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.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.b16.Location = new System.Drawing.Point(561, 4); - this.b16.MinimumSize = new System.Drawing.Size(1, 1); - this.b16.Name = "b16"; - this.b16.Padding = new System.Windows.Forms.Padding(6, 0, 5, 0); - this.b16.Radius = 2; - this.b16.Size = new System.Drawing.Size(32, 32); - this.b16.Symbol = 61701; - this.b16.TabIndex = 16; - this.b16.TagString = ">"; - this.b16.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.b16.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); + b16.Cursor = Cursors.Hand; + b16.Font = new Font("宋体", 10.5F); + b16.ImageAlign = ContentAlignment.MiddleRight; + b16.Location = new Point(561, 4); + b16.MinimumSize = new Size(1, 1); + b16.Name = "b16"; + b16.Padding = new Padding(6, 0, 5, 0); + b16.Radius = 2; + b16.Size = new Size(32, 32); + b16.Symbol = 61701; + b16.TabIndex = 16; + b16.TagString = ">"; + b16.TextAlign = ContentAlignment.MiddleLeft; + b16.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); // // UIMiniPagination // - this.Controls.Add(this.b16); - this.Controls.Add(this.b15); - this.Controls.Add(this.b14); - this.Controls.Add(this.b13); - this.Controls.Add(this.b12); - this.Controls.Add(this.b11); - this.Controls.Add(this.b10); - this.Controls.Add(this.b9); - this.Controls.Add(this.b8); - this.Controls.Add(this.b7); - this.Controls.Add(this.b6); - this.Controls.Add(this.b5); - this.Controls.Add(this.b4); - this.Controls.Add(this.b3); - this.Controls.Add(this.b2); - this.Controls.Add(this.b1); - this.Controls.Add(this.b0); - this.Name = "UIMiniPagination"; - this.RadiusSides = Sunny.UI.UICornerRadiusSides.None; - this.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; - this.Size = new System.Drawing.Size(641, 40); - this.ResumeLayout(false); - + Controls.Add(b16); + Controls.Add(b15); + Controls.Add(b14); + Controls.Add(b13); + Controls.Add(b12); + Controls.Add(b11); + Controls.Add(b10); + Controls.Add(b9); + Controls.Add(b8); + Controls.Add(b7); + Controls.Add(b6); + Controls.Add(b5); + Controls.Add(b4); + Controls.Add(b3); + Controls.Add(b2); + Controls.Add(b1); + Controls.Add(b0); + Name = "UIMiniPagination"; + RadiusSides = UICornerRadiusSides.None; + RectSides = ToolStripStatusLabelBorderSides.None; + ShowBuiltInResources = true; + Size = new Size(641, 40); + ResumeLayout(false); } #endregion InitializeComponent diff --git a/SunnyUI/Controls/UIMiniPagination.resx b/SunnyUI/Controls/UIMiniPagination.resx index f298a7be..8b2ff64a 100644 --- a/SunnyUI/Controls/UIMiniPagination.resx +++ b/SunnyUI/Controls/UIMiniPagination.resx @@ -1,4 +1,64 @@ - + + + diff --git a/SunnyUI/Controls/UINumPadTextBox.cs b/SunnyUI/Controls/UINumPadTextBox.cs index e7c252b7..b14089d9 100644 --- a/SunnyUI/Controls/UINumPadTextBox.cs +++ b/SunnyUI/Controls/UINumPadTextBox.cs @@ -267,9 +267,10 @@ namespace Sunny.UI // edit.Leave += edit_Leave; // - // UIKeyBoardTextBox + // UINumPadTextBox // - Name = "UIKeyBoardTextBox"; + Name = "UINumPadTextBox"; + ShowBuiltInResources = true; ButtonClick += UIKeyBoardTextBox_ButtonClick; ResumeLayout(false); PerformLayout(); diff --git a/SunnyUI/Controls/UINumPadTextBox.resx b/SunnyUI/Controls/UINumPadTextBox.resx index f298a7be..8b2ff64a 100644 --- a/SunnyUI/Controls/UINumPadTextBox.resx +++ b/SunnyUI/Controls/UINumPadTextBox.resx @@ -1,4 +1,64 @@ - + + + diff --git a/SunnyUI/Controls/UIPagination.cs b/SunnyUI/Controls/UIPagination.cs index cd87c215..7ef9d8f7 100644 --- a/SunnyUI/Controls/UIPagination.cs +++ b/SunnyUI/Controls/UIPagination.cs @@ -647,6 +647,7 @@ namespace Sunny.UI edtPage.MinimumSize = new Size(1, 1); edtPage.Name = "edtPage"; edtPage.Padding = new Padding(5); + edtPage.ShowBuiltInResources = true; edtPage.ShowText = false; edtPage.Size = new Size(53, 29); edtPage.TabIndex = 1; @@ -723,6 +724,7 @@ namespace Sunny.UI Controls.Add(b0); Name = "UIPagination"; RectSides = ToolStripStatusLabelBorderSides.None; + ShowBuiltInResources = true; Size = new Size(1139, 35); ResumeLayout(false); PerformLayout(); diff --git a/SunnyUI/Controls/UIRichTextBox.cs b/SunnyUI/Controls/UIRichTextBox.cs index d7a9b142..2d1dccce 100644 --- a/SunnyUI/Controls/UIRichTextBox.cs +++ b/SunnyUI/Controls/UIRichTextBox.cs @@ -86,6 +86,9 @@ namespace Sunny.UI edit.MouseMove += Edit_MouseMove; } + [Browsable(false)] + public override string[] FormTranslatorProperties { get; } + protected override void Dispose(bool disposing) { base.Dispose(disposing); @@ -527,6 +530,7 @@ namespace Sunny.UI bar.Location = new Point(247, 4); bar.MinimumSize = new Size(1, 1); bar.Name = "bar"; + bar.ShowBuiltInResources = true; bar.Size = new Size(19, 173); bar.TabIndex = 2; bar.Text = "uiScrollBar1"; @@ -538,6 +542,7 @@ namespace Sunny.UI FillColor = Color.White; Name = "UIRichTextBox"; Padding = new Padding(2); + ShowBuiltInResources = true; FontChanged += UIRichTextBox_FontChanged; SizeChanged += UIRichTextBox_SizeChanged; ResumeLayout(false); diff --git a/SunnyUI/Controls/UIRichTextBox.resx b/SunnyUI/Controls/UIRichTextBox.resx index af32865e..8b2ff64a 100644 --- a/SunnyUI/Controls/UIRichTextBox.resx +++ b/SunnyUI/Controls/UIRichTextBox.resx @@ -1,7 +1,7 @@  diff --git a/SunnyUI/Controls/UITimePicker.cs b/SunnyUI/Controls/UITimePicker.cs index 091b0481..a2568f9d 100644 --- a/SunnyUI/Controls/UITimePicker.cs +++ b/SunnyUI/Controls/UITimePicker.cs @@ -36,21 +36,21 @@ namespace Sunny.UI { private void InitializeComponent() { - this.SuspendLayout(); - // + SuspendLayout(); + // // UITimePicker - // - this.Name = "UITimePicker"; - this.Padding = new Padding(0, 0, 30, 0); - this.SymbolDropDown = 61555; - this.SymbolNormal = 61555; - this.ButtonClick += this.UITimePicker_ButtonClick; - this.ResumeLayout(false); - this.PerformLayout(); + // + Name = "UITimePicker"; + ShowBuiltInResources = true; + SymbolDropDown = 61555; + SymbolNormal = 61555; + ButtonClick += UITimePicker_ButtonClick; + ResumeLayout(false); + PerformLayout(); } [Browsable(false)] - public override string[] FormTranslatorProperties { get; } + public override string[] FormTranslatorProperties => ["TimeFormat"]; /// /// 必需的设计器变量。 diff --git a/SunnyUI/Controls/UITimePicker.resx b/SunnyUI/Controls/UITimePicker.resx index 1af7de15..8b2ff64a 100644 --- a/SunnyUI/Controls/UITimePicker.resx +++ b/SunnyUI/Controls/UITimePicker.resx @@ -1,17 +1,17 @@  - diff --git a/SunnyUI/Controls/UITransfer.Designer.cs b/SunnyUI/Controls/UITransfer.Designer.cs index b8c8aabe..5c059fb7 100644 --- a/SunnyUI/Controls/UITransfer.Designer.cs +++ b/SunnyUI/Controls/UITransfer.Designer.cs @@ -30,139 +30,147 @@ namespace Sunny.UI /// private void InitializeComponent() { - this.b1 = new Sunny.UI.UISymbolButton(); - this.b2 = new Sunny.UI.UISymbolButton(); - this.b3 = new Sunny.UI.UISymbolButton(); - this.b4 = new Sunny.UI.UISymbolButton(); - this.l1 = new Sunny.UI.UIListBox(); - this.l2 = new Sunny.UI.UIListBox(); - this.SuspendLayout(); + b1 = new UISymbolButton(); + b2 = new UISymbolButton(); + b3 = new UISymbolButton(); + b4 = new UISymbolButton(); + l1 = new UIListBox(); + l2 = new UIListBox(); + SuspendLayout(); // // b1 // - 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.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); - this.b1.Name = "b1"; - this.b1.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0); - this.b1.Size = new System.Drawing.Size(44, 32); - this.b1.Symbol = 61697; - this.b1.TabIndex = 3; - this.b1.TipsText = null; - this.b1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); - this.b1.Click += new System.EventHandler(this.b1_Click); + b1.BackColor = System.Drawing.Color.Transparent; + b1.Cursor = Cursors.Hand; + b1.Font = new System.Drawing.Font("宋体", 12F); + b1.Location = new System.Drawing.Point(228, 85); + b1.Margin = new Padding(0); + b1.MinimumSize = new System.Drawing.Size(1, 1); + b1.Name = "b1"; + b1.Padding = new Padding(28, 0, 0, 0); + b1.ShowBuiltInResources = true; + b1.Size = new System.Drawing.Size(44, 32); + b1.Symbol = 61697; + b1.TabIndex = 3; + b1.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); + b1.TipsText = null; + b1.Click += b1_Click; // // b2 // - 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.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); - this.b2.Name = "b2"; - this.b2.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0); - this.b2.Size = new System.Drawing.Size(44, 32); - this.b2.Symbol = 61701; - this.b2.TabIndex = 4; - this.b2.TipsText = null; - this.b2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); - this.b2.Click += new System.EventHandler(this.b2_Click); + b2.BackColor = System.Drawing.Color.Transparent; + b2.Cursor = Cursors.Hand; + b2.Font = new System.Drawing.Font("宋体", 12F); + b2.Location = new System.Drawing.Point(228, 135); + b2.Margin = new Padding(0); + b2.MinimumSize = new System.Drawing.Size(1, 1); + b2.Name = "b2"; + b2.Padding = new Padding(28, 0, 0, 0); + b2.ShowBuiltInResources = true; + b2.Size = new System.Drawing.Size(44, 32); + b2.Symbol = 61701; + b2.TabIndex = 4; + b2.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); + b2.TipsText = null; + b2.Click += b2_Click; // // b3 // - 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.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); - this.b3.Name = "b3"; - this.b3.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0); - this.b3.Size = new System.Drawing.Size(44, 32); - this.b3.Symbol = 61700; - this.b3.TabIndex = 5; - this.b3.TipsText = null; - this.b3.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); - this.b3.Click += new System.EventHandler(this.b3_Click); + b3.BackColor = System.Drawing.Color.Transparent; + b3.Cursor = Cursors.Hand; + b3.Font = new System.Drawing.Font("宋体", 12F); + b3.Location = new System.Drawing.Point(228, 183); + b3.Margin = new Padding(0); + b3.MinimumSize = new System.Drawing.Size(1, 1); + b3.Name = "b3"; + b3.Padding = new Padding(28, 0, 0, 0); + b3.ShowBuiltInResources = true; + b3.Size = new System.Drawing.Size(44, 32); + b3.Symbol = 61700; + b3.TabIndex = 5; + b3.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); + b3.TipsText = null; + b3.Click += b3_Click; // // b4 // - 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.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); - this.b4.Name = "b4"; - this.b4.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0); - this.b4.Size = new System.Drawing.Size(44, 32); - this.b4.Symbol = 61696; - this.b4.TabIndex = 6; - this.b4.TipsText = null; - this.b4.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); - this.b4.Click += new System.EventHandler(this.b4_Click); + b4.BackColor = System.Drawing.Color.Transparent; + b4.Cursor = Cursors.Hand; + b4.Font = new System.Drawing.Font("宋体", 12F); + b4.Location = new System.Drawing.Point(228, 233); + b4.Margin = new Padding(0); + b4.MinimumSize = new System.Drawing.Size(1, 1); + b4.Name = "b4"; + b4.Padding = new Padding(28, 0, 0, 0); + b4.ShowBuiltInResources = true; + b4.Size = new System.Drawing.Size(44, 32); + b4.Symbol = 61696; + b4.TabIndex = 6; + b4.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); + b4.TipsText = null; + b4.Click += b4_Click; // // l1 // - 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.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); - this.l1.Name = "l1"; - this.l1.Padding = new System.Windows.Forms.Padding(2); - this.l1.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended; - this.l1.ShowText = false; - this.l1.Size = new System.Drawing.Size(210, 348); - this.l1.TabIndex = 7; - this.l1.Text = null; - this.l1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); - this.l1.Click += new System.EventHandler(this.l1_ItemClick); - this.l1.DoubleClick += new System.EventHandler(this.l1_DoubleClick); + l1.BackColor = System.Drawing.Color.Transparent; + l1.Dock = DockStyle.Left; + l1.FillColor = System.Drawing.Color.White; + l1.Font = new System.Drawing.Font("宋体", 12F); + l1.HoverColor = System.Drawing.Color.FromArgb(155, 200, 255); + l1.ItemSelectForeColor = System.Drawing.Color.White; + l1.Location = new System.Drawing.Point(1, 1); + l1.Margin = new Padding(4, 5, 4, 5); + l1.MinimumSize = new System.Drawing.Size(1, 1); + l1.Name = "l1"; + l1.Padding = new Padding(2); + l1.SelectionMode = SelectionMode.MultiExtended; + l1.ShowBuiltInResources = true; + l1.ShowText = false; + l1.Size = new System.Drawing.Size(210, 348); + l1.TabIndex = 7; + l1.Text = null; + l1.Click += l1_ItemClick; + l1.DoubleClick += l1_DoubleClick; // // l2 // - 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.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); - this.l2.Name = "l2"; - this.l2.Padding = new System.Windows.Forms.Padding(2); - this.l2.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended; - this.l2.ShowText = false; - this.l2.Size = new System.Drawing.Size(210, 348); - this.l2.TabIndex = 8; - this.l2.Text = null; - this.l2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); - this.l2.Click += new System.EventHandler(this.l2_ItemClick); - this.l2.DoubleClick += new System.EventHandler(this.l2_DoubleClick); + l2.BackColor = System.Drawing.Color.Transparent; + l2.Dock = DockStyle.Right; + l2.FillColor = System.Drawing.Color.White; + l2.Font = new System.Drawing.Font("宋体", 12F); + l2.HoverColor = System.Drawing.Color.FromArgb(155, 200, 255); + l2.ItemSelectForeColor = System.Drawing.Color.White; + l2.Location = new System.Drawing.Point(289, 1); + l2.Margin = new Padding(4, 5, 4, 5); + l2.MinimumSize = new System.Drawing.Size(1, 1); + l2.Name = "l2"; + l2.Padding = new Padding(2); + l2.SelectionMode = SelectionMode.MultiExtended; + l2.ShowBuiltInResources = true; + l2.ShowText = false; + l2.Size = new System.Drawing.Size(210, 348); + l2.TabIndex = 8; + l2.Text = null; + l2.Click += l2_ItemClick; + l2.DoubleClick += l2_DoubleClick; // // UITransfer // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.Controls.Add(this.l2); - this.Controls.Add(this.l1); - this.Controls.Add(this.b4); - this.Controls.Add(this.b3); - this.Controls.Add(this.b2); - this.Controls.Add(this.b1); - this.Margin = new System.Windows.Forms.Padding(7, 9, 7, 9); - this.Name = "UITransfer"; - this.Padding = new System.Windows.Forms.Padding(1); - this.RadiusSides = Sunny.UI.UICornerRadiusSides.None; - this.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; - this.Size = new System.Drawing.Size(500, 350); - this.ResumeLayout(false); - + AutoScaleMode = AutoScaleMode.None; + Controls.Add(l2); + Controls.Add(l1); + Controls.Add(b4); + Controls.Add(b3); + Controls.Add(b2); + Controls.Add(b1); + Margin = new Padding(7, 9, 7, 9); + Name = "UITransfer"; + Padding = new Padding(1); + RadiusSides = UICornerRadiusSides.None; + RectSides = ToolStripStatusLabelBorderSides.None; + ShowBuiltInResources = true; + Size = new System.Drawing.Size(500, 350); + ResumeLayout(false); } #endregion diff --git a/SunnyUI/Controls/UITransfer.resx b/SunnyUI/Controls/UITransfer.resx index f298a7be..8b2ff64a 100644 --- a/SunnyUI/Controls/UITransfer.resx +++ b/SunnyUI/Controls/UITransfer.resx @@ -1,4 +1,64 @@ - + + + diff --git a/SunnyUI/Controls/UITreeView.cs b/SunnyUI/Controls/UITreeView.cs index ff4bb0e3..3d19df3d 100644 --- a/SunnyUI/Controls/UITreeView.cs +++ b/SunnyUI/Controls/UITreeView.cs @@ -928,40 +928,49 @@ namespace Sunny.UI Bar = new UIScrollBar(); HBar = new UIHorScrollBar(); SuspendLayout(); - // + // // view - // + // view.BackColor = Color.White; view.BorderStyle = BorderStyle.None; view.DrawMode = TreeViewDrawMode.OwnerDrawAll; + view.FillColor = Color.White; view.ForeColor = Color.FromArgb(48, 48, 48); view.FullRowSelect = true; view.ItemHeight = 28; view.Location = new Point(2, 2); view.Name = "view"; + view.NodeClickChangeCheckBoxes = false; + view.SelectedColor = Color.FromArgb(80, 160, 255); + view.SelectedForeColor = Color.White; view.ShowLines = false; + view.ShowLinesEx = false; view.Size = new Size(266, 176); view.TabIndex = 0; + view.TreeNodeStateSync = true; view.AfterCollapse += view_AfterCollapse; view.AfterExpand += view_AfterExpand; view.DrawNode += view_DrawNode; - // + // // Bar - // + // Bar.Font = new Font("宋体", 12F); Bar.Location = new Point(247, 3); + Bar.MinimumSize = new Size(1, 1); Bar.Name = "Bar"; + Bar.ShowBuiltInResources = true; Bar.Size = new Size(19, 173); Bar.Style = UIStyle.Custom; Bar.StyleCustomMode = true; Bar.TabIndex = 2; Bar.Visible = false; Bar.ValueChanged += Bar_ValueChanged; - // + // // HBar - // + // HBar.Font = new Font("宋体", 12F); HBar.Location = new Point(247, 3); + HBar.MinimumSize = new Size(1, 1); HBar.Name = "HBar"; HBar.Size = new Size(173, 19); HBar.Style = UIStyle.Custom; @@ -969,13 +978,15 @@ namespace Sunny.UI HBar.TabIndex = 3; HBar.Visible = false; HBar.ValueChanged += HBar_ValueChanged; - // - // UITreeViewEx - // + // + // UITreeView + // Controls.Add(Bar); Controls.Add(HBar); Controls.Add(view); FillColor = Color.White; + Name = "UITreeView"; + ShowBuiltInResources = true; ResumeLayout(false); } diff --git a/SunnyUI/Controls/UITreeView.resx b/SunnyUI/Controls/UITreeView.resx index 1af7de15..8b2ff64a 100644 --- a/SunnyUI/Controls/UITreeView.resx +++ b/SunnyUI/Controls/UITreeView.resx @@ -1,17 +1,17 @@  - diff --git a/SunnyUI/Controls/UIUserControl.cs b/SunnyUI/Controls/UIUserControl.cs index d186617f..e8907aaa 100644 --- a/SunnyUI/Controls/UIUserControl.cs +++ b/SunnyUI/Controls/UIUserControl.cs @@ -160,23 +160,6 @@ namespace Sunny.UI } } - //protected bool IsDesignMode - //{ - // get - // { - // if (LicenseManager.UsageMode == LicenseUsageMode.Designtime) - // { - // return true; - // } - // else if (System.Diagnostics.Process.GetCurrentProcess().ProcessName == "devenv") - // { - // return true; - // } - // - // return false; - // } - //} - private ToolStripStatusLabelBorderSides _rectSides = ToolStripStatusLabelBorderSides.All; [DefaultValue(ToolStripStatusLabelBorderSides.All), Description("边框显示位置"), Category("SunnyUI")] diff --git a/SunnyUI/Forms/UIBaseForm.cs b/SunnyUI/Forms/UIBaseForm.cs index e2a77dce..befb33b4 100644 --- a/SunnyUI/Forms/UIBaseForm.cs +++ b/SunnyUI/Forms/UIBaseForm.cs @@ -24,9 +24,11 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.ComponentModel; +using System.Diagnostics; using System.Drawing; using System.Drawing.Design; using System.IO; +using System.Linq; using System.Windows.Forms; namespace Sunny.UI @@ -145,10 +147,13 @@ namespace Sunny.UI public void Render() { - if (!DesignMode && UIStyles.Style.IsValid()) - { + if (DesignMode) return; + + if (UIStyles.Style.IsValid()) SetInheritedStyle(UIStyles.Style); - } + + if (!ShowBuiltInResources) + Translate(); } public virtual void SetInheritedStyle(UIStyle style) @@ -623,13 +628,10 @@ namespace Sunny.UI { get { - bool ReturnFlag = DesignMode; - if (LicenseManager.UsageMode == LicenseUsageMode.Designtime) - ReturnFlag = true; - else if (System.Diagnostics.Process.GetCurrentProcess().ProcessName == "devenv") - ReturnFlag = true; - - return ReturnFlag; + if (DesignMode) return true; + if (LicenseManager.UsageMode == LicenseUsageMode.Designtime) return true; + if (Process.GetCurrentProcess().ProcessName == "devenv") return true; + return false; } } @@ -1064,18 +1066,21 @@ namespace Sunny.UI #endregion IFrame实现 + [DefaultValue(false)] + [Description("控件是否显示多语内置资源"), Category("SunnyUI")] + public bool ShowBuiltInResources { get; set; } = false; + public virtual void Translate() { - var controls = this.GetInterfaceControls(true); + if (IsDesignMode) return; + + var controls = this.GetInterfaceControls(true).Where(p => p is not UIPage); foreach (var control in controls) { - if (control is not UIPage) - control.Translate(); + control.Translate(); } SelectedPage?.Translate(); - - if (IsDesignMode) return; this.TranslateOther(); } diff --git a/SunnyUI/Forms/UIEditForm.Designer.cs b/SunnyUI/Forms/UIEditForm.Designer.cs index 42ccc35a..e057e659 100644 --- a/SunnyUI/Forms/UIEditForm.Designer.cs +++ b/SunnyUI/Forms/UIEditForm.Designer.cs @@ -62,11 +62,13 @@ btnCancel.MinimumSize = new System.Drawing.Size(1, 1); btnCancel.Name = "btnCancel"; btnCancel.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0); + btnCancel.ShowBuiltInResources = true; btnCancel.ShowFocusColor = true; btnCancel.Size = new System.Drawing.Size(100, 35); btnCancel.Symbol = 361453; btnCancel.TabIndex = 1; btnCancel.Text = "取消"; + btnCancel.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); btnCancel.TipsText = null; btnCancel.Click += btnCancel_Click; // @@ -80,11 +82,12 @@ btnOK.MinimumSize = new System.Drawing.Size(1, 1); btnOK.Name = "btnOK"; btnOK.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0); + btnOK.ShowBuiltInResources = true; btnOK.ShowFocusColor = true; btnOK.Size = new System.Drawing.Size(100, 35); - btnOK.Symbol = 361452; btnOK.TabIndex = 0; btnOK.Text = "确定"; + btnOK.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); btnOK.TipsText = null; btnOK.Click += btnOK_Click; // diff --git a/SunnyUI/Forms/UIEditForm.resx b/SunnyUI/Forms/UIEditForm.resx index af32865e..8b2ff64a 100644 --- a/SunnyUI/Forms/UIEditForm.resx +++ b/SunnyUI/Forms/UIEditForm.resx @@ -1,7 +1,7 @@