From 9eb94e9eec2e2e164698e34d0481d66093c8655b Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 15 一月 2025 17:40:55 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
Desktop/HStation.Desktop.Xhs.Core/MainForm.Designer.cs | 97 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 88 insertions(+), 9 deletions(-)
diff --git a/Desktop/HStation.Desktop.Xhs.Core/MainForm.Designer.cs b/Desktop/HStation.Desktop.Xhs.Core/MainForm.Designer.cs
index 7a81199..b880637 100644
--- a/Desktop/HStation.Desktop.Xhs.Core/MainForm.Designer.cs
+++ b/Desktop/HStation.Desktop.Xhs.Core/MainForm.Designer.cs
@@ -34,16 +34,20 @@
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();
tileNavPane = new DevExpress.XtraBars.Navigation.TileNavPane();
nbTitle = new DevExpress.XtraBars.Navigation.NavButton();
navBtnPrevious = new DevExpress.XtraBars.Navigation.NavButton();
navBtnCurrent = new DevExpress.XtraBars.Navigation.NavButton();
navBtnNext = new DevExpress.XtraBars.Navigation.NavButton();
+ navBtnPattern = new DevExpress.XtraBars.Navigation.NavButton();
nbProjectMgr = new DevExpress.XtraBars.Navigation.NavButton();
nbModelMgr = new DevExpress.XtraBars.Navigation.NavButton();
nbProductManage = new DevExpress.XtraBars.Navigation.NavButton();
navButton2 = new DevExpress.XtraBars.Navigation.NavButton();
nbSystemConfig = new DevExpress.XtraBars.Navigation.NavButton();
+ nbAuthConfig = new DevExpress.XtraBars.Navigation.NavButton();
nbMin = new DevExpress.XtraBars.Navigation.NavButton();
nbNormal = new DevExpress.XtraBars.Navigation.NavButton();
nbClose = new DevExpress.XtraBars.Navigation.NavButton();
@@ -62,6 +66,8 @@
flyoutPanel1 = new DevExpress.Utils.FlyoutPanel();
flyoutPanelControl1 = new DevExpress.Utils.FlyoutPanelControl();
svgImg32Model = new DevExpress.Utils.SvgImageCollection(components);
+ flyoutPanel2 = new DevExpress.Utils.FlyoutPanel();
+ flyoutPanelControl2 = new DevExpress.Utils.FlyoutPanelControl();
((System.ComponentModel.ISupportInitialize)tileNavPane).BeginInit();
((System.ComponentModel.ISupportInitialize)documentManager1).BeginInit();
((System.ComponentModel.ISupportInitialize)barManager1).BeginInit();
@@ -71,6 +77,9 @@
flyoutPanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)flyoutPanelControl1).BeginInit();
((System.ComponentModel.ISupportInitialize)svgImg32Model).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)flyoutPanel2).BeginInit();
+ flyoutPanel2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)flyoutPanelControl2).BeginInit();
SuspendLayout();
//
// tileNavPane
@@ -80,11 +89,13 @@
tileNavPane.Buttons.Add(navBtnPrevious);
tileNavPane.Buttons.Add(navBtnCurrent);
tileNavPane.Buttons.Add(navBtnNext);
+ tileNavPane.Buttons.Add(navBtnPattern);
tileNavPane.Buttons.Add(nbProjectMgr);
tileNavPane.Buttons.Add(nbModelMgr);
tileNavPane.Buttons.Add(nbProductManage);
tileNavPane.Buttons.Add(navButton2);
tileNavPane.Buttons.Add(nbSystemConfig);
+ tileNavPane.Buttons.Add(nbAuthConfig);
tileNavPane.Buttons.Add(nbMin);
tileNavPane.Buttons.Add(nbNormal);
tileNavPane.Buttons.Add(nbClose);
@@ -99,7 +110,7 @@
tileNavPane.Dock = DockStyle.Top;
tileNavPane.Location = new Point(0, 0);
tileNavPane.Name = "tileNavPane";
- tileNavPane.Size = new Size(1189, 53);
+ tileNavPane.Size = new Size(1461, 53);
tileNavPane.TabIndex = 0;
tileNavPane.Text = "tileNavPane1";
tileNavPane.ElementClick += tileNavPane_ElementClick;
@@ -160,6 +171,17 @@
navBtnNext.Visible = false;
navBtnNext.ElementClick += navBtnNext_ElementClick;
//
+ // navBtnPattern
+ //
+ navBtnPattern.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Left;
+ navBtnPattern.Caption = null;
+ navBtnPattern.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navBtnPattern.ImageOptions.SvgImage");
+ navBtnPattern.Name = "navBtnPattern";
+ toolTipItem3.Text = "妯″紡鍒囨崲";
+ superToolTip3.Items.Add(toolTipItem3);
+ navBtnPattern.SuperTip = superToolTip3;
+ navBtnPattern.ElementClick += navBtnPattern_ElementClick;
+ //
// nbProjectMgr
//
nbProjectMgr.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right;
@@ -167,6 +189,7 @@
nbProjectMgr.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("nbProjectMgr.ImageOptions.SvgImage");
nbProjectMgr.ImageOptions.SvgImageSize = new Size(24, 24);
nbProjectMgr.Name = "nbProjectMgr";
+ nbProjectMgr.Tag = "project_total_mgr";
nbProjectMgr.ElementClick += nbProjectMgr_ElementClick;
//
// nbModelMgr
@@ -176,6 +199,7 @@
nbModelMgr.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("nbModelMgr.ImageOptions.SvgImage");
nbModelMgr.ImageOptions.SvgImageSize = new Size(24, 24);
nbModelMgr.Name = "nbModelMgr";
+ nbModelMgr.Tag = "model_total_mgr";
nbModelMgr.ElementClick += nbModelMgr_ElementClick;
//
// nbProductManage
@@ -184,7 +208,8 @@
nbProductManage.Caption = "浜у搧绠＄悊";
nbProductManage.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("nbProductManage.ImageOptions.SvgImage");
nbProductManage.Name = "nbProductManage";
- nbProductManage.ElementClick += nbProductManage_ElementClick;
+ nbProductManage.Tag = "assets_total_mgr";
+ nbProductManage.ElementClick += nbAssetsMgr_ElementClick;
//
// navButton2
//
@@ -199,7 +224,17 @@
nbSystemConfig.Caption = "绯荤粺閰嶇疆";
nbSystemConfig.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("nbSystemConfig.ImageOptions.SvgImage");
nbSystemConfig.Name = "nbSystemConfig";
+ nbSystemConfig.Tag = "system_total_mgr";
nbSystemConfig.ElementClick += nbSystemConfig_ElementClick;
+ //
+ // nbAuthConfig
+ //
+ nbAuthConfig.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right;
+ nbAuthConfig.Caption = "鏉冮檺閰嶇疆";
+ nbAuthConfig.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("nbAuthConfig.ImageOptions.SvgImage");
+ nbAuthConfig.Name = "nbAuthConfig";
+ nbAuthConfig.Tag = "auth_total_mgr";
+ nbAuthConfig.ElementClick += nbAuthConfig_ElementClick;
//
// nbMin
//
@@ -283,15 +318,15 @@
barDockControlTop.Dock = DockStyle.Top;
barDockControlTop.Location = new Point(0, 0);
barDockControlTop.Manager = barManager1;
- barDockControlTop.Size = new Size(1189, 0);
+ barDockControlTop.Size = new Size(1461, 0);
//
// barDockControlBottom
//
barDockControlBottom.CausesValidation = false;
barDockControlBottom.Dock = DockStyle.Bottom;
- barDockControlBottom.Location = new Point(0, 669);
+ barDockControlBottom.Location = new Point(0, 690);
barDockControlBottom.Manager = barManager1;
- barDockControlBottom.Size = new Size(1189, 30);
+ barDockControlBottom.Size = new Size(1461, 30);
//
// barDockControlLeft
//
@@ -299,15 +334,15 @@
barDockControlLeft.Dock = DockStyle.Left;
barDockControlLeft.Location = new Point(0, 0);
barDockControlLeft.Manager = barManager1;
- barDockControlLeft.Size = new Size(0, 669);
+ barDockControlLeft.Size = new Size(0, 690);
//
// barDockControlRight
//
barDockControlRight.CausesValidation = false;
barDockControlRight.Dock = DockStyle.Right;
- barDockControlRight.Location = new Point(1189, 0);
+ barDockControlRight.Location = new Point(1461, 0);
barDockControlRight.Manager = barManager1;
- barDockControlRight.Size = new Size(0, 669);
+ barDockControlRight.Size = new Size(0, 690);
//
// dockManager1
//
@@ -329,6 +364,7 @@
tabbedView1.DocumentSelected += tabbedView1_DocumentSelected;
tabbedView1.DocumentAdded += tabbedView1_DocumentAdded;
tabbedView1.DocumentActivated += tabbedView1_DocumentActivated;
+ tabbedView1.DocumentClosing += tabbedView1_DocumentClosing;
tabbedView1.DocumentClosed += tabbedView1_DocumentClosed;
//
// flyoutPanel1
@@ -366,12 +402,48 @@
svgImg32Model.Add("showallvalue", "image://svgimages/dashboards/showallvalue.svg");
svgImg32Model.Add("gaugestylelinearhorizontal", "image://svgimages/dashboards/gaugestylelinearhorizontal.svg");
svgImg32Model.Add("createlinechartnomarkers", "image://svgimages/spreadsheet/createlinechartnomarkers.svg");
+ svgImg32Model.Add("Threelink", (DevExpress.Utils.Svg.SvgImage)resources.GetObject("svgImg32Model.Threelink"));
+ svgImg32Model.Add("Line", (DevExpress.Utils.Svg.SvgImage)resources.GetObject("svgImg32Model.Line"));
+ svgImg32Model.Add("compressor", (DevExpress.Utils.Svg.SvgImage)resources.GetObject("svgImg32Model.compressor"));
+ svgImg32Model.Add("Exchanger", (DevExpress.Utils.Svg.SvgImage)resources.GetObject("svgImg32Model.Exchanger"));
+ svgImg32Model.Add("Fourlink", (DevExpress.Utils.Svg.SvgImage)resources.GetObject("svgImg32Model.Fourlink"));
+ svgImg32Model.Add("Elbow", (DevExpress.Utils.Svg.SvgImage)resources.GetObject("svgImg32Model.Elbow"));
+ svgImg32Model.Add("Manufacturer", (DevExpress.Utils.Svg.SvgImage)resources.GetObject("svgImg32Model.Manufacturer"));
+ svgImg32Model.Add("Valve", (DevExpress.Utils.Svg.SvgImage)resources.GetObject("svgImg32Model.Valve"));
+ svgImg32Model.Add("Pump", (DevExpress.Utils.Svg.SvgImage)resources.GetObject("svgImg32Model.Pump"));
+ svgImg32Model.Add("Nozzle", (DevExpress.Utils.Svg.SvgImage)resources.GetObject("svgImg32Model.Nozzle"));
+ svgImg32Model.Add("namemanager", "image://svgimages/spreadsheet/namemanager.svg");
+ svgImg32Model.Add("actions_user", "image://svgimages/icon builder/actions_user.svg");
+ svgImg32Model.Add("bo_department", "image://svgimages/business objects/bo_department.svg");
+ svgImg32Model.Add("menu", "image://svgimages/pdf viewer/menu.svg");
+ svgImg32Model.Add("relations", "image://svgimages/dashboards/relations.svg");
+ svgImg32Model.Add("text", "image://svgimages/spreadsheet/text.svg");
+ //
+ // flyoutPanel2
+ //
+ flyoutPanel2.AnimationRate = 100;
+ flyoutPanel2.Controls.Add(flyoutPanelControl2);
+ flyoutPanel2.Location = new Point(230, 381);
+ flyoutPanel2.Name = "flyoutPanel2";
+ flyoutPanel2.OptionsBeakPanel.BeakLocation = DevExpress.Utils.BeakPanelBeakLocation.Left;
+ flyoutPanel2.Size = new Size(150, 150);
+ flyoutPanel2.TabIndex = 10;
+ //
+ // flyoutPanelControl2
+ //
+ flyoutPanelControl2.Dock = DockStyle.Fill;
+ flyoutPanelControl2.FlyoutPanel = flyoutPanel2;
+ flyoutPanelControl2.Location = new Point(0, 0);
+ flyoutPanelControl2.Name = "flyoutPanelControl2";
+ flyoutPanelControl2.Size = new Size(150, 150);
+ flyoutPanelControl2.TabIndex = 0;
//
// MainForm
//
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(1189, 699);
+ ClientSize = new Size(1461, 720);
+ Controls.Add(flyoutPanel2);
Controls.Add(flyoutPanel1);
Controls.Add(tileNavPane);
Controls.Add(barDockControlLeft);
@@ -396,6 +468,9 @@
flyoutPanel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)flyoutPanelControl1).EndInit();
((System.ComponentModel.ISupportInitialize)svgImg32Model).EndInit();
+ ((System.ComponentModel.ISupportInitialize)flyoutPanel2).EndInit();
+ flyoutPanel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)flyoutPanelControl2).EndInit();
ResumeLayout(false);
PerformLayout();
}
@@ -430,5 +505,9 @@
private DevExpress.XtraBars.Navigation.NavButton navBtnCurrent;
private DevExpress.XtraBars.Navigation.NavButton navBtnPrevious;
private DevExpress.XtraBars.Navigation.NavButton navBtnNext;
+ private DevExpress.XtraBars.Navigation.NavButton nbAuthConfig;
+ private DevExpress.XtraBars.Navigation.NavButton navBtnPattern;
+ private DevExpress.Utils.FlyoutPanel flyoutPanel2;
+ private DevExpress.Utils.FlyoutPanelControl flyoutPanelControl2;
}
}
--
Gitblit v1.9.3