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/AssetsTranslationMainMgrPage.Designer.cs | 85 +++++++++++++++++++-----------------------
1 files changed, 38 insertions(+), 47 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/AssetsTranslationMainMgrPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/AssetsTranslationMainMgrPage.Designer.cs
index da5fff6..9b487ca 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/AssetsTranslationMainMgrPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/AssetsTranslationMainMgrPage.Designer.cs
@@ -30,11 +30,11 @@
{
components = new Container();
ComponentResourceManager resources = new ComponentResourceManager(typeof(AssetsTranslationMainMgrPage));
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- 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();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
barBtnAdd = new DevExpress.XtraBars.BarButtonItem();
barBtnEdit = new DevExpress.XtraBars.BarButtonItem();
@@ -65,13 +65,12 @@
colDetail = new DevExpress.XtraGrid.Columns.GridColumn();
repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
colMaterial = new DevExpress.XtraGrid.Columns.GridColumn();
- behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(components);
- dragDropEvents1 = new DevExpress.Utils.DragDrop.DragDropEvents(components);
colDiameter = new DevExpress.XtraGrid.Columns.GridColumn();
colEndDiameter = new DevExpress.XtraGrid.Columns.GridColumn();
- coleAlgorithmType = new DevExpress.XtraGrid.Columns.GridColumn();
- colRoughness = new DevExpress.XtraGrid.Columns.GridColumn();
colStartDiameter = new DevExpress.XtraGrid.Columns.GridColumn();
+ behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(components);
+ dragDropEvents1 = new DevExpress.Utils.DragDrop.DragDropEvents(components);
+ colTranslationType = new DevExpress.XtraGrid.Columns.GridColumn();
((ISupportInitialize)ribbonControl1).BeginInit();
((ISupportInitialize)panelControl1).BeginInit();
panelControl1.SuspendLayout();
@@ -105,7 +104,7 @@
barBtnAdd.Id = 1;
barBtnAdd.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAdd.ImageOptions.SvgImage");
barBtnAdd.Name = "barBtnAdd";
- barBtnAdd.ItemClick += this.barBtnAdd_ItemClick;
+ barBtnAdd.ItemClick += barBtnAdd_ItemClick;
//
// barBtnEdit
//
@@ -113,7 +112,7 @@
barBtnEdit.Id = 2;
barBtnEdit.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEdit.ImageOptions.SvgImage");
barBtnEdit.Name = "barBtnEdit";
- barBtnEdit.ItemClick += this.barBtnEdit_ItemClick;
+ barBtnEdit.ItemClick += barBtnEdit_ItemClick;
//
// barBtnDelete
//
@@ -121,7 +120,7 @@
barBtnDelete.Id = 3;
barBtnDelete.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDelete.ImageOptions.SvgImage");
barBtnDelete.Name = "barBtnDelete";
- barBtnDelete.ItemClick += this.barBtnDelete_ItemClick;
+ barBtnDelete.ItemClick += barBtnDelete_ItemClick;
//
// barBtnInfo
//
@@ -129,7 +128,7 @@
barBtnInfo.Id = 4;
barBtnInfo.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnInfo.ImageOptions.SvgImage");
barBtnInfo.Name = "barBtnInfo";
- barBtnInfo.ItemClick += this.barBtnInfo_ItemClick;
+ barBtnInfo.ItemClick += barBtnInfo_ItemClick;
//
// barBtnSearch
//
@@ -137,7 +136,7 @@
barBtnSearch.Id = 12;
barBtnSearch.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSearch.ImageOptions.SvgImage");
barBtnSearch.Name = "barBtnSearch";
- barBtnSearch.ItemClick += this.barBtnSearch_ItemClick;
+ barBtnSearch.ItemClick += barBtnSearch_ItemClick;
//
// barBtnRefresh
//
@@ -145,7 +144,7 @@
barBtnRefresh.Id = 13;
barBtnRefresh.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnRefresh.ImageOptions.SvgImage");
barBtnRefresh.Name = "barBtnRefresh";
- barBtnRefresh.ItemClick += this.barBtnRefresh_ItemClick;
+ barBtnRefresh.ItemClick += barBtnRefresh_ItemClick;
//
// barBtnUp
//
@@ -154,7 +153,7 @@
barBtnUp.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUp.ImageOptions.SvgImage");
barBtnUp.Name = "barBtnUp";
barBtnUp.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
- barBtnUp.ItemClick += this.barBtnUp_ItemClick;
+ barBtnUp.ItemClick += barBtnUp_ItemClick;
//
// barBtnDown
//
@@ -163,7 +162,7 @@
barBtnDown.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDown.ImageOptions.SvgImage");
barBtnDown.Name = "barBtnDown";
barBtnDown.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
- barBtnDown.ItemClick += this.barBtnDown_ItemClick;
+ barBtnDown.ItemClick += barBtnDown_ItemClick;
//
// barCkDrag
//
@@ -171,7 +170,7 @@
barCkDrag.Id = 17;
barCkDrag.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barCkDrag.ImageOptions.SvgImage");
barCkDrag.Name = "barCkDrag";
- barCkDrag.CheckedChanged += this.barCkDrag_CheckedChanged;
+ barCkDrag.CheckedChanged += barCkDrag_CheckedChanged;
//
// barBtnFactor
//
@@ -179,7 +178,7 @@
barBtnFactor.Id = 18;
barBtnFactor.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnFactor.ImageOptions.SvgImage");
barBtnFactor.Name = "barBtnFactor";
- barBtnFactor.ItemClick += this.barBtnFactor_ItemClick;
+ barBtnFactor.ItemClick += barBtnFactor_ItemClick;
//
// ribbonPage1
//
@@ -242,8 +241,8 @@
//
// gridView1
//
- behaviorManager1.SetBehaviors(gridView1, new DevExpress.Utils.Behaviors.Behavior[] { (DevExpress.Utils.Behaviors.Behavior)DevExpress.Utils.DragDrop.DragDropBehavior.Create(typeof(DevExpress.XtraGrid.Extensions.ColumnViewDragDropSource), true, true, true, true, dragDropEvents1) });
- gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colID, colName, colMinorLoss, colKeyWords, colFlags, colTagName, colSortCode, colDescription, colDetail, colMaterial, colDiameter, colEndDiameter, coleAlgorithmType, colRoughness, colStartDiameter });
+ behaviorManager1.SetBehaviors(gridView1, new DevExpress.Utils.Behaviors.Behavior[] { DevExpress.Utils.DragDrop.DragDropBehavior.Create(typeof(DevExpress.XtraGrid.Extensions.ColumnViewDragDropSource), true, true, true, true, dragDropEvents1) });
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colID, colName, colMinorLoss, colKeyWords, colFlags, colTagName, colSortCode, colDescription, colDetail, colMaterial, colDiameter, colEndDiameter, colStartDiameter, colTranslationType });
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
//
@@ -272,7 +271,7 @@
colMinorLoss.MinWidth = 100;
colMinorLoss.Name = "colMinorLoss";
colMinorLoss.Visible = true;
- colMinorLoss.VisibleIndex = 4;
+ colMinorLoss.VisibleIndex = 6;
colMinorLoss.Width = 100;
//
// colKeyWords
@@ -333,9 +332,9 @@
// repositoryItemButtonEdit1
//
repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions1.SvgImage");
- editorButtonImageOptions1.SvgImageSize = new Size(20, 20);
- repositoryItemButtonEdit1.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) });
+ editorButtonImageOptions2.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions2.SvgImage");
+ editorButtonImageOptions2.SvgImageSize = new Size(20, 20);
+ repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
//
@@ -344,11 +343,7 @@
colMaterial.FieldName = "Material";
colMaterial.Name = "colMaterial";
colMaterial.Visible = true;
- colMaterial.VisibleIndex = 3;
- //
- // dragDropEvents1
- //
- dragDropEvents1.DragDrop += this.dragDropEvents1_DragDrop;
+ colMaterial.VisibleIndex = 4;
//
// colDiameter
//
@@ -362,21 +357,7 @@
colEndDiameter.FieldName = "EndDiameter";
colEndDiameter.Name = "colEndDiameter";
colEndDiameter.Visible = true;
- colEndDiameter.VisibleIndex = 12;
- //
- // coleAlgorithmType
- //
- coleAlgorithmType.FieldName = "eAlgorithmType";
- coleAlgorithmType.Name = "coleAlgorithmType";
- coleAlgorithmType.Visible = true;
- coleAlgorithmType.VisibleIndex = 5;
- //
- // colRoughness
- //
- colRoughness.FieldName = "Roughness";
- colRoughness.Name = "colRoughness";
- colRoughness.Visible = true;
- colRoughness.VisibleIndex = 6;
+ colEndDiameter.VisibleIndex = 3;
//
// colStartDiameter
//
@@ -384,6 +365,17 @@
colStartDiameter.Name = "colStartDiameter";
colStartDiameter.Visible = true;
colStartDiameter.VisibleIndex = 2;
+ //
+ // dragDropEvents1
+ //
+ dragDropEvents1.DragDrop += dragDropEvents1_DragDrop;
+ //
+ // colTranslationType
+ //
+ colTranslationType.FieldName = "TranslationType";
+ colTranslationType.Name = "colTranslationType";
+ colTranslationType.Visible = true;
+ colTranslationType.VisibleIndex = 5;
//
// AssetsTranslationMainMgrPage
//
@@ -444,8 +436,7 @@
private DevExpress.XtraGrid.Columns.GridColumn colMaterial;
private DevExpress.XtraGrid.Columns.GridColumn colDiameter;
private DevExpress.XtraGrid.Columns.GridColumn colEndDiameter;
- private DevExpress.XtraGrid.Columns.GridColumn coleAlgorithmType;
- private DevExpress.XtraGrid.Columns.GridColumn colRoughness;
private DevExpress.XtraGrid.Columns.GridColumn colStartDiameter;
+ private DevExpress.XtraGrid.Columns.GridColumn colTranslationType;
}
}
--
Gitblit v1.9.3