From a8ccc992964272f6a74631e8c164e8c91e5cb6d4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 16:47:29 +0800
Subject: [PATCH] 处理冲突
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/PumpProductListBox.Designer.cs | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 5e1a614..274fe5d 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
@@ -38,6 +38,7 @@
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();
@@ -50,6 +51,7 @@
listBoxControl1.Size = new Size(247, 459);
listBoxControl1.TabIndex = 0;
listBoxControl1.SelectedIndexChanged += listBoxControl1_SelectedIndexChanged;
+ listBoxControl1.MouseUp += listBoxControl1_MouseUp;
//
// barManager1
//
@@ -59,8 +61,8 @@
barManager1.DockControls.Add(barDockControlLeft);
barManager1.DockControls.Add(barDockControlRight);
barManager1.Form = this;
- barManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { BtnAddProductProp });
- barManager1.MaxItemId = 1;
+ barManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { BtnAddProductProp, barBtnDelete });
+ barManager1.MaxItemId = 2;
//
// bar1
//
@@ -68,7 +70,7 @@
bar1.DockCol = 0;
bar1.DockRow = 0;
bar1.DockStyle = DevExpress.XtraBars.BarDockStyle.Top;
- bar1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(BtnAddProductProp) });
+ bar1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(BtnAddProductProp), new DevExpress.XtraBars.LinkPersistInfo(barBtnDelete) });
bar1.OptionsBar.AllowQuickCustomization = false;
bar1.OptionsBar.DrawBorder = false;
bar1.OptionsBar.DrawDragBorder = false;
@@ -118,6 +120,14 @@
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
//
AutoScaleDimensions = new SizeF(7F, 14F);
@@ -145,5 +155,6 @@
private DevExpress.XtraBars.BarDockControl barDockControlBottom;
private DevExpress.XtraBars.BarDockControl barDockControlLeft;
private DevExpress.XtraBars.BarDockControl barDockControlRight;
+ private DevExpress.XtraBars.BarButtonItem barBtnDelete;
}
}
--
Gitblit v1.9.3