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 | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 47a43a1..0c3316b 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -71,13 +71,13 @@
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();
this.barDockControlRight = new DevExpress.XtraBars.BarDockControl();
this.barButtonItem1 = new DevExpress.XtraBars.BarButtonItem();
this.barLargeButtonItem5 = new DevExpress.XtraBars.BarLargeButtonItem();
- this.btnBaoGao = new DevExpress.XtraBars.BarLargeButtonItem();
((System.ComponentModel.ISupportInitialize)(this.barManager1)).BeginInit();
this.SuspendLayout();
//
@@ -568,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;
@@ -581,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);
@@ -593,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
//
@@ -602,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
//
@@ -620,14 +629,6 @@
this.barLargeButtonItem5.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem5.ImageOptions.LargeImage")));
this.barLargeButtonItem5.Name = "barLargeButtonItem5";
//
- // btnBaoGao
- //
- this.btnBaoGao.Caption = "鐢熶骇鎶ュ憡";
- this.btnBaoGao.Id = 70;
- this.btnBaoGao.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem6.ImageOptions.Image")));
- this.btnBaoGao.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem6.ImageOptions.LargeImage")));
- this.btnBaoGao.Name = "btnBaoGao";
- //
// UcToolBarMenu
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -638,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();
--
Gitblit v1.9.3