From dee5a1dba25401f51455d86a9c8d2156775e1d12 Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期二, 06 八月 2024 16:02:40 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.Designer.cs | 223 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 178 insertions(+), 45 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.Designer.cs
index d29ce8c..dfd9a3d 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.Designer.cs
@@ -28,34 +28,51 @@
/// </summary>
private void InitializeComponent()
{
+ components = new Container();
+ DevExpress.XtraEditors.TileItemElement tileItemElement1 = new DevExpress.XtraEditors.TileItemElement();
+ DevExpress.XtraEditors.TileItemElement tileItemElement2 = new DevExpress.XtraEditors.TileItemElement();
+ ComponentResourceManager resources = new ComponentResourceManager(typeof(HomeXhsProjectPage));
DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
mapViewProjectListContainer1 = new MapViewProjectListContainer();
+ docPnlProperty = new DevExpress.XtraBars.Docking.DockPanel();
+ dockPanel2_Container = new DevExpress.XtraBars.Docking.ControlContainer();
homeXhsProjectPropertyCtrl1 = new HomeXhsProjectPropertyCtrl();
+ docPnlProject = new DevExpress.XtraBars.Docking.DockPanel();
+ dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
homeXhsProjectTreeListCtrl1 = new HomeXhsProjectTreeListCtrl();
+ tileControl1 = new DevExpress.XtraEditors.TileControl();
+ tileGroup2 = new DevExpress.XtraEditors.TileGroup();
+ tileItemForProject = new DevExpress.XtraEditors.TileItem();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
+ svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
+ mapViewProjectListContainer1.SuspendLayout();
+ docPnlProperty.SuspendLayout();
+ dockPanel2_Container.SuspendLayout();
+ docPnlProject.SuspendLayout();
+ dockPanel1_Container.SuspendLayout();
((ISupportInitialize)Root).BeginInit();
((ISupportInitialize)layoutControlItem1).BeginInit();
((ISupportInitialize)layoutControlItem2).BeginInit();
- ((ISupportInitialize)layoutControlItem3).BeginInit();
+ ((ISupportInitialize)dockManager1).BeginInit();
+ ((ISupportInitialize)svgImg32).BeginInit();
SuspendLayout();
//
// layoutControl1
//
layoutControl1.Controls.Add(mapViewProjectListContainer1);
- layoutControl1.Controls.Add(homeXhsProjectPropertyCtrl1);
- layoutControl1.Controls.Add(homeXhsProjectTreeListCtrl1);
+ layoutControl1.Controls.Add(tileControl1);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 0);
layoutControl1.Name = "layoutControl1";
+ layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(825, 316, 650, 400);
layoutControl1.Root = Root;
layoutControl1.Size = new Size(1063, 677);
layoutControl1.TabIndex = 0;
@@ -63,77 +80,179 @@
//
// mapViewProjectListContainer1
//
- mapViewProjectListContainer1.Location = new Point(252, 2);
+ mapViewProjectListContainer1.Controls.Add(docPnlProperty);
+ mapViewProjectListContainer1.Controls.Add(docPnlProject);
+ mapViewProjectListContainer1.Location = new Point(2, 152);
mapViewProjectListContainer1.Margin = new Padding(3, 2, 3, 2);
mapViewProjectListContainer1.Name = "mapViewProjectListContainer1";
- mapViewProjectListContainer1.Size = new Size(559, 673);
- mapViewProjectListContainer1.TabIndex = 6;
+ mapViewProjectListContainer1.Padding = new Padding(1);
+ mapViewProjectListContainer1.Size = new Size(1059, 523);
+ mapViewProjectListContainer1.TabIndex = 5;
+ //
+ // docPnlProperty
+ //
+ docPnlProperty.Controls.Add(dockPanel2_Container);
+ docPnlProperty.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
+ docPnlProperty.ID = new Guid("0d30d696-5f24-4dbd-8e4c-6fb7a9881d07");
+ docPnlProperty.Location = new Point(858, 1);
+ docPnlProperty.Margin = new Padding(3, 2, 3, 2);
+ docPnlProperty.Name = "docPnlProperty";
+ docPnlProperty.Options.AllowDockBottom = false;
+ docPnlProperty.Options.AllowDockFill = false;
+ docPnlProperty.Options.AllowDockLeft = false;
+ docPnlProperty.Options.AllowDockTop = false;
+ docPnlProperty.Options.AllowFloating = false;
+ docPnlProperty.Options.FloatOnDblClick = false;
+ docPnlProperty.Options.ShowCloseButton = false;
+ docPnlProperty.OriginalSize = new Size(200, 200);
+ docPnlProperty.Size = new Size(200, 521);
+ docPnlProperty.Text = "灞炴�у垪琛�";
+ //
+ // dockPanel2_Container
+ //
+ dockPanel2_Container.Controls.Add(homeXhsProjectPropertyCtrl1);
+ dockPanel2_Container.Location = new Point(4, 26);
+ dockPanel2_Container.Margin = new Padding(3, 2, 3, 2);
+ dockPanel2_Container.Name = "dockPanel2_Container";
+ dockPanel2_Container.Size = new Size(193, 492);
+ dockPanel2_Container.TabIndex = 0;
//
// homeXhsProjectPropertyCtrl1
//
- homeXhsProjectPropertyCtrl1.Location = new Point(815, 2);
+ homeXhsProjectPropertyCtrl1.Dock = DockStyle.Fill;
+ homeXhsProjectPropertyCtrl1.Location = new Point(0, 0);
homeXhsProjectPropertyCtrl1.Name = "homeXhsProjectPropertyCtrl1";
homeXhsProjectPropertyCtrl1.SelectedObject = null;
- homeXhsProjectPropertyCtrl1.Size = new Size(246, 673);
- homeXhsProjectPropertyCtrl1.TabIndex = 5;
+ homeXhsProjectPropertyCtrl1.Size = new Size(193, 492);
+ homeXhsProjectPropertyCtrl1.TabIndex = 0;
+ homeXhsProjectPropertyCtrl1.JumpDirectEvent += homeXhsProjectPropertyCtrl1_JumpDirectEvent;
+ //
+ // docPnlProject
+ //
+ docPnlProject.Controls.Add(dockPanel1_Container);
+ docPnlProject.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left;
+ docPnlProject.ID = new Guid("43abbf3a-fbf6-435d-bed9-7131b4a87877");
+ docPnlProject.Location = new Point(1, 1);
+ docPnlProject.Margin = new Padding(3, 2, 3, 2);
+ docPnlProject.Name = "docPnlProject";
+ docPnlProject.Options.AllowDockBottom = false;
+ docPnlProject.Options.AllowDockFill = false;
+ docPnlProject.Options.AllowDockRight = false;
+ docPnlProject.Options.AllowDockTop = false;
+ docPnlProject.Options.AllowFloating = false;
+ docPnlProject.Options.FloatOnDblClick = false;
+ docPnlProject.Options.ShowCloseButton = false;
+ docPnlProject.OriginalSize = new Size(200, 200);
+ docPnlProject.Size = new Size(200, 521);
+ docPnlProject.Text = "椤圭洰鍒楄〃";
+ //
+ // dockPanel1_Container
+ //
+ dockPanel1_Container.Controls.Add(homeXhsProjectTreeListCtrl1);
+ dockPanel1_Container.Location = new Point(3, 26);
+ dockPanel1_Container.Margin = new Padding(3, 2, 3, 2);
+ dockPanel1_Container.Name = "dockPanel1_Container";
+ dockPanel1_Container.Size = new Size(193, 492);
+ dockPanel1_Container.TabIndex = 0;
//
// homeXhsProjectTreeListCtrl1
//
- homeXhsProjectTreeListCtrl1.Location = new Point(2, 2);
+ homeXhsProjectTreeListCtrl1.Dock = DockStyle.Fill;
+ homeXhsProjectTreeListCtrl1.Location = new Point(0, 0);
homeXhsProjectTreeListCtrl1.Name = "homeXhsProjectTreeListCtrl1";
- homeXhsProjectTreeListCtrl1.Size = new Size(246, 673);
- homeXhsProjectTreeListCtrl1.TabIndex = 4;
+ homeXhsProjectTreeListCtrl1.Size = new Size(193, 492);
+ homeXhsProjectTreeListCtrl1.TabIndex = 0;
homeXhsProjectTreeListCtrl1.SelectProjectEvent += homeXhsProjectTreeListCtrl1_SelectProjectEvent;
+ homeXhsProjectTreeListCtrl1.RefreshDataEvent += homeXhsProjectTreeListCtrl1_RefreshDataEvent;
+ homeXhsProjectTreeListCtrl1.ImportProjectCompletedEvent += homeXhsProjectTreeListCtrl1_ImportProjectCompletedEvent;
+ //
+ // tileControl1
+ //
+ tileControl1.Groups.Add(tileGroup2);
+ tileControl1.HorizontalContentAlignment = DevExpress.Utils.HorzAlignment.Near;
+ tileControl1.Location = new Point(2, 2);
+ tileControl1.MaxId = 1;
+ tileControl1.Name = "tileControl1";
+ tileControl1.Size = new Size(1059, 146);
+ tileControl1.TabIndex = 4;
+ tileControl1.Text = "tileControl1";
+ //
+ // tileGroup2
+ //
+ tileGroup2.Items.Add(tileItemForProject);
+ tileGroup2.Name = "tileGroup2";
+ //
+ // tileItemForProject
+ //
+ tileItemForProject.AllowHtmlText = DevExpress.Utils.DefaultBoolean.True;
+ tileItemForProject.AppearanceItem.Normal.BackColor = Color.FromArgb(185, 180, 234);
+ tileItemForProject.AppearanceItem.Normal.FontSizeDelta = 6;
+ tileItemForProject.AppearanceItem.Normal.Options.UseBackColor = true;
+ tileItemForProject.AppearanceItem.Normal.Options.UseFont = true;
+ tileItemForProject.BorderVisibility = DevExpress.XtraEditors.TileItemBorderVisibility.Never;
+ tileItemElement1.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleLeft;
+ tileItemElement1.ImageOptions.SvgImageSize = new Size(64, 64);
+ tileItemElement1.Text = "10";
+ tileItemElement1.TextLocation = new Point(70, 20);
+ tileItemElement2.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleLeft;
+ tileItemElement2.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("resource.SvgImage");
+ tileItemElement2.ImageOptions.SvgImageSize = new Size(64, 64);
+ tileItemElement2.Text = "椤圭洰鎬绘暟閲�";
+ tileItemElement2.TextLocation = new Point(-50, 45);
+ tileItemForProject.Elements.Add(tileItemElement1);
+ tileItemForProject.Elements.Add(tileItemElement2);
+ tileItemForProject.Id = 0;
+ tileItemForProject.ItemSize = DevExpress.XtraEditors.TileItemSize.Wide;
+ tileItemForProject.Name = "tileItemForProject";
//
// Root
//
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem3 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2 });
Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
Root.Name = "Root";
- columnDefinition1.SizeType = SizeType.Absolute;
- columnDefinition1.Width = 250D;
- columnDefinition2.SizeType = SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = SizeType.Absolute;
- columnDefinition3.Width = 250D;
- Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { columnDefinition1, columnDefinition2, columnDefinition3 });
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = SizeType.Percent;
- Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1 });
+ columnDefinition1.SizeType = SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { columnDefinition1 });
+ rowDefinition1.Height = 150D;
+ rowDefinition1.SizeType = SizeType.Absolute;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = SizeType.Percent;
+ Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1, rowDefinition2 });
Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
Root.Size = new Size(1063, 677);
Root.TextVisible = false;
//
// layoutControlItem1
//
- layoutControlItem1.Control = homeXhsProjectTreeListCtrl1;
+ layoutControlItem1.Control = tileControl1;
layoutControlItem1.Location = new Point(0, 0);
layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(250, 677);
+ layoutControlItem1.Size = new Size(1063, 150);
layoutControlItem1.TextSize = new Size(0, 0);
layoutControlItem1.TextVisible = false;
//
// layoutControlItem2
//
- layoutControlItem2.Control = homeXhsProjectPropertyCtrl1;
- layoutControlItem2.Location = new Point(813, 0);
+ layoutControlItem2.Control = mapViewProjectListContainer1;
+ layoutControlItem2.Location = new Point(0, 150);
layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- layoutControlItem2.Size = new Size(250, 677);
+ layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
+ layoutControlItem2.Size = new Size(1063, 527);
layoutControlItem2.TextSize = new Size(0, 0);
layoutControlItem2.TextVisible = false;
//
- // layoutControlItem3
+ // dockManager1
//
- layoutControlItem3.Control = mapViewProjectListContainer1;
- layoutControlItem3.Location = new Point(250, 0);
- layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
- layoutControlItem3.Size = new Size(563, 677);
- layoutControlItem3.TextSize = new Size(0, 0);
- layoutControlItem3.TextVisible = false;
+ dockManager1.Form = mapViewProjectListContainer1;
+ dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { docPnlProject, docPnlProperty });
+ 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" });
+ //
+ // svgImg32
+ //
+ svgImg32.ImageSize = new Size(32, 32);
+ svgImg32.Add("bo_address", "image://svgimages/business objects/bo_address.svg");
//
// HomeXhsProjectPage
//
@@ -146,10 +265,16 @@
Size = new Size(1063, 677);
((ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
+ mapViewProjectListContainer1.ResumeLayout(false);
+ docPnlProperty.ResumeLayout(false);
+ dockPanel2_Container.ResumeLayout(false);
+ docPnlProject.ResumeLayout(false);
+ dockPanel1_Container.ResumeLayout(false);
((ISupportInitialize)Root).EndInit();
((ISupportInitialize)layoutControlItem1).EndInit();
((ISupportInitialize)layoutControlItem2).EndInit();
- ((ISupportInitialize)layoutControlItem3).EndInit();
+ ((ISupportInitialize)dockManager1).EndInit();
+ ((ISupportInitialize)svgImg32).EndInit();
ResumeLayout(false);
}
@@ -157,11 +282,19 @@
private DevExpress.XtraLayout.LayoutControl layoutControl1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
- private MapViewProjectListContainer mapViewProjectListContainer1;
- private HomeXhsProjectPropertyCtrl homeXhsProjectPropertyCtrl1;
- private HomeXhsProjectTreeListCtrl homeXhsProjectTreeListCtrl1;
+ private DevExpress.XtraEditors.TileControl tileControl1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private MapViewProjectListContainer mapViewProjectListContainer1;
+ private DevExpress.XtraEditors.TileGroup tileGroup2;
+ private DevExpress.XtraEditors.TileItem tileItemForProject;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraBars.Docking.DockPanel docPnlProperty;
+ private DevExpress.XtraBars.Docking.ControlContainer dockPanel2_Container;
+ private DevExpress.XtraBars.Docking.DockPanel docPnlProject;
+ private DevExpress.XtraBars.Docking.ControlContainer dockPanel1_Container;
+ private HomeXhsProjectTreeListCtrl homeXhsProjectTreeListCtrl1;
+ private DevExpress.XtraBars.Docking.DockManager dockManager1;
+ private HomeXhsProjectPropertyCtrl homeXhsProjectPropertyCtrl1;
+ private DevExpress.Utils.SvgImageCollection svgImg32;
}
}
--
Gitblit v1.9.3