From 57051b41eb245cd3dc68ed9167f492df5de9d04c Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 20 九月 2024 15:35:59 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.Designer.cs | 185 +++++++++++++++++----------------------------
1 files changed, 71 insertions(+), 114 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.Designer.cs
index 1b7d044..aa0612e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.Designer.cs
@@ -29,44 +29,42 @@
private void InitializeComponent()
{
components = new Container();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ ComponentResourceManager resources = new ComponentResourceManager(typeof(InputXhsProjectInfoWizardPage));
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
setFlagsEditCtrl1 = new SetFlagsEditCtrl();
txtDescription = new DevExpress.XtraEditors.MemoEdit();
txtTagNme = new DevExpress.XtraEditors.TextEdit();
- txtAddress = new DevExpress.XtraEditors.TextEdit();
txtCustomer = new DevExpress.XtraEditors.TextEdit();
txtName = new DevExpress.XtraEditors.TextEdit();
- txtNO = new DevExpress.XtraEditors.TextEdit();
+ btnEditSelectModelFile = new DevExpress.XtraEditors.ButtonEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
- layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
- btnEditSelectModelFile = new DevExpress.XtraEditors.ButtonEdit();
layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)txtDescription.Properties).BeginInit();
((ISupportInitialize)txtTagNme.Properties).BeginInit();
- ((ISupportInitialize)txtAddress.Properties).BeginInit();
((ISupportInitialize)txtCustomer.Properties).BeginInit();
((ISupportInitialize)txtName.Properties).BeginInit();
- ((ISupportInitialize)txtNO.Properties).BeginInit();
+ ((ISupportInitialize)btnEditSelectModelFile.Properties).BeginInit();
((ISupportInitialize)Root).BeginInit();
- ((ISupportInitialize)layoutControlItem1).BeginInit();
((ISupportInitialize)layoutControlItem2).BeginInit();
- ((ISupportInitialize)layoutControlItem3).BeginInit();
- ((ISupportInitialize)layoutControlItem4).BeginInit();
- ((ISupportInitialize)layoutControlItem6).BeginInit();
((ISupportInitialize)layoutControlItem7).BeginInit();
((ISupportInitialize)layoutControlItem5).BeginInit();
- ((ISupportInitialize)dxErrorProvider1).BeginInit();
- ((ISupportInitialize)btnEditSelectModelFile.Properties).BeginInit();
((ISupportInitialize)layoutControlItem8).BeginInit();
+ ((ISupportInitialize)layoutControlItem6).BeginInit();
+ ((ISupportInitialize)layoutControlItem3).BeginInit();
+ ((ISupportInitialize)dxErrorProvider1).BeginInit();
SuspendLayout();
//
// layoutControl1
@@ -74,10 +72,8 @@
layoutControl1.Controls.Add(setFlagsEditCtrl1);
layoutControl1.Controls.Add(txtDescription);
layoutControl1.Controls.Add(txtTagNme);
- layoutControl1.Controls.Add(txtAddress);
layoutControl1.Controls.Add(txtCustomer);
layoutControl1.Controls.Add(txtName);
- layoutControl1.Controls.Add(txtNO);
layoutControl1.Controls.Add(btnEditSelectModelFile);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 0);
@@ -90,58 +86,56 @@
//
// setFlagsEditCtrl1
//
- setFlagsEditCtrl1.Location = new Point(113, 60);
+ setFlagsEditCtrl1.Location = new Point(113, 36);
setFlagsEditCtrl1.Name = "setFlagsEditCtrl1";
setFlagsEditCtrl1.Size = new Size(314, 20);
setFlagsEditCtrl1.TabIndex = 5;
//
// txtDescription
//
- txtDescription.Location = new Point(113, 108);
+ txtDescription.Location = new Point(113, 87);
txtDescription.Name = "txtDescription";
- txtDescription.Size = new Size(734, 344);
+ txtDescription.Size = new Size(734, 365);
txtDescription.StyleController = layoutControl1;
- txtDescription.TabIndex = 8;
+ txtDescription.TabIndex = 7;
//
// txtTagNme
//
- txtTagNme.Location = new Point(532, 60);
+ txtTagNme.Location = new Point(532, 36);
txtTagNme.Name = "txtTagNme";
txtTagNme.Size = new Size(315, 20);
txtTagNme.StyleController = layoutControl1;
- txtTagNme.TabIndex = 6;
- //
- // txtAddress
- //
- txtAddress.Location = new Point(532, 36);
- txtAddress.Name = "txtAddress";
- txtAddress.Size = new Size(315, 20);
- txtAddress.StyleController = layoutControl1;
- txtAddress.TabIndex = 4;
+ txtTagNme.TabIndex = 4;
//
// txtCustomer
//
- txtCustomer.Location = new Point(113, 36);
+ txtCustomer.Location = new Point(532, 12);
txtCustomer.Name = "txtCustomer";
- txtCustomer.Size = new Size(314, 20);
+ txtCustomer.Size = new Size(315, 20);
txtCustomer.StyleController = layoutControl1;
txtCustomer.TabIndex = 3;
//
// txtName
//
- txtName.Location = new Point(532, 12);
+ txtName.Location = new Point(113, 12);
txtName.Name = "txtName";
- txtName.Size = new Size(315, 20);
+ txtName.Size = new Size(314, 20);
txtName.StyleController = layoutControl1;
- txtName.TabIndex = 2;
+ txtName.TabIndex = 0;
//
- // txtNO
+ // btnEditSelectModelFile
//
- txtNO.Location = new Point(113, 12);
- txtNO.Name = "txtNO";
- txtNO.Size = new Size(314, 20);
- txtNO.StyleController = layoutControl1;
- txtNO.TabIndex = 0;
+ btnEditSelectModelFile.EditValue = "";
+ btnEditSelectModelFile.Location = new Point(113, 60);
+ btnEditSelectModelFile.Name = "btnEditSelectModelFile";
+ editorButtonImageOptions1.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions1.SvgImage");
+ editorButtonImageOptions1.SvgImageSize = new Size(15, 15);
+ btnEditSelectModelFile.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
+ btnEditSelectModelFile.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ btnEditSelectModelFile.Size = new Size(734, 23);
+ btnEditSelectModelFile.StyleController = layoutControl1;
+ btnEditSelectModelFile.TabIndex = 6;
+ btnEditSelectModelFile.ButtonClick += btnEditSelectModelFile_ButtonClick;
//
// Root
//
@@ -149,100 +143,71 @@
Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem3, layoutControlItem4, layoutControlItem6, layoutControlItem7, layoutControlItem5, layoutControlItem8 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2, layoutControlItem7, layoutControlItem5, layoutControlItem8, layoutControlItem6, layoutControlItem3 });
Root.Name = "Root";
Root.Size = new Size(859, 464);
Root.TextVisible = false;
- //
- // layoutControlItem1
- //
- layoutControlItem1.Control = txtNO;
- layoutControlItem1.Location = new Point(0, 0);
- layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(419, 24);
- layoutControlItem1.Text = "缂栧彿锛�";
- layoutControlItem1.TextSize = new Size(89, 14);
//
// layoutControlItem2
//
layoutControlItem2.AllowHtmlStringInCaption = true;
layoutControlItem2.Control = txtName;
- layoutControlItem2.Location = new Point(419, 0);
+ layoutControlItem2.Location = new Point(0, 0);
layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(420, 24);
+ layoutControlItem2.Size = new Size(419, 24);
layoutControlItem2.Text = "<color=red>*</color>鍚嶇О锛�";
layoutControlItem2.TextSize = new Size(89, 14);
- //
- // layoutControlItem3
- //
- layoutControlItem3.Control = txtCustomer;
- layoutControlItem3.Location = new Point(0, 24);
- layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(419, 24);
- layoutControlItem3.Text = "瀹㈡埛锛�";
- layoutControlItem3.TextSize = new Size(89, 14);
- //
- // layoutControlItem4
- //
- layoutControlItem4.Control = txtAddress;
- layoutControlItem4.Location = new Point(419, 24);
- layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(420, 24);
- layoutControlItem4.Text = "鍦板潃锛�";
- layoutControlItem4.TextSize = new Size(89, 14);
- //
- // layoutControlItem6
- //
- layoutControlItem6.Control = txtTagNme;
- layoutControlItem6.Location = new Point(419, 48);
- layoutControlItem6.Name = "layoutControlItem6";
- layoutControlItem6.Size = new Size(420, 24);
- layoutControlItem6.Text = "鏍囧織锛�";
- layoutControlItem6.TextSize = new Size(89, 14);
//
// layoutControlItem7
//
layoutControlItem7.Control = txtDescription;
- layoutControlItem7.Location = new Point(0, 96);
+ layoutControlItem7.Location = new Point(0, 75);
layoutControlItem7.Name = "layoutControlItem7";
- layoutControlItem7.Size = new Size(839, 348);
+ layoutControlItem7.Size = new Size(839, 369);
layoutControlItem7.Text = "璇存槑";
layoutControlItem7.TextSize = new Size(89, 14);
//
// layoutControlItem5
//
layoutControlItem5.Control = setFlagsEditCtrl1;
- layoutControlItem5.Location = new Point(0, 48);
+ layoutControlItem5.Location = new Point(0, 24);
layoutControlItem5.Name = "layoutControlItem5";
layoutControlItem5.Size = new Size(419, 24);
layoutControlItem5.Text = "鏍囩锛�";
layoutControlItem5.TextSize = new Size(89, 14);
- //
- // dxErrorProvider1
- //
- dxErrorProvider1.ContainerControl = this;
- //
- // btnEditSelectModelFile
- //
- btnEditSelectModelFile.EditValue = "";
- btnEditSelectModelFile.Location = new Point(113, 84);
- btnEditSelectModelFile.Name = "btnEditSelectModelFile";
- btnEditSelectModelFile.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton() });
- btnEditSelectModelFile.Size = new Size(734, 20);
- btnEditSelectModelFile.StyleController = layoutControl1;
- btnEditSelectModelFile.TabIndex = 7;
- btnEditSelectModelFile.ButtonClick += btnEditSelectModelFile_ButtonClick;
//
// layoutControlItem8
//
layoutControlItem8.AppearanceItemCaption.FontSizeDelta = 1;
layoutControlItem8.AppearanceItemCaption.Options.UseFont = true;
layoutControlItem8.Control = btnEditSelectModelFile;
- layoutControlItem8.Location = new Point(0, 72);
+ layoutControlItem8.Location = new Point(0, 48);
layoutControlItem8.Name = "layoutControlItem8";
- layoutControlItem8.Size = new Size(839, 24);
+ layoutControlItem8.Size = new Size(839, 27);
layoutControlItem8.Text = "閫夋嫨妯″瀷鏂囦欢:";
layoutControlItem8.TextSize = new Size(89, 17);
+ //
+ // layoutControlItem6
+ //
+ layoutControlItem6.Control = txtTagNme;
+ layoutControlItem6.Location = new Point(419, 24);
+ layoutControlItem6.Name = "layoutControlItem6";
+ layoutControlItem6.Size = new Size(420, 24);
+ layoutControlItem6.Text = "鏍囧織锛�";
+ layoutControlItem6.TextSize = new Size(89, 14);
+ //
+ // layoutControlItem3
+ //
+ layoutControlItem3.Control = txtCustomer;
+ layoutControlItem3.Location = new Point(419, 0);
+ layoutControlItem3.Name = "layoutControlItem3";
+ layoutControlItem3.Size = new Size(420, 24);
+ layoutControlItem3.Text = "瀹㈡埛锛�";
+ layoutControlItem3.TextSize = new Size(89, 14);
+ //
+ // dxErrorProvider1
+ //
+ dxErrorProvider1.ContainerControl = this;
//
// InputXhsProjectInfoWizardPage
//
@@ -255,21 +220,17 @@
layoutControl1.ResumeLayout(false);
((ISupportInitialize)txtDescription.Properties).EndInit();
((ISupportInitialize)txtTagNme.Properties).EndInit();
- ((ISupportInitialize)txtAddress.Properties).EndInit();
((ISupportInitialize)txtCustomer.Properties).EndInit();
((ISupportInitialize)txtName.Properties).EndInit();
- ((ISupportInitialize)txtNO.Properties).EndInit();
+ ((ISupportInitialize)btnEditSelectModelFile.Properties).EndInit();
((ISupportInitialize)Root).EndInit();
- ((ISupportInitialize)layoutControlItem1).EndInit();
((ISupportInitialize)layoutControlItem2).EndInit();
- ((ISupportInitialize)layoutControlItem3).EndInit();
- ((ISupportInitialize)layoutControlItem4).EndInit();
- ((ISupportInitialize)layoutControlItem6).EndInit();
((ISupportInitialize)layoutControlItem7).EndInit();
((ISupportInitialize)layoutControlItem5).EndInit();
- ((ISupportInitialize)dxErrorProvider1).EndInit();
- ((ISupportInitialize)btnEditSelectModelFile.Properties).EndInit();
((ISupportInitialize)layoutControlItem8).EndInit();
+ ((ISupportInitialize)layoutControlItem6).EndInit();
+ ((ISupportInitialize)layoutControlItem3).EndInit();
+ ((ISupportInitialize)dxErrorProvider1).EndInit();
ResumeLayout(false);
}
@@ -278,15 +239,11 @@
private DevExpress.XtraLayout.LayoutControl layoutControl1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraEditors.TextEdit txtName;
- private DevExpress.XtraEditors.TextEdit txtNO;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
private DevExpress.XtraEditors.TextEdit txtCustomer;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraEditors.TextEdit txtTagNme;
- private DevExpress.XtraEditors.TextEdit txtAddress;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraEditors.MemoEdit txtDescription;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
--
Gitblit v1.9.3