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 | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 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 eb19de8..dfd9a3d 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.Designer.cs
@@ -50,6 +50,7 @@
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
+ svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
mapViewProjectListContainer1.SuspendLayout();
@@ -61,6 +62,7 @@
((ISupportInitialize)layoutControlItem1).BeginInit();
((ISupportInitialize)layoutControlItem2).BeginInit();
((ISupportInitialize)dockManager1).BeginInit();
+ ((ISupportInitialize)svgImg32).BeginInit();
SuspendLayout();
//
// layoutControl1
@@ -83,6 +85,7 @@
mapViewProjectListContainer1.Location = new Point(2, 152);
mapViewProjectListContainer1.Margin = new Padding(3, 2, 3, 2);
mapViewProjectListContainer1.Name = "mapViewProjectListContainer1";
+ mapViewProjectListContainer1.Padding = new Padding(1);
mapViewProjectListContainer1.Size = new Size(1059, 523);
mapViewProjectListContainer1.TabIndex = 5;
//
@@ -91,7 +94,7 @@
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(859, 0);
+ docPnlProperty.Location = new Point(858, 1);
docPnlProperty.Margin = new Padding(3, 2, 3, 2);
docPnlProperty.Name = "docPnlProperty";
docPnlProperty.Options.AllowDockBottom = false;
@@ -102,7 +105,7 @@
docPnlProperty.Options.FloatOnDblClick = false;
docPnlProperty.Options.ShowCloseButton = false;
docPnlProperty.OriginalSize = new Size(200, 200);
- docPnlProperty.Size = new Size(200, 523);
+ docPnlProperty.Size = new Size(200, 521);
docPnlProperty.Text = "灞炴�у垪琛�";
//
// dockPanel2_Container
@@ -111,7 +114,7 @@
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, 494);
+ dockPanel2_Container.Size = new Size(193, 492);
dockPanel2_Container.TabIndex = 0;
//
// homeXhsProjectPropertyCtrl1
@@ -120,15 +123,16 @@
homeXhsProjectPropertyCtrl1.Location = new Point(0, 0);
homeXhsProjectPropertyCtrl1.Name = "homeXhsProjectPropertyCtrl1";
homeXhsProjectPropertyCtrl1.SelectedObject = null;
- homeXhsProjectPropertyCtrl1.Size = new Size(193, 494);
+ 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(0, 0);
+ docPnlProject.Location = new Point(1, 1);
docPnlProject.Margin = new Padding(3, 2, 3, 2);
docPnlProject.Name = "docPnlProject";
docPnlProject.Options.AllowDockBottom = false;
@@ -139,7 +143,7 @@
docPnlProject.Options.FloatOnDblClick = false;
docPnlProject.Options.ShowCloseButton = false;
docPnlProject.OriginalSize = new Size(200, 200);
- docPnlProject.Size = new Size(200, 523);
+ docPnlProject.Size = new Size(200, 521);
docPnlProject.Text = "椤圭洰鍒楄〃";
//
// dockPanel1_Container
@@ -148,7 +152,7 @@
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, 494);
+ dockPanel1_Container.Size = new Size(193, 492);
dockPanel1_Container.TabIndex = 0;
//
// homeXhsProjectTreeListCtrl1
@@ -156,9 +160,11 @@
homeXhsProjectTreeListCtrl1.Dock = DockStyle.Fill;
homeXhsProjectTreeListCtrl1.Location = new Point(0, 0);
homeXhsProjectTreeListCtrl1.Name = "homeXhsProjectTreeListCtrl1";
- homeXhsProjectTreeListCtrl1.Size = new Size(193, 494);
+ homeXhsProjectTreeListCtrl1.Size = new Size(193, 492);
homeXhsProjectTreeListCtrl1.TabIndex = 0;
homeXhsProjectTreeListCtrl1.SelectProjectEvent += homeXhsProjectTreeListCtrl1_SelectProjectEvent;
+ homeXhsProjectTreeListCtrl1.RefreshDataEvent += homeXhsProjectTreeListCtrl1_RefreshDataEvent;
+ homeXhsProjectTreeListCtrl1.ImportProjectCompletedEvent += homeXhsProjectTreeListCtrl1_ImportProjectCompletedEvent;
//
// tileControl1
//
@@ -179,7 +185,7 @@
// tileItemForProject
//
tileItemForProject.AllowHtmlText = DevExpress.Utils.DefaultBoolean.True;
- tileItemForProject.AppearanceItem.Normal.BackColor = Color.FromArgb(185, 209, 234);
+ 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;
@@ -243,6 +249,11 @@
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
//
Appearance.BackColor = SystemColors.Control;
@@ -263,6 +274,7 @@
((ISupportInitialize)layoutControlItem1).EndInit();
((ISupportInitialize)layoutControlItem2).EndInit();
((ISupportInitialize)dockManager1).EndInit();
+ ((ISupportInitialize)svgImg32).EndInit();
ResumeLayout(false);
}
@@ -283,5 +295,6 @@
private HomeXhsProjectTreeListCtrl homeXhsProjectTreeListCtrl1;
private DevExpress.XtraBars.Docking.DockManager dockManager1;
private HomeXhsProjectPropertyCtrl homeXhsProjectPropertyCtrl1;
+ private DevExpress.Utils.SvgImageCollection svgImg32;
}
}
--
Gitblit v1.9.3