From 6f932c727fe72e5c3417812234371a35e7225a93 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 15 十月 2024 14:20:40 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/PumpProductListBox.Designer.cs | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/PumpProductListBox.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/PumpProductListBox.Designer.cs
index 274fe5d..4a3ae40 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/PumpProductListBox.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/PumpProductListBox.Designer.cs
@@ -34,11 +34,11 @@
barManager1 = new DevExpress.XtraBars.BarManager(components);
bar1 = new DevExpress.XtraBars.Bar();
BtnAddProductProp = new DevExpress.XtraBars.BarButtonItem();
+ barBtnDelete = new DevExpress.XtraBars.BarButtonItem();
barDockControlTop = new DevExpress.XtraBars.BarDockControl();
barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
barDockControlRight = new DevExpress.XtraBars.BarDockControl();
- barBtnDelete = new DevExpress.XtraBars.BarButtonItem();
((System.ComponentModel.ISupportInitialize)listBoxControl1).BeginInit();
((System.ComponentModel.ISupportInitialize)barManager1).BeginInit();
SuspendLayout();
@@ -88,6 +88,15 @@
BtnAddProductProp.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
BtnAddProductProp.ItemClick += BtnAddProductProp_ItemClick;
//
+ // barBtnDelete
+ //
+ barBtnDelete.Caption = "鍒犻櫎灞炴��";
+ barBtnDelete.Id = 1;
+ barBtnDelete.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDelete.ImageOptions.SvgImage");
+ barBtnDelete.Name = "barBtnDelete";
+ barBtnDelete.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ barBtnDelete.ItemClick += barBtnDelete_ItemClick;
+ //
// barDockControlTop
//
barDockControlTop.CausesValidation = false;
@@ -119,14 +128,6 @@
barDockControlRight.Location = new Point(247, 28);
barDockControlRight.Manager = barManager1;
barDockControlRight.Size = new Size(0, 459);
- //
- // barBtnDelete
- //
- barBtnDelete.Caption = "鍒犻櫎灞炴��";
- barBtnDelete.Id = 1;
- barBtnDelete.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDelete.ImageOptions.SvgImage");
- barBtnDelete.Name = "barBtnDelete";
- barBtnDelete.ItemClick += barBtnDelete_ItemClick;
//
// PumpProductListBox
//
--
Gitblit v1.9.3