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/15-meter/01-series/AssetsMeterSeriesMgrTreeCtrl.Designer.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/15-meter/01-series/AssetsMeterSeriesMgrTreeCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/15-meter/01-series/AssetsMeterSeriesMgrTreeCtrl.Designer.cs
index a28cc43..b546c35 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/15-meter/01-series/AssetsMeterSeriesMgrTreeCtrl.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/15-meter/01-series/AssetsMeterSeriesMgrTreeCtrl.Designer.cs
@@ -37,11 +37,11 @@
{
components = new Container();
ComponentResourceManager resources = new ComponentResourceManager(typeof(AssetsMeterSeriesMgrTreeCtrl));
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- SerializableAppearanceObject serializableAppearanceObject9 = new SerializableAppearanceObject();
- SerializableAppearanceObject serializableAppearanceObject10 = new SerializableAppearanceObject();
- SerializableAppearanceObject serializableAppearanceObject11 = new SerializableAppearanceObject();
- SerializableAppearanceObject serializableAppearanceObject12 = new SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ SerializableAppearanceObject serializableAppearanceObject1 = new SerializableAppearanceObject();
+ SerializableAppearanceObject serializableAppearanceObject2 = new SerializableAppearanceObject();
+ SerializableAppearanceObject serializableAppearanceObject3 = new SerializableAppearanceObject();
+ SerializableAppearanceObject serializableAppearanceObject4 = new SerializableAppearanceObject();
layoutControl1 = new LayoutControl();
treeList1 = new TreeList();
colName = new TreeListColumn();
@@ -259,9 +259,9 @@
// repositoryItemButtonEdit1
//
repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions3.SvgImage");
- editorButtonImageOptions3.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, editorButtonImageOptions3, new KeyShortcut(Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, ToolTipAnchor.Default) });
+ 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 KeyShortcut(Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, ToolTipAnchor.Default) });
repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
//
--
Gitblit v1.9.3