From 5dd7ab9852c9a5659cc916e9ed986b5099efeaf8 Mon Sep 17 00:00:00 2001 From: Shuxia Ning <NingShuxia0927@outlook.com> Date: 星期三, 23 十月 2024 13:04:33 +0800 Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.Designer.cs | 168 +++++++++++++++++++++++++++++-------------------------- 1 files changed, 88 insertions(+), 80 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 4e77163..7ce66f8 100644 --- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.Designer.cs +++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.Designer.cs @@ -32,20 +32,19 @@ { components = new Container(); ComponentResourceManager resources = new ComponentResourceManager(typeof(PumpFullInfoViewDlg)); - DevExpress.Utils.SuperToolTip superToolTip6 = new DevExpress.Utils.SuperToolTip(); - DevExpress.Utils.ToolTipItem toolTipItem6 = new DevExpress.Utils.ToolTipItem(); - DevExpress.Utils.SuperToolTip superToolTip7 = new DevExpress.Utils.SuperToolTip(); - DevExpress.Utils.ToolTipItem toolTipItem7 = new DevExpress.Utils.ToolTipItem(); - DevExpress.Utils.SuperToolTip superToolTip8 = new DevExpress.Utils.SuperToolTip(); - DevExpress.Utils.ToolTipItem toolTipItem8 = new DevExpress.Utils.ToolTipItem(); - DevExpress.Utils.SuperToolTip superToolTip9 = new DevExpress.Utils.SuperToolTip(); - DevExpress.Utils.ToolTipItem toolTipItem9 = new DevExpress.Utils.ToolTipItem(); - DevExpress.Utils.SuperToolTip superToolTip10 = new DevExpress.Utils.SuperToolTip(); - DevExpress.Utils.ToolTipItem toolTipItem10 = new DevExpress.Utils.ToolTipItem(); - PageTitle pageTitle2 = new PageTitle(); + 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.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 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(); - navBtnRefreshMatching = new DevExpress.XtraBars.Navigation.NavButton(); navBtnEdit = new DevExpress.XtraBars.Navigation.NavButton(); navBtn鎵嬫満椤甸潰 = new DevExpress.XtraBars.Navigation.NavButton(); navBtn瀵垮懡鎴愭湰璁$畻 = new DevExpress.XtraBars.Navigation.NavButton(); @@ -65,13 +64,15 @@ barDockControlLeft = new BarDockControl(); barDockControlRight = new BarDockControl(); imageCollection1 = new DevExpress.Utils.ImageCollection(components); - barButtonItem1 = new BarButtonItem(); - barButtonItem2 = new BarButtonItem(); - barButtonItem3 = new BarButtonItem(); + barButtonItemExcelEdit = new BarButtonItem(); + barButtonItemEdit = new BarButtonItem(); + barButtonItemOnePoint = new BarButtonItem(); barBtnEditProp = new BarButtonItem(); - barButtonItem5 = new BarButtonItem(); + barBtnRefreshMatching = new BarButtonItem(); + barButtonItemPicture = new BarButtonItem(); repositoryItemBreadCrumbEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemBreadCrumbEdit(); repositoryItemPageNumberEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemPageNumberEdit(); + repositoryItemTextEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemTextEdit(); tileNavPane1 = new DevExpress.XtraBars.Navigation.TileNavPane(); navButton1 = new DevExpress.XtraBars.Navigation.NavButton(); navButton2 = new DevExpress.XtraBars.Navigation.NavButton(); @@ -103,6 +104,7 @@ ((ISupportInitialize)imageCollection1).BeginInit(); ((ISupportInitialize)repositoryItemBreadCrumbEdit1).BeginInit(); ((ISupportInitialize)repositoryItemPageNumberEdit1).BeginInit(); + ((ISupportInitialize)repositoryItemTextEdit1).BeginInit(); ((ISupportInitialize)tileNavPane1).BeginInit(); panelMain.SuspendLayout(); ((ISupportInitialize)tileNavPane3).BeginInit(); @@ -116,7 +118,6 @@ tileNavPaneTop.AllowGlyphSkinning = true; tileNavPaneTop.ButtonPadding = new Padding(6); tileNavPaneTop.Buttons.Add(navBtnTitle); - tileNavPaneTop.Buttons.Add(navBtnRefreshMatching); tileNavPaneTop.Buttons.Add(navBtnEdit); tileNavPaneTop.Buttons.Add(navBtn鎵嬫満椤甸潰); tileNavPaneTop.Buttons.Add(navBtn瀵垮懡鎴愭湰璁$畻); @@ -161,13 +162,6 @@ navBtnTitle.Name = "navBtnTitle"; navBtnTitle.ElementClick += navBtnTitle_ElementClick; // - // navBtnRefreshMatching - // - navBtnRefreshMatching.Caption = "閲嶆柊鍖归厤"; - navBtnRefreshMatching.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navBtnRefreshMatching.ImageOptions.SvgImage"); - navBtnRefreshMatching.Name = "navBtnRefreshMatching"; - navBtnRefreshMatching.ElementClick += navBtnRefreshMatching_ElementClick; - // // navBtnEdit // navBtnEdit.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right; @@ -182,7 +176,6 @@ navBtn鎵嬫満椤甸潰.Caption = "鎵嬫満椤甸潰"; navBtn鎵嬫満椤甸潰.Name = "navBtn鎵嬫満椤甸潰"; navBtn鎵嬫満椤甸潰.Visible = false; - navBtn鎵嬫満椤甸潰.ElementClick += navBtn鎵嬫満椤甸潰_ElementClick; // // navBtn瀵垮懡鎴愭湰璁$畻 // @@ -190,7 +183,6 @@ navBtn瀵垮懡鎴愭湰璁$畻.Caption = "瀵垮懡鎴愭湰璁$畻"; navBtn瀵垮懡鎴愭湰璁$畻.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navBtn瀵垮懡鎴愭湰璁$畻.ImageOptions.SvgImage"); navBtn瀵垮懡鎴愭湰璁$畻.Name = "navBtn瀵垮懡鎴愭湰璁$畻"; - navBtn瀵垮懡鎴愭湰璁$畻.ElementClick += navBtn瀵垮懡鎴愭湰璁$畻_ElementClick; // // navBtn瀵煎嚭 // @@ -207,9 +199,9 @@ navBtnDock.Caption = "鍋滈潬"; navBtnDock.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navBtnDock.ImageOptions.SvgImage"); navBtnDock.Name = "navBtnDock"; - toolTipItem6.Text = "鍋滈潬"; - superToolTip6.Items.Add(toolTipItem6); - navBtnDock.SuperTip = superToolTip6; + toolTipItem1.Text = "鍋滈潬"; + superToolTip1.Items.Add(toolTipItem1); + navBtnDock.SuperTip = superToolTip1; navBtnDock.ElementClick += navBtnDock_ElementClick; // // navButton8 @@ -218,9 +210,9 @@ navButton8.Caption = null; navButton8.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navButton8.ImageOptions.SvgImage"); navButton8.Name = "navButton8"; - toolTipItem7.Text = "鏈�灏忓寲"; - superToolTip7.Items.Add(toolTipItem7); - navButton8.SuperTip = superToolTip7; + toolTipItem2.Text = "鏈�灏忓寲"; + superToolTip2.Items.Add(toolTipItem2); + navButton8.SuperTip = superToolTip2; navButton8.ElementClick += navBtnMin_ElementClick; // // navBtnbutton9 @@ -228,9 +220,9 @@ navBtnbutton9.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right; navBtnbutton9.Caption = null; navBtnbutton9.Name = "navBtnbutton9"; - toolTipItem8.Text = "鍚戜笅杩樺師"; - superToolTip8.Items.Add(toolTipItem8); - navBtnbutton9.SuperTip = superToolTip8; + toolTipItem3.Text = "鍚戜笅杩樺師"; + superToolTip3.Items.Add(toolTipItem3); + navBtnbutton9.SuperTip = superToolTip3; navBtnbutton9.ElementClick += navBtnSize_ElementClick; // // navBtnbutton10 @@ -239,9 +231,9 @@ navBtnbutton10.Caption = null; navBtnbutton10.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navBtnbutton10.ImageOptions.SvgImage"); navBtnbutton10.Name = "navBtnbutton10"; - toolTipItem9.Text = "鍏抽棴"; - superToolTip9.Items.Add(toolTipItem9); - navBtnbutton10.SuperTip = superToolTip9; + toolTipItem4.Text = "鍏抽棴"; + superToolTip4.Items.Add(toolTipItem4); + navBtnbutton10.SuperTip = superToolTip4; navBtnbutton10.ElementClick += navBtnClose_ElementClick; // // popupMenu1 @@ -255,28 +247,24 @@ bbi瀵煎嚭瀹夎鍥�.Caption = "瀵煎嚭瀹夎鍥�"; bbi瀵煎嚭瀹夎鍥�.Id = 0; bbi瀵煎嚭瀹夎鍥�.Name = "bbi瀵煎嚭瀹夎鍥�"; - bbi瀵煎嚭瀹夎鍥�.ItemClick += bbi瀵煎嚭瀹夎鍥綺ItemClick; // // bbi瀵煎嚭鎬ц兘鏇茬嚎 // bbi瀵煎嚭鎬ц兘鏇茬嚎.Caption = "瀵煎嚭鎬ц兘鏇茬嚎"; bbi瀵煎嚭鎬ц兘鏇茬嚎.Id = 2; bbi瀵煎嚭鎬ц兘鏇茬嚎.Name = "bbi瀵煎嚭鎬ц兘鏇茬嚎"; - bbi瀵煎嚭鎬ц兘鏇茬嚎.ItemClick += bbi瀵煎嚭鎬ц兘鏇茬嚎_ItemClick; // // bbi涓嬭浇BIM鏂囦欢 // bbi涓嬭浇BIM鏂囦欢.Caption = "BIM鏂囦欢"; bbi涓嬭浇BIM鏂囦欢.Id = 3; bbi涓嬭浇BIM鏂囦欢.Name = "bbi涓嬭浇BIM鏂囦欢"; - bbi涓嬭浇BIM鏂囦欢.ItemClick += bbi涓嬭浇BIM鏂囦欢_ItemClick; // // bbi瀵煎嚭灞炴�ц〃 // bbi瀵煎嚭灞炴�ц〃.Caption = "瀵煎嚭灞炴�ц〃"; bbi瀵煎嚭灞炴�ц〃.Id = 1; bbi瀵煎嚭灞炴�ц〃.Name = "bbi瀵煎嚭灞炴�ц〃"; - bbi瀵煎嚭灞炴�ц〃.ItemClick += bbi瀵煎嚭灞炴�ц〃_ItemClick; // // barManager1 // @@ -286,9 +274,9 @@ barManager1.DockControls.Add(barDockControlRight); barManager1.Form = this; barManager1.Images = imageCollection1; - barManager1.Items.AddRange(new BarItem[] { bbi瀵煎嚭瀹夎鍥�, bbi瀵煎嚭灞炴�ц〃, bbi瀵煎嚭鎬ц兘鏇茬嚎, bbi涓嬭浇BIM鏂囦欢, barButtonItem1, barButtonItem2, barButtonItem3, barBtnEditProp, barButtonItem5 }); - barManager1.MaxItemId = 20; - barManager1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemBreadCrumbEdit1, repositoryItemPageNumberEdit1 }); + barManager1.Items.AddRange(new BarItem[] { bbi瀵煎嚭瀹夎鍥�, bbi瀵煎嚭灞炴�ц〃, bbi瀵煎嚭鎬ц兘鏇茬嚎, bbi涓嬭浇BIM鏂囦欢, barButtonItemExcelEdit, barButtonItemEdit, barButtonItemOnePoint, barBtnEditProp, barBtnRefreshMatching, barButtonItemPicture }); + barManager1.MaxItemId = 24; + barManager1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemBreadCrumbEdit1, repositoryItemPageNumberEdit1, repositoryItemTextEdit1 }); // // barDockControlTop // @@ -332,37 +320,53 @@ imageCollection1.Images.SetKeyName(4, "涓插苟鑱�32White.png"); imageCollection1.Images.SetKeyName(5, "涓插苟鑱�32WhiteSolid.png"); // - // barButtonItem1 + // barButtonItemExcelEdit // - barButtonItem1.Caption = "琛ㄦ牸缂栬緫"; - barButtonItem1.Id = 10; - barButtonItem1.Name = "barButtonItem1"; - barButtonItem1.ItemClick += BarButtonItem1_ItemClick; + barButtonItemExcelEdit.Caption = "琛ㄦ牸缂栬緫"; + barButtonItemExcelEdit.Id = 10; + barButtonItemExcelEdit.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barButtonItemExcelEdit.ImageOptions.SvgImage"); + barButtonItemExcelEdit.Name = "barButtonItemExcelEdit"; + barButtonItemExcelEdit.ItemClick += BarButtonItem1_ItemClick; // - // barButtonItem2 + // barButtonItemEdit // - barButtonItem2.Caption = "鏇茬嚎缂栬緫"; - barButtonItem2.Id = 13; - barButtonItem2.Name = "barButtonItem2"; + barButtonItemEdit.Caption = "鏇茬嚎缂栬緫"; + barButtonItemEdit.Id = 13; + barButtonItemEdit.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barButtonItemEdit.ImageOptions.SvgImage"); + barButtonItemEdit.Name = "barButtonItemEdit"; + barButtonItemEdit.ItemClick += BarButtonItemEdit_ItemClick; // - // barButtonItem3 + // barButtonItemOnePoint // - barButtonItem3.Caption = "鍗曠偣缂栬緫"; - barButtonItem3.Id = 14; - barButtonItem3.Name = "barButtonItem3"; + barButtonItemOnePoint.Caption = "鍗曠偣缂栬緫"; + barButtonItemOnePoint.Id = 14; + barButtonItemOnePoint.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barButtonItemOnePoint.ImageOptions.SvgImage"); + barButtonItemOnePoint.Name = "barButtonItemOnePoint"; + barButtonItemOnePoint.ItemClick += BarButtonItemOnePoint_ItemClick; // // barBtnEditProp // barBtnEditProp.Caption = "娉靛瀷鍙峰睘鎬х紪杈�"; barBtnEditProp.Id = 15; + barBtnEditProp.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEditProp.ImageOptions.SvgImage"); barBtnEditProp.Name = "barBtnEditProp"; barBtnEditProp.ItemClick += BarBtnEditProp_ItemClick; // - // barButtonItem5 + // barBtnRefreshMatching // - barButtonItem5.Caption = "barButtonItem5"; - barButtonItem5.Id = 16; - barButtonItem5.Name = "barButtonItem5"; + barBtnRefreshMatching.Caption = "鍨嬪彿閲嶆柊鍖归厤"; + barBtnRefreshMatching.Id = 22; + barBtnRefreshMatching.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnRefreshMatching.ImageOptions.SvgImage"); + barBtnRefreshMatching.Name = "barBtnRefreshMatching"; + barBtnRefreshMatching.ItemClick += BarBtnRefreshMatching_ItemClick; + // + // barButtonItemPicture + // + barButtonItemPicture.Caption = "鍥剧墖缂栬緫"; + barButtonItemPicture.Id = 23; + barButtonItemPicture.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barButtonItemPicture.ImageOptions.SvgImage"); + barButtonItemPicture.Name = "barButtonItemPicture"; + barButtonItemPicture.ItemClick += BarButtonItemPicture_ItemClick; // // repositoryItemBreadCrumbEdit1 // @@ -375,6 +379,11 @@ repositoryItemPageNumberEdit1.AutoHeight = false; repositoryItemPageNumberEdit1.Mask.EditMask = "########;"; repositoryItemPageNumberEdit1.Name = "repositoryItemPageNumberEdit1"; + // + // repositoryItemTextEdit1 + // + repositoryItemTextEdit1.AutoHeight = false; + repositoryItemTextEdit1.Name = "repositoryItemTextEdit1"; // // tileNavPane1 // @@ -450,9 +459,9 @@ navButton6.AppearanceSelected.Options.UseForeColor = true; navButton6.Caption = null; navButton6.Name = "navButton6"; - toolTipItem10.Text = "鏈�灏忓寲"; - superToolTip10.Items.Add(toolTipItem10); - navButton6.SuperTip = superToolTip10; + toolTipItem5.Text = "鏈�灏忓寲"; + superToolTip5.Items.Add(toolTipItem5); + navButton6.SuperTip = superToolTip5; // // panelMain // @@ -469,12 +478,12 @@ pumpFullInfoCtrl1.Location = new Point(0, 0); pumpFullInfoCtrl1.Name = "pumpFullInfoCtrl1"; pumpFullInfoCtrl1.PageGuid = null; - pageTitle2.AllowClose = true; - pageTitle2.Caption = "姘存车淇℃伅"; - pageTitle2.HeaderImage = null; - pageTitle2.HeaderSvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("pageTitle2.HeaderSvgImage"); - pageTitle2.SvgImageSize = new Size(0, 0); - pumpFullInfoCtrl1.PageTitle = pageTitle2; + 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; // @@ -662,7 +671,7 @@ // // popupMenuEdit // - popupMenuEdit.LinksPersistInfo.AddRange(new LinkPersistInfo[] { new LinkPersistInfo(barButtonItem1, true), new LinkPersistInfo(barButtonItem2), new LinkPersistInfo(barButtonItem3), new LinkPersistInfo(barBtnEditProp, true) }); + popupMenuEdit.LinksPersistInfo.AddRange(new LinkPersistInfo[] { new LinkPersistInfo(barButtonItemExcelEdit, true), new LinkPersistInfo(barButtonItemEdit), new LinkPersistInfo(barButtonItemOnePoint), new LinkPersistInfo(barButtonItemPicture), new LinkPersistInfo(barBtnEditProp, true), new LinkPersistInfo(barBtnRefreshMatching) }); popupMenuEdit.Manager = barManager1; popupMenuEdit.Name = "popupMenuEdit"; // @@ -695,6 +704,7 @@ ((ISupportInitialize)imageCollection1).EndInit(); ((ISupportInitialize)repositoryItemBreadCrumbEdit1).EndInit(); ((ISupportInitialize)repositoryItemPageNumberEdit1).EndInit(); + ((ISupportInitialize)repositoryItemTextEdit1).EndInit(); ((ISupportInitialize)tileNavPane1).EndInit(); panelMain.ResumeLayout(false); ((ISupportInitialize)tileNavPane3).EndInit(); @@ -704,9 +714,6 @@ ResumeLayout(false); PerformLayout(); } - - - #endregion @@ -756,15 +763,16 @@ private DevExpress.XtraBars.Navigation.NavButton navButton8; private PumpFullInfoCtrl pumpFullInfoCtrl1; private DevExpress.XtraBars.Navigation.NavButton navBtnDock; - private DevExpress.XtraBars.Navigation.NavButton navBtnRefreshMatching; private DevExpress.XtraBars.Navigation.NavButton navBtnEdit; - private DevExpress.XtraBars.BarButtonItem barButtonItem1; + private DevExpress.XtraBars.BarButtonItem barButtonItemExcelEdit; private DevExpress.XtraBars.PopupMenu popupMenuEdit; - private DevExpress.XtraBars.BarButtonItem barButtonItem2; - private DevExpress.XtraBars.BarButtonItem barButtonItem3; + private DevExpress.XtraBars.BarButtonItem barButtonItemEdit; + private DevExpress.XtraBars.BarButtonItem barButtonItemOnePoint; private BarButtonItem barBtnEditProp; - private BarButtonItem barButtonItem5; private DevExpress.XtraEditors.Repository.RepositoryItemBreadCrumbEdit repositoryItemBreadCrumbEdit1; private DevExpress.XtraEditors.Repository.RepositoryItemPageNumberEdit repositoryItemPageNumberEdit1; + private DevExpress.XtraEditors.Repository.RepositoryItemTextEdit repositoryItemTextEdit1; + private BarButtonItem barBtnRefreshMatching; + private BarButtonItem barButtonItemPicture; } } \ No newline at end of file -- Gitblit v1.9.3