From 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 08 一月 2025 13:57:33 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/AddAssetsTranslationMainDlg.Designer.cs | 112 ++++++++++++++++++++++++++++----------------------------
1 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/AddAssetsTranslationMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/AddAssetsTranslationMainDlg.Designer.cs
index 1252e2d..7626596 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/AddAssetsTranslationMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/AddAssetsTranslationMainDlg.Designer.cs
@@ -32,7 +32,7 @@
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
textEditEndDiameter = new DevExpress.XtraEditors.TextEdit();
textEditStartDiameter = new DevExpress.XtraEditors.TextEdit();
- textEditAlgorithmType = new DevExpress.XtraEditors.ImageComboBoxEdit();
+ textEditTranslationType = new DevExpress.XtraEditors.ImageComboBoxEdit();
txtCaliber = new DevExpress.XtraEditors.TextEdit();
txtMaterial = new DevExpress.XtraEditors.TextEdit();
TextEditMinorLoss = new DevExpress.XtraEditors.TextEdit();
@@ -53,14 +53,14 @@
layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)textEditEndDiameter.Properties).BeginInit();
((ISupportInitialize)textEditStartDiameter.Properties).BeginInit();
- ((ISupportInitialize)textEditAlgorithmType.Properties).BeginInit();
+ ((ISupportInitialize)textEditTranslationType.Properties).BeginInit();
((ISupportInitialize)txtCaliber.Properties).BeginInit();
((ISupportInitialize)txtMaterial.Properties).BeginInit();
((ISupportInitialize)TextEditMinorLoss.Properties).BeginInit();
@@ -79,8 +79,8 @@
((ISupportInitialize)layoutControlItem11).BeginInit();
((ISupportInitialize)layoutControlItem14).BeginInit();
((ISupportInitialize)layoutControlItem4).BeginInit();
- ((ISupportInitialize)layoutControlItem9).BeginInit();
((ISupportInitialize)layoutControlItem13).BeginInit();
+ ((ISupportInitialize)layoutControlItem9).BeginInit();
((ISupportInitialize)dxErrorProvider1).BeginInit();
SuspendLayout();
//
@@ -88,7 +88,7 @@
//
layoutControl1.Controls.Add(textEditEndDiameter);
layoutControl1.Controls.Add(textEditStartDiameter);
- layoutControl1.Controls.Add(textEditAlgorithmType);
+ layoutControl1.Controls.Add(textEditTranslationType);
layoutControl1.Controls.Add(txtCaliber);
layoutControl1.Controls.Add(txtMaterial);
layoutControl1.Controls.Add(TextEditMinorLoss);
@@ -109,81 +109,81 @@
//
// textEditEndDiameter
//
- textEditEndDiameter.Location = new Point(405, 84);
+ textEditEndDiameter.Location = new Point(410, 84);
textEditEndDiameter.Name = "textEditEndDiameter";
- textEditEndDiameter.Size = new Size(248, 20);
+ textEditEndDiameter.Size = new Size(243, 20);
textEditEndDiameter.StyleController = layoutControl1;
textEditEndDiameter.TabIndex = 8;
//
// textEditStartDiameter
//
- textEditStartDiameter.Location = new Point(83, 84);
+ textEditStartDiameter.Location = new Point(88, 84);
textEditStartDiameter.Name = "textEditStartDiameter";
- textEditStartDiameter.Size = new Size(247, 20);
+ textEditStartDiameter.Size = new Size(242, 20);
textEditStartDiameter.StyleController = layoutControl1;
textEditStartDiameter.TabIndex = 7;
//
- // textEditAlgorithmType
+ // textEditTranslationType
//
- textEditAlgorithmType.Location = new Point(83, 108);
- textEditAlgorithmType.Name = "textEditAlgorithmType";
- textEditAlgorithmType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
- textEditAlgorithmType.Size = new Size(247, 20);
- textEditAlgorithmType.StyleController = layoutControl1;
- textEditAlgorithmType.TabIndex = 9;
+ textEditTranslationType.Location = new Point(88, 108);
+ textEditTranslationType.Name = "textEditTranslationType";
+ textEditTranslationType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+ textEditTranslationType.Size = new Size(242, 20);
+ textEditTranslationType.StyleController = layoutControl1;
+ textEditTranslationType.TabIndex = 9;
//
// txtCaliber
//
- txtCaliber.Location = new Point(405, 36);
+ txtCaliber.Location = new Point(410, 36);
txtCaliber.Name = "txtCaliber";
txtCaliber.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
txtCaliber.Properties.DisplayFormat.FormatString = "{0}mm";
txtCaliber.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Custom;
txtCaliber.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
txtCaliber.Properties.NullValuePrompt = "mm";
- txtCaliber.Size = new Size(248, 20);
+ txtCaliber.Size = new Size(243, 20);
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 4;
//
// txtMaterial
//
- txtMaterial.Location = new Point(83, 36);
+ txtMaterial.Location = new Point(88, 36);
txtMaterial.Name = "txtMaterial";
txtMaterial.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
- txtMaterial.Size = new Size(247, 20);
+ txtMaterial.Size = new Size(242, 20);
txtMaterial.StyleController = layoutControl1;
txtMaterial.TabIndex = 3;
//
// TextEditMinorLoss
//
- TextEditMinorLoss.Location = new Point(83, 60);
+ TextEditMinorLoss.Location = new Point(88, 60);
TextEditMinorLoss.Name = "TextEditMinorLoss";
- TextEditMinorLoss.Size = new Size(247, 20);
+ TextEditMinorLoss.Size = new Size(242, 20);
TextEditMinorLoss.StyleController = layoutControl1;
TextEditMinorLoss.TabIndex = 5;
//
// txtKeyWord
//
- txtKeyWord.Location = new Point(405, 12);
+ txtKeyWord.Location = new Point(410, 12);
txtKeyWord.Name = "txtKeyWord";
txtKeyWord.Properties.NullValuePrompt = ",鍒嗛殧 渚嬪 A,B";
- txtKeyWord.Size = new Size(248, 20);
+ txtKeyWord.Size = new Size(243, 20);
txtKeyWord.StyleController = layoutControl1;
txtKeyWord.TabIndex = 2;
//
// txtTagName
//
- txtTagName.Location = new Point(405, 108);
+ txtTagName.Location = new Point(410, 108);
txtTagName.Name = "txtTagName";
- txtTagName.Size = new Size(248, 20);
+ txtTagName.Size = new Size(243, 20);
txtTagName.StyleController = layoutControl1;
txtTagName.TabIndex = 10;
//
// setFlagsEditCtrl1
//
- setFlagsEditCtrl1.Location = new Point(405, 60);
+ setFlagsEditCtrl1.Location = new Point(410, 60);
setFlagsEditCtrl1.Name = "setFlagsEditCtrl1";
- setFlagsEditCtrl1.Size = new Size(248, 20);
+ setFlagsEditCtrl1.Size = new Size(243, 20);
setFlagsEditCtrl1.TabIndex = 6;
//
// generalOkAndCancelCtrl1
@@ -199,18 +199,18 @@
//
// txtDescription
//
- txtDescription.Location = new Point(83, 132);
+ txtDescription.Location = new Point(88, 132);
txtDescription.Name = "txtDescription";
- txtDescription.Size = new Size(570, 207);
+ txtDescription.Size = new Size(565, 207);
txtDescription.StyleController = layoutControl1;
txtDescription.TabIndex = 11;
//
// txtName
//
- txtName.Location = new Point(83, 12);
+ txtName.Location = new Point(88, 12);
txtName.Name = "txtName";
txtName.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
- txtName.Size = new Size(247, 20);
+ txtName.Size = new Size(242, 20);
txtName.StyleController = layoutControl1;
txtName.TabIndex = 0;
//
@@ -233,7 +233,7 @@
layoutControlItem1.Name = "layoutControlItem1";
layoutControlItem1.Size = new Size(322, 24);
layoutControlItem1.Text = "<color=red>*</color>鍚嶇О:";
- layoutControlItem1.TextSize = new Size(59, 14);
+ layoutControlItem1.TextSize = new Size(64, 14);
//
// layoutControlItem6
//
@@ -242,7 +242,7 @@
layoutControlItem6.Name = "layoutControlItem6";
layoutControlItem6.Size = new Size(645, 211);
layoutControlItem6.Text = "璇存槑:";
- layoutControlItem6.TextSize = new Size(59, 14);
+ layoutControlItem6.TextSize = new Size(64, 14);
//
// layoutControlItem7
//
@@ -260,7 +260,7 @@
layoutControlItem10.Name = "layoutControlItem10";
layoutControlItem10.Size = new Size(323, 24);
layoutControlItem10.Text = "鍏抽敭瀛�:";
- layoutControlItem10.TextSize = new Size(59, 14);
+ layoutControlItem10.TextSize = new Size(64, 14);
//
// layoutControlItem8
//
@@ -269,7 +269,7 @@
layoutControlItem8.Name = "layoutControlItem8";
layoutControlItem8.Size = new Size(323, 24);
layoutControlItem8.Text = "鏍囩:";
- layoutControlItem8.TextSize = new Size(59, 14);
+ layoutControlItem8.TextSize = new Size(64, 14);
//
// layoutControlItem2
//
@@ -279,7 +279,7 @@
layoutControlItem2.Name = "layoutControlItem2";
layoutControlItem2.Size = new Size(322, 24);
layoutControlItem2.Text = "鏉愯川:";
- layoutControlItem2.TextSize = new Size(59, 14);
+ layoutControlItem2.TextSize = new Size(64, 14);
//
// layoutControlItem3
//
@@ -288,7 +288,7 @@
layoutControlItem3.Name = "layoutControlItem3";
layoutControlItem3.Size = new Size(323, 24);
layoutControlItem3.Text = "鍙ｅ緞:";
- layoutControlItem3.TextSize = new Size(59, 14);
+ layoutControlItem3.TextSize = new Size(64, 14);
//
// layoutControlItem11
//
@@ -298,7 +298,7 @@
layoutControlItem11.Name = "layoutControlItem11";
layoutControlItem11.Size = new Size(322, 24);
layoutControlItem11.Text = "<color=red>*</color>鍠峰皠绯绘暟:";
- layoutControlItem11.TextSize = new Size(59, 14);
+ layoutControlItem11.TextSize = new Size(64, 14);
//
// layoutControlItem14
//
@@ -307,25 +307,16 @@
layoutControlItem14.Name = "layoutControlItem14";
layoutControlItem14.Size = new Size(323, 24);
layoutControlItem14.Text = "涓嬫父鐩村緞:";
- layoutControlItem14.TextSize = new Size(59, 14);
+ layoutControlItem14.TextSize = new Size(64, 14);
//
// layoutControlItem4
//
- layoutControlItem4.Control = textEditAlgorithmType;
+ layoutControlItem4.Control = textEditTranslationType;
layoutControlItem4.Location = new Point(0, 96);
layoutControlItem4.Name = "layoutControlItem4";
layoutControlItem4.Size = new Size(322, 24);
- layoutControlItem4.Text = "绠楁硶绫诲瀷:";
- layoutControlItem4.TextSize = new Size(59, 14);
- //
- // layoutControlItem9
- //
- layoutControlItem9.Control = txtTagName;
- layoutControlItem9.Location = new Point(322, 96);
- layoutControlItem9.Name = "layoutControlItem9";
- layoutControlItem9.Size = new Size(323, 24);
- layoutControlItem9.Text = "鏍囧織:";
- layoutControlItem9.TextSize = new Size(59, 14);
+ layoutControlItem4.Text = "杩囨浮浠剁被鍨�:";
+ layoutControlItem4.TextSize = new Size(64, 14);
//
// layoutControlItem13
//
@@ -334,7 +325,16 @@
layoutControlItem13.Name = "layoutControlItem13";
layoutControlItem13.Size = new Size(322, 24);
layoutControlItem13.Text = "涓婃父鐩村緞:";
- layoutControlItem13.TextSize = new Size(59, 14);
+ layoutControlItem13.TextSize = new Size(64, 14);
+ //
+ // layoutControlItem9
+ //
+ layoutControlItem9.Control = txtTagName;
+ layoutControlItem9.Location = new Point(322, 96);
+ layoutControlItem9.Name = "layoutControlItem9";
+ layoutControlItem9.Size = new Size(323, 24);
+ layoutControlItem9.Text = "鏍囧織:";
+ layoutControlItem9.TextSize = new Size(64, 14);
//
// dxErrorProvider1
//
@@ -353,7 +353,7 @@
layoutControl1.ResumeLayout(false);
((ISupportInitialize)textEditEndDiameter.Properties).EndInit();
((ISupportInitialize)textEditStartDiameter.Properties).EndInit();
- ((ISupportInitialize)textEditAlgorithmType.Properties).EndInit();
+ ((ISupportInitialize)textEditTranslationType.Properties).EndInit();
((ISupportInitialize)txtCaliber.Properties).EndInit();
((ISupportInitialize)txtMaterial.Properties).EndInit();
((ISupportInitialize)TextEditMinorLoss.Properties).EndInit();
@@ -372,8 +372,8 @@
((ISupportInitialize)layoutControlItem11).EndInit();
((ISupportInitialize)layoutControlItem14).EndInit();
((ISupportInitialize)layoutControlItem4).EndInit();
- ((ISupportInitialize)layoutControlItem9).EndInit();
((ISupportInitialize)layoutControlItem13).EndInit();
+ ((ISupportInitialize)layoutControlItem9).EndInit();
((ISupportInitialize)dxErrorProvider1).EndInit();
ResumeLayout(false);
}
@@ -404,7 +404,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraEditors.TextEdit textEditEndDiameter;
private DevExpress.XtraEditors.TextEdit textEditStartDiameter;
- private DevExpress.XtraEditors.ImageComboBoxEdit textEditAlgorithmType;
+ private DevExpress.XtraEditors.ImageComboBoxEdit textEditTranslationType;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
--
Gitblit v1.9.3