From 935a8a4996853c51188402c57f905ee9c9eac898 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 04 十二月 2024 22:51:50 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 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 96a8b2c..ab775ea 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
@@ -83,6 +83,7 @@
barBtnSetVisualVisible = new DevExpress.XtraBars.BarButtonItem();
barCkDecorator = new DevExpress.XtraBars.BarCheckItem();
barBtnAddWorking = new DevExpress.XtraBars.BarButtonItem();
+ barBtnPumpCurve = new DevExpress.XtraBars.BarButtonItem();
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
pageGroupModel = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribbonPageGroup6 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -104,7 +105,6 @@
controlContainerBottom = new DevExpress.XtraBars.Docking.ControlContainer();
svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
rmSet = new DevExpress.XtraBars.Ribbon.RadialMenu(components);
- barBtnPumpCurve = new DevExpress.XtraBars.BarButtonItem();
((ISupportInitialize)ribbonControl1).BeginInit();
((ISupportInitialize)repositoryItemImageComboBox1).BeginInit();
((ISupportInitialize)tabPane1).BeginInit();
@@ -447,7 +447,7 @@
//
// barBtnWorkingPower
//
- barBtnWorkingPower.Caption = "鑳芥晥鍒嗘瀽";
+ barBtnWorkingPower.Caption = "鑳借�楀垎鏋�";
barBtnWorkingPower.Id = 71;
barBtnWorkingPower.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingPower.ImageOptions.SvgImage");
barBtnWorkingPower.Name = "barBtnWorkingPower";
@@ -522,6 +522,15 @@
barBtnAddWorking.Name = "barBtnAddWorking";
barBtnAddWorking.ItemClick += barBtnAddWorking_ItemClick;
//
+ // barBtnPumpCurve
+ //
+ barBtnPumpCurve.Caption = "鎬ц兘鏇茬嚎";
+ barBtnPumpCurve.Id = 81;
+ barBtnPumpCurve.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnPumpCurve.ImageOptions.SvgImage");
+ barBtnPumpCurve.Name = "barBtnPumpCurve";
+ barBtnPumpCurve.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+ barBtnPumpCurve.ItemClick += barBtnPumpCurve_ItemClick;
+ //
// ribbonPage1
//
ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupModel, ribbonPageGroup6, ribbonPageGroup1, ribbonPageGroup7, ribbonPageGroup5, ribbonPageGroup2, ribbonPageGroup9, ribbonPageGroup3 });
@@ -582,8 +591,8 @@
//
// ribbonPageGroup9
//
- ribbonPageGroup9.ItemLinks.Add(barBtnWorkingEvaluation);
ribbonPageGroup9.ItemLinks.Add(barBtnPumpAnaly);
+ ribbonPageGroup9.ItemLinks.Add(barBtnWorkingEvaluation);
ribbonPageGroup9.ItemLinks.Add(barBtnWorkingPower);
ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossCurve);
ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossStatistics);
@@ -711,15 +720,6 @@
rmSet.Name = "rmSet";
rmSet.Ribbon = ribbonControl1;
rmSet.BeforePopup += rmSet_BeforePopup;
- //
- // barBtnPumpCurve
- //
- barBtnPumpCurve.Caption = "鎬ц兘鏇茬嚎";
- barBtnPumpCurve.Id = 81;
- barBtnPumpCurve.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnPumpCurve.ImageOptions.SvgImage");
- barBtnPumpCurve.Name = "barBtnPumpCurve";
- barBtnPumpCurve.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
- barBtnPumpCurve.ItemClick += barBtnPumpCurve_ItemClick;
//
// XhsProjectSimulationCorePage
//
--
Gitblit v1.9.3