.gitignore | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Client/DesktopMain/DPumpHydr.DesktopMain.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WinFrmUI/DPumpHydr.WinFrmUI.RLT/Controls/TextBoxEdit/MaterialTextBoxEdit.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_InitialRibbon.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WinFrmUI/DPumpHydr.WinFrmUI.Volute/基本参数/ViewModel/HdrBaseInfo.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WinFrmUI/DPumpHydr.WinFrmUI.Volute/基本参数/ctrlHdrBaseInfo.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WinFrmUI/DPumpHydr.WinFrmUI.Volute/基本参数/ctrlHdrBaseInfo.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WinFrmUI/DPumpHydr.WinFrmUI.Volute/基本参数/ctrlHdrBaseInfo.resx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.gitignore
@@ -90,3 +90,4 @@ /Client/DesktopMain/Resources/updownbars.svg /Client/DesktopMain/Resources/ViewAll.svg /Client/DesktopMain/Resources/BackgroupSplash.png /Client/DesktopMain/bin Client/DesktopMain/DPumpHydr.DesktopMain.csproj
@@ -20,6 +20,9 @@ <Compile Remove="MainWindow\MainWindowOld.designer.cs" /> <Compile Remove="Main\Form1.cs" /> <Compile Remove="Main\Form1.Designer.cs" /> <Compile Remove="RibbonTestForm.cs" /> <Compile Remove="RibbonTestForm.Designer.cs" /> <Compile Remove="RibbonTestForm_InitialRibbon.cs" /> </ItemGroup> <ItemGroup> @@ -27,6 +30,7 @@ <EmbeddedResource Remove="MainWindow\MainWindowOld.en-US.resx" /> <EmbeddedResource Remove="MainWindow\MainWindowOld.resx" /> <EmbeddedResource Remove="Main\Form1.resx" /> <EmbeddedResource Remove="RibbonTestForm.resx" /> </ItemGroup> <ItemGroup> WinFrmUI/DPumpHydr.WinFrmUI.RLT/Controls/TextBoxEdit/MaterialTextBoxEdit.cs
@@ -31,7 +31,11 @@ [Browsable(false)] public MaterialSkinManager SkinManager => MaterialSkinManager.Instance; public bool Focus() /// <summary> /// /// </summary> /// <returns></returns> public new bool Focus() { return baseTextBox.Focus(); } @@ -114,6 +118,19 @@ } } [Category("Material"), DefaultValue(""), Localizable(true), Description("Helper text conveys additional guidance about the input field, such as how it will be used.")] public string NullValuePromptText { get => _nullValuePromptText; set { _nullValuePromptText = value; Invalidate(); } } private string _nullValuePromptText; private string _errorMessage; [Category("Material"), DefaultValue(""), Localizable(true), Description("When text input isn't accepted, an error message can display instructions on how to fix it. Error messages are displayed below the input line, replacing helper text until fixed.")] WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage.Designer.cs
@@ -35,7 +35,7 @@ private void InitializeComponent() { ribbonForm = new Ribbon(); panel1 = new Panel(); panelParas = new Panel(); SuspendLayout(); // // ribbonForm @@ -58,17 +58,17 @@ // // panel1 // panel1.Dock = DockStyle.Fill; panel1.Location = new System.Drawing.Point(0, 147); panel1.Name = "panel1"; panel1.Size = new System.Drawing.Size(933, 491); panel1.TabIndex = 1; panelParas.Dock = DockStyle.Fill; panelParas.Location = new System.Drawing.Point(0, 147); panelParas.Name = "panel1"; panelParas.Size = new System.Drawing.Size(933, 491); panelParas.TabIndex = 1; // // MainViewPage // AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); AutoScaleMode = AutoScaleMode.Font; Controls.Add(panel1); Controls.Add(panelParas); Controls.Add(ribbonForm); Margin = new Padding(4); Name = "MainViewPage"; @@ -79,6 +79,6 @@ #endregion private System.Windows.Forms.Ribbon ribbonForm; private Panel panel1; private Panel panelParas; } } WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_InitialRibbon.cs
@@ -802,10 +802,8 @@ Rbtnå¼å§.Click += (sender, e) => { Rbtnä¸ä¸æ¥.Visible = true; Rbtnåæ¶.Visible = true; _ctrlHdrBaseInfo = new ctrlHdrBaseInfo(); _ctrlHdrBaseInfo.Name = "ctrlHdrBaseInfo"; _ctrlHdrBaseInfo.Dock = DockStyle.Right; this.panel1.Controls.Add(_ctrlHdrBaseInfo); InitialStepNodes(); }; Rbtn宿 = new System.Windows.Forms.RibbonButton(); @@ -815,7 +813,7 @@ Rbtn宿.Name = "Rbtn宿"; Rbtn宿.Text = "宿"; Rbtn宿.Click += (sender, e) => { this.panel1.Controls.Remove(_ctrlSetOutflowStyle); this.panelParas.Controls.Remove(_ctrlSetOutflowStyle); Rbtnä¸ä¸æ¥.Visible = false; Rbtnåæ¶.Visible = false; Rbtnä¸ä¸æ¥.Visible = false; @@ -830,37 +828,37 @@ Rbtnåæ¶.Name = "Rbtnåæ¶"; Rbtnåæ¶.Text = "åæ¶"; Rbtnåæ¶.Click += (sender, e) => { if( MessageBox.Show("ç¡®å®è¦åæ¶åï¼", "æç¤º", MessageBoxButtons.OKCancel, MessageBoxIcon.Question)== DialogResult.OK) { Rbtnä¸ä¸æ¥.Visible = false; Rbtnåæ¶.Visible = false; Rbtnä¸ä¸æ¥.Visible = false; Rbtn宿.Visible = false; if (this.panel1.Controls.Contains(_ctrlHdrBaseInfo)) { this.panel1.Controls.Remove(_ctrlHdrBaseInfo); } if (this.panel1.Controls.Contains(_ctrlGeomBaseInfo)) { this.panel1.Controls.Remove(_ctrlGeomBaseInfo); } if (this.panel1.Controls.Contains(_ctrlSectionBaseInfo)) { this.panel1.Controls.Remove(_ctrlSectionBaseInfo); } if (this.panel1.Controls.Contains(_ctrlSectionShapeInfo18)) { this.panel1.Controls.Remove(_ctrlSectionShapeInfo18); } if (this.panel1.Controls.Contains(_ctrlSetOutflowStyle)) { this.panel1.Controls.Remove(_ctrlSetOutflowStyle); } if (this.panel1.Controls.Contains(_ctrlSetOutflowDim)) { this.panel1.Controls.Remove(_ctrlSetOutflowDim); } } //if( MessageBox.Show("ç¡®å®è¦åæ¶åï¼", "æç¤º", MessageBoxButtons.OKCancel, MessageBoxIcon.Question)== DialogResult.OK) // { // Rbtnä¸ä¸æ¥.Visible = false; // Rbtnåæ¶.Visible = false; // Rbtnä¸ä¸æ¥.Visible = false; // Rbtn宿.Visible = false; // if (this.panel1.Controls.Contains(_ctrlHdrBaseInfo)) // { // this.panel1.Controls.Remove(_ctrlHdrBaseInfo); // } // if (this.panel1.Controls.Contains(_ctrlGeomBaseInfo)) // { // this.panel1.Controls.Remove(_ctrlGeomBaseInfo); // } // if (this.panel1.Controls.Contains(_ctrlSectionBaseInfo)) // { // this.panel1.Controls.Remove(_ctrlSectionBaseInfo); // } // if (this.panel1.Controls.Contains(_ctrlSectionShapeInfo18)) // { // this.panel1.Controls.Remove(_ctrlSectionShapeInfo18); // } // if (this.panel1.Controls.Contains(_ctrlSetOutflowStyle)) // { // this.panel1.Controls.Remove(_ctrlSetOutflowStyle); // } // if (this.panel1.Controls.Contains(_ctrlSetOutflowDim)) // { // this.panel1.Controls.Remove(_ctrlSetOutflowDim); // } // } }; @@ -872,54 +870,7 @@ Rbtnä¸ä¸æ¥.Text = "ä¸ä¸æ¥"; Rbtnä¸ä¸æ¥.Click += (sender, e) => { if (this.panel1.Controls.Contains(_ctrlGeomBaseInfo)) { this.panel1.Controls.Remove(_ctrlGeomBaseInfo); Rbtnä¸ä¸æ¥.Visible = false; _ctrlHdrBaseInfo = new ctrlHdrBaseInfo(); _ctrlHdrBaseInfo.Name = "ctrlHdrBaseInfo"; _ctrlHdrBaseInfo.Dock = DockStyle.Right; this.panel1.Controls.Add(_ctrlHdrBaseInfo); return; } if (this.panel1.Controls.Contains(_ctrlSectionBaseInfo)) { this.panel1.Controls.Remove(_ctrlSectionBaseInfo); _ctrlGeomBaseInfo = new ctrlGeomBaseInfo(); _ctrlGeomBaseInfo.Name = "ctrlGeomBaseInfo"; _ctrlGeomBaseInfo.Dock = DockStyle.Right; this.panel1.Controls.Add(_ctrlGeomBaseInfo); return; } if (this.panel1.Controls.Contains(_ctrlSectionShapeInfo18)) { this.panel1.Controls.Remove(_ctrlSectionShapeInfo18); _ctrlSectionBaseInfo = new ctrlSectionBaseInfo(); _ctrlSectionBaseInfo.Name = "ctrlSectionBaseInfo"; _ctrlSectionBaseInfo.Dock = DockStyle.Right; this.panel1.Controls.Add(_ctrlSectionBaseInfo); return; } if (this.panel1.Controls.Contains(_ctrlSetOutflowDim)) { this.panel1.Controls.Remove(_ctrlSetOutflowDim); _ctrlSectionShapeInfo18 = new ctrlSectionShapeInfo18(); _ctrlSectionShapeInfo18.Name = "ctrlSectionShapeInfo18"; _ctrlSectionShapeInfo18.Dock = DockStyle.Right; this.panel1.Controls.Add(_ctrlSectionShapeInfo18); return; } if (this.panel1.Controls.Contains(_ctrlSetOutflowStyle)) { this.panel1.Controls.Remove(_ctrlSetOutflowStyle); Rbtnä¸ä¸æ¥.Visible = true; _ctrlSetOutflowDim = new ctrlSetOutflowDim(); _ctrlSetOutflowDim.Name = "ctrlSetOutflowDim"; _ctrlSetOutflowDim.Dock = DockStyle.Right; this.panel1.Controls.Add(_ctrlSetOutflowDim); return; } GoPrevStepCore(); }; Rbtnä¸ä¸æ¥ = new System.Windows.Forms.RibbonButton(); @@ -929,78 +880,7 @@ Rbtnä¸ä¸æ¥.Name = "Rbtnä¸ä¸æ¥"; Rbtnä¸ä¸æ¥.Text = "ä¸ä¸æ¥"; Rbtnä¸ä¸æ¥.Click += (sender, e) => { string error = null; if(_ctrlHdrBaseInfo.Verify(out error)) {if (this.panel1.Controls.Contains(_ctrlHdrBaseInfo)) { this.panel1.Controls.Remove(_ctrlHdrBaseInfo); Rbtnä¸ä¸æ¥.Visible = true; _ctrlGeomBaseInfo = new ctrlGeomBaseInfo(); _ctrlGeomBaseInfo.Name = "ctrlGeomBaseInfo"; _ctrlGeomBaseInfo.Dock = DockStyle.Right; this.panel1.Controls.Add(_ctrlGeomBaseInfo); return; } } else { MessageBox.Show(error); return; } if (_ctrlGeomBaseInfo.Verify(out error)) { if (this.panel1.Controls.Contains(_ctrlGeomBaseInfo)) { this.panel1.Controls.Remove(_ctrlGeomBaseInfo); _ctrlSectionBaseInfo = new ctrlSectionBaseInfo(); _ctrlSectionBaseInfo.Name = "ctrlSectionBaseInfo"; _ctrlSectionBaseInfo.Dock = DockStyle.Right; this.panel1.Controls.Add(_ctrlSectionBaseInfo); return; } } else { MessageBox.Show(error); return; } if (_ctrlSectionBaseInfo.Verify(out error)) { if (this.panel1.Controls.Contains(_ctrlSectionBaseInfo)) { this.panel1.Controls.Remove(_ctrlSectionBaseInfo); _ctrlSectionShapeInfo18 = new ctrlSectionShapeInfo18(); _ctrlSectionShapeInfo18.Name = "ctrlSectionShapeInfo18"; _ctrlSectionShapeInfo18.Dock = DockStyle.Right; this.panel1.Controls.Add(_ctrlSectionShapeInfo18); return; } } else { MessageBox.Show(error); return; } if (this.panel1.Controls.Contains(_ctrlSectionShapeInfo18)) { this.panel1.Controls.Remove(_ctrlSectionShapeInfo18); _ctrlSetOutflowDim = new ctrlSetOutflowDim(); _ctrlSetOutflowDim.Name = "ctrlSetOutflowDim"; _ctrlSetOutflowDim.Dock = DockStyle.Right; this.panel1.Controls.Add(_ctrlSetOutflowDim); return; } if (this.panel1.Controls.Contains(_ctrlSetOutflowDim)) { this.panel1.Controls.Remove(_ctrlSetOutflowDim); Rbtnä¸ä¸æ¥.Visible = false; Rbtn宿.Visible = true; _ctrlSetOutflowStyle = new ctrlSetOutflowStyle(); _ctrlSetOutflowStyle.Name = "ctrlSetOutflowStyle"; _ctrlSetOutflowStyle.Dock = DockStyle.Right; this.panel1.Controls.Add(_ctrlSetOutflowStyle); return; } GoNextStepCore(); }; WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs
@@ -34,7 +34,7 @@ private List<DPumpHydr.WinFrmUI.Volute.TreeStepNode> _allStepNodes = null; private long _currentStepID = 0; /// <summary> /// ä¸ä¸æ¥ /// </summary> @@ -52,7 +52,7 @@ { return GoPrevStepCore(); } ViewModel.HdrBaseInfo _hdrBaseInfo = null; private bool GoNextStepCore() { var next_step = (from x in _allStepNodes @@ -61,7 +61,17 @@ select x).FirstOrDefault(); if (next_step == null) return false; if(_currentStepID == Step_ID_Hdr_Base_Info) { string error_info; var hdrBaseInfo = _ctrlHdrBaseInfo.GetBindingData(out error_info); if(hdrBaseInfo == null) { MessageBox.Show(error_info); return false; } _hdrBaseInfo = hdrBaseInfo; } SetParasCtrl(next_step.ID); return true; @@ -90,15 +100,20 @@ { if (_ctrlHdrBaseInfo == null) _ctrlHdrBaseInfo = new ctrlHdrBaseInfo(); // dockPanel2.Controls.Clear(); // dockPanel2.Controls.Add(_ctrlHdrBaseInfo); this.panelParas.Controls.Clear(); this.panelParas.Controls.Add(_ctrlHdrBaseInfo); } if (step_id == Step_ID_Geom_Base_Info) { if (_ctrlGeomBaseInfo == null) { _ctrlGeomBaseInfo = new ctrlGeomBaseInfo(); // dockPanel2.Controls.Clear(); // dockPanel2.Controls.Add(_ctrlGeomBaseInfo); _ctrlGeomBaseInfo.Name = "ctrlGeomBaseInfo"; _ctrlGeomBaseInfo.Dock = DockStyle.Fill; } this.panelParas.Controls.Clear(); this.panelParas.Controls.Add(_ctrlGeomBaseInfo); } @@ -107,16 +122,27 @@ if (step_id == Step_ID_Section18_Base) { if (_ctrlSectionBaseInfo == null) _ctrlSectionBaseInfo = new ctrlSectionBaseInfo(); // dockPanel2.Controls.Clear(); // dockPanel2.Controls.Add(_ctrlSectionBaseInfo); { _ctrlSectionBaseInfo = new ctrlSectionBaseInfo(); _ctrlSectionBaseInfo.Name = "ctrlSectionBaseInfo"; _ctrlSectionBaseInfo.Dock = DockStyle.Fill; } this.panelParas.Controls.Clear(); this.panelParas.Controls.Add(_ctrlSectionBaseInfo); } if (step_id == Step_ID_Section18_Dim) { if (_ctrlSectionShapeInfo18 == null) { _ctrlSectionShapeInfo18 = new ctrlSectionShapeInfo18(); // dockPanel2.Controls.Clear(); // dockPanel2.Controls.Add(_ctrlSectionShapeInfo18); _ctrlSectionShapeInfo18.Name = "ctrlSectionShapeInfo18"; _ctrlSectionShapeInfo18.Dock = DockStyle.Fill; } this.panelParas.Controls.Clear(); this.panelParas.Controls.Add(_ctrlSectionShapeInfo18); } @@ -125,16 +151,16 @@ { if (_ctrlSetOutflowStyle == null) _ctrlSetOutflowStyle = new ctrlSetOutflowStyle(); // dockPanel2.Controls.Clear(); // dockPanel2.Controls.Add(_ctrlSetOutflowStyle); this.panelParas.Controls.Clear(); this.panelParas.Controls.Add(_ctrlSetOutflowStyle); } if (step_id == Step_ID_Outflow_Dim) { if (_ctrlSetOutflowDim == null) _ctrlSetOutflowDim = new ctrlSetOutflowDim(); // dockPanel2.Controls.Clear(); // dockPanel2.Controls.Add(_ctrlSetOutflowDim); this.panelParas.Controls.Clear(); this.panelParas.Controls.Add(_ctrlSetOutflowDim); } @@ -252,9 +278,6 @@ #endregion #region åºæ°´ä½ var stepGroup_åºæ°´ä½ = new DPumpHydr.WinFrmUI.Volute.TreeStepNode() @@ -301,6 +324,23 @@ #endregion ViewModel.HdrBaseInfo hdrBaseInfo = new ViewModel.HdrBaseInfo(); hdrBaseInfo.Q = 200; hdrBaseInfo.H = 50; hdrBaseInfo.n = 2900; hdrBaseInfo.D2 = 220; hdrBaseInfo.B2 = 20; if (_ctrlHdrBaseInfo == null) { _ctrlHdrBaseInfo = new ctrlHdrBaseInfo(); _ctrlHdrBaseInfo.Name = "ctrlHdrBaseInfo"; _ctrlHdrBaseInfo.Dock = DockStyle.Right; _ctrlHdrBaseInfo.SetBindingData(hdrBaseInfo); } this.panelParas.Controls.Clear(); this.panelParas.Controls.Add(_ctrlHdrBaseInfo); this._currentStepID = Step_ID_Hdr_Base_Info; //this.stepTreeListCtrl.SetStepSource(_allStepNodes, 1); } WinFrmUI/DPumpHydr.WinFrmUI.Volute/»ù±¾²ÎÊý/ViewModel/HdrBaseInfo.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,17 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace DPumpHydr.WinFrmUI.Volute.ViewModel { public class HdrBaseInfo { public double Q { get; set; } public double H { get; set; } public double n { get; set; } public double D2 { get; set; } public double B2 { get; set; } } } WinFrmUI/DPumpHydr.WinFrmUI.Volute/»ù±¾²ÎÊý/ctrlHdrBaseInfo.Designer.cs
@@ -332,6 +332,7 @@ mTextBoxEditæ»æµé.CharacterCasing = System.Windows.Forms.CharacterCasing.Normal; mTextBoxEditæ»æµé.Depth = 0; mTextBoxEditæ»æµé.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel); mTextBoxEditæ»æµé.HelperText = "请è¾å ¥æ»æµéQ"; mTextBoxEditæ»æµé.HideSelection = true; mTextBoxEditæ»æµé.Hint = "æ»æµéQ"; mTextBoxEditæ»æµé.LeadingIcon = null; @@ -343,7 +344,6 @@ mTextBoxEditæ»æµé.PrefixSuffix = RLT.Controls.MaterialTextBoxEdit.PrefixSuffixTypes.Suffix; mTextBoxEditæ»æµé.PrefixSuffixText = "m³/h "; mTextBoxEditæ»æµé.ReadOnly = false; mTextBoxEditæ»æµé.RightToLeft = System.Windows.Forms.RightToLeft.Yes; mTextBoxEditæ»æµé.SelectedText = ""; mTextBoxEditæ»æµé.SelectionLength = 0; mTextBoxEditæ»æµé.SelectionStart = 0; @@ -352,7 +352,7 @@ mTextBoxEditæ»æµé.TabIndex = 3; mTextBoxEditæ»æµé.TabStop = false; mTextBoxEditæ»æµé.Text = "请è¾å ¥æ»æµé"; mTextBoxEditæ»æµé.TextAlign = System.Windows.Forms.HorizontalAlignment.Left; mTextBoxEditæ»æµé.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; mTextBoxEditæ»æµé.TrailingIcon = null; mTextBoxEditæ»æµé.UseAccent = false; mTextBoxEditæ»æµé.UseSystemPasswordChar = false; WinFrmUI/DPumpHydr.WinFrmUI.Volute/»ù±¾²ÎÊý/ctrlHdrBaseInfo.cs
@@ -7,9 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using static System.Net.Mime.MediaTypeNames; using static System.Runtime.InteropServices.JavaScript.JSType; using System.Windows.Forms; namespace DPumpHydr.WinFrmUI.Volute { @@ -18,10 +16,24 @@ public ctrlHdrBaseInfo() { InitializeComponent(); Tips(); addimage(); BuildAllTips(); BuildLeadingIcon(); } private string ResourcesPath = @"Data\MainForm\Icons"; public void SetBindingData(ViewModel.HdrBaseInfo vm) { } public ViewModel.HdrBaseInfo GetBindingData(out string error) { if(!Verify(out error)) { return null; } error = null; return null; } public bool Verify(out string error) { error = ""; @@ -40,31 +52,31 @@ if (string.IsNullOrEmpty(mTextBoxEditæ»æµé.Text) || mTextBoxEditæ»æµé.Text == "请è¾å ¥æ»æµé") { error = "请è¾å ¥å¿ 填项ï¼"; mTextBoxEditæ»æµé.TrailingIcon = Icon(ResourcesPath, image); mTextBoxEditæ»æµé.TrailingIcon = BuildIcon(ResourcesPath, image); skyLabelæ»æµé.Visible = true; } if (string.IsNullOrEmpty(mTextBoxEdit转é.Text) || mTextBoxEdit转é.Text == "请è¾å ¥è½¬é") { error = "请è¾å ¥å¿ 填项ï¼"; mTextBoxEdit转é.TrailingIcon = Icon(ResourcesPath, image); mTextBoxEdit转é.TrailingIcon = BuildIcon(ResourcesPath, image); skyLabel转é.Visible = true; } if (string.IsNullOrEmpty(mTextBoxEditæ¬ç¨.Text) || mTextBoxEditæ¬ç¨.Text == "请è¾å ¥æ¬ç¨") { error = "请è¾å ¥å¿ 填项ï¼"; mTextBoxEditæ¬ç¨.TrailingIcon = Icon(ResourcesPath, image); mTextBoxEditæ¬ç¨.TrailingIcon = BuildIcon(ResourcesPath, image); skyLabelæ¬ç¨.Visible = true; } if (string.IsNullOrEmpty(mTextBoxEditåºå£ç´å¾.Text) || mTextBoxEditåºå£ç´å¾.Text == "请è¾å ¥åºå£ç´å¾") { error = "请è¾å ¥å¿ 填项ï¼"; mTextBoxEditåºå£ç´å¾.TrailingIcon = Icon(ResourcesPath, image); mTextBoxEditåºå£ç´å¾.TrailingIcon = BuildIcon(ResourcesPath, image); skyLabelåºå£ç´å¾.Visible = true; } if (string.IsNullOrEmpty(mTextBoxEditåºå£å®½åº¦.Text) || mTextBoxEditåºå£å®½åº¦.Text == "请è¾å ¥åºå£å®½åº¦") { error = "请è¾å ¥å¿ 填项ï¼"; mTextBoxEditåºå£å®½åº¦.TrailingIcon = Icon(ResourcesPath, image); mTextBoxEditåºå£å®½åº¦.TrailingIcon = BuildIcon(ResourcesPath, image); skyLabelåºå£å®½åº¦.Visible = true; } @@ -73,18 +85,25 @@ return true; } private void addimage() //Leadingicon è¾å ¥æ¡åç¼å¾ç private string ResourcesPath = @"Data\MainForm\Icons"; private void BuildLeadingIcon() { //Leadingicon è¾å ¥æ¡åç¼å¾ç var image = "north-star.png"; mTextBoxEditæ»æµé.LeadingIcon = Icon(ResourcesPath, image); mTextBoxEdit转é.LeadingIcon = Icon(ResourcesPath, image); mTextBoxEditæ¬ç¨.LeadingIcon = Icon(ResourcesPath, image); mTextBoxEditåºå£ç´å¾.LeadingIcon = Icon(ResourcesPath, image); mTextBoxEditåºå£å®½åº¦.LeadingIcon = Icon(ResourcesPath, image); var image = BuildIcon(ResourcesPath, "north-star.png"); if (image == null) { return; } mTextBoxEditæ»æµé.LeadingIcon = image; mTextBoxEdit转é.LeadingIcon = image; mTextBoxEditæ¬ç¨.LeadingIcon = image; mTextBoxEditåºå£ç´å¾.LeadingIcon = image; mTextBoxEditåºå£å®½åº¦.LeadingIcon = image; } private void Tips() private void BuildAllTips() { metroToolTipç¬¬ä¸æ¥æç¤º.SetToolTip(this.RBtnæè½¬å, "æè½¬å"); metroToolTipç¬¬ä¸æ¥æç¤º.SetToolTip(this.RBtnåè壳å, "åè壳å"); @@ -295,9 +314,12 @@ /// <param name="path">æä»¶å¤¹è·¯å¾ï¼ç¼è¯è·¯å¾ä¸çï¼</param> /// <param name="filename">æä»¶å</param> /// <returns></returns> private System.Drawing.Image Icon(string path, string filename) private System.Drawing.Image BuildIcon(string path, string filename) { System.Drawing.Image thumbnail = AssembledPath(path, filename).GetThumbnailImage(20, 20, () => false, IntPtr.Zero); var image = BuildImage(path, filename); if (image == null) return null; System.Drawing.Image thumbnail = image.GetThumbnailImage(20, 20, () => false, IntPtr.Zero); return thumbnail; } @@ -307,15 +329,22 @@ /// <param name="path">è·¯å¾</param> /// <param name="filename">æä»¶å</param> /// <returns></returns> private System.Drawing.Image AssembledPath(string path, string filename) private System.Drawing.Image BuildImage(string path, string filename) { if (path == null && filename == null) { return null; } string fullPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, path, filename); System.Drawing.Image image = System.Drawing.Image.FromFile(fullPath); return image; if (File.Exists(fullPath)) { System.Drawing.Image image = System.Drawing.Image.FromFile(fullPath); return image; } else { return null; } } } WinFrmUI/DPumpHydr.WinFrmUI.Volute/»ù±¾²ÎÊý/ctrlHdrBaseInfo.resx
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <root> <!-- Microsoft ResX Schema Microsoft ResX Schema Version 2.0 @@ -48,7 +48,7 @@ value : The object must be serialized with : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 value : The object must be serialized with : System.Runtime.Serialization.Formatters.Soap.SoapFormatter