From 247cc1010a4967a24d2d0eaeb092acc24c08ba96 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期六, 05 四月 2025 14:25:12 +0800 Subject: [PATCH] fqc --- DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 113 ++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 92 insertions(+), 21 deletions(-) diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs index 8ee9837..694283b 100644 --- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs +++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs @@ -62,7 +62,9 @@ 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.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(); @@ -73,6 +75,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 +116,19 @@ this.btnZhongTai, this.btnWg, this.btnHelp, - this.btnLayout}); + this.btnLayout, + this.btnOa, + this.btnFont}); this.barManager1.MainMenu = this.bar2; - this.barManager1.MaxItemId = 52; + this.barManager1.MaxItemId = 56; // // 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; @@ -152,9 +163,13 @@ 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.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"; @@ -165,9 +180,9 @@ 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; @@ -178,7 +193,7 @@ 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; @@ -189,7 +204,7 @@ 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; @@ -200,7 +215,7 @@ 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; @@ -211,7 +226,7 @@ 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; @@ -222,7 +237,7 @@ 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; @@ -233,7 +248,7 @@ 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; @@ -244,7 +259,7 @@ 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; @@ -255,7 +270,7 @@ 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; @@ -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.Options.UseFont = true; this.btnQuery.Name = "btnQuery"; this.btnQuery.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; // @@ -275,7 +292,7 @@ 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; @@ -287,7 +304,7 @@ 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; @@ -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.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.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.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.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.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.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.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.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.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.Options.UseFont = true; this.btnLog.Name = "btnLog"; this.btnLog.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; // @@ -396,8 +433,9 @@ // this.btnTzbl.Caption = "閫氱煡澶囨枡"; this.btnTzbl.Id = 41; - this.btnTzbl.ImageOptions.ImageUri.Uri = "business%20objects/bo_security_permission_object"; - this.btnTzbl.ImageOptions.SvgImage = global::Gs.DevApp.Properties.Resources.time; + 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; @@ -407,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.Options.UseFont = true; this.btnKg.Name = "btnKg"; this.btnKg.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph; this.btnKg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; @@ -416,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.Options.UseFont = true; this.btnWg.Name = "btnWg"; this.btnWg.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph; this.btnWg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; @@ -425,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.Options.UseFont = true; this.btnZhongTai.Name = "btnZhongTai"; this.btnZhongTai.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph; this.btnZhongTai.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; @@ -434,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.Options.UseFont = true; this.btnJieAn.Name = "btnJieAn"; this.btnJieAn.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; // @@ -442,17 +488,40 @@ 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 + // + 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.Options.UseFont = true; + this.btnOa.Name = "btnOa"; + this.btnOa.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"; - this.btnLayout.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; + // + // 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 // @@ -460,7 +529,7 @@ 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"; // @@ -550,5 +619,7 @@ 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; } } -- Gitblit v1.9.3