From 2e8e85f65748ee5a5adf0dcda864aa4167cbf2ef Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 11 十二月 2024 10:32:35 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs | 92 ++++++++++++++++++++++++++-------------------
1 files changed, 53 insertions(+), 39 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 0fa1ad7..c50e94b 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 superToolTip1 = new DevExpress.Utils.SuperToolTip();
- DevExpress.Utils.ToolTipItem toolTipItem1 = new DevExpress.Utils.ToolTipItem();
+ DevExpress.Utils.SuperToolTip superToolTip2 = new DevExpress.Utils.SuperToolTip();
+ DevExpress.Utils.ToolTipItem toolTipItem2 = new DevExpress.Utils.ToolTipItem();
ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
barBtnCheck = new DevExpress.XtraBars.BarButtonItem();
barBtnCalcu = new DevExpress.XtraBars.BarButtonItem();
@@ -84,7 +84,11 @@
barCkDecorator = new DevExpress.XtraBars.BarCheckItem();
barBtnAddWorking = new DevExpress.XtraBars.BarButtonItem();
barBtnPumpCurve = new DevExpress.XtraBars.BarButtonItem();
+ barBtnEditScheme = new DevExpress.XtraBars.BarButtonItem();
+ barBtnDeleteScheme = new DevExpress.XtraBars.BarButtonItem();
+ barBtnExportWord = new DevExpress.XtraBars.BarButtonItem();
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
+ ribPageGroupForScheme = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
pageGroupModel = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribbonPageGroup6 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -105,9 +109,6 @@
controlContainerBottom = new DevExpress.XtraBars.Docking.ControlContainer();
svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
rmSet = new DevExpress.XtraBars.Ribbon.RadialMenu(components);
- ribPageGroupForScheme = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
- barBtnEditScheme = new DevExpress.XtraBars.BarButtonItem();
- barBtnDeleteScheme = new DevExpress.XtraBars.BarButtonItem();
((ISupportInitialize)ribbonControl1).BeginInit();
((ISupportInitialize)repositoryItemImageComboBox1).BeginInit();
((ISupportInitialize)tabPane1).BeginInit();
@@ -123,9 +124,9 @@
//
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, barBtnSetMonitor, barBtnSetMonitorValue, barCkMonitor, barCkMark, barCkFlowEffect, barCkGrading, barCkCalcu, barBtnWorkingLossCurve, barBtnWorkingLossStatistics, barBtnWorkingPower, barBtnWorkingAnaly, barBtnPumpParallel, barBtnRepair, barBtnWorkingEvaluation, barBtnSetVisualVisible, barCkDecorator, barBtnAddWorking, barBtnPumpCurve, barBtnEditScheme, barBtnDeleteScheme });
+ 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, barBtnSetMonitor, barBtnSetMonitorValue, barCkMonitor, barCkMark, barCkFlowEffect, barCkGrading, barCkCalcu, barBtnWorkingLossCurve, barBtnWorkingLossStatistics, barBtnWorkingPower, barBtnWorkingAnaly, barBtnPumpParallel, barBtnRepair, barBtnWorkingEvaluation, barBtnSetVisualVisible, barCkDecorator, barBtnAddWorking, barBtnPumpCurve, barBtnEditScheme, barBtnDeleteScheme, barBtnExportWord });
ribbonControl1.Location = new Point(0, 0);
- ribbonControl1.MaxItemId = 84;
+ ribbonControl1.MaxItemId = 85;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbonControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemImageComboBox1 });
@@ -133,7 +134,7 @@
ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
ribbonControl1.ShowQatLocationSelector = false;
ribbonControl1.ShowToolbarCustomizeItem = false;
- ribbonControl1.Size = new Size(1464, 128);
+ ribbonControl1.Size = new Size(1464, 101);
ribbonControl1.Toolbar.ShowCustomizeItem = false;
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
//
@@ -482,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;
- toolTipItem1.Text = "閫氳繃璇曠畻锛岃皟鏁寸娈典笂涓嬫父";
- superToolTip1.Items.Add(toolTipItem1);
- barBtnRepair.SuperTip = superToolTip1;
+ toolTipItem2.Text = "閫氳繃璇曠畻锛岃皟鏁寸娈典笂涓嬫父";
+ superToolTip2.Items.Add(toolTipItem2);
+ barBtnRepair.SuperTip = superToolTip2;
barBtnRepair.ItemClick += barBtnRepair_ItemClick;
//
// barBtnWorkingEvaluation
@@ -534,11 +535,43 @@
barBtnPumpCurve.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
barBtnPumpCurve.ItemClick += barBtnPumpCurve_ItemClick;
//
+ // barBtnEditScheme
+ //
+ barBtnEditScheme.Caption = "缂栬緫";
+ barBtnEditScheme.Id = 82;
+ barBtnEditScheme.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEditScheme.ImageOptions.SvgImage");
+ barBtnEditScheme.Name = "barBtnEditScheme";
+ barBtnEditScheme.ItemClick += barBtnEditScheme_ItemClick;
+ //
+ // barBtnDeleteScheme
+ //
+ barBtnDeleteScheme.Caption = "鍒犻櫎";
+ barBtnDeleteScheme.Id = 83;
+ barBtnDeleteScheme.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDeleteScheme.ImageOptions.SvgImage");
+ barBtnDeleteScheme.Name = "barBtnDeleteScheme";
+ barBtnDeleteScheme.ItemClick += barBtnDeleteScheme_ItemClick;
+ //
+ // barBtnExportWord
+ //
+ barBtnExportWord.Caption = "瀵煎嚭鎶ュ憡";
+ barBtnExportWord.Enabled = false;
+ barBtnExportWord.Id = 84;
+ barBtnExportWord.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnExportWord.ImageOptions.SvgImage");
+ barBtnExportWord.Name = "barBtnExportWord";
+ barBtnExportWord.ItemClick += barBtnExportWord_ItemClick;
+ //
// ribbonPage1
//
ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribPageGroupForScheme, pageGroupModel, ribbonPageGroup6, ribbonPageGroup1, ribbonPageGroup7, ribbonPageGroup5, ribbonPageGroup2, ribbonPageGroup9, ribbonPageGroup3 });
ribbonPage1.Name = "ribbonPage1";
ribbonPage1.Text = "ribbonPage1";
+ //
+ // ribPageGroupForScheme
+ //
+ ribPageGroupForScheme.ItemLinks.Add(barBtnEditScheme);
+ ribPageGroupForScheme.ItemLinks.Add(barBtnDeleteScheme);
+ ribPageGroupForScheme.Name = "ribPageGroupForScheme";
+ ribPageGroupForScheme.Text = "鏂规";
//
// pageGroupModel
//
@@ -589,6 +622,7 @@
ribbonPageGroup2.ItemLinks.Add(barBtnExportInp);
ribbonPageGroup2.ItemLinks.Add(barBtnCalcu);
ribbonPageGroup2.ItemLinks.Add(barBtnAddWorking);
+ ribbonPageGroup2.ItemLinks.Add(barBtnExportWord);
ribbonPageGroup2.Name = "ribbonPageGroup2";
ribbonPageGroup2.Text = "姘村姏璁＄畻";
//
@@ -626,12 +660,12 @@
tabPane1.Controls.Add(tabPageBimface);
tabPane1.Controls.Add(tabPageQ3d);
tabPane1.Dock = DockStyle.Fill;
- tabPane1.Location = new Point(0, 128);
+ tabPane1.Location = new Point(0, 101);
tabPane1.Name = "tabPane1";
tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabPageBimface, tabPageQ3d });
- tabPane1.RegularSize = new Size(1189, 407);
+ tabPane1.RegularSize = new Size(1189, 434);
tabPane1.SelectedPage = tabPageBimface;
- tabPane1.Size = new Size(1189, 407);
+ tabPane1.Size = new Size(1189, 434);
tabPane1.TabIndex = 1;
tabPane1.Text = "tabPane1";
//
@@ -659,19 +693,19 @@
docPnlRight.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
docPnlRight.FloatVertical = true;
docPnlRight.ID = new Guid("cffe2560-3445-4488-83cf-b9e4b936ff18");
- docPnlRight.Location = new Point(1189, 128);
+ docPnlRight.Location = new Point(1189, 101);
docPnlRight.Name = "docPnlRight";
docPnlRight.OriginalSize = new Size(275, 200);
docPnlRight.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Right;
docPnlRight.SavedIndex = 0;
- docPnlRight.Size = new Size(275, 572);
+ docPnlRight.Size = new Size(275, 599);
docPnlRight.Text = "灞炴��";
//
// controlContainerRight
//
controlContainerRight.Location = new Point(4, 26);
controlContainerRight.Name = "controlContainerRight";
- controlContainerRight.Size = new Size(268, 543);
+ controlContainerRight.Size = new Size(268, 570);
controlContainerRight.TabIndex = 0;
//
// docPnlBottom
@@ -724,27 +758,6 @@
rmSet.Ribbon = ribbonControl1;
rmSet.BeforePopup += rmSet_BeforePopup;
//
- // ribPageGroupForScheme
- //
- ribPageGroupForScheme.ItemLinks.Add(barBtnEditScheme);
- ribPageGroupForScheme.ItemLinks.Add(barBtnDeleteScheme);
- ribPageGroupForScheme.Name = "ribPageGroupForScheme";
- ribPageGroupForScheme.Text = "鏂规";
- //
- // barBtnEditScheme
- //
- barBtnEditScheme.Caption = "缂栬緫";
- barBtnEditScheme.Id = 82;
- barBtnEditScheme.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEditScheme.ImageOptions.SvgImage");
- barBtnEditScheme.Name = "barBtnEditScheme";
- //
- // barBtnDeleteScheme
- //
- barBtnDeleteScheme.Caption = "鍒犻櫎";
- barBtnDeleteScheme.Id = 83;
- barBtnDeleteScheme.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDeleteScheme.ImageOptions.SvgImage");
- barBtnDeleteScheme.Name = "barBtnDeleteScheme";
- //
// XhsProjectSimulationCorePage
//
Appearance.BackColor = SystemColors.Control;
@@ -752,8 +765,8 @@
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(tabPane1);
- Controls.Add(docPnlBottom);
Controls.Add(docPnlRight);
+ Controls.Add(docPnlBottom);
Controls.Add(ribbonControl1);
Margin = new Padding(2);
Name = "XhsProjectSimulationCorePage";
@@ -847,5 +860,6 @@
private DevExpress.XtraBars.BarButtonItem barBtnEditScheme;
private DevExpress.XtraBars.BarButtonItem barBtnDeleteScheme;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribPageGroupForScheme;
+ private DevExpress.XtraBars.BarButtonItem barBtnExportWord;
}
}
--
Gitblit v1.9.3