From 98e49c0dd42840a094837f7acae532bc237a719a Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期二, 20 八月 2024 15:42:37 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysTypeManageMainPanel.Designer.cs | 86 ++++++++++++++----------------------------
1 files changed, 29 insertions(+), 57 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysTypeManageMainPanel.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysTypeManageMainPanel.Designer.cs
index 53750b3..3ecf3a0 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysTypeManageMainPanel.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysTypeManageMainPanel.Designer.cs
@@ -39,7 +39,7 @@
dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
- moduleTreeListCtrl1 = new SysModuleTreeListCtrl();
+ moduleTreeListCtrl1 = new SysModuleListBoxCtrl();
gridControl1 = new DevExpress.XtraGrid.GridControl();
typeViewModelBindingSource = new BindingSource(components);
gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -48,11 +48,9 @@
colExtendTypeDisPlayName = new DevExpress.XtraGrid.Columns.GridColumn();
colSortCode = new DevExpress.XtraGrid.Columns.GridColumn();
colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
- layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- Root = new DevExpress.XtraLayout.LayoutControlGroup();
- layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
barButtonItem1 = new DevExpress.XtraBars.BarButtonItem();
svgImage32 = new DevExpress.Utils.SvgImageCollection(components);
+ sidePanel1 = new DevExpress.XtraEditors.SidePanel();
((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
((System.ComponentModel.ISupportInitialize)dockManager1).BeginInit();
dockPanel1.SuspendLayout();
@@ -60,11 +58,8 @@
((System.ComponentModel.ISupportInitialize)gridControl1).BeginInit();
((System.ComponentModel.ISupportInitialize)typeViewModelBindingSource).BeginInit();
((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
- layoutControl1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
((System.ComponentModel.ISupportInitialize)svgImage32).BeginInit();
+ sidePanel1.SuspendLayout();
SuspendLayout();
//
// ribbonControl1
@@ -81,7 +76,7 @@
ribbonControl1.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ShowPageHeadersInFormCaption = DevExpress.Utils.DefaultBoolean.True;
ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide;
- ribbonControl1.Size = new Size(1133, 101);
+ ribbonControl1.Size = new Size(933, 101);
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
//
// barBtnEditPumpCurve
@@ -133,10 +128,10 @@
dockPanel1.Controls.Add(dockPanel1_Container);
dockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left;
dockPanel1.ID = new Guid("20cba9f0-4c76-45ad-a0f6-714fb6b14171");
- dockPanel1.Location = new Point(0, 101);
+ dockPanel1.Location = new Point(0, 0);
dockPanel1.Name = "dockPanel1";
dockPanel1.OriginalSize = new Size(200, 200);
- dockPanel1.Size = new Size(200, 446);
+ dockPanel1.Size = new Size(200, 547);
dockPanel1.Text = "妯″潡鍒楄〃";
//
// dockPanel1_Container
@@ -144,7 +139,7 @@
dockPanel1_Container.Controls.Add(moduleTreeListCtrl1);
dockPanel1_Container.Location = new Point(3, 26);
dockPanel1_Container.Name = "dockPanel1_Container";
- dockPanel1_Container.Size = new Size(193, 417);
+ dockPanel1_Container.Size = new Size(193, 518);
dockPanel1_Container.TabIndex = 0;
//
// moduleTreeListCtrl1
@@ -154,18 +149,19 @@
moduleTreeListCtrl1.Dock = DockStyle.Fill;
moduleTreeListCtrl1.Location = new Point(0, 0);
moduleTreeListCtrl1.Name = "moduleTreeListCtrl1";
- moduleTreeListCtrl1.Size = new Size(193, 417);
+ moduleTreeListCtrl1.Size = new Size(193, 518);
moduleTreeListCtrl1.TabIndex = 0;
//
// gridControl1
//
gridControl1.DataSource = typeViewModelBindingSource;
- gridControl1.Location = new Point(2, 2);
+ gridControl1.Dock = DockStyle.Fill;
+ gridControl1.Location = new Point(0, 101);
gridControl1.MainView = gridView1;
gridControl1.MenuManager = ribbonControl1;
gridControl1.Name = "gridControl1";
- gridControl1.Size = new Size(929, 442);
- gridControl1.TabIndex = 3;
+ gridControl1.Size = new Size(933, 446);
+ gridControl1.TabIndex = 0;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
//
// typeViewModelBindingSource
@@ -231,36 +227,6 @@
colDescription.Visible = true;
colDescription.VisibleIndex = 4;
//
- // layoutControl1
- //
- layoutControl1.Controls.Add(gridControl1);
- layoutControl1.Dock = DockStyle.Fill;
- layoutControl1.Location = new Point(200, 101);
- layoutControl1.Name = "layoutControl1";
- layoutControl1.Root = Root;
- layoutControl1.Size = new Size(933, 446);
- layoutControl1.TabIndex = 6;
- layoutControl1.Text = "layoutControl1";
- //
- // Root
- //
- Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
- Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1 });
- Root.Name = "Root";
- Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- Root.Size = new Size(933, 446);
- Root.TextVisible = false;
- //
- // layoutControlItem1
- //
- layoutControlItem1.Control = gridControl1;
- layoutControlItem1.Location = new Point(0, 0);
- layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(933, 446);
- layoutControlItem1.TextSize = new Size(0, 0);
- layoutControlItem1.TextVisible = false;
- //
// barButtonItem1
//
barButtonItem1.Caption = "barButtonItem1";
@@ -273,15 +239,26 @@
svgImage32.Add("bletter", "image://svgimages/outlook inspired/bletter.svg");
svgImage32.Add("bold", "image://svgimages/outlook inspired/bold.svg");
//
+ // sidePanel1
+ //
+ sidePanel1.BorderThickness = 0;
+ sidePanel1.Controls.Add(gridControl1);
+ sidePanel1.Controls.Add(ribbonControl1);
+ sidePanel1.Dock = DockStyle.Fill;
+ sidePanel1.Location = new Point(200, 0);
+ sidePanel1.Name = "sidePanel1";
+ sidePanel1.Size = new Size(933, 547);
+ sidePanel1.TabIndex = 8;
+ sidePanel1.Text = "sidePanel1";
+ //
// SysTypeManageMainPanel
//
Appearance.BackColor = SystemColors.Control;
Appearance.Options.UseBackColor = true;
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
- Controls.Add(layoutControl1);
+ Controls.Add(sidePanel1);
Controls.Add(dockPanel1);
- Controls.Add(ribbonControl1);
Name = "SysTypeManageMainPanel";
Size = new Size(1133, 547);
((System.ComponentModel.ISupportInitialize)ribbonControl1).EndInit();
@@ -291,13 +268,10 @@
((System.ComponentModel.ISupportInitialize)gridControl1).EndInit();
((System.ComponentModel.ISupportInitialize)typeViewModelBindingSource).EndInit();
((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
- layoutControl1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)Root).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
((System.ComponentModel.ISupportInitialize)svgImage32).EndInit();
+ sidePanel1.ResumeLayout(false);
+ sidePanel1.PerformLayout();
ResumeLayout(false);
- PerformLayout();
}
#endregion
@@ -310,9 +284,6 @@
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraBars.Docking.DockPanel dockPanel1;
private DevExpress.XtraBars.Docking.ControlContainer dockPanel1_Container;
- private DevExpress.XtraLayout.LayoutControl layoutControl1;
- private DevExpress.XtraLayout.LayoutControlGroup Root;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraBars.BarButtonItem barBtnEditPumpCurve;
private DevExpress.XtraBars.BarButtonItem BtnAdd;
private DevExpress.XtraBars.BarButtonItem BtnDelete;
@@ -322,8 +293,9 @@
private DevExpress.XtraGrid.Columns.GridColumn colCode;
private DevExpress.XtraGrid.Columns.GridColumn colSortCode;
private DevExpress.XtraGrid.Columns.GridColumn colDescription;
- private SysModuleTreeListCtrl moduleTreeListCtrl1;
+ private SysModuleListBoxCtrl moduleTreeListCtrl1;
private DevExpress.XtraGrid.Columns.GridColumn colExtendTypeDisPlayName;
private DevExpress.Utils.SvgImageCollection svgImage32;
+ private DevExpress.XtraEditors.SidePanel sidePanel1;
}
}
--
Gitblit v1.9.3