From 8366fcbfed5c66fa1fab4f6dba964a3451c24091 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 12 九月 2025 16:26:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 35 ++++-------------------------------
1 files changed, 4 insertions(+), 31 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 2f0c056..2a3bea3 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -63,8 +63,6 @@
this.btnShouHouFchk = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnCaiWuChk = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnCaiWuFchk = new DevExpress.XtraBars.BarLargeButtonItem();
- this.btnPingZhi = new DevExpress.XtraBars.BarLargeButtonItem();
- this.btnFPingZhi = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnAll = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnGongZi = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnLianBan = new DevExpress.XtraBars.BarLargeButtonItem();
@@ -139,11 +137,9 @@
this.btnGongZi,
this.btnLianBan,
this.btnGx,
- this.btnBaoGao,
- this.btnPingZhi,
- this.btnFPingZhi});
+ this.btnBaoGao});
this.barManager1.MainMenu = this.bar2;
- this.barManager1.MaxItemId = 78;
+ this.barManager1.MaxItemId = 76;
//
// bar2
//
@@ -186,8 +182,6 @@
new DevExpress.XtraBars.LinkPersistInfo(this.btnShouHouFchk),
new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiWuChk),
new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiWuFchk),
- new DevExpress.XtraBars.LinkPersistInfo(this.btnPingZhi),
- new DevExpress.XtraBars.LinkPersistInfo(this.btnFPingZhi),
new DevExpress.XtraBars.LinkPersistInfo(this.btnAll),
new DevExpress.XtraBars.LinkPersistInfo(this.btnGongZi),
new DevExpress.XtraBars.LinkPersistInfo(this.btnLianBan),
@@ -501,25 +495,6 @@
this.btnCaiWuFchk.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
this.btnCaiWuFchk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
- // btnPingZhi
- //
- this.btnPingZhi.Caption = "鍝佽川瀹℃牳";
- this.btnPingZhi.Id = 76;
- this.btnPingZhi.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnPingZhi.ImageOptions.Image")));
- this.btnPingZhi.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnPingZhi.ImageOptions.LargeImage")));
- this.btnPingZhi.Name = "btnPingZhi";
- this.btnPingZhi.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
- this.btnPingZhi.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
- //
- // btnFPingZhi
- //
- this.btnFPingZhi.Caption = "鍝佽川鍙嶅鏍�";
- this.btnFPingZhi.Id = 77;
- this.btnFPingZhi.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnFPingZhi.ImageOptions.Image")));
- this.btnFPingZhi.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnFPingZhi.ImageOptions.LargeImage")));
- this.btnFPingZhi.Name = "btnFPingZhi";
- this.btnFPingZhi.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
- //
// btnAll
//
this.btnAll.Caption = "鎵归噺璁剧疆";
@@ -645,7 +620,7 @@
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 70);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 72);
this.barDockControlBottom.Manager = this.barManager1;
this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
//
@@ -674,7 +649,7 @@
this.Controls.Add(this.barDockControlBottom);
this.Controls.Add(this.barDockControlTop);
this.Name = "UcToolBarMenu";
- this.Size = new System.Drawing.Size(1543, 70);
+ this.Size = new System.Drawing.Size(1543, 72);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -730,7 +705,5 @@
private DevExpress.XtraBars.BarLargeButtonItem btnLianBan;
private DevExpress.XtraBars.BarLargeButtonItem btnGx;
private DevExpress.XtraBars.BarLargeButtonItem btnBaoGao;
- private DevExpress.XtraBars.BarLargeButtonItem btnPingZhi;
- private DevExpress.XtraBars.BarLargeButtonItem btnFPingZhi;
}
}
--
Gitblit v1.9.3