From 0d9526152334f26c9110dab0652796f59a185820 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 29 十月 2024 13:30:43 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs | 18 ++++--------------
1 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
index 7427804..b6e087c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
@@ -55,7 +55,6 @@
barBtnSearch = new DevExpress.XtraBars.BarButtonItem();
barBtnGradingSet = new DevExpress.XtraBars.BarButtonItem();
barBtnGradingApply = new DevExpress.XtraBars.BarButtonItem();
- barBtnProperty = new DevExpress.XtraBars.BarButtonItem();
barBtnRefresh = new DevExpress.XtraBars.BarButtonItem();
barBtnSetMark = new DevExpress.XtraBars.BarButtonItem();
barBtnSetReservoirList = new DevExpress.XtraBars.BarButtonItem();
@@ -99,7 +98,7 @@
//
ribbonControl1.ExpandCollapseItem.Id = 0;
ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
- ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnHydroCheck, barBtnHydroCalcu, barBtnHydroExportInp, barBtnSave, barBtnHydroParterList, barBtnFastShowHidden, barBtnMatchingList, barBtnUnMatchingList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnSetFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnParallelAnaly, barBtnSearch, barBtnGradingSet, barBtnGradingApply, barBtnProperty, barBtnRefresh, barBtnSetMark, barBtnSetReservoirList, barBtnSetTankList, barBtnSetWaterboxList, barBtnSetBluntheadList, barBtnSetNozzleList, barBtnSetHydrantList, barBtnSetMeterList, barBtnSetCompressorList, barBtnSetFlowmeterList, barBtnSetPressmeterList });
+ ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnHydroCheck, barBtnHydroCalcu, barBtnHydroExportInp, barBtnSave, barBtnHydroParterList, barBtnFastShowHidden, barBtnMatchingList, barBtnUnMatchingList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnSetFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnParallelAnaly, barBtnSearch, barBtnGradingSet, barBtnGradingApply, barBtnRefresh, barBtnSetMark, barBtnSetReservoirList, barBtnSetTankList, barBtnSetWaterboxList, barBtnSetBluntheadList, barBtnSetNozzleList, barBtnSetHydrantList, barBtnSetMeterList, barBtnSetCompressorList, barBtnSetFlowmeterList, barBtnSetPressmeterList });
ribbonControl1.Location = new Point(0, 0);
ribbonControl1.MaxItemId = 51;
ribbonControl1.Name = "ribbonControl1";
@@ -114,7 +113,7 @@
//
// barBtnHydroCheck
//
- barBtnHydroCheck.Caption = "鏍￠獙";
+ barBtnHydroCheck.Caption = "妫�鏌�";
barBtnHydroCheck.Id = 1;
barBtnHydroCheck.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroCheck.ImageOptions.SvgImage");
barBtnHydroCheck.Name = "barBtnHydroCheck";
@@ -251,7 +250,7 @@
//
barBtnParallelAnaly.Caption = "骞惰仈鍒嗘瀽";
barBtnParallelAnaly.Id = 31;
- barBtnParallelAnaly.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAnaly.ImageOptions.SvgImage");
+ barBtnParallelAnaly.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnParallelAnaly.ImageOptions.SvgImage");
barBtnParallelAnaly.Name = "barBtnParallelAnaly";
barBtnParallelAnaly.ItemClick += barBtnAnaly_ItemClick;
//
@@ -279,20 +278,13 @@
barBtnGradingApply.Name = "barBtnGradingApply";
barBtnGradingApply.ItemClick += barBtnGradingApply_ItemClick;
//
- // barBtnProperty
- //
- barBtnProperty.Caption = "灞炴�ч潰鏉�";
- barBtnProperty.Id = 38;
- barBtnProperty.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnProperty.ImageOptions.SvgImage");
- barBtnProperty.Name = "barBtnProperty";
- barBtnProperty.ItemClick += barBtnProperty_ItemClick;
- //
// barBtnRefresh
//
barBtnRefresh.Caption = "鍒锋柊";
barBtnRefresh.Id = 39;
barBtnRefresh.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnRefresh.ImageOptions.SvgImage");
barBtnRefresh.Name = "barBtnRefresh";
+ barBtnRefresh.ItemClick += barBtnRefresh_ItemClick;
//
// barBtnSetMark
//
@@ -389,7 +381,6 @@
pageGroupModel.ItemLinks.Add(barBtnSearch);
pageGroupModel.ItemLinks.Add(barBtnHydroParterList);
pageGroupModel.ItemLinks.Add(barBtnSetList);
- pageGroupModel.ItemLinks.Add(barBtnProperty);
pageGroupModel.ItemLinks.Add(barBtnSetMark);
pageGroupModel.Name = "pageGroupModel";
pageGroupModel.Text = "妯″瀷";
@@ -589,7 +580,6 @@
private DevExpress.XtraBars.BarButtonItem barBtnGradingSet;
private DevExpress.XtraBars.BarButtonItem barBtnGradingApply;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
- private DevExpress.XtraBars.BarButtonItem barBtnProperty;
private DevExpress.XtraBars.BarButtonItem barBtnRefresh;
private DevExpress.XtraBars.BarButtonItem barBtnSetMark;
private DevExpress.XtraBars.BarButtonItem barBtnSetReservoirList;
--
Gitblit v1.9.3