From bc0ed5b6cfda6c72c06f451b77da8518c41ab210 Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期四, 20 三月 2025 16:16:03 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/02-model/HydroModelMgrPage.Designer.cs | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/02-model/HydroModelMgrPage.Designer.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/02-model/HydroModelMgrPage.Designer.cs
index 54d85a1..444839a 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/02-model/HydroModelMgrPage.Designer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/02-model/HydroModelMgrPage.Designer.cs
@@ -47,6 +47,7 @@
barBtnCalcuModel = new DevExpress.XtraBars.BarButtonItem();
barBtnValidModel = new DevExpress.XtraBars.BarButtonItem();
barBtnExportInp = new DevExpress.XtraBars.BarButtonItem();
+ barBtnParter = new DevExpress.XtraBars.BarButtonItem();
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
ribPageGrpBaseMgr = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -64,7 +65,7 @@
colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
colDetail = new DevExpress.XtraGrid.Columns.GridColumn();
repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- barBtnParter = new DevExpress.XtraBars.BarButtonItem();
+ barBtnTest = new DevExpress.XtraBars.BarButtonItem();
((ISupportInitialize)ribbonControl1).BeginInit();
((ISupportInitialize)svgImage32).BeginInit();
((ISupportInitialize)panelControl1).BeginInit();
@@ -79,9 +80,9 @@
//
ribbonControl1.ExpandCollapseItem.Id = 0;
ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
- ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnDelete, barBtnDetail, barBtnEdit, barBtnAdd, barBtnUp, barBtnDown, barBtnRefresh, barBtnViewModel, barBtnCalcuModel, barBtnValidModel, barBtnExportInp, barBtnParter });
+ ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnDelete, barBtnDetail, barBtnEdit, barBtnAdd, barBtnUp, barBtnDown, barBtnRefresh, barBtnViewModel, barBtnCalcuModel, barBtnValidModel, barBtnExportInp, barBtnParter, barBtnTest });
ribbonControl1.Location = new Point(1, 1);
- ribbonControl1.MaxItemId = 22;
+ ribbonControl1.MaxItemId = 23;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
@@ -177,6 +178,14 @@
barBtnExportInp.Name = "barBtnExportInp";
barBtnExportInp.ItemClick += barBtnExportInp_ItemClick;
//
+ // barBtnParter
+ //
+ barBtnParter.Caption = "缁勪欢";
+ barBtnParter.Id = 21;
+ barBtnParter.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnParter.ImageOptions.SvgImage");
+ barBtnParter.Name = "barBtnParter";
+ barBtnParter.ItemClick += barBtnParter_ItemClick;
+ //
// ribbonPage1
//
ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribPageGrpBaseMgr, ribbonPageGroup2, ribbonPageGroup1 });
@@ -199,6 +208,7 @@
ribbonPageGroup2.ItemLinks.Add(barBtnValidModel);
ribbonPageGroup2.ItemLinks.Add(barBtnExportInp);
ribbonPageGroup2.ItemLinks.Add(barBtnParter);
+ ribbonPageGroup2.ItemLinks.Add(barBtnTest);
ribbonPageGroup2.Name = "ribbonPageGroup2";
ribbonPageGroup2.Text = "姘村姏";
//
@@ -314,13 +324,13 @@
repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
//
- // barBtnParter
+ // barBtnTest
//
- barBtnParter.Caption = "缁勪欢";
- barBtnParter.Id = 21;
- barBtnParter.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnParter.ImageOptions.SvgImage");
- barBtnParter.Name = "barBtnParter";
- barBtnParter.ItemClick += barBtnParter_ItemClick;
+ barBtnTest.Caption = "娴嬭瘯";
+ barBtnTest.Id = 22;
+ barBtnTest.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnTest.ImageOptions.SvgImage");
+ barBtnTest.Name = "barBtnTest";
+ barBtnTest.ItemClick += barBtnTest_ItemClick;
//
// HydroModelMgrPage
//
@@ -376,5 +386,6 @@
protected DevExpress.XtraBars.BarButtonItem barBtnValidModel;
private DevExpress.XtraBars.BarButtonItem barBtnExportInp;
private DevExpress.XtraBars.BarButtonItem barBtnParter;
+ private DevExpress.XtraBars.BarButtonItem barBtnTest;
}
}
--
Gitblit v1.9.3