From b7b95d84fe541040e5b86168265ecf8f87aaa54a Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 26 三月 2025 10:48:38 +0800
Subject: [PATCH] 生产退料
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 95 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 79 insertions(+), 16 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 202cd40..eb4cddb 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -62,8 +62,9 @@
this.btnZhongTai = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnJieAn = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnFjieAn = new DevExpress.XtraBars.BarLargeButtonItem();
- this.btnHelp = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnOa = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnLayout = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnHelp = new DevExpress.XtraBars.BarLargeButtonItem();
this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
@@ -73,6 +74,8 @@
//
// barManager1
//
+ this.barManager1.AllowCustomization = false;
+ this.barManager1.AllowMoveBarOnToolbar = false;
this.barManager1.AllowShowToolbarsPopup = false;
this.barManager1.Bars.AddRange(new DevExpress.XtraBars.Bar[] {
this.bar2});
@@ -112,12 +115,21 @@
this.btnZhongTai,
this.btnWg,
this.btnHelp,
- this.btnLayout});
+ this.btnLayout,
+ this.btnOa});
this.barManager1.MainMenu = this.bar2;
- this.barManager1.MaxItemId = 52;
+ this.barManager1.MaxItemId = 55;
//
// bar2
//
+ this.bar2.BarAppearance.Disabled.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.bar2.BarAppearance.Disabled.Options.UseFont = true;
+ this.bar2.BarAppearance.Hovered.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.bar2.BarAppearance.Hovered.Options.UseFont = true;
+ this.bar2.BarAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.bar2.BarAppearance.Normal.Options.UseFont = true;
+ this.bar2.BarAppearance.Pressed.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.bar2.BarAppearance.Pressed.Options.UseFont = true;
this.bar2.BarName = "Main menu";
this.bar2.DockCol = 0;
this.bar2.DockRow = 0;
@@ -152,9 +164,12 @@
new DevExpress.XtraBars.LinkPersistInfo(this.btnZhongTai),
new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnJieAn, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnFjieAn, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
- new DevExpress.XtraBars.LinkPersistInfo(this.btnHelp),
- new DevExpress.XtraBars.LinkPersistInfo(this.btnLayout)});
+ new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnOa, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnLayout),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnHelp)});
this.bar2.OptionsBar.AllowQuickCustomization = false;
+ this.bar2.OptionsBar.DrawBorder = false;
+ this.bar2.OptionsBar.DrawDragBorder = false;
this.bar2.OptionsBar.MultiLine = true;
this.bar2.OptionsBar.UseWholeRow = true;
this.bar2.Text = "Main menu";
@@ -266,6 +281,8 @@
this.btnQuery.Id = 23;
this.btnQuery.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.viewmergeddata_16x16;
this.btnQuery.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.viewmergeddata_32x32;
+ this.btnQuery.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnQuery.ItemAppearance.Normal.Options.UseFont = true;
this.btnQuery.Name = "btnQuery";
this.btnQuery.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -298,6 +315,8 @@
this.btnReport.Id = 22;
this.btnReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.printlayoutview_16x16;
this.btnReport.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.printlayoutview_32x32;
+ this.btnReport.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnReport.ItemAppearance.Normal.Options.UseFont = true;
this.btnReport.Name = "btnReport";
this.btnReport.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
this.btnReport.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -308,6 +327,8 @@
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")));
+ this.btnDesign.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnDesign.ItemAppearance.Normal.Options.UseFont = true;
this.btnDesign.Name = "btnDesign";
this.btnDesign.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -317,6 +338,8 @@
this.btnJianYan.Id = 27;
this.btnJianYan.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x16;
this.btnJianYan.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.checkbuttons_32x32;
+ this.btnJianYan.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnJianYan.ItemAppearance.Normal.Options.UseFont = true;
this.btnJianYan.Name = "btnJianYan";
this.btnJianYan.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -326,6 +349,8 @@
this.btnFjianYan.Id = 28;
this.btnFjianYan.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.radiobuttons_16x16;
this.btnFjianYan.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.radiobuttons_32x32;
+ this.btnFjianYan.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnFjianYan.ItemAppearance.Normal.Options.UseFont = true;
this.btnFjianYan.Name = "btnFjianYan";
this.btnFjianYan.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -335,6 +360,8 @@
this.btnPiZhun.Id = 29;
this.btnPiZhun.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.boposition2_16x161;
this.btnPiZhun.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.boposition2_32x32;
+ this.btnPiZhun.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnPiZhun.ItemAppearance.Normal.Options.UseFont = true;
this.btnPiZhun.Name = "btnPiZhun";
this.btnPiZhun.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -344,6 +371,8 @@
this.btnZhiLiangChk.Id = 31;
this.btnZhiLiangChk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x162;
this.btnZhiLiangChk.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.checkbuttons_32x321;
+ this.btnZhiLiangChk.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnZhiLiangChk.ItemAppearance.Normal.Options.UseFont = true;
this.btnZhiLiangChk.Name = "btnZhiLiangChk";
this.btnZhiLiangChk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -353,6 +382,8 @@
this.btnZhiLiangFchk.Id = 33;
this.btnZhiLiangFchk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.forcetesting_16x161;
this.btnZhiLiangFchk.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.forcetesting_32x321;
+ this.btnZhiLiangFchk.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnZhiLiangFchk.ItemAppearance.Normal.Options.UseFont = true;
this.btnZhiLiangFchk.Name = "btnZhiLiangFchk";
this.btnZhiLiangFchk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -362,6 +393,8 @@
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.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnBoHui.ItemAppearance.Normal.Options.UseFont = true;
this.btnBoHui.Name = "btnBoHui";
this.btnBoHui.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -371,6 +404,8 @@
this.btnCaiGouChk.Id = 34;
this.btnCaiGouChk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_showmarkup_16x16;
this.btnCaiGouChk.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.trackingchanges_showmarkup_32x32;
+ this.btnCaiGouChk.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnCaiGouChk.ItemAppearance.Normal.Options.UseFont = true;
this.btnCaiGouChk.Name = "btnCaiGouChk";
this.btnCaiGouChk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -389,6 +424,8 @@
this.btnLog.Id = 18;
this.btnLog.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.salesperiodlifetime_16x16;
this.btnLog.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.salesperiodlifetime_32x32;
+ this.btnLog.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnLog.ItemAppearance.Normal.Options.UseFont = true;
this.btnLog.Name = "btnLog";
this.btnLog.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -396,7 +433,9 @@
//
this.btnTzbl.Caption = "閫氱煡澶囨枡";
this.btnTzbl.Id = 41;
- this.btnTzbl.ImageOptions.ImageUri.Uri = "business%20objects/bo_security_permission_object";
+ this.btnTzbl.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.announcement_32x32;
+ this.btnTzbl.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnTzbl.ItemAppearance.Normal.Options.UseFont = true;
this.btnTzbl.Name = "btnTzbl";
this.btnTzbl.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
this.btnTzbl.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -406,6 +445,8 @@
this.btnKg.Caption = "寮�宸�";
this.btnKg.Id = 42;
this.btnKg.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbox2_32x323;
+ this.btnKg.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnKg.ItemAppearance.Normal.Options.UseFont = true;
this.btnKg.Name = "btnKg";
this.btnKg.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
this.btnKg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -415,6 +456,8 @@
this.btnWg.Caption = "鎵嬪姩瀹屽伐";
this.btnWg.Id = 45;
this.btnWg.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_trackchanges_32x32;
+ this.btnWg.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnWg.ItemAppearance.Normal.Options.UseFont = true;
this.btnWg.Name = "btnWg";
this.btnWg.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
this.btnWg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -424,6 +467,8 @@
this.btnZhongTai.Caption = "鐘舵�佷慨鏀�";
this.btnZhongTai.Id = 44;
this.btnZhongTai.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_allmarkup_32x32;
+ this.btnZhongTai.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnZhongTai.ItemAppearance.Normal.Options.UseFont = true;
this.btnZhongTai.Name = "btnZhongTai";
this.btnZhongTai.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
this.btnZhongTai.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -433,6 +478,8 @@
this.btnJieAn.Caption = "缁撴";
this.btnJieAn.Id = 38;
this.btnJieAn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.copymodeldifferences_32x32;
+ this.btnJieAn.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnJieAn.ItemAppearance.Normal.Options.UseFont = true;
this.btnJieAn.Name = "btnJieAn";
this.btnJieAn.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -441,8 +488,31 @@
this.btnFjieAn.Caption = "鍙嶇粨妗�";
this.btnFjieAn.Id = 39;
this.btnFjieAn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.wordwrap_32x32;
+ this.btnFjieAn.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnFjieAn.ItemAppearance.Normal.Options.UseFont = true;
this.btnFjieAn.Name = "btnFjieAn";
this.btnFjieAn.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
+ // btnOa
+ //
+ this.btnOa.Caption = "鎻愪氦OA";
+ this.btnOa.Id = 54;
+ this.btnOa.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.meeting_16x16;
+ this.btnOa.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.meeting_32x321;
+ this.btnOa.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnOa.ItemAppearance.Normal.Options.UseFont = true;
+ this.btnOa.Name = "btnOa";
+ this.btnOa.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
+ // btnLayout
+ //
+ this.btnLayout.Caption = "淇濆瓨鐗堥潰";
+ this.btnLayout.Id = 51;
+ this.btnLayout.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.globalcolorscheme_16x16;
+ this.btnLayout.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.globalcolorscheme_32x32;
+ this.btnLayout.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnLayout.ItemAppearance.Normal.Options.UseFont = true;
+ this.btnLayout.Name = "btnLayout";
//
// btnHelp
//
@@ -453,14 +523,6 @@
this.btnHelp.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
this.btnHelp.ItemAppearance.Normal.Options.UseFont = true;
this.btnHelp.Name = "btnHelp";
- //
- // btnLayout
- //
- this.btnLayout.Caption = "淇濆瓨鐗堥潰";
- this.btnLayout.Id = 51;
- this.btnLayout.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.globalcolorscheme_16x16;
- this.btnLayout.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.globalcolorscheme_32x32;
- this.btnLayout.Name = "btnLayout";
//
// barDockControlTop
//
@@ -474,7 +536,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, 68);
this.barDockControlBottom.Manager = this.barManager1;
this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
//
@@ -503,7 +565,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, 68);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -548,5 +610,6 @@
private DevExpress.XtraBars.BarLargeButtonItem btnWg;
private DevExpress.XtraBars.BarLargeButtonItem btnHelp;
private DevExpress.XtraBars.BarLargeButtonItem btnLayout;
+ private DevExpress.XtraBars.BarLargeButtonItem btnOa;
}
}
--
Gitblit v1.9.3