From 64a6c4193199d15d7ac5aa67a9677df01a37a50d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 12 六月 2025 08:04:31 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 212 ++++++++++++++++++++++++++++-------------------------
1 files changed, 112 insertions(+), 100 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 60d2168..8a12050 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -47,23 +47,23 @@
this.btnOut = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnReport = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnDesign = new DevExpress.XtraBars.BarLargeButtonItem();
- this.btnJianYan = new DevExpress.XtraBars.BarLargeButtonItem();
- this.btnFjianYan = new DevExpress.XtraBars.BarLargeButtonItem();
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.btnTzbl = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnKg = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnShouJian = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnWg = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnZhongTai = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnJieAn = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnFjieAn = new DevExpress.XtraBars.BarLargeButtonItem();
- this.btnOa = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnShouHouChk = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnShouHouFchk = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnCaiWuChk = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnCaiWuFchk = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnLayout = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnFont = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnHelp = new DevExpress.XtraBars.BarLargeButtonItem();
this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
@@ -74,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});
@@ -98,14 +100,9 @@
this.btnReport,
this.btnQuery,
this.btnDesign,
- this.btnJianYan,
- this.btnFjianYan,
this.btnPiZhun,
- this.btnZhiLiangChk,
- this.btnZhiLiangFchk,
this.btnCaiGouChk,
this.btnCaiGouFchk,
- this.btnBoHui,
this.btnJieAn,
this.btnFjieAn,
this.btnTzbl,
@@ -114,12 +111,21 @@
this.btnWg,
this.btnHelp,
this.btnLayout,
- this.btnOa});
+ this.btnFont,
+ this.btnShouJian,
+ this.btnCaiWuChk,
+ this.btnCaiWuFchk,
+ this.btnShouHouChk,
+ this.btnShouHouFchk});
this.barManager1.MainMenu = this.bar2;
- this.barManager1.MaxItemId = 55;
+ this.barManager1.MaxItemId = 62;
//
// bar2
//
+ this.bar2.BarAppearance.Disabled.Options.UseFont = true;
+ this.bar2.BarAppearance.Hovered.Options.UseFont = true;
+ this.bar2.BarAppearance.Normal.Options.UseFont = true;
+ this.bar2.BarAppearance.Pressed.Options.UseFont = true;
this.bar2.BarName = "Main menu";
this.bar2.DockCol = 0;
this.bar2.DockRow = 0;
@@ -139,25 +145,27 @@
new DevExpress.XtraBars.LinkPersistInfo(this.btnOut),
new DevExpress.XtraBars.LinkPersistInfo(this.btnReport),
new DevExpress.XtraBars.LinkPersistInfo(this.btnDesign),
- new DevExpress.XtraBars.LinkPersistInfo(this.btnJianYan),
- new DevExpress.XtraBars.LinkPersistInfo(this.btnFjianYan),
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),
new DevExpress.XtraBars.LinkPersistInfo(this.btnTzbl),
new DevExpress.XtraBars.LinkPersistInfo(this.btnKg),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnShouJian),
new DevExpress.XtraBars.LinkPersistInfo(this.btnWg),
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(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnOa, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnShouHouChk),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnShouHouFchk),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiWuChk),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiWuFchk),
new DevExpress.XtraBars.LinkPersistInfo(this.btnLayout),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnFont),
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";
@@ -168,9 +176,7 @@
this.btnAdd.Id = 3;
this.btnAdd.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_allmarkup_16x16;
this.btnAdd.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.trackingchanges_allmarkup_32x32;
- this.btnAdd.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
this.btnAdd.ItemAppearance.Normal.Options.UseFont = true;
- this.btnAdd.ItemInMenuAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 12F);
this.btnAdd.ItemInMenuAppearance.Normal.Options.UseFont = true;
this.btnAdd.Name = "btnAdd";
this.btnAdd.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -181,7 +187,6 @@
this.btnEdit.Id = 5;
this.btnEdit.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_trackchanges_16x16;
this.btnEdit.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.trackingchanges_trackchanges_32x32;
- this.btnEdit.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
this.btnEdit.ItemAppearance.Normal.Options.UseFont = true;
this.btnEdit.Name = "btnEdit";
this.btnEdit.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -192,7 +197,6 @@
this.btnSave.Id = 6;
this.btnSave.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exportfile_16x16;
this.btnSave.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.exportfile_32x32;
- this.btnSave.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
this.btnSave.ItemAppearance.Normal.Options.UseFont = true;
this.btnSave.Name = "btnSave";
this.btnSave.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -203,7 +207,6 @@
this.btnEsc.Id = 9;
this.btnEsc.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnEsc.ImageOptions.Image")));
this.btnEsc.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnEsc.ImageOptions.LargeImage")));
- this.btnEsc.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
this.btnEsc.ItemAppearance.Normal.Options.UseFont = true;
this.btnEsc.Name = "btnEsc";
this.btnEsc.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -214,7 +217,6 @@
this.btnLoad.Id = 10;
this.btnLoad.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.convert_16x16;
this.btnLoad.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.convert_32x32;
- this.btnLoad.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
this.btnLoad.ItemAppearance.Normal.Options.UseFont = true;
this.btnLoad.Name = "btnLoad";
this.btnLoad.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -225,7 +227,6 @@
this.btnDel.Id = 4;
this.btnDel.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
this.btnDel.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.removegroupfooter_32x32;
- this.btnDel.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
this.btnDel.ItemAppearance.Normal.Options.UseFont = true;
this.btnDel.Name = "btnDel";
this.btnDel.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -236,7 +237,6 @@
this.btnChk.Id = 13;
this.btnChk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x16;
this.btnChk.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.checkbox2_32x32;
- this.btnChk.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
this.btnChk.ItemAppearance.Normal.Options.UseFont = true;
this.btnChk.Name = "btnChk";
this.btnChk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -247,7 +247,6 @@
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.Font = new System.Drawing.Font("Tahoma", 10F);
this.btnFchk.ItemAppearance.Normal.Options.UseFont = true;
this.btnFchk.Name = "btnFchk";
this.btnFchk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -258,7 +257,6 @@
this.btnHb.Id = 16;
this.btnHb.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnHb.ImageOptions.Image")));
this.btnHb.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnHb.ImageOptions.LargeImage")));
- this.btnHb.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
this.btnHb.ItemAppearance.Normal.Options.UseFont = true;
this.btnHb.Name = "btnHb";
this.btnHb.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -269,6 +267,7 @@
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.Options.UseFont = true;
this.btnQuery.Name = "btnQuery";
this.btnQuery.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -278,7 +277,6 @@
this.btnIn.Id = 17;
this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.sendxls_16x16;
this.btnIn.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.sendxls_32x32;
- this.btnIn.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
this.btnIn.ItemAppearance.Normal.Options.UseFont = true;
this.btnIn.Name = "btnIn";
this.btnIn.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -290,7 +288,6 @@
this.btnOut.Id = 12;
this.btnOut.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.wraptext2_16x16;
this.btnOut.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.wraptext2_32x32;
- this.btnOut.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
this.btnOut.ItemAppearance.Normal.Options.UseFont = true;
this.btnOut.Name = "btnOut";
this.btnOut.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -301,6 +298,7 @@
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.Options.UseFont = true;
this.btnReport.Name = "btnReport";
this.btnReport.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
this.btnReport.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -311,26 +309,9 @@
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.Options.UseFont = true;
this.btnDesign.Name = "btnDesign";
this.btnDesign.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
- //
- // btnJianYan
- //
- this.btnJianYan.Caption = "鎻愪氦妫�楠�";
- 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.Name = "btnJianYan";
- this.btnJianYan.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
- //
- // btnFjianYan
- //
- this.btnFjianYan.Caption = "鎾ゅ洖妫�楠�";
- 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.Name = "btnFjianYan";
- this.btnFjianYan.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
// btnPiZhun
//
@@ -338,35 +319,10 @@
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.Options.UseFont = true;
this.btnPiZhun.Name = "btnPiZhun";
this.btnPiZhun.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
- //
- // btnZhiLiangChk
- //
- this.btnZhiLiangChk.Caption = "璐ㄩ噺瀹℃牳";
- 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.Name = "btnZhiLiangChk";
- this.btnZhiLiangChk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
- //
- // btnZhiLiangFchk
- //
- this.btnZhiLiangFchk.Caption = "璐ㄩ噺鍙嶅鏍�";
- 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.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
//
@@ -374,6 +330,7 @@
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.Options.UseFont = true;
this.btnCaiGouChk.Name = "btnCaiGouChk";
this.btnCaiGouChk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -392,6 +349,7 @@
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.Options.UseFont = true;
this.btnLog.Name = "btnLog";
this.btnLog.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -400,6 +358,7 @@
this.btnTzbl.Caption = "閫氱煡澶囨枡";
this.btnTzbl.Id = 41;
this.btnTzbl.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.announcement_32x32;
+ 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;
@@ -409,15 +368,26 @@
this.btnKg.Caption = "寮�宸�";
this.btnKg.Id = 42;
this.btnKg.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbox2_32x323;
+ 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;
+ //
+ // btnShouJian
+ //
+ this.btnShouJian.Caption = "鐢熸垚棣栨";
+ this.btnShouJian.Id = 56;
+ this.btnShouJian.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.inlinesizelegend_16x16;
+ this.btnShouJian.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.inlinesizelegend_32x32;
+ this.btnShouJian.Name = "btnShouJian";
+ this.btnShouJian.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
// btnWg
//
this.btnWg.Caption = "鎵嬪姩瀹屽伐";
this.btnWg.Id = 45;
this.btnWg.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_trackchanges_32x32;
+ 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;
@@ -427,6 +397,7 @@
this.btnZhongTai.Caption = "鐘舵�佷慨鏀�";
this.btnZhongTai.Id = 44;
this.btnZhongTai.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_allmarkup_32x32;
+ 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;
@@ -436,6 +407,7 @@
this.btnJieAn.Caption = "缁撴";
this.btnJieAn.Id = 38;
this.btnJieAn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.copymodeldifferences_32x32;
+ this.btnJieAn.ItemAppearance.Normal.Options.UseFont = true;
this.btnJieAn.Name = "btnJieAn";
this.btnJieAn.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -444,25 +416,66 @@
this.btnFjieAn.Caption = "鍙嶇粨妗�";
this.btnFjieAn.Id = 39;
this.btnFjieAn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.wordwrap_32x32;
+ this.btnFjieAn.ItemAppearance.Normal.Options.UseFont = true;
this.btnFjieAn.Name = "btnFjieAn";
this.btnFjieAn.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+
//
- // btnOa
+ // btnShouHouChk
//
- 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.Name = "btnOa";
- this.btnOa.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ this.btnShouHouChk.Caption = "鍞悗瀹℃牳";
+ this.btnShouHouChk.Id = 60;
+ this.btnShouHouChk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.boperson_16x16;
+ this.btnShouHouChk.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.boperson_32x32;
+ this.btnShouHouChk.Name = "btnShouHouChk";
+ this.btnShouHouChk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
+ // btnShouHouFchk
+ //
+ this.btnShouHouFchk.Caption = "鍞悗鍙嶅鏍�";
+ this.btnShouHouFchk.Id = 61;
+ this.btnShouHouFchk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.bodetails_16x162;
+ this.btnShouHouFchk.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.bodetails_32x32;
+ this.btnShouHouFchk.Name = "btnShouHouFchk";
+ this.btnShouHouFchk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
+ // btnCaiWuChk
+ //
+ this.btnCaiWuChk.Caption = "璐㈠姟瀹℃牳";
+ this.btnCaiWuChk.Id = 58;
+ this.btnCaiWuChk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.botask_16x16;
+ this.btnCaiWuChk.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.botask_32x32;
+ this.btnCaiWuChk.Name = "btnCaiWuChk";
+ this.btnCaiWuChk.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
+ this.btnCaiWuChk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
+ // btnCaiWuFchk
+ //
+ this.btnCaiWuFchk.Caption = "璐㈠姟鍙嶅鏍�";
+ this.btnCaiWuFchk.Id = 59;
+ this.btnCaiWuFchk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.boresume_16x16;
+ this.btnCaiWuFchk.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.boresume_32x32;
+ this.btnCaiWuFchk.Name = "btnCaiWuFchk";
+ this.btnCaiWuFchk.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
+ this.btnCaiWuFchk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
// btnLayout
//
- this.btnLayout.Caption = "淇濆瓨鐗堥潰";
+ 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.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.subreport_16x16;
+ this.btnLayout.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.subreport_32x32;
+ this.btnLayout.ItemAppearance.Normal.Options.UseFont = true;
this.btnLayout.Name = "btnLayout";
+ //
+ // btnFont
+ //
+ this.btnFont.Caption = "瀛椾綋";
+ this.btnFont.Id = 55;
+ this.btnFont.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.fontsizeincrease_16x161;
+ this.btnFont.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.fontsizeincrease_32x321;
+ this.btnFont.Name = "btnFont";
+ this.btnFont.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
//
// btnHelp
//
@@ -470,7 +483,6 @@
this.btnHelp.Id = 49;
this.btnHelp.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.knowledgebasearticle_32x32;
this.btnHelp.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.knowledgebasearticle_32x32;
- this.btnHelp.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
this.btnHelp.ItemAppearance.Normal.Options.UseFont = true;
this.btnHelp.Name = "btnHelp";
//
@@ -480,13 +492,13 @@
this.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top;
this.barDockControlTop.Location = new System.Drawing.Point(0, 0);
this.barDockControlTop.Manager = this.barManager1;
- this.barDockControlTop.Size = new System.Drawing.Size(1543, 148);
+ this.barDockControlTop.Size = new System.Drawing.Size(1543, 142);
//
// barDockControlBottom
//
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, 146);
this.barDockControlBottom.Manager = this.barManager1;
this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
//
@@ -494,17 +506,17 @@
//
this.barDockControlLeft.CausesValidation = false;
this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left;
- this.barDockControlLeft.Location = new System.Drawing.Point(0, 148);
+ this.barDockControlLeft.Location = new System.Drawing.Point(0, 142);
this.barDockControlLeft.Manager = this.barManager1;
- this.barDockControlLeft.Size = new System.Drawing.Size(0, 0);
+ this.barDockControlLeft.Size = new System.Drawing.Size(0, 4);
//
// barDockControlRight
//
this.barDockControlRight.CausesValidation = false;
this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right;
- this.barDockControlRight.Location = new System.Drawing.Point(1543, 148);
+ this.barDockControlRight.Location = new System.Drawing.Point(1543, 142);
this.barDockControlRight.Manager = this.barManager1;
- this.barDockControlRight.Size = new System.Drawing.Size(0, 0);
+ this.barDockControlRight.Size = new System.Drawing.Size(0, 4);
//
// UcToolBarMenu
//
@@ -515,7 +527,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, 146);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -540,14 +552,9 @@
private DevExpress.XtraBars.BarLargeButtonItem btnReport;
private DevExpress.XtraBars.BarLargeButtonItem btnQuery;
private DevExpress.XtraBars.BarLargeButtonItem btnDesign;
- private DevExpress.XtraBars.BarLargeButtonItem btnJianYan;
- private DevExpress.XtraBars.BarLargeButtonItem btnFjianYan;
private DevExpress.XtraBars.BarLargeButtonItem btnPiZhun;
- private DevExpress.XtraBars.BarLargeButtonItem btnZhiLiangChk;
- 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;
@@ -560,6 +567,11 @@
private DevExpress.XtraBars.BarLargeButtonItem btnWg;
private DevExpress.XtraBars.BarLargeButtonItem btnHelp;
private DevExpress.XtraBars.BarLargeButtonItem btnLayout;
- private DevExpress.XtraBars.BarLargeButtonItem btnOa;
+ private DevExpress.XtraBars.BarLargeButtonItem btnFont;
+ private DevExpress.XtraBars.BarLargeButtonItem btnShouJian;
+ private DevExpress.XtraBars.BarLargeButtonItem btnCaiWuChk;
+ private DevExpress.XtraBars.BarLargeButtonItem btnCaiWuFchk;
+ private DevExpress.XtraBars.BarLargeButtonItem btnShouHouChk;
+ private DevExpress.XtraBars.BarLargeButtonItem btnShouHouFchk;
}
}
--
Gitblit v1.9.3