From 4999c3c3884084c10c8a4bb2426e92cb63600166 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期六, 09 十一月 2024 09:58:22 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroVisualPropertyCtrl.Designer.cs | 68 +++++++++++++++++-----------------
1 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroParterPropertyCtrl.Designer.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroVisualPropertyCtrl.Designer.cs
similarity index 88%
rename from WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroParterPropertyCtrl.Designer.cs
rename to WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroVisualPropertyCtrl.Designer.cs
index 76f96c3..7bafcad 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroParterPropertyCtrl.Designer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroVisualPropertyCtrl.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace Yw.WinFrmUI
{
- partial class HydroParterPropertyCtrl
+ partial class HydroVisualPropertyCtrl
{
/// <summary>
/// 蹇呴渶鐨勮璁″櫒鍙橀噺銆�
@@ -29,16 +29,16 @@
private void InitializeComponent()
{
components = new Container();
- ComponentResourceManager resources = new ComponentResourceManager(typeof(HydroParterPropertyCtrl));
- DevExpress.Utils.SuperToolTip superToolTip1 = new DevExpress.Utils.SuperToolTip();
- DevExpress.Utils.ToolTipItem toolTipItem1 = new DevExpress.Utils.ToolTipItem();
- DevExpress.Utils.SuperToolTip superToolTip2 = new DevExpress.Utils.SuperToolTip();
- DevExpress.Utils.ToolTipItem toolTipItem2 = new DevExpress.Utils.ToolTipItem();
- DevExpress.Utils.SuperToolTip superToolTip3 = new DevExpress.Utils.SuperToolTip();
- DevExpress.Utils.ToolTipTitleItem toolTipTitleItem1 = new DevExpress.Utils.ToolTipTitleItem();
- DevExpress.Utils.ToolTipItem toolTipItem3 = new DevExpress.Utils.ToolTipItem();
+ DevExpress.Utils.SuperToolTip superToolTip5 = new DevExpress.Utils.SuperToolTip();
+ DevExpress.Utils.ToolTipItem toolTipItem5 = new DevExpress.Utils.ToolTipItem();
+ DevExpress.Utils.SuperToolTip superToolTip6 = new DevExpress.Utils.SuperToolTip();
+ DevExpress.Utils.ToolTipItem toolTipItem6 = new DevExpress.Utils.ToolTipItem();
+ ComponentResourceManager resources = new ComponentResourceManager(typeof(HydroVisualPropertyCtrl));
+ DevExpress.Utils.SuperToolTip superToolTip4 = new DevExpress.Utils.SuperToolTip();
+ DevExpress.Utils.ToolTipTitleItem toolTipTitleItem2 = new DevExpress.Utils.ToolTipTitleItem();
+ DevExpress.Utils.ToolTipItem toolTipItem4 = new DevExpress.Utils.ToolTipItem();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- hydroParterPropertyDescriptionCtrl1 = new HydroParterPropertyDescriptionCtrl();
+ hydroVisualPropertyDescriptionCtrl1 = new HydroVisualPropertyDescriptionCtrl();
propertyGridControl1 = new DevExpress.XtraVerticalGrid.PropertyGridControl();
svgImg16 = new DevExpress.Utils.SvgImageCollection(components);
layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -69,7 +69,7 @@
//
// layoutControl1
//
- layoutControl1.Controls.Add(hydroParterPropertyDescriptionCtrl1);
+ layoutControl1.Controls.Add(hydroVisualPropertyDescriptionCtrl1);
layoutControl1.Controls.Add(propertyGridControl1);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 28);
@@ -80,12 +80,12 @@
layoutControl1.TabIndex = 0;
layoutControl1.Text = "layoutControl1";
//
- // hydroParterPropertyDescriptionCtrl1
+ // hydroVisualPropertyDescriptionCtrl1
//
- hydroParterPropertyDescriptionCtrl1.Location = new Point(2, 502);
- hydroParterPropertyDescriptionCtrl1.Name = "hydroParterPropertyDescriptionCtrl1";
- hydroParterPropertyDescriptionCtrl1.Size = new Size(256, 98);
- hydroParterPropertyDescriptionCtrl1.TabIndex = 5;
+ hydroVisualPropertyDescriptionCtrl1.Location = new Point(2, 502);
+ hydroVisualPropertyDescriptionCtrl1.Name = "hydroVisualPropertyDescriptionCtrl1";
+ hydroVisualPropertyDescriptionCtrl1.Size = new Size(256, 98);
+ hydroVisualPropertyDescriptionCtrl1.TabIndex = 5;
//
// propertyGridControl1
//
@@ -136,7 +136,7 @@
//
// layoutDescription
//
- layoutDescription.Control = hydroParterPropertyDescriptionCtrl1;
+ layoutDescription.Control = hydroVisualPropertyDescriptionCtrl1;
layoutDescription.Location = new Point(0, 502);
layoutDescription.Name = "layoutDescription";
layoutDescription.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 2);
@@ -204,9 +204,9 @@
barBtnChangeLink.Id = 16;
barBtnChangeLink.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnChangeLink.ImageOptions.SvgImage");
barBtnChangeLink.Name = "barBtnChangeLink";
- toolTipItem1.Text = "璋冩暣涓婁笅娓�";
- superToolTip1.Items.Add(toolTipItem1);
- barBtnChangeLink.SuperTip = superToolTip1;
+ toolTipItem5.Text = "璋冩暣涓婁笅娓�";
+ superToolTip5.Items.Add(toolTipItem5);
+ barBtnChangeLink.SuperTip = superToolTip5;
barBtnChangeLink.ItemClick += barBtnChangeLink_ItemClick;
//
// barBtnView
@@ -214,9 +214,9 @@
barBtnView.Id = 17;
barBtnView.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnView.ImageOptions.SvgImage");
barBtnView.Name = "barBtnView";
- toolTipItem2.Text = "鏌ョ湅";
- superToolTip2.Items.Add(toolTipItem2);
- barBtnView.SuperTip = superToolTip2;
+ toolTipItem6.Text = "鏌ョ湅";
+ superToolTip6.Items.Add(toolTipItem6);
+ barBtnView.SuperTip = superToolTip6;
barBtnView.ItemClick += barBtnView_ItemClick;
//
// barBtnHelp
@@ -226,14 +226,14 @@
barBtnHelp.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHelp.ImageOptions.SvgImage");
barBtnHelp.ImageOptions.SvgImageSize = new Size(20, 20);
barBtnHelp.Name = "barBtnHelp";
- toolTipTitleItem1.Appearance.Image = (Image)resources.GetObject("resource.Image");
- toolTipTitleItem1.Appearance.Options.UseImage = true;
- toolTipTitleItem1.ImageOptions.Image = (Image)resources.GetObject("resource.Image1");
- toolTipItem3.LeftIndent = 6;
- toolTipItem3.Text = "鎻忚堪淇℃伅";
- superToolTip3.Items.Add(toolTipTitleItem1);
- superToolTip3.Items.Add(toolTipItem3);
- barBtnHelp.SuperTip = superToolTip3;
+ toolTipTitleItem2.Appearance.Image = (Image)resources.GetObject("resource.Image");
+ toolTipTitleItem2.Appearance.Options.UseImage = true;
+ toolTipTitleItem2.ImageOptions.Image = (Image)resources.GetObject("resource.Image1");
+ toolTipItem4.LeftIndent = 6;
+ toolTipItem4.Text = "鎻忚堪淇℃伅";
+ superToolTip4.Items.Add(toolTipTitleItem2);
+ superToolTip4.Items.Add(toolTipItem4);
+ barBtnHelp.SuperTip = superToolTip4;
barBtnHelp.ItemClick += barBtnHelp_ItemClick;
//
// barDockControlTop
@@ -268,7 +268,7 @@
barDockControlRight.Manager = barManager1;
barDockControlRight.Size = new Size(0, 602);
//
- // HydroParterPropertyCtrl
+ // HydroVisualPropertyCtrl
//
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
@@ -277,7 +277,7 @@
Controls.Add(barDockControlRight);
Controls.Add(barDockControlBottom);
Controls.Add(barDockControlTop);
- Name = "HydroParterPropertyCtrl";
+ Name = "HydroVisualPropertyCtrl";
Size = new Size(260, 630);
((ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
@@ -311,7 +311,7 @@
private DevExpress.Utils.SvgImageCollection svgImg16;
private DevExpress.XtraBars.BarButtonItem barBtnChangeLink;
private DevExpress.XtraBars.BarButtonItem barBtnView;
- private HydroParterPropertyDescriptionCtrl hydroParterPropertyDescriptionCtrl1;
+ private HydroVisualPropertyDescriptionCtrl hydroVisualPropertyDescriptionCtrl1;
private DevExpress.XtraLayout.LayoutControlItem layoutDescription;
}
}
--
Gitblit v1.9.3