界面微调 program 冲突

Shuxia Ning

2024-08-14 9407658b38b9925685e9e47c89491edf2ebdd15b

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/01-scene/HydroSceneMgrPage.Designer.cs

@@ -49,6 +49,7 @@
            ribPageGroupForMore = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
            panelControl1 = new DevExpress.XtraEditors.PanelControl();
            gridControl1 = new DevExpress.XtraGrid.GridControl();
            hydroSceneMgrViewModelBindingSource = new BindingSource(components);
            gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            colName = new DevExpress.XtraGrid.Columns.GridColumn();
            colCode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -58,20 +59,20 @@
            colDetail = new DevExpress.XtraGrid.Columns.GridColumn();
            repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
            hydroSceneMgrViewModelBindingSource = new BindingSource(components);
            ((ISupportInitialize)ribbonControl1).BeginInit();
            ((ISupportInitialize)panelControl1).BeginInit();
            panelControl1.SuspendLayout();
            ((ISupportInitialize)gridControl1).BeginInit();
            ((ISupportInitialize)hydroSceneMgrViewModelBindingSource).BeginInit();
            ((ISupportInitialize)gridView1).BeginInit();
            ((ISupportInitialize)repositoryItemButtonEdit1).BeginInit();
            ((ISupportInitialize)svgImg32).BeginInit();
            ((ISupportInitialize)hydroSceneMgrViewModelBindingSource).BeginInit();
            SuspendLayout();
            // 
            // ribbonControl1
            // 
            ribbonControl1.ExpandCollapseItem.Id = 0;
            ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnAdd, barBtnEdit, barBtnDelete, barBtnInfo, barBtnSearch, barBtnRefresh, barBtnUp, barBtnDown });
            ribbonControl1.Location = new Point(1, 1);
            ribbonControl1.MaxItemId = 16;
@@ -91,6 +92,7 @@
            barBtnAdd.Id = 1;
            barBtnAdd.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAdd.ImageOptions.SvgImage");
            barBtnAdd.Name = "barBtnAdd";
            barBtnAdd.ItemClick += barBtnAdd_ItemClick;
            // 
            // barBtnEdit
            // 
@@ -98,6 +100,7 @@
            barBtnEdit.Id = 2;
            barBtnEdit.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEdit.ImageOptions.SvgImage");
            barBtnEdit.Name = "barBtnEdit";
            barBtnEdit.ItemClick += barBtnEdit_ItemClick;
            // 
            // barBtnDelete
            // 
@@ -105,6 +108,7 @@
            barBtnDelete.Id = 3;
            barBtnDelete.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDelete.ImageOptions.SvgImage");
            barBtnDelete.Name = "barBtnDelete";
            barBtnDelete.ItemClick += barBtnDelete_ItemClick;
            // 
            // barBtnInfo
            // 
@@ -112,6 +116,7 @@
            barBtnInfo.Id = 4;
            barBtnInfo.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnInfo.ImageOptions.SvgImage");
            barBtnInfo.Name = "barBtnInfo";
            barBtnInfo.ItemClick += barBtnInfo_ItemClick;
            // 
            // barBtnSearch
            // 
@@ -131,17 +136,19 @@
            // 
            // barBtnUp
            // 
            barBtnUp.Caption = "升序";
            barBtnUp.Caption = "上移";
            barBtnUp.Id = 14;
            barBtnUp.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUp.ImageOptions.SvgImage");
            barBtnUp.Name = "barBtnUp";
            barBtnUp.ItemClick += barBtnUp_ItemClick;
            // 
            // barBtnDown
            // 
            barBtnDown.Caption = "降序";
            barBtnDown.Caption = "下移";
            barBtnDown.Id = 15;
            barBtnDown.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDown.ImageOptions.SvgImage");
            barBtnDown.Name = "barBtnDown";
            barBtnDown.ItemClick += barBtnDown_ItemClick;
            // 
            // ribbonPage1
            // 
@@ -190,6 +197,10 @@
            gridControl1.Size = new Size(996, 539);
            gridControl1.TabIndex = 0;
            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
            // 
            // hydroSceneMgrViewModelBindingSource
            // 
            hydroSceneMgrViewModelBindingSource.DataSource = typeof(HydroSceneMgrViewModel);
            // 
            // gridView1
            // 
@@ -258,10 +269,6 @@
            svgImg32.ImageSize = new Size(32, 32);
            svgImg32.Add("actions_book", "image://svgimages/icon builder/actions_book.svg");
            // 
            // hydroSceneMgrViewModelBindingSource
            // 
            hydroSceneMgrViewModelBindingSource.DataSource = typeof(HydroSceneMgrViewModel);
            // 
            // HydroSceneMgrPage
            // 
            Appearance.BackColor = SystemColors.Control;
@@ -277,10 +284,10 @@
            ((ISupportInitialize)panelControl1).EndInit();
            panelControl1.ResumeLayout(false);
            ((ISupportInitialize)gridControl1).EndInit();
            ((ISupportInitialize)hydroSceneMgrViewModelBindingSource).EndInit();
            ((ISupportInitialize)gridView1).EndInit();
            ((ISupportInitialize)repositoryItemButtonEdit1).EndInit();
            ((ISupportInitialize)svgImg32).EndInit();
            ((ISupportInitialize)hydroSceneMgrViewModelBindingSource).EndInit();
            ResumeLayout(false);
            PerformLayout();
        }