From d4898c5d7e1bbbbba384a0e29f29c066d6f502a7 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 25 十一月 2024 17:44:18 +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/XhsProjectSimulationMgrPage.Designer.cs | 64 ++++++-------------------------
1 files changed, 13 insertions(+), 51 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.Designer.cs
index 04e63dd..8d2eae9 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.Designer.cs
@@ -33,18 +33,13 @@
dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
dockMgr = new DevExpress.XtraBars.Docking.DockPanel();
dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
- sidePanel2 = new SidePanel();
- xhsProjectSimulationFunctionMgrCtrl1 = new XhsProjectSimulationFunctionMgrCtrl();
- sidePanel1 = new SidePanel();
- xhsProjectSimulationSchemeMgrCtrl1 = new XhsProjectSimulationSchemeMgrCtrl();
documentManager1 = new DevExpress.XtraBars.Docking2010.DocumentManager(components);
tabbedView1 = new DevExpress.XtraBars.Docking2010.Views.Tabbed.TabbedView(components);
+ xhsProjectSimulationFunctionMgrCtrl1 = new XhsProjectSimulationFunctionCtrl();
((ISupportInitialize)svgImg32).BeginInit();
((ISupportInitialize)dockManager1).BeginInit();
dockMgr.SuspendLayout();
dockPanel1_Container.SuspendLayout();
- sidePanel2.SuspendLayout();
- sidePanel1.SuspendLayout();
((ISupportInitialize)documentManager1).BeginInit();
((ISupportInitialize)tabbedView1).BeginInit();
SuspendLayout();
@@ -69,52 +64,15 @@
dockMgr.Name = "dockMgr";
dockMgr.OriginalSize = new Size(230, 200);
dockMgr.Size = new Size(230, 669);
- dockMgr.Text = "鏂规鍒楄〃";
+ dockMgr.Text = "椤圭洰妯℃嫙";
//
// dockPanel1_Container
//
- dockPanel1_Container.Controls.Add(sidePanel2);
- dockPanel1_Container.Controls.Add(sidePanel1);
+ dockPanel1_Container.Controls.Add(xhsProjectSimulationFunctionMgrCtrl1);
dockPanel1_Container.Location = new Point(3, 26);
dockPanel1_Container.Name = "dockPanel1_Container";
dockPanel1_Container.Size = new Size(223, 640);
dockPanel1_Container.TabIndex = 0;
- //
- // sidePanel2
- //
- sidePanel2.Controls.Add(xhsProjectSimulationFunctionMgrCtrl1);
- sidePanel2.Dock = DockStyle.Fill;
- sidePanel2.Location = new Point(0, 265);
- sidePanel2.Name = "sidePanel2";
- sidePanel2.Size = new Size(223, 375);
- sidePanel2.TabIndex = 1;
- sidePanel2.Text = "sidePanel2";
- //
- // xhsProjectSimulationFunctionMgrCtrl1
- //
- xhsProjectSimulationFunctionMgrCtrl1.Dock = DockStyle.Fill;
- xhsProjectSimulationFunctionMgrCtrl1.Location = new Point(0, 0);
- xhsProjectSimulationFunctionMgrCtrl1.Name = "xhsProjectSimulationFunctionMgrCtrl1";
- xhsProjectSimulationFunctionMgrCtrl1.Size = new Size(223, 375);
- xhsProjectSimulationFunctionMgrCtrl1.TabIndex = 0;
- //
- // sidePanel1
- //
- sidePanel1.Controls.Add(xhsProjectSimulationSchemeMgrCtrl1);
- sidePanel1.Dock = DockStyle.Top;
- sidePanel1.Location = new Point(0, 0);
- sidePanel1.Name = "sidePanel1";
- sidePanel1.Size = new Size(223, 265);
- sidePanel1.TabIndex = 0;
- sidePanel1.Text = "sidePanel1";
- //
- // xhsProjectSimulationSchemeMgrCtrl1
- //
- xhsProjectSimulationSchemeMgrCtrl1.Dock = DockStyle.Fill;
- xhsProjectSimulationSchemeMgrCtrl1.Location = new Point(0, 0);
- xhsProjectSimulationSchemeMgrCtrl1.Name = "xhsProjectSimulationSchemeMgrCtrl1";
- xhsProjectSimulationSchemeMgrCtrl1.Size = new Size(223, 264);
- xhsProjectSimulationSchemeMgrCtrl1.TabIndex = 0;
//
// documentManager1
//
@@ -129,6 +87,14 @@
tabbedView1.DocumentActivated += tabbedView1_DocumentActivated;
tabbedView1.DocumentClosed += tabbedView1_DocumentClosed;
//
+ // xhsProjectSimulationFunctionMgrCtrl1
+ //
+ xhsProjectSimulationFunctionMgrCtrl1.Dock = DockStyle.Fill;
+ xhsProjectSimulationFunctionMgrCtrl1.Location = new Point(0, 0);
+ xhsProjectSimulationFunctionMgrCtrl1.Name = "xhsProjectSimulationFunctionMgrCtrl1";
+ xhsProjectSimulationFunctionMgrCtrl1.Size = new Size(223, 640);
+ xhsProjectSimulationFunctionMgrCtrl1.TabIndex = 0;
+ //
// XhsProjectSimulationMgrPage
//
Appearance.BackColor = SystemColors.Control;
@@ -136,14 +102,13 @@
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(dockMgr);
+ Margin = new Padding(4, 5, 4, 5);
Name = "XhsProjectSimulationMgrPage";
Size = new Size(1055, 669);
((ISupportInitialize)svgImg32).EndInit();
((ISupportInitialize)dockManager1).EndInit();
dockMgr.ResumeLayout(false);
dockPanel1_Container.ResumeLayout(false);
- sidePanel2.ResumeLayout(false);
- sidePanel1.ResumeLayout(false);
((ISupportInitialize)documentManager1).EndInit();
((ISupportInitialize)tabbedView1).EndInit();
ResumeLayout(false);
@@ -155,11 +120,8 @@
private DevExpress.XtraBars.Docking.DockManager dockManager1;
private DevExpress.XtraBars.Docking.DockPanel dockMgr;
private DevExpress.XtraBars.Docking.ControlContainer dockPanel1_Container;
- private SidePanel sidePanel1;
- private SidePanel sidePanel2;
- private XhsProjectSimulationFunctionMgrCtrl xhsProjectSimulationFunctionMgrCtrl1;
- private XhsProjectSimulationSchemeMgrCtrl xhsProjectSimulationSchemeMgrCtrl1;
private DevExpress.XtraBars.Docking2010.DocumentManager documentManager1;
private DevExpress.XtraBars.Docking2010.Views.Tabbed.TabbedView tabbedView1;
+ private XhsProjectSimulationFunctionCtrl xhsProjectSimulationFunctionMgrCtrl1;
}
}
\ No newline at end of file
--
Gitblit v1.9.3