From f02df8852f3adbebd6c50a6c0077065ca18ccd84 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 11 十二月 2024 17:15:46 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 b369cf9..a501297 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
@@ -32,8 +32,8 @@
{
components = new Container();
ComponentResourceManager resources = new ComponentResourceManager(typeof(XhsProjectSimulationCorePage));
- DevExpress.Utils.SuperToolTip superToolTip2 = new DevExpress.Utils.SuperToolTip();
- DevExpress.Utils.ToolTipItem toolTipItem2 = new DevExpress.Utils.ToolTipItem();
+ DevExpress.Utils.SuperToolTip superToolTip1 = new DevExpress.Utils.SuperToolTip();
+ DevExpress.Utils.ToolTipItem toolTipItem1 = new DevExpress.Utils.ToolTipItem();
ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
barBtnCheck = new DevExpress.XtraBars.BarButtonItem();
barBtnCalcu = new DevExpress.XtraBars.BarButtonItem();
@@ -483,9 +483,9 @@
barBtnRepair.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnRepair.ImageOptions.SvgImage");
barBtnRepair.Name = "barBtnRepair";
barBtnRepair.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
- toolTipItem2.Text = "閫氳繃璇曠畻锛岃皟鏁寸娈典笂涓嬫父";
- superToolTip2.Items.Add(toolTipItem2);
- barBtnRepair.SuperTip = superToolTip2;
+ toolTipItem1.Text = "閫氳繃璇曠畻锛岃皟鏁寸娈典笂涓嬫父";
+ superToolTip1.Items.Add(toolTipItem1);
+ barBtnRepair.SuperTip = superToolTip1;
barBtnRepair.ItemClick += barBtnRepair_ItemClick;
//
// barBtnWorkingEvaluation
@@ -622,7 +622,6 @@
ribbonPageGroup2.ItemLinks.Add(barBtnExportInp);
ribbonPageGroup2.ItemLinks.Add(barBtnCalcu);
ribbonPageGroup2.ItemLinks.Add(barBtnAddWorking);
- ribbonPageGroup2.ItemLinks.Add(barBtnExportWord);
ribbonPageGroup2.Name = "ribbonPageGroup2";
ribbonPageGroup2.Text = "姘村姏璁＄畻";
//
@@ -634,6 +633,7 @@
ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossCurve);
ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossStatistics);
ribbonPageGroup9.ItemLinks.Add(barBtnWorkingAnaly);
+ ribbonPageGroup9.ItemLinks.Add(barBtnExportWord);
ribbonPageGroup9.Name = "ribbonPageGroup9";
ribbonPageGroup9.Text = "宸ュ喌鍒嗘瀽";
//
--
Gitblit v1.9.3