From 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 08 一月 2025 13:57:33 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/08-grading/04-tree/SelectHydroGradingPropTreeCtrl.Designer.cs | 278 ++-----------------------------------------------------
1 files changed, 11 insertions(+), 267 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/08-grading/04-tree/SelectHydroGradingPropTreeCtrl.Designer.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/08-grading/04-tree/SelectHydroGradingPropTreeCtrl.Designer.cs
index d0e27a5..e990437 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/08-grading/04-tree/SelectHydroGradingPropTreeCtrl.Designer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/08-grading/04-tree/SelectHydroGradingPropTreeCtrl.Designer.cs
@@ -28,287 +28,31 @@
/// </summary>
private void InitializeComponent()
{
- components = new Container();
- ComponentResourceManager resources = new ComponentResourceManager(typeof(SelectHydroGradingPropTreeCtrl));
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- treeList1 = new DevExpress.XtraTreeList.TreeList();
- colName = new DevExpress.XtraTreeList.Columns.TreeListColumn();
- barManager1 = new DevExpress.XtraBars.BarManager(components);
- bar1 = new DevExpress.XtraBars.Bar();
- barBtnExpandAll = new DevExpress.XtraBars.BarButtonItem();
- barBtnCollpseAll = new DevExpress.XtraBars.BarButtonItem();
- barBtnSearchBox = new DevExpress.XtraBars.BarButtonItem();
- barCkTreeLine = new DevExpress.XtraBars.BarCheckItem();
- barDockControlTop = new DevExpress.XtraBars.BarDockControl();
- barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
- barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
- barDockControlRight = new DevExpress.XtraBars.BarDockControl();
- repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- searchControl1 = new DevExpress.XtraEditors.SearchControl();
- Root = new DevExpress.XtraLayout.LayoutControlGroup();
- layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- svgImg16 = new DevExpress.Utils.SvgImageCollection(components);
- imgCollection16 = new DevExpress.Utils.ImageCollection(components);
- ((ISupportInitialize)layoutControl1).BeginInit();
- layoutControl1.SuspendLayout();
- ((ISupportInitialize)treeList1).BeginInit();
- ((ISupportInitialize)barManager1).BeginInit();
- ((ISupportInitialize)repositoryItemButtonEdit1).BeginInit();
- ((ISupportInitialize)searchControl1.Properties).BeginInit();
- ((ISupportInitialize)Root).BeginInit();
- ((ISupportInitialize)layoutControlItem1).BeginInit();
- ((ISupportInitialize)layoutControlItem2).BeginInit();
- ((ISupportInitialize)svgImg16).BeginInit();
- ((ISupportInitialize)imgCollection16).BeginInit();
+ simpleTreeViewCtrl1 = new SimpleTreeViewCtrl();
SuspendLayout();
//
- // layoutControl1
+ // simpleTreeViewCtrl1
//
- layoutControl1.Controls.Add(treeList1);
- layoutControl1.Controls.Add(searchControl1);
- layoutControl1.Dock = DockStyle.Fill;
- layoutControl1.Location = new Point(0, 24);
- layoutControl1.Name = "layoutControl1";
- layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(539, 371, 650, 400);
- layoutControl1.Root = Root;
- layoutControl1.Size = new Size(235, 636);
- layoutControl1.TabIndex = 0;
- layoutControl1.Text = "layoutControl1";
- //
- // treeList1
- //
- treeList1.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { colName });
- treeList1.ImageIndexFieldName = "Type";
- treeList1.KeyFieldName = "Id";
- treeList1.Location = new Point(0, 24);
- treeList1.MenuManager = barManager1;
- treeList1.Name = "treeList1";
- treeList1.OptionsMenu.EnableNodeMenu = false;
- treeList1.OptionsSelection.EnableAppearanceFocusedCell = false;
- treeList1.OptionsView.FocusRectStyle = DevExpress.XtraTreeList.DrawFocusRectStyle.None;
- treeList1.ParentFieldName = "ParentId";
- treeList1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemButtonEdit1 });
- treeList1.Size = new Size(235, 611);
- treeList1.TabIndex = 5;
- treeList1.TreeViewColumn = colName;
- treeList1.ViewStyle = DevExpress.XtraTreeList.TreeListViewStyle.TreeView;
- treeList1.FocusedNodeChanged += treeList1_FocusedNodeChanged;
- //
- // colName
- //
- colName.Caption = "鍚嶇О";
- colName.FieldName = "Name";
- colName.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("colName.ImageOptions.SvgImage");
- colName.Name = "colName";
- colName.Visible = true;
- colName.VisibleIndex = 0;
- colName.Width = 172;
- //
- // barManager1
- //
- barManager1.Bars.AddRange(new DevExpress.XtraBars.Bar[] { bar1 });
- 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, barBtnSearchBox, barCkTreeLine });
- barManager1.MaxItemId = 6;
- //
- // bar1
- //
- bar1.BarName = "Custom 1";
- bar1.CanDockStyle = DevExpress.XtraBars.BarCanDockStyle.Top;
- bar1.DockCol = 0;
- bar1.DockRow = 0;
- bar1.DockStyle = DevExpress.XtraBars.BarDockStyle.Top;
- bar1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barBtnExpandAll), new DevExpress.XtraBars.LinkPersistInfo(barBtnCollpseAll), new DevExpress.XtraBars.LinkPersistInfo(barBtnSearchBox), new DevExpress.XtraBars.LinkPersistInfo(barCkTreeLine) });
- bar1.OptionsBar.AllowQuickCustomization = false;
- bar1.OptionsBar.DrawDragBorder = false;
- bar1.OptionsBar.MultiLine = true;
- bar1.OptionsBar.UseWholeRow = true;
- bar1.Text = "Custom 1";
- //
- // 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;
- //
- // barBtnSearchBox
- //
- barBtnSearchBox.Caption = "鎼滅储";
- barBtnSearchBox.Id = 2;
- barBtnSearchBox.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSearchBox.ImageOptions.SvgImage");
- barBtnSearchBox.Name = "barBtnSearchBox";
- barBtnSearchBox.ItemClick += barBtnSearch_ItemClick;
- //
- // barCkTreeLine
- //
- barCkTreeLine.Caption = "鏍戠嚎";
- barCkTreeLine.Id = 4;
- barCkTreeLine.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barCkTreeLine.ImageOptions.SvgImage");
- barCkTreeLine.Name = "barCkTreeLine";
- barCkTreeLine.CheckedChanged += barCkTreeLine_CheckedChanged;
- //
- // barDockControlTop
- //
- barDockControlTop.CausesValidation = false;
- barDockControlTop.Dock = DockStyle.Top;
- barDockControlTop.Location = new Point(0, 0);
- barDockControlTop.Manager = barManager1;
- barDockControlTop.Size = new Size(235, 24);
- //
- // barDockControlBottom
- //
- barDockControlBottom.CausesValidation = false;
- barDockControlBottom.Dock = DockStyle.Bottom;
- barDockControlBottom.Location = new Point(0, 660);
- barDockControlBottom.Manager = barManager1;
- barDockControlBottom.Size = new Size(235, 0);
- //
- // barDockControlLeft
- //
- barDockControlLeft.CausesValidation = false;
- barDockControlLeft.Dock = DockStyle.Left;
- barDockControlLeft.Location = new Point(0, 24);
- barDockControlLeft.Manager = barManager1;
- barDockControlLeft.Size = new Size(0, 636);
- //
- // barDockControlRight
- //
- barDockControlRight.CausesValidation = false;
- barDockControlRight.Dock = DockStyle.Right;
- barDockControlRight.Location = new Point(235, 24);
- barDockControlRight.Manager = barManager1;
- barDockControlRight.Size = new Size(0, 636);
- //
- // repositoryItemButtonEdit1
- //
- repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions1.SvgImage");
- editorButtonImageOptions1.SvgImageSize = new Size(20, 20);
- repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
- repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
- repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
- //
- // searchControl1
- //
- searchControl1.Client = treeList1;
- searchControl1.Location = new Point(0, 2);
- searchControl1.MenuManager = barManager1;
- searchControl1.Name = "searchControl1";
- searchControl1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Repository.ClearButton(), new DevExpress.XtraEditors.Repository.SearchButton() });
- searchControl1.Properties.Client = treeList1;
- searchControl1.Size = new Size(235, 20);
- searchControl1.StyleController = layoutControl1;
- searchControl1.TabIndex = 4;
- //
- // Root
- //
- Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
- Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2 });
- Root.Name = "Root";
- Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- Root.Size = new Size(235, 636);
- Root.TextVisible = false;
- //
- // layoutControlItem1
- //
- layoutControlItem1.Control = searchControl1;
- layoutControlItem1.Location = new Point(0, 0);
- layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 2, 1);
- layoutControlItem1.Size = new Size(235, 23);
- layoutControlItem1.TextSize = new Size(0, 0);
- layoutControlItem1.TextVisible = false;
- //
- // layoutControlItem2
- //
- layoutControlItem2.Control = treeList1;
- layoutControlItem2.Location = new Point(0, 23);
- layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 1, 1);
- layoutControlItem2.Size = new Size(235, 613);
- layoutControlItem2.TextSize = new Size(0, 0);
- layoutControlItem2.TextVisible = false;
- //
- // svgImg16
- //
- svgImg16.Add("groupby", "image://svgimages/snap/groupby.svg");
- svgImg16.Add("properties", "image://svgimages/setup/properties.svg");
- //
- // imgCollection16
- //
- imgCollection16.ImageStream = (DevExpress.Utils.ImageCollectionStreamer)resources.GetObject("imgCollection16.ImageStream");
+ simpleTreeViewCtrl1.Dock = DockStyle.Fill;
+ simpleTreeViewCtrl1.Location = new Point(0, 0);
+ simpleTreeViewCtrl1.Name = "simpleTreeViewCtrl1";
+ simpleTreeViewCtrl1.ShowTreeLines = false;
+ simpleTreeViewCtrl1.Size = new Size(235, 660);
+ simpleTreeViewCtrl1.TabIndex = 0;
+ simpleTreeViewCtrl1.ToolBarVisible = true;
//
// SelectHydroGradingPropTreeCtrl
//
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
- Controls.Add(layoutControl1);
- Controls.Add(barDockControlLeft);
- Controls.Add(barDockControlRight);
- Controls.Add(barDockControlBottom);
- Controls.Add(barDockControlTop);
+ Controls.Add(simpleTreeViewCtrl1);
Name = "SelectHydroGradingPropTreeCtrl";
Size = new Size(235, 660);
- ((ISupportInitialize)layoutControl1).EndInit();
- layoutControl1.ResumeLayout(false);
- ((ISupportInitialize)treeList1).EndInit();
- ((ISupportInitialize)barManager1).EndInit();
- ((ISupportInitialize)repositoryItemButtonEdit1).EndInit();
- ((ISupportInitialize)searchControl1.Properties).EndInit();
- ((ISupportInitialize)Root).EndInit();
- ((ISupportInitialize)layoutControlItem1).EndInit();
- ((ISupportInitialize)layoutControlItem2).EndInit();
- ((ISupportInitialize)svgImg16).EndInit();
- ((ISupportInitialize)imgCollection16).EndInit();
ResumeLayout(false);
- PerformLayout();
}
#endregion
- private DevExpress.XtraLayout.LayoutControl layoutControl1;
- private DevExpress.XtraLayout.LayoutControlGroup Root;
- private DevExpress.XtraBars.BarManager barManager1;
- private DevExpress.XtraBars.Bar bar1;
- private DevExpress.XtraBars.BarButtonItem barBtnExpandAll;
- private DevExpress.XtraBars.BarDockControl barDockControlTop;
- private DevExpress.XtraBars.BarDockControl barDockControlBottom;
- private DevExpress.XtraBars.BarDockControl barDockControlLeft;
- private DevExpress.XtraBars.BarDockControl barDockControlRight;
- private DevExpress.XtraEditors.SearchControl searchControl1;
- private DevExpress.XtraBars.BarButtonItem barBtnCollpseAll;
- private DevExpress.XtraBars.BarButtonItem barBtnSearchBox;
- private DevExpress.XtraBars.BarCheckItem barCkTreeLine;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private DevExpress.XtraTreeList.TreeList treeList1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraTreeList.Columns.TreeListColumn colName;
- private DevExpress.XtraEditors.SimpleButton btnImportProject;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraBars.BarButtonItem barBtnRefresh;
- private DevExpress.Utils.ImageCollection imgCollection16;
- private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
- private DevExpress.Utils.SvgImageCollection svgImg16;
+ private SimpleTreeViewCtrl simpleTreeViewCtrl1;
}
}
--
Gitblit v1.9.3