From 9010fdfa1f7f6fe29c76111ef95d6383c74ea313 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期一, 22 九月 2025 11:09:10 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_MesClient
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 49 +++++++++++++++++++++++++++++++------------------
1 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index ce62208..0c3316b 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -40,8 +40,8 @@
this.btnLoad = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnDel = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnChk = new DevExpress.XtraBars.BarLargeButtonItem();
- this.btnFchk = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnHb = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnFchk = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnQuery = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnIn = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnOut = new DevExpress.XtraBars.BarLargeButtonItem();
@@ -71,6 +71,7 @@
this.barLargeButtonItem3 = new DevExpress.XtraBars.BarLargeButtonItem();
this.barLargeButtonItem4 = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnChbg = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnBaoGao = new DevExpress.XtraBars.BarLargeButtonItem();
this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
@@ -132,9 +133,10 @@
this.btnFPiZhun,
this.barButtonItem1,
this.barLargeButtonItem5,
- this.btnChbg});
+ this.btnChbg,
+ this.btnBaoGao});
this.barManager1.MainMenu = this.bar2;
- this.barManager1.MaxItemId = 70;
+ this.barManager1.MaxItemId = 71;
//
// bar2
//
@@ -184,7 +186,8 @@
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem2),
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem3),
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem4),
- new DevExpress.XtraBars.LinkPersistInfo(this.btnChbg)});
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnChbg),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnBaoGao)});
this.bar2.OptionsBar.AllowQuickCustomization = false;
this.bar2.OptionsBar.DrawBorder = false;
this.bar2.OptionsBar.DrawDragBorder = false;
@@ -263,16 +266,6 @@
this.btnChk.Name = "btnChk";
this.btnChk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
- // btnFchk
- //
- this.btnFchk.Caption = "鍙嶅鏍�";
- this.btnFchk.Id = 14;
- this.btnFchk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.forcetesting_16x16;
- this.btnFchk.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.forcetesting_32x32;
- this.btnFchk.ItemAppearance.Normal.Options.UseFont = true;
- this.btnFchk.Name = "btnFchk";
- this.btnFchk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
- //
// btnHb
//
this.btnHb.Caption = "鍚堝苟瀹℃牳";
@@ -282,6 +275,16 @@
this.btnHb.ItemAppearance.Normal.Options.UseFont = true;
this.btnHb.Name = "btnHb";
this.btnHb.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
+ // btnFchk
+ //
+ this.btnFchk.Caption = "鍙嶅鏍�";
+ this.btnFchk.Id = 14;
+ this.btnFchk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.forcetesting_16x16;
+ this.btnFchk.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.forcetesting_32x32;
+ this.btnFchk.ItemAppearance.Normal.Options.UseFont = true;
+ this.btnFchk.Name = "btnFchk";
+ this.btnFchk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
// btnQuery
//
@@ -565,6 +568,15 @@
this.btnChbg.Name = "btnChbg";
this.btnChbg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
+ // btnBaoGao
+ //
+ this.btnBaoGao.Caption = "鐢熶骇鎶ュ憡";
+ this.btnBaoGao.Id = 70;
+ this.btnBaoGao.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnBaoGao.ImageOptions.Image")));
+ this.btnBaoGao.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnBaoGao.ImageOptions.LargeImage")));
+ this.btnBaoGao.Name = "btnBaoGao";
+ this.btnBaoGao.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
// barDockControlTop
//
this.barDockControlTop.CausesValidation = false;
@@ -578,7 +590,7 @@
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 114);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 306);
this.barDockControlBottom.Manager = this.barManager1;
this.barDockControlBottom.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.barDockControlBottom.Size = new System.Drawing.Size(1350, 0);
@@ -590,7 +602,7 @@
this.barDockControlLeft.Location = new System.Drawing.Point(0, 114);
this.barDockControlLeft.Manager = this.barManager1;
this.barDockControlLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.barDockControlLeft.Size = new System.Drawing.Size(0, 0);
+ this.barDockControlLeft.Size = new System.Drawing.Size(0, 192);
//
// barDockControlRight
//
@@ -599,7 +611,7 @@
this.barDockControlRight.Location = new System.Drawing.Point(1350, 114);
this.barDockControlRight.Manager = this.barManager1;
this.barDockControlRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.barDockControlRight.Size = new System.Drawing.Size(0, 0);
+ this.barDockControlRight.Size = new System.Drawing.Size(0, 192);
//
// barButtonItem1
//
@@ -627,7 +639,7 @@
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(1350, 114);
+ this.Size = new System.Drawing.Size(1350, 306);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -681,5 +693,6 @@
private DevExpress.XtraBars.BarButtonItem barButtonItem1;
private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem5;
private DevExpress.XtraBars.BarLargeButtonItem btnChbg;
+ private DevExpress.XtraBars.BarLargeButtonItem btnBaoGao;
}
}
--
Gitblit v1.9.3