From 3b08b5c772ffc0c10644c1aaa9f7b2447582c858 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 14 十月 2024 17:50:24 +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 | 98 ++++++++++++++----------------------------------
1 files changed, 29 insertions(+), 69 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysTypeManageMainPanel.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysTypeManageMainPanel.Designer.cs
index 6198659..273bdde 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,12 +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);
- layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ sidePanel1 = new DevExpress.XtraEditors.SidePanel();
((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
((System.ComponentModel.ISupportInitialize)dockManager1).BeginInit();
dockPanel1.SuspendLayout();
@@ -61,22 +58,17 @@
((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();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
+ sidePanel1.SuspendLayout();
SuspendLayout();
//
// ribbonControl1
//
- ribbonControl1.Dock = DockStyle.None;
ribbonControl1.DrawGroupsBorderMode = DevExpress.Utils.DefaultBoolean.True;
ribbonControl1.ExpandCollapseItem.Id = 0;
ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnEditPumpCurve, BtnAdd, BtnDelete });
- ribbonControl1.Location = new Point(2, 2);
+ ribbonControl1.Location = new Point(0, 0);
ribbonControl1.MaxItemId = 17;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
@@ -84,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(929, 101);
+ ribbonControl1.Size = new Size(933, 101);
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
//
// barBtnEditPumpCurve
@@ -127,6 +119,8 @@
//
// dockManager1
//
+ dockManager1.DockingOptions.ShowAutoHideButton = false;
+ dockManager1.DockingOptions.ShowCloseButton = false;
dockManager1.Form = this;
dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { dockPanel1 });
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" });
@@ -163,11 +157,12 @@
// gridControl1
//
gridControl1.DataSource = typeViewModelBindingSource;
- gridControl1.Location = new Point(2, 184);
+ gridControl1.Dock = DockStyle.Fill;
+ gridControl1.Location = new Point(0, 101);
gridControl1.MainView = gridView1;
gridControl1.MenuManager = ribbonControl1;
gridControl1.Name = "gridControl1";
- gridControl1.Size = new Size(929, 361);
+ gridControl1.Size = new Size(933, 446);
gridControl1.TabIndex = 0;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
//
@@ -179,6 +174,7 @@
//
gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
gridView1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ gridView1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colExtendTypeDisPlayName, colSortCode, colDescription });
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
@@ -222,7 +218,7 @@
colSortCode.FieldName = "SortCode";
colSortCode.Name = "colSortCode";
colSortCode.Visible = true;
- colSortCode.VisibleIndex = 3;
+ colSortCode.VisibleIndex = 4;
//
// colDescription
//
@@ -232,38 +228,7 @@
colDescription.FieldName = "Description";
colDescription.Name = "colDescription";
colDescription.Visible = true;
- colDescription.VisibleIndex = 4;
- //
- // layoutControl1
- //
- layoutControl1.Controls.Add(ribbonControl1);
- layoutControl1.Controls.Add(gridControl1);
- layoutControl1.Dock = DockStyle.Fill;
- layoutControl1.Location = new Point(200, 0);
- layoutControl1.Name = "layoutControl1";
- layoutControl1.Root = Root;
- layoutControl1.Size = new Size(933, 547);
- layoutControl1.TabIndex = 6;
- layoutControl1.Text = "layoutControl1";
- //
- // Root
- //
- Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
- Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2, layoutControlItem1 });
- Root.Name = "Root";
- Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- Root.Size = new Size(933, 547);
- Root.TextVisible = false;
- //
- // layoutControlItem1
- //
- layoutControlItem1.Control = gridControl1;
- layoutControlItem1.Location = new Point(0, 182);
- layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(933, 365);
- layoutControlItem1.TextSize = new Size(0, 0);
- layoutControlItem1.TextVisible = false;
+ colDescription.VisibleIndex = 3;
//
// barButtonItem1
//
@@ -274,17 +239,19 @@
// svgImage32
//
svgImage32.ImageSize = new Size(32, 32);
- svgImage32.Add("bletter", "image://svgimages/outlook inspired/bletter.svg");
- svgImage32.Add("bold", "image://svgimages/outlook inspired/bold.svg");
+ svgImage32.Add("columntotalsposition", "image://svgimages/dashboards/columntotalsposition.svg");
//
- // layoutControlItem2
+ // sidePanel1
//
- layoutControlItem2.Control = ribbonControl1;
- layoutControlItem2.Location = new Point(0, 0);
- layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(933, 182);
- layoutControlItem2.TextSize = new Size(0, 0);
- layoutControlItem2.TextVisible = false;
+ 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
//
@@ -292,7 +259,7 @@
Appearance.Options.UseBackColor = true;
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
- Controls.Add(layoutControl1);
+ Controls.Add(sidePanel1);
Controls.Add(dockPanel1);
Name = "SysTypeManageMainPanel";
Size = new Size(1133, 547);
@@ -303,13 +270,9 @@
((System.ComponentModel.ISupportInitialize)gridControl1).EndInit();
((System.ComponentModel.ISupportInitialize)typeViewModelBindingSource).EndInit();
((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
- layoutControl1.ResumeLayout(false);
- layoutControl1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)Root).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
((System.ComponentModel.ISupportInitialize)svgImage32).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
+ sidePanel1.ResumeLayout(false);
+ sidePanel1.PerformLayout();
ResumeLayout(false);
}
@@ -323,9 +286,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;
@@ -335,9 +295,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.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraEditors.SidePanel sidePanel1;
}
}
--
Gitblit v1.9.3