From ef716332fef142a02843b5a99e8e3e92ab165738 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 24 十二月 2024 11:35:24 +0800
Subject: [PATCH] 修改单独匹配界面线程问题
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.Designer.cs | 194 +++++++++++++++++++++++++++---------------------
1 files changed, 109 insertions(+), 85 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.Designer.cs
index 4c8a96f..488256f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.Designer.cs
@@ -29,27 +29,32 @@
private void InitializeComponent()
{
components = new Container();
+ DevExpress.XtraBars.Navigation.AccordionContextButton accordionContextButton1 = new DevExpress.XtraBars.Navigation.AccordionContextButton();
ComponentResourceManager resources = new ComponentResourceManager(typeof(SimulationFunctionCtrl));
accordionControl1 = new DevExpress.XtraBars.Navigation.AccordionControl();
elementProjectSiteInfo = new DevExpress.XtraBars.Navigation.AccordionControlElement();
elementProjectSiteSimulation = new DevExpress.XtraBars.Navigation.AccordionControlElement();
- elementSchemeList = new DevExpress.XtraBars.Navigation.AccordionControlElement();
+ elementProjectSiteSchemeList = new DevExpress.XtraBars.Navigation.AccordionControlElement();
svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- btnCompareWorking = new SimpleButton();
- btnCreateProjectSiteScheme = new SimpleButton();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ barManager1 = new DevExpress.XtraBars.BarManager(components);
+ barDockControlTop = new DevExpress.XtraBars.BarDockControl();
+ barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
+ barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
+ barDockControlRight = new DevExpress.XtraBars.BarDockControl();
+ barBtnExpandAll = new DevExpress.XtraBars.BarButtonItem();
+ barBtnCollpseAll = new DevExpress.XtraBars.BarButtonItem();
+ popupMenu1 = new DevExpress.XtraBars.PopupMenu(components);
((ISupportInitialize)accordionControl1).BeginInit();
((ISupportInitialize)svgImg32).BeginInit();
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)Root).BeginInit();
((ISupportInitialize)layoutControlItem1).BeginInit();
- ((ISupportInitialize)layoutControlItem3).BeginInit();
- ((ISupportInitialize)layoutControlItem2).BeginInit();
+ ((ISupportInitialize)barManager1).BeginInit();
+ ((ISupportInitialize)popupMenu1).BeginInit();
SuspendLayout();
//
// accordionControl1
@@ -59,7 +64,7 @@
accordionControl1.Appearance.Group.Default.Options.UseFont = true;
accordionControl1.Appearance.Item.Default.FontSizeDelta = 1;
accordionControl1.Appearance.Item.Default.Options.UseFont = true;
- accordionControl1.Elements.AddRange(new DevExpress.XtraBars.Navigation.AccordionControlElement[] { elementProjectSiteInfo, elementProjectSiteSimulation, elementSchemeList });
+ accordionControl1.Elements.AddRange(new DevExpress.XtraBars.Navigation.AccordionControlElement[] { elementProjectSiteInfo, elementProjectSiteSimulation, elementProjectSiteSchemeList });
accordionControl1.ExpandElementMode = DevExpress.XtraBars.Navigation.ExpandElementMode.Multiple;
accordionControl1.ExpandGroupOnHeaderClick = false;
accordionControl1.ExpandItemOnHeaderClick = false;
@@ -73,11 +78,12 @@
accordionControl1.OptionsMinimizing.AllowFooterResizing = false;
accordionControl1.OptionsMinimizing.AllowMinimizeMode = DevExpress.Utils.DefaultBoolean.False;
accordionControl1.ScrollBarMode = DevExpress.XtraBars.Navigation.ScrollBarMode.Fluent;
- accordionControl1.Size = new Size(232, 660);
+ accordionControl1.Size = new Size(232, 710);
accordionControl1.StyleController = layoutControl1;
accordionControl1.TabIndex = 1;
accordionControl1.ViewType = DevExpress.XtraBars.Navigation.AccordionControlViewType.HamburgerMenu;
- accordionControl1.ElementClick += accordionControl1_ElementClick;
+ accordionControl1.ContextButtonClick += accordionControl1_ContextButtonClick;
+ accordionControl1.MouseClick += accordionControl1_MouseClick;
//
// elementProjectSiteInfo
//
@@ -99,13 +105,22 @@
elementProjectSiteSimulation.Text = "姘村姏妯℃嫙";
elementProjectSiteSimulation.Click += elementProjectSiteSimulation_Click;
//
- // elementSchemeList
+ // elementProjectSiteSchemeList
//
- elementSchemeList.ImageOptions.ImageIndex = 2;
- elementSchemeList.Name = "elementSchemeList";
- elementSchemeList.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
- elementSchemeList.Tag = "scheme-list";
- elementSchemeList.Text = "鏂规绠＄悊";
+ accordionContextButton1.AlignmentOptions.Panel = DevExpress.Utils.ContextItemPanel.Center;
+ accordionContextButton1.AlignmentOptions.Position = DevExpress.Utils.ContextItemPosition.Far;
+ accordionContextButton1.Id = new Guid("c11f8afe-1d26-419d-b332-c96d2729c114");
+ accordionContextButton1.ImageOptionsCollection.ItemNormal.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("resource.SvgImage");
+ accordionContextButton1.ImageOptionsCollection.ItemNormal.SvgImageSize = new Size(20, 20);
+ accordionContextButton1.Name = "accordionContextButton1";
+ accordionContextButton1.ToolTip = "鍒涘缓鏂规";
+ elementProjectSiteSchemeList.ContextButtons.Add(accordionContextButton1);
+ elementProjectSiteSchemeList.HeaderTemplate.AddRange(new DevExpress.XtraBars.Navigation.HeaderElementInfo[] { new DevExpress.XtraBars.Navigation.HeaderElementInfo(DevExpress.XtraBars.Navigation.HeaderElementType.Image), new DevExpress.XtraBars.Navigation.HeaderElementInfo(DevExpress.XtraBars.Navigation.HeaderElementType.Text), new DevExpress.XtraBars.Navigation.HeaderElementInfo(DevExpress.XtraBars.Navigation.HeaderElementType.ContextButtons, DevExpress.XtraBars.Navigation.HeaderElementAlignment.Left), new DevExpress.XtraBars.Navigation.HeaderElementInfo(DevExpress.XtraBars.Navigation.HeaderElementType.HeaderControl) });
+ elementProjectSiteSchemeList.ImageOptions.ImageIndex = 2;
+ elementProjectSiteSchemeList.Name = "elementProjectSiteSchemeList";
+ elementProjectSiteSchemeList.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
+ elementProjectSiteSchemeList.Tag = "scheme-list";
+ elementProjectSiteSchemeList.Text = "鏂规绠＄悊";
//
// svgImg32
//
@@ -119,8 +134,6 @@
//
// layoutControl1
//
- layoutControl1.Controls.Add(btnCompareWorking);
- layoutControl1.Controls.Add(btnCreateProjectSiteScheme);
layoutControl1.Controls.Add(accordionControl1);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 0);
@@ -131,47 +144,11 @@
layoutControl1.TabIndex = 2;
layoutControl1.Text = "layoutControl1";
//
- // btnCompareWorking
- //
- btnCompareWorking.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
- btnCompareWorking.Appearance.ForeColor = Color.White;
- btnCompareWorking.Appearance.Options.UseBackColor = true;
- btnCompareWorking.Appearance.Options.UseForeColor = true;
- btnCompareWorking.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
- btnCompareWorking.ImageOptions.ImageToTextAlignment = ImageAlignToText.LeftCenter;
- btnCompareWorking.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("btnCompareWorking.ImageOptions.SvgImage");
- btnCompareWorking.ImageOptions.SvgImageSize = new Size(16, 16);
- btnCompareWorking.Location = new Point(1, 686);
- btnCompareWorking.Name = "btnCompareWorking";
- btnCompareWorking.Size = new Size(230, 23);
- btnCompareWorking.StyleController = layoutControl1;
- btnCompareWorking.TabIndex = 5;
- btnCompareWorking.Text = "宸ュ喌瀵规瘮";
- btnCompareWorking.Click += btnCompareWorking_Click;
- //
- // btnCreateProjectSiteScheme
- //
- btnCreateProjectSiteScheme.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
- btnCreateProjectSiteScheme.Appearance.ForeColor = Color.White;
- btnCreateProjectSiteScheme.Appearance.Options.UseBackColor = true;
- btnCreateProjectSiteScheme.Appearance.Options.UseForeColor = true;
- btnCreateProjectSiteScheme.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
- btnCreateProjectSiteScheme.ImageOptions.ImageToTextAlignment = ImageAlignToText.LeftCenter;
- btnCreateProjectSiteScheme.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("btnCreateProjectSiteScheme.ImageOptions.SvgImage");
- btnCreateProjectSiteScheme.ImageOptions.SvgImageSize = new Size(16, 16);
- btnCreateProjectSiteScheme.Location = new Point(1, 661);
- btnCreateProjectSiteScheme.Name = "btnCreateProjectSiteScheme";
- btnCreateProjectSiteScheme.Size = new Size(230, 23);
- btnCreateProjectSiteScheme.StyleController = layoutControl1;
- btnCreateProjectSiteScheme.TabIndex = 4;
- btnCreateProjectSiteScheme.Text = "鍒涘缓鏂规";
- btnCreateProjectSiteScheme.Click += btnCreateProjectSiteScheme_Click;
- //
// Root
//
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem3, layoutControlItem2 });
+ 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(232, 710);
@@ -183,41 +160,83 @@
layoutControlItem1.Location = new Point(0, 0);
layoutControlItem1.Name = "layoutControlItem1";
layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlItem1.Size = new Size(232, 660);
+ layoutControlItem1.Size = new Size(232, 710);
layoutControlItem1.TextSize = new Size(0, 0);
layoutControlItem1.TextVisible = false;
//
- // layoutControlItem3
+ // barManager1
//
- layoutControlItem3.Control = btnCompareWorking;
- layoutControlItem3.Location = new Point(0, 685);
- layoutControlItem3.MaxSize = new Size(0, 25);
- layoutControlItem3.MinSize = new Size(76, 25);
- layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 1, 1);
- layoutControlItem3.Size = new Size(232, 25);
- layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- layoutControlItem3.TextSize = new Size(0, 0);
- layoutControlItem3.TextVisible = false;
+ barManager1.DockControls.Add(barDockControlTop);
+ barManager1.DockControls.Add(barDockControlBottom);
+ barManager1.DockControls.Add(barDockControlLeft);
+ barManager1.DockControls.Add(barDockControlRight);
+ barManager1.Form = this;
+ barManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { barBtnExpandAll, barBtnCollpseAll });
+ barManager1.MaxItemId = 2;
//
- // layoutControlItem2
+ // barDockControlTop
//
- layoutControlItem2.Control = btnCreateProjectSiteScheme;
- layoutControlItem2.Location = new Point(0, 660);
- layoutControlItem2.MaxSize = new Size(0, 25);
- layoutControlItem2.MinSize = new Size(1, 25);
- layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 1, 1);
- layoutControlItem2.Size = new Size(232, 25);
- layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- layoutControlItem2.TextSize = new Size(0, 0);
- layoutControlItem2.TextVisible = false;
+ barDockControlTop.CausesValidation = false;
+ barDockControlTop.Dock = DockStyle.Top;
+ barDockControlTop.Location = new Point(0, 0);
+ barDockControlTop.Manager = barManager1;
+ barDockControlTop.Size = new Size(232, 0);
+ //
+ // barDockControlBottom
+ //
+ barDockControlBottom.CausesValidation = false;
+ barDockControlBottom.Dock = DockStyle.Bottom;
+ barDockControlBottom.Location = new Point(0, 710);
+ barDockControlBottom.Manager = barManager1;
+ barDockControlBottom.Size = new Size(232, 0);
+ //
+ // barDockControlLeft
+ //
+ barDockControlLeft.CausesValidation = false;
+ barDockControlLeft.Dock = DockStyle.Left;
+ barDockControlLeft.Location = new Point(0, 0);
+ barDockControlLeft.Manager = barManager1;
+ barDockControlLeft.Size = new Size(0, 710);
+ //
+ // barDockControlRight
+ //
+ barDockControlRight.CausesValidation = false;
+ barDockControlRight.Dock = DockStyle.Right;
+ barDockControlRight.Location = new Point(232, 0);
+ barDockControlRight.Manager = barManager1;
+ barDockControlRight.Size = new Size(0, 710);
+ //
+ // barBtnExpandAll
+ //
+ barBtnExpandAll.Caption = "鍏ㄩ儴灞曞紑";
+ barBtnExpandAll.Id = 0;
+ barBtnExpandAll.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnExpandAll.ImageOptions.SvgImage");
+ barBtnExpandAll.Name = "barBtnExpandAll";
+ barBtnExpandAll.ItemClick += barBtnExpandAll_ItemClick;
+ //
+ // barBtnCollpseAll
+ //
+ barBtnCollpseAll.Caption = "鍏ㄩ儴鎶樺彔";
+ barBtnCollpseAll.Id = 1;
+ barBtnCollpseAll.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCollpseAll.ImageOptions.SvgImage");
+ barBtnCollpseAll.Name = "barBtnCollpseAll";
+ barBtnCollpseAll.ItemClick += barBtnCollpseAll_ItemClick;
+ //
+ // popupMenu1
+ //
+ popupMenu1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barBtnExpandAll), new DevExpress.XtraBars.LinkPersistInfo(barBtnCollpseAll) });
+ popupMenu1.Manager = barManager1;
+ popupMenu1.Name = "popupMenu1";
//
// SimulationFunctionCtrl
//
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(layoutControl1);
+ Controls.Add(barDockControlLeft);
+ Controls.Add(barDockControlRight);
+ Controls.Add(barDockControlBottom);
+ Controls.Add(barDockControlTop);
Name = "SimulationFunctionCtrl";
Size = new Size(232, 710);
((ISupportInitialize)accordionControl1).EndInit();
@@ -226,9 +245,10 @@
layoutControl1.ResumeLayout(false);
((ISupportInitialize)Root).EndInit();
((ISupportInitialize)layoutControlItem1).EndInit();
- ((ISupportInitialize)layoutControlItem3).EndInit();
- ((ISupportInitialize)layoutControlItem2).EndInit();
+ ((ISupportInitialize)barManager1).EndInit();
+ ((ISupportInitialize)popupMenu1).EndInit();
ResumeLayout(false);
+ PerformLayout();
}
#endregion
@@ -237,13 +257,17 @@
private DevExpress.XtraBars.Navigation.AccordionControl accordionControl1;
private DevExpress.XtraBars.Navigation.AccordionControlElement elementProjectSiteInfo;
private DevExpress.XtraBars.Navigation.AccordionControlElement elementProjectSiteSimulation;
- private DevExpress.XtraBars.Navigation.AccordionControlElement elementSchemeList;
+ private DevExpress.XtraBars.Navigation.AccordionControlElement elementProjectSiteSchemeList;
private DevExpress.XtraLayout.LayoutControl layoutControl1;
- private SimpleButton btnCompareWorking;
- private SimpleButton btnCreateProjectSiteScheme;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraBars.BarManager barManager1;
+ private DevExpress.XtraBars.BarDockControl barDockControlTop;
+ private DevExpress.XtraBars.BarDockControl barDockControlBottom;
+ private DevExpress.XtraBars.BarDockControl barDockControlLeft;
+ private DevExpress.XtraBars.BarDockControl barDockControlRight;
+ private DevExpress.XtraBars.BarButtonItem barBtnExpandAll;
+ private DevExpress.XtraBars.BarButtonItem barBtnCollpseAll;
+ private DevExpress.XtraBars.PopupMenu popupMenu1;
}
}
--
Gitblit v1.9.3