From c653f2f6f2de553395b706de3a62fec5e4a6fbf7 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 21 十一月 2024 17:52:18 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/AddXhsSchemeDlg.Designer.cs | 772 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 585 insertions(+), 187 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/AddXhsSchemeDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/AddXhsSchemeDlg.Designer.cs
index 8a43ae6..c8356fa 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/AddXhsSchemeDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/AddXhsSchemeDlg.Designer.cs
@@ -47,11 +47,48 @@
colDelete = new DevExpress.XtraGrid.Columns.GridColumn();
repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
ribbon = new DevExpress.XtraBars.Ribbon.RibbonControl();
- barButtonItem1 = new DevExpress.XtraBars.BarButtonItem();
- barButtonItem2 = new DevExpress.XtraBars.BarButtonItem();
- barButtonItem3 = new DevExpress.XtraBars.BarButtonItem();
- ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
sidePanel3dModel = new SidePanel();
+ barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
+ barManager1 = new DevExpress.XtraBars.BarManager(components);
+ bar1 = new DevExpress.XtraBars.Bar();
+ barBtnFastShowHidden = new DevExpress.XtraBars.BarButtonItem();
+ barDockControlTop = new DevExpress.XtraBars.BarDockControl();
+ barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
+ barDockControlRight = new DevExpress.XtraBars.BarDockControl();
+ dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
+ dockPanel5 = new DevExpress.XtraBars.Docking.DockPanel();
+ dockPanelChangeRecord = new DevExpress.XtraBars.Docking.DockPanel();
+ dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
+ layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ gridControl2 = new DevExpress.XtraGrid.GridControl();
+ setSchemeParterRecordItemBindingSource = new BindingSource(components);
+ gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ colName1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ colAfterValue = new DevExpress.XtraGrid.Columns.GridColumn();
+ colBeforeValue = new DevExpress.XtraGrid.Columns.GridColumn();
+ Root = new DevExpress.XtraLayout.LayoutControlGroup();
+ layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
+ layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
+ layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ dockPanelScheme = new DevExpress.XtraBars.Docking.DockPanel();
+ dockPanel3_Container = new DevExpress.XtraBars.Docking.ControlContainer();
+ layoutControl2 = new DevExpress.XtraLayout.LayoutControl();
+ setFlagsEditCtrl1 = new SetFlagsEditCtrl();
+ imgCmbSchemeType = new ImageComboBoxEdit();
+ txtNo = new TextEdit();
+ txtName = new TextEdit();
+ btnSave = new SimpleButton();
+ memoDescription = new MemoEdit();
+ layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
+ layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ dockPanelParterList = new DevExpress.XtraBars.Docking.DockPanel();
+ dockPanel2_Container = new DevExpress.XtraBars.Docking.ControlContainer();
tabPane1 = new DevExpress.XtraBars.Navigation.TabPane();
tabPagePump = new DevExpress.XtraBars.Navigation.TabNavigationPage();
setSchemePumpListCtrl1 = new SetSchemePumpListCtrl();
@@ -60,53 +97,66 @@
tabPagePipe = new DevExpress.XtraBars.Navigation.TabNavigationPage();
setSchemePipeListCtrl1 = new SetSchemePipeListCtrl();
panelContainer1 = new DevExpress.XtraBars.Docking.DockPanel();
- gridControl2 = new DevExpress.XtraGrid.GridControl();
- setSchemeParterRecordItemBindingSource = new BindingSource(components);
- gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
- colName1 = new DevExpress.XtraGrid.Columns.GridColumn();
- colAfterValue = new DevExpress.XtraGrid.Columns.GridColumn();
- colBeforeValue = new DevExpress.XtraGrid.Columns.GridColumn();
- dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
- dockPanel5 = new DevExpress.XtraBars.Docking.DockPanel();
- dockPanelChangeRecord = new DevExpress.XtraBars.Docking.DockPanel();
- dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
- dockPanelChangeRecordItem = new DevExpress.XtraBars.Docking.DockPanel();
- dockPanel3_Container = new DevExpress.XtraBars.Docking.ControlContainer();
- dockPanelParterList = new DevExpress.XtraBars.Docking.DockPanel();
- dockPanel2_Container = new DevExpress.XtraBars.Docking.ControlContainer();
+ dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
+ layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
((ISupportInitialize)gridControl1).BeginInit();
((ISupportInitialize)setSchemeParterRecordBindingSource).BeginInit();
((ISupportInitialize)gridView1).BeginInit();
((ISupportInitialize)repositoryItemButtonEdit1).BeginInit();
((ISupportInitialize)ribbon).BeginInit();
+ sidePanel3dModel.SuspendLayout();
+ ((ISupportInitialize)barManager1).BeginInit();
+ ((ISupportInitialize)dockManager1).BeginInit();
+ dockPanel5.SuspendLayout();
+ dockPanelChangeRecord.SuspendLayout();
+ dockPanel1_Container.SuspendLayout();
+ ((ISupportInitialize)layoutControl1).BeginInit();
+ layoutControl1.SuspendLayout();
+ ((ISupportInitialize)gridControl2).BeginInit();
+ ((ISupportInitialize)setSchemeParterRecordItemBindingSource).BeginInit();
+ ((ISupportInitialize)gridView2).BeginInit();
+ ((ISupportInitialize)Root).BeginInit();
+ ((ISupportInitialize)layoutControlGroup1).BeginInit();
+ ((ISupportInitialize)layoutControlItem1).BeginInit();
+ ((ISupportInitialize)layoutControlGroup2).BeginInit();
+ ((ISupportInitialize)layoutControlItem2).BeginInit();
+ dockPanelScheme.SuspendLayout();
+ dockPanel3_Container.SuspendLayout();
+ ((ISupportInitialize)layoutControl2).BeginInit();
+ layoutControl2.SuspendLayout();
+ ((ISupportInitialize)imgCmbSchemeType.Properties).BeginInit();
+ ((ISupportInitialize)txtNo.Properties).BeginInit();
+ ((ISupportInitialize)txtName.Properties).BeginInit();
+ ((ISupportInitialize)memoDescription.Properties).BeginInit();
+ ((ISupportInitialize)layoutControlGroup3).BeginInit();
+ ((ISupportInitialize)layoutControlItem5).BeginInit();
+ ((ISupportInitialize)layoutControlItem13).BeginInit();
+ ((ISupportInitialize)layoutControlItem14).BeginInit();
+ ((ISupportInitialize)layoutControlItem12).BeginInit();
+ ((ISupportInitialize)layoutControlItem3).BeginInit();
+ ((ISupportInitialize)layoutControlItem11).BeginInit();
+ dockPanelParterList.SuspendLayout();
+ dockPanel2_Container.SuspendLayout();
((ISupportInitialize)tabPane1).BeginInit();
tabPane1.SuspendLayout();
tabPagePump.SuspendLayout();
tabPageValve.SuspendLayout();
tabPagePipe.SuspendLayout();
- ((ISupportInitialize)gridControl2).BeginInit();
- ((ISupportInitialize)setSchemeParterRecordItemBindingSource).BeginInit();
- ((ISupportInitialize)gridView2).BeginInit();
- ((ISupportInitialize)dockManager1).BeginInit();
- dockPanel5.SuspendLayout();
- dockPanelChangeRecord.SuspendLayout();
- dockPanel1_Container.SuspendLayout();
- dockPanelChangeRecordItem.SuspendLayout();
- dockPanel3_Container.SuspendLayout();
- dockPanelParterList.SuspendLayout();
- dockPanel2_Container.SuspendLayout();
+ ((ISupportInitialize)dxErrorProvider1).BeginInit();
+ ((ISupportInitialize)layoutControlItem9).BeginInit();
+ ((ISupportInitialize)layoutControlItem10).BeginInit();
SuspendLayout();
//
// gridControl1
//
gridControl1.DataSource = setSchemeParterRecordBindingSource;
- gridControl1.Dock = DockStyle.Fill;
- gridControl1.Location = new Point(0, 0);
+ gridControl1.Location = new Point(0, 33);
gridControl1.MainView = gridView1;
gridControl1.MenuManager = ribbon;
gridControl1.Name = "gridControl1";
gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemButtonEdit1 });
- gridControl1.Size = new Size(369, 431);
+ gridControl1.Size = new Size(393, 469);
gridControl1.TabIndex = 0;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
//
@@ -195,18 +245,16 @@
//
ribbon.ExpandCollapseItem.Id = 0;
ribbon.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
- ribbon.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbon.ExpandCollapseItem, barButtonItem1, barButtonItem2, barButtonItem3 });
+ ribbon.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbon.ExpandCollapseItem });
ribbon.Location = new Point(0, 0);
- ribbon.MaxItemId = 10;
+ ribbon.MaxItemId = 22;
ribbon.Name = "ribbon";
ribbon.OptionsExpandCollapseMenu.EnableExpandCollapseMenu = DevExpress.Utils.DefaultBoolean.False;
ribbon.OptionsExpandCollapseMenu.ShowQuickAccessToolbarItem = DevExpress.Utils.DefaultBoolean.False;
ribbon.OptionsExpandCollapseMenu.ShowRibbonGroup = DevExpress.Utils.DefaultBoolean.False;
ribbon.OptionsExpandCollapseMenu.ShowRibbonLayoutGroup = DevExpress.Utils.DefaultBoolean.False;
ribbon.OptionsTouch.TouchUI = DevExpress.Utils.DefaultBoolean.False;
- ribbon.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbon.RibbonCaptionAlignment = DevExpress.XtraBars.Ribbon.RibbonCaptionAlignment.Left;
- ribbon.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.MacOffice;
ribbon.SearchItemPosition = DevExpress.XtraBars.Ribbon.SearchItemPosition.None;
ribbon.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
ribbon.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.False;
@@ -216,125 +264,159 @@
ribbon.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide;
ribbon.ShowQatLocationSelector = false;
ribbon.ShowToolbarCustomizeItem = false;
- ribbon.Size = new Size(1569, 174);
+ ribbon.Size = new Size(1569, 48);
ribbon.Toolbar.ShowCustomizeItem = false;
- //
- // barButtonItem1
- //
- barButtonItem1.Caption = "barButtonItem1";
- barButtonItem1.Id = 7;
- barButtonItem1.Name = "barButtonItem1";
- //
- // barButtonItem2
- //
- barButtonItem2.Caption = "barButtonItem2";
- barButtonItem2.Id = 8;
- barButtonItem2.Name = "barButtonItem2";
- //
- // barButtonItem3
- //
- barButtonItem3.Caption = "barButtonItem3";
- barButtonItem3.Id = 9;
- barButtonItem3.Name = "barButtonItem3";
- //
- // ribbonPage1
- //
- ribbonPage1.Name = "ribbonPage1";
- ribbonPage1.Text = "ribbonPage1";
//
// sidePanel3dModel
//
+ sidePanel3dModel.Controls.Add(barDockControlLeft);
+ sidePanel3dModel.Controls.Add(barDockControlRight);
+ sidePanel3dModel.Controls.Add(barDockControlBottom);
+ sidePanel3dModel.Controls.Add(barDockControlTop);
sidePanel3dModel.Dock = DockStyle.Fill;
- sidePanel3dModel.Location = new Point(0, 174);
+ sidePanel3dModel.Location = new Point(0, 48);
sidePanel3dModel.Name = "sidePanel3dModel";
- sidePanel3dModel.Size = new Size(1199, 583);
+ sidePanel3dModel.Size = new Size(1175, 709);
sidePanel3dModel.TabIndex = 2;
sidePanel3dModel.Text = "sidePanel2";
//
- // tabPane1
+ // barDockControlLeft
//
- tabPane1.Controls.Add(tabPagePump);
- tabPane1.Controls.Add(tabPageValve);
- tabPane1.Controls.Add(tabPagePipe);
- tabPane1.Dock = DockStyle.Fill;
- tabPane1.Location = new Point(0, 0);
- tabPane1.Name = "tabPane1";
- tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabPagePump, tabPageValve, tabPagePipe });
- tabPane1.RegularSize = new Size(1199, 312);
- tabPane1.SelectedPage = tabPagePump;
- tabPane1.Size = new Size(1199, 312);
- tabPane1.TabIndex = 0;
- tabPane1.Text = "tabPane1";
+ barDockControlLeft.CausesValidation = false;
+ barDockControlLeft.Dock = DockStyle.Left;
+ barDockControlLeft.Location = new Point(0, 35);
+ barDockControlLeft.Manager = barManager1;
+ barDockControlLeft.Size = new Size(0, 674);
//
- // tabPagePump
+ // barManager1
//
- tabPagePump.Caption = "姘存车";
- tabPagePump.Controls.Add(setSchemePumpListCtrl1);
- tabPagePump.Name = "tabPagePump";
- tabPagePump.Size = new Size(1199, 263);
+ barManager1.AllowMdiChildButtons = false;
+ barManager1.AllowMoveBarOnToolbar = false;
+ barManager1.AllowQuickCustomization = false;
+ barManager1.AllowShowToolbarsPopup = false;
+ barManager1.Bars.AddRange(new DevExpress.XtraBars.Bar[] { bar1 });
+ barManager1.DockControls.Add(barDockControlTop);
+ barManager1.DockControls.Add(barDockControlBottom);
+ barManager1.DockControls.Add(barDockControlLeft);
+ barManager1.DockControls.Add(barDockControlRight);
+ barManager1.DockManager = dockManager1;
+ barManager1.Form = sidePanel3dModel;
+ barManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { barBtnFastShowHidden });
+ barManager1.MaxItemId = 1;
+ barManager1.ShowFullMenusAfterDelay = false;
+ barManager1.ShowScreenTipsInToolbars = false;
+ barManager1.ShowShortcutInScreenTips = false;
+ barManager1.TransparentEditorsMode = DevExpress.Utils.DefaultBoolean.False;
//
- // setSchemePumpListCtrl1
+ // bar1
//
- setSchemePumpListCtrl1.Dock = DockStyle.Fill;
- setSchemePumpListCtrl1.Location = new Point(0, 0);
- setSchemePumpListCtrl1.Margin = new Padding(4, 5, 4, 5);
- setSchemePumpListCtrl1.Name = "setSchemePumpListCtrl1";
- setSchemePumpListCtrl1.Size = new Size(1199, 263);
- setSchemePumpListCtrl1.TabIndex = 0;
+ bar1.BarName = "Tools";
+ bar1.DockCol = 0;
+ bar1.DockRow = 0;
+ bar1.DockStyle = DevExpress.XtraBars.BarDockStyle.Top;
+ bar1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barBtnFastShowHidden) });
+ bar1.OptionsBar.AllowQuickCustomization = false;
+ bar1.OptionsBar.DrawDragBorder = false;
+ bar1.OptionsBar.UseWholeRow = true;
+ bar1.Text = "Tools";
//
- // tabPageValve
+ // barBtnFastShowHidden
//
- tabPageValve.Caption = "闃�闂�";
- tabPageValve.Controls.Add(setSchemeValveListCtrl1);
- tabPageValve.Name = "tabPageValve";
- tabPageValve.Size = new Size(977, 384);
+ barBtnFastShowHidden.Caption = "涓�閿樉闅�";
+ barBtnFastShowHidden.Id = 0;
+ barBtnFastShowHidden.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnFastShowHidden.ImageOptions.SvgImage");
+ barBtnFastShowHidden.Name = "barBtnFastShowHidden";
+ barBtnFastShowHidden.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
+ barBtnFastShowHidden.ItemClick += barBtnFastShowHidden_ItemClick;
//
- // setSchemeValveListCtrl1
+ // barDockControlTop
//
- setSchemeValveListCtrl1.Dock = DockStyle.Fill;
- setSchemeValveListCtrl1.Location = new Point(0, 0);
- setSchemeValveListCtrl1.Margin = new Padding(4, 5, 4, 5);
- setSchemeValveListCtrl1.Name = "setSchemeValveListCtrl1";
- setSchemeValveListCtrl1.Size = new Size(977, 384);
- setSchemeValveListCtrl1.TabIndex = 2;
+ barDockControlTop.CausesValidation = false;
+ barDockControlTop.Dock = DockStyle.Top;
+ barDockControlTop.Location = new Point(0, 0);
+ barDockControlTop.Manager = barManager1;
+ barDockControlTop.Size = new Size(1175, 35);
//
- // tabPagePipe
+ // barDockControlBottom
//
- tabPagePipe.Caption = "绠¤矾";
- tabPagePipe.Controls.Add(setSchemePipeListCtrl1);
- tabPagePipe.Name = "tabPagePipe";
- tabPagePipe.Size = new Size(977, 384);
+ barDockControlBottom.CausesValidation = false;
+ barDockControlBottom.Dock = DockStyle.Bottom;
+ barDockControlBottom.Location = new Point(0, 709);
+ barDockControlBottom.Manager = barManager1;
+ barDockControlBottom.Size = new Size(1175, 0);
//
- // setSchemePipeListCtrl1
+ // barDockControlRight
//
- setSchemePipeListCtrl1.Dock = DockStyle.Fill;
- setSchemePipeListCtrl1.Location = new Point(0, 0);
- setSchemePipeListCtrl1.Margin = new Padding(4, 5, 4, 5);
- setSchemePipeListCtrl1.Name = "setSchemePipeListCtrl1";
- setSchemePipeListCtrl1.Size = new Size(977, 384);
- setSchemePipeListCtrl1.TabIndex = 1;
+ barDockControlRight.CausesValidation = false;
+ barDockControlRight.Dock = DockStyle.Right;
+ barDockControlRight.Location = new Point(1175, 35);
+ barDockControlRight.Manager = barManager1;
+ barDockControlRight.Size = new Size(0, 674);
//
- // panelContainer1
+ // dockManager1
//
- panelContainer1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill;
- panelContainer1.DockedAsTabbedDocument = true;
- panelContainer1.ID = new Guid("69c11a8a-862c-4240-930a-ff3d90593b2b");
- panelContainer1.Location = new Point(0, 0);
- panelContainer1.Name = "panelContainer1";
- panelContainer1.OriginalSize = new Size(200, 200);
- panelContainer1.Size = new Size(1526, 527);
- panelContainer1.TabsPosition = DevExpress.XtraBars.Docking.TabsPosition.Top;
- panelContainer1.Text = "panelContainer1";
+ dockManager1.DockingOptions.ShowAutoHideButton = false;
+ dockManager1.DockingOptions.ShowCloseButton = false;
+ dockManager1.DockingOptions.ShowMaximizeButton = false;
+ dockManager1.DockingOptions.ShowMinimizeButton = false;
+ dockManager1.Form = this;
+ dockManager1.MenuManager = barManager1;
+ dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { dockPanel5, dockPanelParterList });
+ dockManager1.Style = DevExpress.XtraBars.Docking2010.Views.DockingViewStyle.Light;
+ dockManager1.TopZIndexControls.AddRange(new string[] { "DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "System.Windows.Forms.StatusBar", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl" });
+ //
+ // dockPanel5
+ //
+ dockPanel5.Controls.Add(dockPanelChangeRecord);
+ dockPanel5.Controls.Add(dockPanelScheme);
+ dockPanel5.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
+ dockPanel5.ID = new Guid("4f9140be-dc44-4cc6-9924-d22c117f4a97");
+ dockPanel5.Location = new Point(1175, 48);
+ dockPanel5.Name = "dockPanel5";
+ dockPanel5.OriginalSize = new Size(394, 200);
+ dockPanel5.Size = new Size(394, 1056);
+ dockPanel5.Text = "panelContainer1";
+ //
+ // dockPanelChangeRecord
+ //
+ dockPanelChangeRecord.Controls.Add(dockPanel1_Container);
+ dockPanelChangeRecord.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill;
+ dockPanelChangeRecord.ID = new Guid("2c97b548-e9c5-4899-b8e1-203e6decf6f7");
+ dockPanelChangeRecord.Location = new Point(0, 0);
+ dockPanelChangeRecord.Name = "dockPanelChangeRecord";
+ dockPanelChangeRecord.OriginalSize = new Size(394, 825);
+ dockPanelChangeRecord.Size = new Size(394, 825);
+ dockPanelChangeRecord.Text = "鍙樻洿璁板綍";
+ //
+ // dockPanel1_Container
+ //
+ dockPanel1_Container.Controls.Add(layoutControl1);
+ dockPanel1_Container.Location = new Point(1, 34);
+ dockPanel1_Container.Name = "dockPanel1_Container";
+ dockPanel1_Container.Size = new Size(393, 791);
+ dockPanel1_Container.TabIndex = 0;
+ //
+ // layoutControl1
+ //
+ layoutControl1.Controls.Add(gridControl2);
+ layoutControl1.Controls.Add(gridControl1);
+ layoutControl1.Dock = DockStyle.Fill;
+ layoutControl1.Location = new Point(0, 0);
+ layoutControl1.Name = "layoutControl1";
+ layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(565, 389, 975, 600);
+ layoutControl1.Root = Root;
+ layoutControl1.Size = new Size(393, 791);
+ layoutControl1.TabIndex = 0;
+ layoutControl1.Text = "layoutControl1";
//
// gridControl2
//
gridControl2.DataSource = setSchemeParterRecordItemBindingSource;
- gridControl2.Dock = DockStyle.Fill;
- gridControl2.Location = new Point(0, 0);
+ gridControl2.Location = new Point(0, 535);
gridControl2.MainView = gridView2;
gridControl2.MenuManager = ribbon;
gridControl2.Name = "gridControl2";
- gridControl2.Size = new Size(369, 430);
+ gridControl2.Size = new Size(393, 256);
gridControl2.TabIndex = 0;
gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView2 });
//
@@ -377,66 +459,234 @@
colBeforeValue.VisibleIndex = 2;
colBeforeValue.Width = 112;
//
- // dockManager1
+ // Root
//
- dockManager1.DockingOptions.ShowAutoHideButton = false;
- dockManager1.DockingOptions.ShowCloseButton = false;
- dockManager1.DockingOptions.ShowMaximizeButton = false;
- dockManager1.DockingOptions.ShowMinimizeButton = false;
- dockManager1.Form = this;
- dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { dockPanel5, dockPanelParterList });
- dockManager1.Style = DevExpress.XtraBars.Docking2010.Views.DockingViewStyle.Light;
- dockManager1.TopZIndexControls.AddRange(new string[] { "DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "System.Windows.Forms.StatusBar", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl" });
+ Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ Root.GroupBordersVisible = false;
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1, layoutControlGroup2 });
+ Root.Name = "Root";
+ Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+ Root.Size = new Size(393, 791);
+ Root.TextVisible = false;
//
- // dockPanel5
+ // layoutControlGroup1
//
- dockPanel5.Controls.Add(dockPanelChangeRecord);
- dockPanel5.Controls.Add(dockPanelChangeRecordItem);
- dockPanel5.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
- dockPanel5.ID = new Guid("4f9140be-dc44-4cc6-9924-d22c117f4a97");
- dockPanel5.Location = new Point(1199, 174);
- dockPanel5.Name = "dockPanel5";
- dockPanel5.OriginalSize = new Size(370, 200);
- dockPanel5.Size = new Size(370, 930);
- dockPanel5.Text = "panelContainer1";
+ layoutControlGroup1.ExpandButtonVisible = true;
+ layoutControlGroup1.GroupStyle = DevExpress.Utils.GroupStyle.Title;
+ layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1 });
+ layoutControlGroup1.Location = new Point(0, 0);
+ layoutControlGroup1.Name = "layoutControlGroup1";
+ layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+ layoutControlGroup1.ShowInCustomizationForm = false;
+ layoutControlGroup1.Size = new Size(393, 502);
+ layoutControlGroup1.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+ layoutControlGroup1.Text = "璁板綍鍒楄〃";
//
- // dockPanelChangeRecord
+ // layoutControlItem1
//
- dockPanelChangeRecord.Controls.Add(dockPanel1_Container);
- dockPanelChangeRecord.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill;
- dockPanelChangeRecord.ID = new Guid("2c97b548-e9c5-4899-b8e1-203e6decf6f7");
- dockPanelChangeRecord.Location = new Point(0, 0);
- dockPanelChangeRecord.Name = "dockPanelChangeRecord";
- dockPanelChangeRecord.OriginalSize = new Size(370, 245);
- dockPanelChangeRecord.Size = new Size(370, 465);
- dockPanelChangeRecord.Text = "鍙樻洿璁板綍鍒楄〃";
+ layoutControlItem1.Control = gridControl1;
+ layoutControlItem1.HighlightFocusedItem = DevExpress.Utils.DefaultBoolean.True;
+ layoutControlItem1.Location = new Point(0, 0);
+ layoutControlItem1.Name = "layoutControlItem1";
+ layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+ layoutControlItem1.Size = new Size(393, 469);
+ layoutControlItem1.TextSize = new Size(0, 0);
+ layoutControlItem1.TextVisible = false;
//
- // dockPanel1_Container
+ // layoutControlGroup2
//
- dockPanel1_Container.Controls.Add(gridControl1);
- dockPanel1_Container.Location = new Point(1, 34);
- dockPanel1_Container.Name = "dockPanel1_Container";
- dockPanel1_Container.Size = new Size(369, 431);
- dockPanel1_Container.TabIndex = 0;
+ layoutControlGroup2.ExpandButtonVisible = true;
+ layoutControlGroup2.GroupStyle = DevExpress.Utils.GroupStyle.Title;
+ layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2 });
+ layoutControlGroup2.Location = new Point(0, 502);
+ layoutControlGroup2.Name = "layoutControlGroup2";
+ layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+ layoutControlGroup2.ShowInCustomizationForm = false;
+ layoutControlGroup2.Size = new Size(393, 289);
+ layoutControlGroup2.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+ layoutControlGroup2.Text = "璁板綍璇︽儏";
//
- // dockPanelChangeRecordItem
+ // layoutControlItem2
//
- dockPanelChangeRecordItem.Controls.Add(dockPanel3_Container);
- dockPanelChangeRecordItem.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill;
- dockPanelChangeRecordItem.ID = new Guid("39552842-60b6-4e4d-b215-438810b7a737");
- dockPanelChangeRecordItem.Location = new Point(0, 465);
- dockPanelChangeRecordItem.Name = "dockPanelChangeRecordItem";
- dockPanelChangeRecordItem.OriginalSize = new Size(370, 245);
- dockPanelChangeRecordItem.Size = new Size(370, 465);
- dockPanelChangeRecordItem.Text = "鍙樻洿璁板綍璇︾粏";
+ layoutControlItem2.Control = gridControl2;
+ layoutControlItem2.HighlightFocusedItem = DevExpress.Utils.DefaultBoolean.True;
+ layoutControlItem2.Location = new Point(0, 0);
+ layoutControlItem2.Name = "layoutControlItem2";
+ layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+ layoutControlItem2.Size = new Size(393, 256);
+ layoutControlItem2.TextSize = new Size(0, 0);
+ layoutControlItem2.TextVisible = false;
+ //
+ // dockPanelScheme
+ //
+ dockPanelScheme.Controls.Add(dockPanel3_Container);
+ dockPanelScheme.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill;
+ dockPanelScheme.ID = new Guid("39552842-60b6-4e4d-b215-438810b7a737");
+ dockPanelScheme.Location = new Point(0, 825);
+ dockPanelScheme.Name = "dockPanelScheme";
+ dockPanelScheme.OriginalSize = new Size(394, 231);
+ dockPanelScheme.Size = new Size(394, 231);
+ dockPanelScheme.Text = "鏂规淇℃伅";
//
// dockPanel3_Container
//
- dockPanel3_Container.Controls.Add(gridControl2);
+ dockPanel3_Container.Controls.Add(layoutControl2);
dockPanel3_Container.Location = new Point(1, 35);
dockPanel3_Container.Name = "dockPanel3_Container";
- dockPanel3_Container.Size = new Size(369, 430);
+ dockPanel3_Container.Size = new Size(393, 196);
dockPanel3_Container.TabIndex = 0;
+ //
+ // layoutControl2
+ //
+ layoutControl2.Controls.Add(setFlagsEditCtrl1);
+ layoutControl2.Controls.Add(imgCmbSchemeType);
+ layoutControl2.Controls.Add(txtNo);
+ layoutControl2.Controls.Add(txtName);
+ layoutControl2.Controls.Add(btnSave);
+ layoutControl2.Controls.Add(memoDescription);
+ layoutControl2.Dock = DockStyle.Fill;
+ layoutControl2.Location = new Point(0, 0);
+ layoutControl2.Name = "layoutControl2";
+ layoutControl2.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(71, 697, 975, 600);
+ layoutControl2.Root = layoutControlGroup3;
+ layoutControl2.Size = new Size(393, 196);
+ layoutControl2.TabIndex = 0;
+ layoutControl2.Text = "layoutControl2";
+ //
+ // setFlagsEditCtrl1
+ //
+ setFlagsEditCtrl1.Location = new Point(262, 44);
+ setFlagsEditCtrl1.Margin = new Padding(6, 8, 6, 8);
+ setFlagsEditCtrl1.Name = "setFlagsEditCtrl1";
+ setFlagsEditCtrl1.Size = new Size(119, 28);
+ setFlagsEditCtrl1.TabIndex = 3;
+ //
+ // imgCmbSchemeType
+ //
+ imgCmbSchemeType.Location = new Point(76, 44);
+ imgCmbSchemeType.Margin = new Padding(4, 5, 4, 5);
+ imgCmbSchemeType.Name = "imgCmbSchemeType";
+ imgCmbSchemeType.Properties.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Combo) });
+ imgCmbSchemeType.Size = new Size(118, 28);
+ imgCmbSchemeType.StyleController = layoutControl2;
+ imgCmbSchemeType.TabIndex = 4;
+ //
+ // txtNo
+ //
+ txtNo.Location = new Point(76, 12);
+ txtNo.Margin = new Padding(4, 5, 4, 5);
+ txtNo.Name = "txtNo";
+ txtNo.Size = new Size(118, 28);
+ txtNo.StyleController = layoutControl2;
+ txtNo.TabIndex = 0;
+ //
+ // txtName
+ //
+ txtName.Location = new Point(262, 12);
+ txtName.Margin = new Padding(4, 5, 4, 5);
+ txtName.Name = "txtName";
+ txtName.Size = new Size(119, 28);
+ txtName.StyleController = layoutControl2;
+ txtName.TabIndex = 2;
+ //
+ // btnSave
+ //
+ btnSave.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question;
+ btnSave.Appearance.Options.UseBackColor = true;
+ btnSave.Location = new Point(120, 144);
+ btnSave.Name = "btnSave";
+ btnSave.Size = new Size(153, 32);
+ btnSave.StyleController = layoutControl2;
+ btnSave.TabIndex = 6;
+ btnSave.Text = "淇濆瓨";
+ btnSave.Click += btnSave_Click;
+ //
+ // memoDescription
+ //
+ memoDescription.Location = new Point(76, 76);
+ memoDescription.MenuManager = ribbon;
+ memoDescription.Name = "memoDescription";
+ memoDescription.Properties.ScrollBars = ScrollBars.Horizontal;
+ memoDescription.Size = new Size(305, 56);
+ memoDescription.StyleController = layoutControl2;
+ memoDescription.TabIndex = 5;
+ //
+ // layoutControlGroup3
+ //
+ layoutControlGroup3.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ layoutControlGroup3.GroupBordersVisible = false;
+ layoutControlGroup3.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5, layoutControlItem13, layoutControlItem14, layoutControlItem12, layoutControlItem3, layoutControlItem11 });
+ layoutControlGroup3.Name = "Root";
+ layoutControlGroup3.Size = new Size(393, 196);
+ layoutControlGroup3.TextVisible = false;
+ //
+ // layoutControlItem5
+ //
+ layoutControlItem5.Control = btnSave;
+ layoutControlItem5.Location = new Point(0, 124);
+ layoutControlItem5.Name = "layoutControlItem5";
+ layoutControlItem5.Padding = new DevExpress.XtraLayout.Utils.Padding(110, 110, 10, 10);
+ layoutControlItem5.Size = new Size(373, 52);
+ layoutControlItem5.TextSize = new Size(0, 0);
+ layoutControlItem5.TextVisible = false;
+ //
+ // layoutControlItem13
+ //
+ layoutControlItem13.AppearanceItemCaption.Options.UseTextOptions = true;
+ layoutControlItem13.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
+ layoutControlItem13.Control = txtNo;
+ layoutControlItem13.Location = new Point(0, 0);
+ layoutControlItem13.Name = "layoutControlItem13";
+ layoutControlItem13.Size = new Size(186, 32);
+ layoutControlItem13.Text = "缂栫爜:";
+ layoutControlItem13.TextSize = new Size(52, 22);
+ //
+ // layoutControlItem14
+ //
+ layoutControlItem14.AllowHtmlStringInCaption = true;
+ layoutControlItem14.AppearanceItemCaption.Options.UseTextOptions = true;
+ layoutControlItem14.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
+ layoutControlItem14.Control = txtName;
+ layoutControlItem14.Location = new Point(186, 0);
+ layoutControlItem14.Name = "layoutControlItem14";
+ layoutControlItem14.Size = new Size(187, 32);
+ layoutControlItem14.Text = "<color=red>*</color>鍚嶇О:";
+ layoutControlItem14.TextSize = new Size(52, 22);
+ //
+ // layoutControlItem12
+ //
+ layoutControlItem12.AllowHtmlStringInCaption = true;
+ layoutControlItem12.AppearanceItemCaption.Options.UseTextOptions = true;
+ layoutControlItem12.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
+ layoutControlItem12.Control = imgCmbSchemeType;
+ layoutControlItem12.Location = new Point(0, 32);
+ layoutControlItem12.Name = "layoutControlItem12";
+ layoutControlItem12.Size = new Size(186, 32);
+ layoutControlItem12.Text = "<color=red>*</color>绫诲瀷:";
+ layoutControlItem12.TextSize = new Size(52, 22);
+ //
+ // layoutControlItem3
+ //
+ layoutControlItem3.AppearanceItemCaption.Options.UseTextOptions = true;
+ layoutControlItem3.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
+ layoutControlItem3.Control = memoDescription;
+ layoutControlItem3.Location = new Point(0, 64);
+ layoutControlItem3.Name = "layoutControlItem3";
+ layoutControlItem3.Size = new Size(373, 60);
+ layoutControlItem3.Text = "璇存槑:";
+ layoutControlItem3.TextSize = new Size(52, 22);
+ //
+ // layoutControlItem11
+ //
+ layoutControlItem11.AllowHtmlStringInCaption = true;
+ layoutControlItem11.AppearanceItemCaption.Options.UseTextOptions = true;
+ layoutControlItem11.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
+ layoutControlItem11.Control = setFlagsEditCtrl1;
+ layoutControlItem11.Location = new Point(186, 32);
+ layoutControlItem11.Name = "layoutControlItem11";
+ layoutControlItem11.Size = new Size(187, 32);
+ layoutControlItem11.Text = "鏍囩:";
+ layoutControlItem11.TextSize = new Size(52, 22);
//
// dockPanelParterList
//
@@ -446,7 +696,7 @@
dockPanelParterList.Location = new Point(0, 757);
dockPanelParterList.Name = "dockPanelParterList";
dockPanelParterList.OriginalSize = new Size(200, 347);
- dockPanelParterList.Size = new Size(1199, 347);
+ dockPanelParterList.Size = new Size(1175, 347);
dockPanelParterList.Text = "鏋勫缓鍒楄〃";
//
// dockPanel2_Container
@@ -454,8 +704,103 @@
dockPanel2_Container.Controls.Add(tabPane1);
dockPanel2_Container.Location = new Point(0, 35);
dockPanel2_Container.Name = "dockPanel2_Container";
- dockPanel2_Container.Size = new Size(1199, 312);
+ dockPanel2_Container.Size = new Size(1175, 312);
dockPanel2_Container.TabIndex = 0;
+ //
+ // tabPane1
+ //
+ tabPane1.Controls.Add(tabPagePump);
+ tabPane1.Controls.Add(tabPageValve);
+ tabPane1.Controls.Add(tabPagePipe);
+ tabPane1.Dock = DockStyle.Fill;
+ tabPane1.Location = new Point(0, 0);
+ tabPane1.Name = "tabPane1";
+ tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabPagePump, tabPageValve, tabPagePipe });
+ tabPane1.RegularSize = new Size(1175, 312);
+ tabPane1.SelectedPage = tabPagePump;
+ tabPane1.Size = new Size(1175, 312);
+ tabPane1.TabIndex = 0;
+ tabPane1.Text = "tabPane1";
+ //
+ // tabPagePump
+ //
+ tabPagePump.Caption = "姘存车";
+ tabPagePump.Controls.Add(setSchemePumpListCtrl1);
+ tabPagePump.Name = "tabPagePump";
+ tabPagePump.Size = new Size(1175, 263);
+ //
+ // setSchemePumpListCtrl1
+ //
+ setSchemePumpListCtrl1.Dock = DockStyle.Fill;
+ setSchemePumpListCtrl1.Location = new Point(0, 0);
+ setSchemePumpListCtrl1.Margin = new Padding(4, 5, 4, 5);
+ setSchemePumpListCtrl1.Name = "setSchemePumpListCtrl1";
+ setSchemePumpListCtrl1.Size = new Size(1175, 263);
+ setSchemePumpListCtrl1.TabIndex = 0;
+ //
+ // tabPageValve
+ //
+ tabPageValve.Caption = "闃�闂�";
+ tabPageValve.Controls.Add(setSchemeValveListCtrl1);
+ tabPageValve.Name = "tabPageValve";
+ tabPageValve.Size = new Size(977, 384);
+ //
+ // setSchemeValveListCtrl1
+ //
+ setSchemeValveListCtrl1.Dock = DockStyle.Fill;
+ setSchemeValveListCtrl1.Location = new Point(0, 0);
+ setSchemeValveListCtrl1.Margin = new Padding(4, 5, 4, 5);
+ setSchemeValveListCtrl1.Name = "setSchemeValveListCtrl1";
+ setSchemeValveListCtrl1.Size = new Size(977, 384);
+ setSchemeValveListCtrl1.TabIndex = 2;
+ //
+ // tabPagePipe
+ //
+ tabPagePipe.Caption = "绠¤矾";
+ tabPagePipe.Controls.Add(setSchemePipeListCtrl1);
+ tabPagePipe.Name = "tabPagePipe";
+ tabPagePipe.Size = new Size(977, 384);
+ //
+ // setSchemePipeListCtrl1
+ //
+ setSchemePipeListCtrl1.Dock = DockStyle.Fill;
+ setSchemePipeListCtrl1.Location = new Point(0, 0);
+ setSchemePipeListCtrl1.Margin = new Padding(4, 5, 4, 5);
+ setSchemePipeListCtrl1.Name = "setSchemePipeListCtrl1";
+ setSchemePipeListCtrl1.Size = new Size(977, 384);
+ setSchemePipeListCtrl1.TabIndex = 1;
+ //
+ // panelContainer1
+ //
+ panelContainer1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Float;
+ panelContainer1.DockedAsTabbedDocument = true;
+ panelContainer1.ID = new Guid("69c11a8a-862c-4240-930a-ff3d90593b2b");
+ panelContainer1.Location = new Point(0, 0);
+ panelContainer1.Name = "panelContainer1";
+ panelContainer1.OriginalSize = new Size(200, 200);
+ panelContainer1.Size = new Size(200, 200);
+ panelContainer1.Text = "panelContainer1";
+ //
+ // dxErrorProvider1
+ //
+ dxErrorProvider1.ContainerControl = this;
+ //
+ // layoutControlItem9
+ //
+ layoutControlItem9.AllowHtmlStringInCaption = true;
+ layoutControlItem9.Location = new Point(0, 32);
+ layoutControlItem9.Name = "layoutControlItem3";
+ layoutControlItem9.Size = new Size(421, 32);
+ layoutControlItem9.Text = "<color=red>*</color>绫诲瀷锛�";
+ layoutControlItem9.TextSize = new Size(64, 22);
+ //
+ // layoutControlItem10
+ //
+ layoutControlItem10.Location = new Point(421, 32);
+ layoutControlItem10.Name = "layoutControlItem4";
+ layoutControlItem10.Size = new Size(423, 32);
+ layoutControlItem10.Text = "鏍囩锛�";
+ layoutControlItem10.TextSize = new Size(64, 22);
//
// AddXhsSchemeDlg
//
@@ -475,22 +820,48 @@
((ISupportInitialize)gridView1).EndInit();
((ISupportInitialize)repositoryItemButtonEdit1).EndInit();
((ISupportInitialize)ribbon).EndInit();
+ sidePanel3dModel.ResumeLayout(false);
+ sidePanel3dModel.PerformLayout();
+ ((ISupportInitialize)barManager1).EndInit();
+ ((ISupportInitialize)dockManager1).EndInit();
+ dockPanel5.ResumeLayout(false);
+ dockPanelChangeRecord.ResumeLayout(false);
+ dockPanel1_Container.ResumeLayout(false);
+ ((ISupportInitialize)layoutControl1).EndInit();
+ layoutControl1.ResumeLayout(false);
+ ((ISupportInitialize)gridControl2).EndInit();
+ ((ISupportInitialize)setSchemeParterRecordItemBindingSource).EndInit();
+ ((ISupportInitialize)gridView2).EndInit();
+ ((ISupportInitialize)Root).EndInit();
+ ((ISupportInitialize)layoutControlGroup1).EndInit();
+ ((ISupportInitialize)layoutControlItem1).EndInit();
+ ((ISupportInitialize)layoutControlGroup2).EndInit();
+ ((ISupportInitialize)layoutControlItem2).EndInit();
+ dockPanelScheme.ResumeLayout(false);
+ dockPanel3_Container.ResumeLayout(false);
+ ((ISupportInitialize)layoutControl2).EndInit();
+ layoutControl2.ResumeLayout(false);
+ ((ISupportInitialize)imgCmbSchemeType.Properties).EndInit();
+ ((ISupportInitialize)txtNo.Properties).EndInit();
+ ((ISupportInitialize)txtName.Properties).EndInit();
+ ((ISupportInitialize)memoDescription.Properties).EndInit();
+ ((ISupportInitialize)layoutControlGroup3).EndInit();
+ ((ISupportInitialize)layoutControlItem5).EndInit();
+ ((ISupportInitialize)layoutControlItem13).EndInit();
+ ((ISupportInitialize)layoutControlItem14).EndInit();
+ ((ISupportInitialize)layoutControlItem12).EndInit();
+ ((ISupportInitialize)layoutControlItem3).EndInit();
+ ((ISupportInitialize)layoutControlItem11).EndInit();
+ dockPanelParterList.ResumeLayout(false);
+ dockPanel2_Container.ResumeLayout(false);
((ISupportInitialize)tabPane1).EndInit();
tabPane1.ResumeLayout(false);
tabPagePump.ResumeLayout(false);
tabPageValve.ResumeLayout(false);
tabPagePipe.ResumeLayout(false);
- ((ISupportInitialize)gridControl2).EndInit();
- ((ISupportInitialize)setSchemeParterRecordItemBindingSource).EndInit();
- ((ISupportInitialize)gridView2).EndInit();
- ((ISupportInitialize)dockManager1).EndInit();
- dockPanel5.ResumeLayout(false);
- dockPanelChangeRecord.ResumeLayout(false);
- dockPanel1_Container.ResumeLayout(false);
- dockPanelChangeRecordItem.ResumeLayout(false);
- dockPanel3_Container.ResumeLayout(false);
- dockPanelParterList.ResumeLayout(false);
- dockPanel2_Container.ResumeLayout(false);
+ ((ISupportInitialize)dxErrorProvider1).EndInit();
+ ((ISupportInitialize)layoutControlItem9).EndInit();
+ ((ISupportInitialize)layoutControlItem10).EndInit();
ResumeLayout(false);
PerformLayout();
}
@@ -499,7 +870,6 @@
private DevExpress.XtraBars.Ribbon.RibbonControl ribbon;
private SidePanel sidePanel3dModel;
- private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1;
private DevExpress.XtraBars.Docking.DockPanel panelContainer1;
private DevExpress.XtraBars.Navigation.TabPane tabPane1;
private DevExpress.XtraBars.Navigation.TabNavigationPage tabPagePump;
@@ -529,12 +899,40 @@
private DevExpress.XtraBars.Docking.DockPanel dockPanel5;
private DevExpress.XtraBars.Docking.DockPanel dockPanelChangeRecord;
private DevExpress.XtraBars.Docking.ControlContainer dockPanel1_Container;
- private DevExpress.XtraBars.Docking.DockPanel dockPanelChangeRecordItem;
+ private DevExpress.XtraBars.Docking.DockPanel dockPanelScheme;
private DevExpress.XtraBars.Docking.ControlContainer dockPanel3_Container;
private DevExpress.XtraGrid.Columns.GridColumn colDelete;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
- private DevExpress.XtraBars.BarButtonItem barButtonItem1;
- private DevExpress.XtraBars.BarButtonItem barButtonItem2;
- private DevExpress.XtraBars.BarButtonItem barButtonItem3;
+ private DevExpress.XtraLayout.LayoutControl layoutControl1;
+ private DevExpress.XtraLayout.LayoutControlGroup Root;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControl layoutControl2;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup3;
+ private SimpleButton btnSave;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private SetFlagsEditCtrl setFlagsEditCtrl1;
+ private ImageComboBoxEdit imgCmbSchemeType;
+ private TextEdit txtNo;
+ private TextEdit txtName;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private MemoEdit memoDescription;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraBars.BarDockControl barDockControlLeft;
+ private DevExpress.XtraBars.BarManager barManager1;
+ private DevExpress.XtraBars.Bar bar1;
+ private DevExpress.XtraBars.BarButtonItem barBtnFastShowHidden;
+ private DevExpress.XtraBars.BarDockControl barDockControlTop;
+ private DevExpress.XtraBars.BarDockControl barDockControlBottom;
+ private DevExpress.XtraBars.BarDockControl barDockControlRight;
}
}
\ No newline at end of file
--
Gitblit v1.9.3