From 66e37d850e416d55f147aca37b1365f821f71f1f Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期四, 11 十二月 2025 23:23:08 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~kyy/LB_MesClient
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 53 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 41 insertions(+), 12 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 0658423..7ab4893 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -77,6 +77,8 @@
this.barLargeButtonItem3 = new DevExpress.XtraBars.BarLargeButtonItem();
this.barLargeButtonItem4 = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnBaoGao = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnBDLingLiao = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnWj = new DevExpress.XtraBars.BarLargeButtonItem();
this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
@@ -141,9 +143,11 @@
this.btnGx,
this.btnBaoGao,
this.btnPingZhi,
- this.btnFPingZhi});
+ this.btnFPingZhi,
+ this.btnBDLingLiao,
+ this.btnWj});
this.barManager1.MainMenu = this.bar2;
- this.barManager1.MaxItemId = 78;
+ this.barManager1.MaxItemId = 79;
//
// bar2
//
@@ -199,7 +203,9 @@
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem2),
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem3),
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem4),
- new DevExpress.XtraBars.LinkPersistInfo(this.btnBaoGao)});
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnBaoGao),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnBDLingLiao),
+ new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnWj, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph)});
this.bar2.OptionsBar.DrawDragBorder = false;
this.bar2.OptionsBar.MultiLine = true;
this.bar2.OptionsBar.UseWholeRow = true;
@@ -633,48 +639,69 @@
this.btnBaoGao.Name = "btnBaoGao";
this.btnBaoGao.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
+ // btnBDLingLiao
+ //
+ this.btnBDLingLiao.Caption = "澶囧崟棰嗘枡";
+ this.btnBDLingLiao.Id = 78;
+ this.btnBDLingLiao.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnBDLingLiao.ImageOptions.Image")));
+ this.btnBDLingLiao.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnBDLingLiao.ImageOptions.LargeImage")));
+ this.btnBDLingLiao.Name = "btnBDLingLiao";
+ this.btnBDLingLiao.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
+ // btnWj
+ //
+ this.btnWj.Caption = "瀹岀粨";
+ this.btnWj.Id = 79;
+ this.btnWj.Name = "btnWj";
+ this.btnWj.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
// barDockControlTop
//
this.barDockControlTop.CausesValidation = false;
this.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top;
this.barDockControlTop.Location = new System.Drawing.Point(0, 0);
this.barDockControlTop.Manager = this.barManager1;
- this.barDockControlTop.Size = new System.Drawing.Size(1543, 213);
+ this.barDockControlTop.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.barDockControlTop.Size = new System.Drawing.Size(1350, 171);
//
// barDockControlBottom
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 190);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 246);
this.barDockControlBottom.Manager = this.barManager1;
- this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
+ this.barDockControlBottom.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.barDockControlBottom.Size = new System.Drawing.Size(1350, 0);
//
// barDockControlLeft
//
this.barDockControlLeft.CausesValidation = false;
this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left;
- this.barDockControlLeft.Location = new System.Drawing.Point(0, 213);
+ this.barDockControlLeft.Location = new System.Drawing.Point(0, 171);
this.barDockControlLeft.Manager = this.barManager1;
- this.barDockControlLeft.Size = new System.Drawing.Size(0, 0);
+ this.barDockControlLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.barDockControlLeft.Size = new System.Drawing.Size(0, 75);
//
// barDockControlRight
//
this.barDockControlRight.CausesValidation = false;
this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right;
- this.barDockControlRight.Location = new System.Drawing.Point(1543, 213);
+ this.barDockControlRight.Location = new System.Drawing.Point(1350, 171);
this.barDockControlRight.Manager = this.barManager1;
- this.barDockControlRight.Size = new System.Drawing.Size(0, 0);
+ this.barDockControlRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.barDockControlRight.Size = new System.Drawing.Size(0, 75);
//
// UcToolBarMenu
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.barDockControlLeft);
this.Controls.Add(this.barDockControlRight);
this.Controls.Add(this.barDockControlBottom);
this.Controls.Add(this.barDockControlTop);
+ this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "UcToolBarMenu";
- this.Size = new System.Drawing.Size(1543, 190);
+ this.Size = new System.Drawing.Size(1350, 246);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -732,5 +759,7 @@
private DevExpress.XtraBars.BarLargeButtonItem btnBaoGao;
private DevExpress.XtraBars.BarLargeButtonItem btnPingZhi;
private DevExpress.XtraBars.BarLargeButtonItem btnFPingZhi;
+ private DevExpress.XtraBars.BarLargeButtonItem btnBDLingLiao;
+ private DevExpress.XtraBars.BarLargeButtonItem btnWj;
}
}
--
Gitblit v1.9.3