From 6f932c727fe72e5c3417812234371a35e7225a93 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 15 十月 2024 14:20:40 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.Designer.cs | 67 ++++++++++++++++++++++++---------
1 files changed, 49 insertions(+), 18 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.Designer.cs
index 45e3d24..68cfe78 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class DetailInfo4DsDlg
+ partial class PumpFullInfoViewDlg
{
/// <summary>
/// Required designer variable.
@@ -29,15 +29,18 @@
private void InitializeComponent()
{
components = new Container();
- ComponentResourceManager resources = new ComponentResourceManager(typeof(DetailInfo4DsDlg));
- DevExpress.Utils.SuperToolTip superToolTip1 = new DevExpress.Utils.SuperToolTip();
- DevExpress.Utils.ToolTipItem toolTipItem1 = new DevExpress.Utils.ToolTipItem();
+ ComponentResourceManager resources = new ComponentResourceManager(typeof(PumpFullInfoViewDlg));
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.ToolTipItem toolTipItem3 = new DevExpress.Utils.ToolTipItem();
DevExpress.Utils.SuperToolTip superToolTip4 = new DevExpress.Utils.SuperToolTip();
DevExpress.Utils.ToolTipItem toolTipItem4 = new DevExpress.Utils.ToolTipItem();
+ DevExpress.Utils.SuperToolTip superToolTip1 = new DevExpress.Utils.SuperToolTip();
+ DevExpress.Utils.ToolTipItem toolTipItem1 = new DevExpress.Utils.ToolTipItem();
+ DevExpress.Utils.SuperToolTip superToolTip5 = new DevExpress.Utils.SuperToolTip();
+ DevExpress.Utils.ToolTipItem toolTipItem5 = new DevExpress.Utils.ToolTipItem();
+ PageTitle pageTitle1 = new PageTitle();
tileNavPaneTop = new DevExpress.XtraBars.Navigation.TileNavPane();
navBtnTitle = new DevExpress.XtraBars.Navigation.NavButton();
navBtn鎵嬫満椤甸潰 = new DevExpress.XtraBars.Navigation.NavButton();
@@ -46,6 +49,7 @@
navButton8 = new DevExpress.XtraBars.Navigation.NavButton();
navBtnbutton9 = new DevExpress.XtraBars.Navigation.NavButton();
navBtnbutton10 = new DevExpress.XtraBars.Navigation.NavButton();
+ navBtnDock = new DevExpress.XtraBars.Navigation.NavButton();
popupMenu1 = new DevExpress.XtraBars.PopupMenu(components);
bbi瀵煎嚭瀹夎鍥� = new DevExpress.XtraBars.BarButtonItem();
bbi瀵煎嚭鎬ц兘鏇茬嚎 = new DevExpress.XtraBars.BarButtonItem();
@@ -100,6 +104,7 @@
tileNavPaneTop.Buttons.Add(navBtn鎵嬫満椤甸潰);
tileNavPaneTop.Buttons.Add(navBtn瀵垮懡鎴愭湰璁＄畻);
tileNavPaneTop.Buttons.Add(navBtn瀵煎嚭);
+ tileNavPaneTop.Buttons.Add(navBtnDock);
tileNavPaneTop.Buttons.Add(navButton8);
tileNavPaneTop.Buttons.Add(navBtnbutton9);
tileNavPaneTop.Buttons.Add(navBtnbutton10);
@@ -144,12 +149,14 @@
navBtn鎵嬫満椤甸潰.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right;
navBtn鎵嬫満椤甸潰.Caption = "鎵嬫満椤甸潰";
navBtn鎵嬫満椤甸潰.Name = "navBtn鎵嬫満椤甸潰";
+ navBtn鎵嬫満椤甸潰.Visible = false;
navBtn鎵嬫満椤甸潰.ElementClick += navBtn鎵嬫満椤甸潰_ElementClick;
//
// navBtn瀵垮懡鎴愭湰璁＄畻
//
navBtn瀵垮懡鎴愭湰璁＄畻.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right;
navBtn瀵垮懡鎴愭湰璁＄畻.Caption = "瀵垮懡鎴愭湰璁＄畻";
+ navBtn瀵垮懡鎴愭湰璁＄畻.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navBtn瀵垮懡鎴愭湰璁＄畻.ImageOptions.SvgImage");
navBtn瀵垮懡鎴愭湰璁＄畻.Name = "navBtn瀵垮懡鎴愭湰璁＄畻";
navBtn瀵垮懡鎴愭湰璁＄畻.ElementClick += navBtn瀵垮懡鎴愭湰璁＄畻_ElementClick;
//
@@ -157,6 +164,7 @@
//
navBtn瀵煎嚭.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right;
navBtn瀵煎嚭.Caption = "涓嬭浇";
+ navBtn瀵煎嚭.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navBtn瀵煎嚭.ImageOptions.SvgImage");
navBtn瀵煎嚭.Name = "navBtn瀵煎嚭";
navBtn瀵煎嚭.ElementClick += navBtn瀵煎嚭_ElementClick;
//
@@ -166,9 +174,9 @@
navButton8.Caption = null;
navButton8.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navButton8.ImageOptions.SvgImage");
navButton8.Name = "navButton8";
- toolTipItem1.Text = "鏈�灏忓寲";
- superToolTip1.Items.Add(toolTipItem1);
- navButton8.SuperTip = superToolTip1;
+ toolTipItem2.Text = "鏈�灏忓寲";
+ superToolTip2.Items.Add(toolTipItem2);
+ navButton8.SuperTip = superToolTip2;
navButton8.ElementClick += navBtnMin_ElementClick;
//
// navBtnbutton9
@@ -176,9 +184,9 @@
navBtnbutton9.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right;
navBtnbutton9.Caption = null;
navBtnbutton9.Name = "navBtnbutton9";
- toolTipItem2.Text = "鍚戜笅杩樺師";
- superToolTip2.Items.Add(toolTipItem2);
- navBtnbutton9.SuperTip = superToolTip2;
+ toolTipItem3.Text = "鍚戜笅杩樺師";
+ superToolTip3.Items.Add(toolTipItem3);
+ navBtnbutton9.SuperTip = superToolTip3;
navBtnbutton9.ElementClick += navBtnSize_ElementClick;
//
// navBtnbutton10
@@ -187,10 +195,21 @@
navBtnbutton10.Caption = null;
navBtnbutton10.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navBtnbutton10.ImageOptions.SvgImage");
navBtnbutton10.Name = "navBtnbutton10";
- toolTipItem3.Text = "鍏抽棴";
- superToolTip3.Items.Add(toolTipItem3);
- navBtnbutton10.SuperTip = superToolTip3;
+ toolTipItem4.Text = "鍏抽棴";
+ superToolTip4.Items.Add(toolTipItem4);
+ navBtnbutton10.SuperTip = superToolTip4;
navBtnbutton10.ElementClick += navBtnClose_ElementClick;
+ //
+ // navBtnDock
+ //
+ navBtnDock.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right;
+ navBtnDock.Caption = "鍋滈潬";
+ navBtnDock.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navBtnDock.ImageOptions.SvgImage");
+ navBtnDock.Name = "navBtnDock";
+ toolTipItem1.Text = "鍋滈潬";
+ superToolTip1.Items.Add(toolTipItem1);
+ navBtnDock.SuperTip = superToolTip1;
+ navBtnDock.ElementClick += navBtnDock_ElementClick;
//
// popupMenu1
//
@@ -353,9 +372,9 @@
navButton6.AppearanceSelected.Options.UseForeColor = true;
navButton6.Caption = null;
navButton6.Name = "navButton6";
- toolTipItem4.Text = "鏈�灏忓寲";
- superToolTip4.Items.Add(toolTipItem4);
- navButton6.SuperTip = superToolTip4;
+ toolTipItem5.Text = "鏈�灏忓寲";
+ superToolTip5.Items.Add(toolTipItem5);
+ navButton6.SuperTip = superToolTip5;
//
// panelMain
//
@@ -371,6 +390,13 @@
pumpFullInfoCtrl1.Dock = DockStyle.Fill;
pumpFullInfoCtrl1.Location = new Point(0, 0);
pumpFullInfoCtrl1.Name = "pumpFullInfoCtrl1";
+ pumpFullInfoCtrl1.PageGuid = null;
+ pageTitle1.AllowClose = true;
+ pageTitle1.Caption = "姘存车淇℃伅";
+ pageTitle1.HeaderImage = null;
+ pageTitle1.HeaderSvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("pageTitle1.HeaderSvgImage");
+ pageTitle1.SvgImageSize = new Size(0, 0);
+ pumpFullInfoCtrl1.PageTitle = pageTitle1;
pumpFullInfoCtrl1.Size = new Size(1274, 659);
pumpFullInfoCtrl1.TabIndex = 0;
//
@@ -453,6 +479,7 @@
navButton璇环.AppearanceSelected.Options.UseFont = true;
navButton璇环.Caption = "璇环";
navButton璇环.Name = "navButton璇环";
+ navButton璇环.Visible = false;
navButton璇环.ElementClick += navButton璇环_ElementClick;
//
// bbi娣诲姞鏀惰棌
@@ -467,6 +494,7 @@
bbi娣诲姞鏀惰棌.Caption = "娣诲姞鏀惰棌";
bbi娣诲姞鏀惰棌.Name = "bbi娣诲姞鏀惰棌";
bbi娣诲姞鏀惰棌.Padding = new Padding(5, 0, 10, 0);
+ bbi娣诲姞鏀惰棌.Visible = false;
//
// bbi娣诲姞姣旇緝
//
@@ -480,6 +508,7 @@
bbi娣诲姞姣旇緝.Caption = "娣诲姞姣旇緝";
bbi娣诲姞姣旇緝.Name = "bbi娣诲姞姣旇緝";
bbi娣诲姞姣旇緝.Padding = new Padding(10, 0, 10, 0);
+ bbi娣诲姞姣旇緝.Visible = false;
//
// bbi娣诲姞涓插苟鑱�
//
@@ -493,6 +522,7 @@
bbi娣诲姞涓插苟鑱�.Caption = "娣诲姞涓插苟鑱�";
bbi娣诲姞涓插苟鑱�.Name = "bbi娣诲姞涓插苟鑱�";
bbi娣诲姞涓插苟鑱�.Padding = new Padding(10, 0, 10, 0);
+ bbi娣诲姞涓插苟鑱�.Visible = false;
//
// barManager2
//
@@ -552,7 +582,7 @@
popupMenu2.Manager = barManager2;
popupMenu2.Name = "popupMenu2";
//
- // DetailInfo4DsDlg
+ // PumpFullInfoViewDlg
//
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
@@ -571,7 +601,7 @@
FormBorderEffect = FormBorderEffect.Shadow;
FormBorderStyle = FormBorderStyle.None;
IconOptions.ShowIcon = false;
- Name = "DetailInfo4DsDlg";
+ Name = "PumpFullInfoViewDlg";
Padding = new Padding(2);
StartPosition = FormStartPosition.CenterScreen;
Text = "閫夊瀷姝ラ";
@@ -634,5 +664,6 @@
private DevExpress.XtraBars.PopupMenu popupMenu2;
private DevExpress.XtraBars.Navigation.NavButton navButton8;
private PumpFullInfoCtrl pumpFullInfoCtrl1;
+ private DevExpress.XtraBars.Navigation.NavButton navBtnDock;
}
}
\ No newline at end of file
--
Gitblit v1.9.3