From fb3e670f48e3525665a79dad19747a2c604aeae2 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 09 一月 2025 11:43:54 +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 | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 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 b866a23..1434a24 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
@@ -66,7 +66,6 @@
barBtnSetPressmeterList = new DevExpress.XtraBars.BarButtonItem();
barCkMonitorVisible = new DevExpress.XtraBars.BarCheckItem();
barCkMark = new DevExpress.XtraBars.BarCheckItem();
- barCkFlowEffect = new DevExpress.XtraBars.BarCheckItem();
barCkGrading = new DevExpress.XtraBars.BarCheckItem();
barCkCalcu = new DevExpress.XtraBars.BarCheckItem();
barBtnWorkingLossCurve = new DevExpress.XtraBars.BarButtonItem();
@@ -124,7 +123,7 @@
//
ribbonControl1.ExpandCollapseItem.Id = 0;
ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
- ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnCheck, barBtnCalcu, barBtnExportInp, barBtnSave, barBtnVisualList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnSetFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnPumpAnaly, barBtnSearch, barBtnSetGradingList, barBtnApplyGradingList, barBtnRefresh, barBtnSetMark, barBtnSetReservoirList, barBtnSetTankList, barBtnSetWaterboxList, barBtnSetBluntheadList, barBtnSetNozzleList, barBtnSetHydrantList, barBtnSetMeterList, barBtnSetCompressorList, barBtnSetFlowmeterList, barBtnSetPressmeterList, barCkMonitorVisible, barCkMark, barCkFlowEffect, barCkGrading, barCkCalcu, barBtnWorkingLossCurve, barBtnWorkingLossStatistics, barBtnWorkingPower, barBtnWorkingAnaly, barBtnPumpParallel, barBtnWorkingEvaluation, barBtnSetVisualVisible, barCkDecorator, barBtnAddWorking, barBtnPumpCurve, barBtnEditScheme, barBtnDeleteScheme, barBtnExportWord, barBtnWorkingMonitorAnaly, barBtnSetCoolingList, barBtnDockingMonitor, barBtnDockingMonitorValue, barBtnAnalyseMonitor });
+ ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnCheck, barBtnCalcu, barBtnExportInp, barBtnSave, barBtnVisualList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnSetFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnPumpAnaly, barBtnSearch, barBtnSetGradingList, barBtnApplyGradingList, barBtnRefresh, barBtnSetMark, barBtnSetReservoirList, barBtnSetTankList, barBtnSetWaterboxList, barBtnSetBluntheadList, barBtnSetNozzleList, barBtnSetHydrantList, barBtnSetMeterList, barBtnSetCompressorList, barBtnSetFlowmeterList, barBtnSetPressmeterList, barCkMonitorVisible, barCkMark, barCkGrading, barCkCalcu, barBtnWorkingLossCurve, barBtnWorkingLossStatistics, barBtnWorkingPower, barBtnWorkingAnaly, barBtnPumpParallel, barBtnWorkingEvaluation, barBtnSetVisualVisible, barCkDecorator, barBtnAddWorking, barBtnPumpCurve, barBtnEditScheme, barBtnDeleteScheme, barBtnExportWord, barBtnWorkingMonitorAnaly, barBtnSetCoolingList, barBtnDockingMonitor, barBtnDockingMonitorValue, barBtnAnalyseMonitor });
ribbonControl1.Location = new Point(0, 0);
ribbonControl1.MaxItemId = 90;
ribbonControl1.Name = "ribbonControl1";
@@ -185,7 +184,6 @@
barBtnSetList.Id = 21;
barBtnSetList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetList.ImageOptions.SvgImage");
barBtnSetList.Name = "barBtnSetList";
- barBtnSetList.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
barBtnSetList.ItemClick += barBtnSetList_ItemClick;
//
// barBtnSetPumpList
@@ -388,14 +386,6 @@
barCkMark.Name = "barCkMark";
barCkMark.CheckedChanged += barCkMark_CheckedChanged;
//
- // barCkFlowEffect
- //
- barCkFlowEffect.Caption = "姘存祦鍔ㄧ敾";
- barCkFlowEffect.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
- barCkFlowEffect.Id = 66;
- barCkFlowEffect.Name = "barCkFlowEffect";
- barCkFlowEffect.CheckedChanged += barCkFlowEffect_CheckedChanged;
- //
// barCkGrading
//
barCkGrading.Caption = "鏄剧ず";
@@ -551,7 +541,7 @@
barBtnDockingMonitor.Caption = "浼犳劅鍣ㄦ祴鐐�";
barBtnDockingMonitor.Enabled = false;
barBtnDockingMonitor.Id = 87;
- barBtnDockingMonitor.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSensorMonitor.ImageOptions.SvgImage");
+ barBtnDockingMonitor.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDockingMonitor.ImageOptions.SvgImage");
barBtnDockingMonitor.Name = "barBtnDockingMonitor";
barBtnDockingMonitor.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
barBtnDockingMonitor.ItemClick += barBtnDockingMonitor_ItemClick;
@@ -560,7 +550,7 @@
//
barBtnDockingMonitorValue.Caption = "浼犳劅鍣ㄦ祴鍊�";
barBtnDockingMonitorValue.Id = 88;
- barBtnDockingMonitorValue.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSensorMonitorValue.ImageOptions.SvgImage");
+ barBtnDockingMonitorValue.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDockingMonitorValue.ImageOptions.SvgImage");
barBtnDockingMonitorValue.Name = "barBtnDockingMonitorValue";
barBtnDockingMonitorValue.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
barBtnDockingMonitorValue.ItemClick += barBtnDockingMonitorValue_ItemClick;
@@ -591,10 +581,9 @@
//
pageGroupModel.ItemLinks.Add(barCkDecorator);
pageGroupModel.ItemLinks.Add(barBtnSetVisualVisible);
- pageGroupModel.ItemLinks.Add(barBtnVisualList);
pageGroupModel.ItemLinks.Add(barBtnSearch);
+ pageGroupModel.ItemLinks.Add(barBtnVisualList);
pageGroupModel.ItemLinks.Add(barBtnSetList);
- pageGroupModel.ItemLinks.Add(barCkFlowEffect);
pageGroupModel.Name = "pageGroupModel";
pageGroupModel.Text = "妯″瀷";
//
@@ -749,6 +738,7 @@
// rmSet
//
rmSet.AllowGlyphSkinning = true;
+ rmSet.AutoExpand = true;
rmSet.Glyph = (Image)resources.GetObject("rmSet.Glyph");
rmSet.ItemLinks.Add(barBtnSetReservoirList);
rmSet.ItemLinks.Add(barBtnSetTankList);
@@ -770,6 +760,7 @@
rmSet.ItemLinks.Add(barBtnSetExchangerList);
rmSet.ItemLinks.Add(barBtnSetCompressorList);
rmSet.ItemLinks.Add(barBtnSetJunctionList);
+ rmSet.MenuColor = Color.FromArgb(0, 122, 204);
rmSet.Name = "rmSet";
rmSet.Ribbon = ribbonControl1;
rmSet.BeforePopup += rmSet_BeforePopup;
@@ -855,7 +846,6 @@
private DevExpress.XtraBars.BarCheckItem barCkMonitorVisible;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup9;
private DevExpress.XtraBars.BarCheckItem barCkMark;
- private DevExpress.XtraBars.BarCheckItem barCkFlowEffect;
private DevExpress.XtraBars.BarCheckItem barCkGrading;
private DevExpress.XtraBars.BarCheckItem barCkCalcu;
private DevExpress.XtraBars.BarButtonItem barBtnWorkingLossCurve;
--
Gitblit v1.9.3