From 2e8e85f65748ee5a5adf0dcda864aa4167cbf2ef Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 11 十二月 2024 10:32:35 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeDlg.Designer.cs | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 115 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeDlg.Designer.cs
index 9d12ffa..1b73f30 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeDlg.Designer.cs
@@ -28,19 +28,132 @@
/// </summary>
private void InitializeComponent()
{
+ ComponentResourceManager resources = new ComponentResourceManager(typeof(CreateXhsSchemeDlg));
+ layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ stepProgressBar1 = new StepProgressBar();
+ stepPbBasicInfo = new StepProgressBarItem();
+ Root = new DevExpress.XtraLayout.LayoutControlGroup();
+ layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
+ stepPbPumpChanged = new StepProgressBarItem();
+ ((ISupportInitialize)layoutControl1).BeginInit();
+ layoutControl1.SuspendLayout();
+ ((ISupportInitialize)stepProgressBar1).BeginInit();
+ ((ISupportInitialize)Root).BeginInit();
+ ((ISupportInitialize)layoutControlItem1).BeginInit();
+ ((ISupportInitialize)emptySpaceItem1).BeginInit();
SuspendLayout();
+ //
+ // layoutControl1
+ //
+ layoutControl1.Controls.Add(stepProgressBar1);
+ layoutControl1.Dock = DockStyle.Fill;
+ layoutControl1.Location = new Point(0, 0);
+ layoutControl1.Margin = new Padding(4, 5, 4, 5);
+ layoutControl1.Name = "layoutControl1";
+ layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(1585, 699, 975, 600);
+ layoutControl1.Root = Root;
+ layoutControl1.Size = new Size(1517, 1003);
+ layoutControl1.TabIndex = 0;
+ layoutControl1.Text = "layoutControl1";
+ //
+ // stepProgressBar1
+ //
+ stepProgressBar1.ConnectorLineThickness = 3;
+ stepProgressBar1.ContentAlignment = ContentAlignment.MiddleCenter;
+ stepProgressBar1.DistanceBetweenContentBlockElements = 9;
+ stepProgressBar1.IndentBetweenItems = 46;
+ stepProgressBar1.IndicatorLineThickness = 3;
+ stepProgressBar1.IndicatorToContentBlockDistance = 9;
+ stepProgressBar1.ItemOptions.Indicator.ActiveStateImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("stepProgressBar1.ItemOptions.Indicator.ActiveStateImageOptions.SvgImage");
+ stepProgressBar1.ItemOptions.Indicator.ActiveStateImageOptions.SvgImageSize = new Size(20, 20);
+ stepProgressBar1.Items.Add(stepPbBasicInfo);
+ stepProgressBar1.Items.Add(stepPbPumpChanged);
+ stepProgressBar1.Location = new Point(12, 12);
+ stepProgressBar1.Margin = new Padding(4, 5, 4, 5);
+ stepProgressBar1.MaximumSize = new Size(1556, 94);
+ stepProgressBar1.MinimumSize = new Size(1556, 94);
+ stepProgressBar1.Name = "stepProgressBar1";
+ stepProgressBar1.Padding = new Padding(43, 16, 14, 16);
+ stepProgressBar1.SelectedItemIndex = 1;
+ stepProgressBar1.ShadowDrawMode = StepProgressBarShadowDrawMode.ActiveElements;
+ stepProgressBar1.ShadowSize = 11;
+ stepProgressBar1.Size = new Size(1556, 94);
+ stepProgressBar1.StyleController = layoutControl1;
+ stepProgressBar1.TabIndex = 5;
+ stepProgressBar1.Visible = false;
+ //
+ // stepPbBasicInfo
+ //
+ stepPbBasicInfo.ContentBlock2.Caption = "鍩烘湰淇℃伅";
+ stepPbBasicInfo.Name = "stepPbBasicInfo";
+ stepPbBasicInfo.Options.Indicator.ActiveStateDrawMode = IndicatorDrawMode.Full;
+ stepPbBasicInfo.Options.Indicator.ActiveStateImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("stepPbSelectModelFile.Options.Indicator.ActiveStateImageOptions.SvgImage");
+ stepPbBasicInfo.Options.Indicator.InactiveStateImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("stepPbSelectModelFile.Options.Indicator.InactiveStateImageOptions.SvgImage");
+ stepPbBasicInfo.State = StepProgressBarItemState.Active;
+ //
+ // Root
+ //
+ Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ Root.GroupBordersVisible = false;
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, emptySpaceItem1 });
+ Root.Name = "Root";
+ Root.Size = new Size(1580, 977);
+ Root.TextVisible = false;
+ //
+ // layoutControlItem1
+ //
+ layoutControlItem1.Control = stepProgressBar1;
+ layoutControlItem1.Location = new Point(0, 0);
+ layoutControlItem1.Name = "layoutControlItem1";
+ layoutControlItem1.Size = new Size(1560, 98);
+ layoutControlItem1.TextSize = new Size(0, 0);
+ layoutControlItem1.TextVisible = false;
+ //
+ // emptySpaceItem1
+ //
+ emptySpaceItem1.AllowHotTrack = false;
+ emptySpaceItem1.Location = new Point(0, 98);
+ emptySpaceItem1.Name = "emptySpaceItem1";
+ emptySpaceItem1.Size = new Size(1560, 859);
+ emptySpaceItem1.TextSize = new Size(0, 0);
+ //
+ // stepPbPumpChanged
+ //
+ stepPbPumpChanged.ContentBlock2.Caption = "姘存车鍙樻洿";
+ stepPbPumpChanged.Name = "stepPbPumpChanged";
+ stepPbPumpChanged.Options.Indicator.ActiveStateDrawMode = IndicatorDrawMode.Full;
+ stepPbPumpChanged.Options.Indicator.ActiveStateImageOptions.SvgImage = Xhs.Core.Properties.Resources.bo_sale_item;
+ stepPbPumpChanged.Options.Indicator.InactiveStateImageOptions.SvgImage = Xhs.Core.Properties.Resources.bo_sale_item1;
+ stepPbPumpChanged.State = StepProgressBarItemState.Active;
//
// CreateXhsSchemeDlg
//
- AutoScaleDimensions = new SizeF(7F, 14F);
+ AutoScaleDimensions = new SizeF(10F, 22F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(1062, 638);
+ ClientSize = new Size(1517, 1003);
+ Controls.Add(layoutControl1);
+ Margin = new Padding(4, 5, 4, 5);
Name = "CreateXhsSchemeDlg";
StartPosition = FormStartPosition.CenterParent;
Text = "鍒涘缓鏂规";
+ ((ISupportInitialize)layoutControl1).EndInit();
+ layoutControl1.ResumeLayout(false);
+ ((ISupportInitialize)stepProgressBar1).EndInit();
+ ((ISupportInitialize)Root).EndInit();
+ ((ISupportInitialize)layoutControlItem1).EndInit();
+ ((ISupportInitialize)emptySpaceItem1).EndInit();
ResumeLayout(false);
}
#endregion
+
+ private DevExpress.XtraLayout.LayoutControl layoutControl1;
+ private StepProgressBar stepProgressBar1;
+ private StepProgressBarItem stepPbBasicInfo;
+ private DevExpress.XtraLayout.LayoutControlGroup Root;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
+ private StepProgressBarItem stepPbPumpChanged;
}
}
\ No newline at end of file
--
Gitblit v1.9.3