冲突

yangyin

2024-08-06 dee5a1dba25401f51455d86a9c8d2156775e1d12

 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
@@ -84,7 +86,6 @@
            mapViewProjectListContainer1.Margin = new Padding(3, 2, 3, 2);
            mapViewProjectListContainer1.Name = "mapViewProjectListContainer1";
            mapViewProjectListContainer1.Padding = new Padding(1);
            mapViewProjectListContainer1.ShowBoder = true;
            mapViewProjectListContainer1.Size = new Size(1059, 523);
            mapViewProjectListContainer1.TabIndex = 5;
            // 
@@ -248,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;
@@ -268,6 +274,7 @@
            ((ISupportInitialize)layoutControlItem1).EndInit();
            ((ISupportInitialize)layoutControlItem2).EndInit();
            ((ISupportInitialize)dockManager1).EndInit();
            ((ISupportInitialize)svgImg32).EndInit();
            ResumeLayout(false);
        }

@@ -288,5 +295,6 @@
        private HomeXhsProjectTreeListCtrl homeXhsProjectTreeListCtrl1;
        private DevExpress.XtraBars.Docking.DockManager dockManager1;
        private HomeXhsProjectPropertyCtrl homeXhsProjectPropertyCtrl1;
        private DevExpress.Utils.SvgImageCollection svgImg32;
    }
}