From acb4d0f2ee702dadf3656126fa7c4feae03c0357 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 11 十一月 2024 19:40:57 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 69 +++++++++++++++++-----------------
1 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 254e66b..a7a58ac 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -31,7 +31,6 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UcToolBarMenu));
- this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
this.barManager1 = new DevExpress.XtraBars.BarManager(this.components);
this.bar2 = new DevExpress.XtraBars.Bar();
this.btnAdd = new DevExpress.XtraBars.BarLargeButtonItem();
@@ -42,7 +41,6 @@
this.btnDel = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnChk = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnFchk = new DevExpress.XtraBars.BarLargeButtonItem();
- this.btnPrint = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnHb = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnKG = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnQuery = new DevExpress.XtraBars.BarLargeButtonItem();
@@ -56,22 +54,16 @@
this.btnPiZhun = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnZhiLiangChk = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnZhiLiangFchk = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnBoHui = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnCaiGouChk = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnCaiGouFchk = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnLog = 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();
((System.ComponentModel.ISupportInitialize)(this.barManager1)).BeginInit();
this.SuspendLayout();
- //
- // barDockControlLeft
- //
- this.barDockControlLeft.CausesValidation = false;
- this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left;
- this.barDockControlLeft.Location = new System.Drawing.Point(0, 145);
- this.barDockControlLeft.Manager = this.barManager1;
- this.barDockControlLeft.Size = new System.Drawing.Size(0, 0);
//
// barManager1
//
@@ -92,7 +84,6 @@
this.btnOut,
this.btnChk,
this.btnFchk,
- this.btnPrint,
this.btnHb,
this.btnIn,
this.btnLog,
@@ -107,9 +98,10 @@
this.btnZhiLiangChk,
this.btnZhiLiangFchk,
this.btnCaiGouChk,
- this.btnCaiGouFchk});
+ this.btnCaiGouFchk,
+ this.btnBoHui});
this.barManager1.MainMenu = this.bar2;
- this.barManager1.MaxItemId = 37;
+ this.barManager1.MaxItemId = 38;
//
// bar2
//
@@ -126,7 +118,6 @@
new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnDel, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
new DevExpress.XtraBars.LinkPersistInfo(this.btnChk),
new DevExpress.XtraBars.LinkPersistInfo(this.btnFchk),
- new DevExpress.XtraBars.LinkPersistInfo(this.btnPrint),
new DevExpress.XtraBars.LinkPersistInfo(this.btnHb),
new DevExpress.XtraBars.LinkPersistInfo(this.btnKG),
new DevExpress.XtraBars.LinkPersistInfo(this.btnQuery),
@@ -140,6 +131,7 @@
new DevExpress.XtraBars.LinkPersistInfo(this.btnPiZhun),
new DevExpress.XtraBars.LinkPersistInfo(this.btnZhiLiangChk),
new DevExpress.XtraBars.LinkPersistInfo(this.btnZhiLiangFchk),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnBoHui),
new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiGouChk),
new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiGouFchk),
new DevExpress.XtraBars.LinkPersistInfo(this.btnLog)});
@@ -237,17 +229,6 @@
this.btnFchk.Name = "btnFchk";
this.btnFchk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
- // btnPrint
- //
- this.btnPrint.Caption = "鎵撳嵃";
- this.btnPrint.Id = 15;
- this.btnPrint.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnPrint.ImageOptions.Image")));
- this.btnPrint.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnPrint.ImageOptions.LargeImage")));
- this.btnPrint.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
- this.btnPrint.ItemAppearance.Normal.Options.UseFont = true;
- this.btnPrint.Name = "btnPrint";
- this.btnPrint.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
- //
// btnHb
//
this.btnHb.Caption = "鍚堝苟";
@@ -311,16 +292,17 @@
//
// btnReport
//
- this.btnReport.Caption = "鎶ヨ〃";
+ this.btnReport.Caption = "鎵撳嵃";
this.btnReport.Id = 22;
- this.btnReport.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnReport.ImageOptions.Image")));
+ this.btnReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.printlayoutview_16x16;
+ this.btnReport.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.printlayoutview_32x32;
this.btnReport.Name = "btnReport";
this.btnReport.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
this.btnReport.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
// btnDesign
//
- this.btnDesign.Caption = "璁捐鎶ヨ〃";
+ this.btnDesign.Caption = "璁捐鎵撳嵃";
this.btnDesign.Id = 26;
this.btnDesign.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnDesign.ImageOptions.Image")));
this.btnDesign.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnDesign.ImageOptions.LargeImage")));
@@ -372,6 +354,15 @@
this.btnZhiLiangFchk.Name = "btnZhiLiangFchk";
this.btnZhiLiangFchk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
+ // btnBoHui
+ //
+ this.btnBoHui.Caption = "椹冲洖閲嶆";
+ this.btnBoHui.Id = 37;
+ this.btnBoHui.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.updatetableofcontents_16x16;
+ this.btnBoHui.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.updatetableofcontents_32x32;
+ this.btnBoHui.Name = "btnBoHui";
+ this.btnBoHui.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
// btnCaiGouChk
//
this.btnCaiGouChk.Caption = "閲囪喘瀹℃牳";
@@ -411,9 +402,17 @@
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 69);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 70);
this.barDockControlBottom.Manager = this.barManager1;
this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
+ //
+ // barDockControlLeft
+ //
+ this.barDockControlLeft.CausesValidation = false;
+ this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left;
+ this.barDockControlLeft.Location = new System.Drawing.Point(0, 145);
+ this.barDockControlLeft.Manager = this.barManager1;
+ this.barDockControlLeft.Size = new System.Drawing.Size(0, 0);
//
// barDockControlRight
//
@@ -432,7 +431,7 @@
this.Controls.Add(this.barDockControlBottom);
this.Controls.Add(this.barDockControlTop);
this.Name = "UcToolBarMenu";
- this.Size = new System.Drawing.Size(1543, 69);
+ this.Size = new System.Drawing.Size(1543, 70);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -440,7 +439,6 @@
}
#endregion
- private DevExpress.XtraBars.BarDockControl barDockControlLeft;
private DevExpress.XtraBars.BarManager barManager1;
private DevExpress.XtraBars.Bar bar2;
private DevExpress.XtraBars.BarLargeButtonItem btnAdd;
@@ -452,10 +450,6 @@
private DevExpress.XtraBars.BarLargeButtonItem btnOut;
private DevExpress.XtraBars.BarLargeButtonItem btnChk;
private DevExpress.XtraBars.BarLargeButtonItem btnFchk;
- private DevExpress.XtraBars.BarDockControl barDockControlTop;
- private DevExpress.XtraBars.BarDockControl barDockControlBottom;
- private DevExpress.XtraBars.BarDockControl barDockControlRight;
- private DevExpress.XtraBars.BarLargeButtonItem btnPrint;
private DevExpress.XtraBars.BarLargeButtonItem btnHb;
private DevExpress.XtraBars.BarLargeButtonItem btnIn;
private DevExpress.XtraBars.BarLargeButtonItem btnLog;
@@ -471,5 +465,10 @@
private DevExpress.XtraBars.BarLargeButtonItem btnZhiLiangFchk;
private DevExpress.XtraBars.BarLargeButtonItem btnCaiGouChk;
private DevExpress.XtraBars.BarLargeButtonItem btnCaiGouFchk;
+ private DevExpress.XtraBars.BarLargeButtonItem btnBoHui;
+ private DevExpress.XtraBars.BarDockControl barDockControlTop;
+ private DevExpress.XtraBars.BarDockControl barDockControlBottom;
+ private DevExpress.XtraBars.BarDockControl barDockControlLeft;
+ private DevExpress.XtraBars.BarDockControl barDockControlRight;
}
}
--
Gitblit v1.9.3