From bc3adbd73a55d8382fbd02b2fd090a05ec13a7d5 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 13 三月 2025 10:07:17 +0800
Subject: [PATCH] 提交OA

---
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs |  136 +++++++++++++++++----------------------------
 1 files changed, 51 insertions(+), 85 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index b202928..377fe4c 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -45,7 +45,6 @@
             this.btnQuery = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnIn = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnOut = new DevExpress.XtraBars.BarLargeButtonItem();
-            this.btnRole = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnReport = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnDesign = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnJianYan = new DevExpress.XtraBars.BarLargeButtonItem();
@@ -58,25 +57,24 @@
             this.btnCaiGouFchk = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnLog = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnTzbl = new DevExpress.XtraBars.BarLargeButtonItem();
-            this.btnFtzbl = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnKg = new DevExpress.XtraBars.BarLargeButtonItem();
-            this.btnDkg = new DevExpress.XtraBars.BarLargeButtonItem();
-            this.btnZanTing = new DevExpress.XtraBars.BarLargeButtonItem();
-            this.btnBdll = 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.btnLayout = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnHelp = new DevExpress.XtraBars.BarLargeButtonItem();
+            this.btnOa = 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();
-            this.btnWg = new DevExpress.XtraBars.BarLargeButtonItem();
-            this.btnFwg = new DevExpress.XtraBars.BarLargeButtonItem();
             ((System.ComponentModel.ISupportInitialize)(this.barManager1)).BeginInit();
             this.SuspendLayout();
             // 
             // barManager1
             // 
+            this.barManager1.AllowShowToolbarsPopup = false;
             this.barManager1.Bars.AddRange(new DevExpress.XtraBars.Bar[] {
             this.bar2});
             this.barManager1.DockControls.Add(this.barDockControlTop);
@@ -97,7 +95,6 @@
             this.btnHb,
             this.btnIn,
             this.btnLog,
-            this.btnRole,
             this.btnReport,
             this.btnQuery,
             this.btnDesign,
@@ -113,15 +110,13 @@
             this.btnFjieAn,
             this.btnTzbl,
             this.btnKg,
-            this.btnDkg,
-            this.btnZanTing,
-            this.btnBdll,
+            this.btnZhongTai,
             this.btnWg,
-            this.btnFtzbl,
             this.btnHelp,
-            this.btnFwg});
+            this.btnLayout,
+            this.btnOa});
             this.barManager1.MainMenu = this.bar2;
-            this.barManager1.MaxItemId = 51;
+            this.barManager1.MaxItemId = 55;
             // 
             // bar2
             // 
@@ -142,7 +137,6 @@
             new DevExpress.XtraBars.LinkPersistInfo(this.btnQuery),
             new DevExpress.XtraBars.LinkPersistInfo(this.btnIn),
             new DevExpress.XtraBars.LinkPersistInfo(this.btnOut),
-            new DevExpress.XtraBars.LinkPersistInfo(this.btnRole),
             new DevExpress.XtraBars.LinkPersistInfo(this.btnReport),
             new DevExpress.XtraBars.LinkPersistInfo(this.btnDesign),
             new DevExpress.XtraBars.LinkPersistInfo(this.btnJianYan),
@@ -155,14 +149,15 @@
             new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiGouFchk),
             new DevExpress.XtraBars.LinkPersistInfo(this.btnLog),
             new DevExpress.XtraBars.LinkPersistInfo(this.btnTzbl),
-            new DevExpress.XtraBars.LinkPersistInfo(this.btnFtzbl),
             new DevExpress.XtraBars.LinkPersistInfo(this.btnKg),
-            new DevExpress.XtraBars.LinkPersistInfo(this.btnDkg),
-            new DevExpress.XtraBars.LinkPersistInfo(this.btnZanTing),
-            new DevExpress.XtraBars.LinkPersistInfo(this.btnBdll),
+            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.btnLayout),
             new DevExpress.XtraBars.LinkPersistInfo(this.btnHelp)});
+            this.bar2.OptionsBar.AllowQuickCustomization = false;
             this.bar2.OptionsBar.MultiLine = true;
             this.bar2.OptionsBar.UseWholeRow = true;
             this.bar2.Text = "Main menu";
@@ -300,15 +295,6 @@
             this.btnOut.Name = "btnOut";
             this.btnOut.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
             // 
-            // btnRole
-            // 
-            this.btnRole.Caption = "淇濆瓨鏉冮檺";
-            this.btnRole.Id = 21;
-            this.btnRole.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.editrangepermission_16x16;
-            this.btnRole.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.editrangepermission_32x32;
-            this.btnRole.Name = "btnRole";
-            this.btnRole.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            // 
             // btnReport
             // 
             this.btnReport.Caption = "鎵撳嵃";
@@ -414,21 +400,10 @@
             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.Name = "btnTzbl";
             this.btnTzbl.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
             this.btnTzbl.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            // 
-            // btnFtzbl
-            // 
-            this.btnFtzbl.Caption = "鎾ゅ洖閫氱煡";
-            this.btnFtzbl.Id = 48;
-            this.btnFtzbl.ImageOptions.ImageUri.Uri = "business%20objects/bo_rules";
-            this.btnFtzbl.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.btnFtzbl.ItemAppearance.Normal.Options.UseFont = true;
-            this.btnFtzbl.ItemInMenuAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 12F);
-            this.btnFtzbl.ItemInMenuAppearance.Normal.Options.UseFont = true;
-            this.btnFtzbl.Name = "btnFtzbl";
-            this.btnFtzbl.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
             // 
             // btnKg
             // 
@@ -439,32 +414,23 @@
             this.btnKg.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
             this.btnKg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
             // 
-            // btnDkg
+            // btnWg
             // 
-            this.btnDkg.Caption = "寰呭紑宸�";
-            this.btnDkg.Id = 43;
-            this.btnDkg.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_32x322;
-            this.btnDkg.Name = "btnDkg";
-            this.btnDkg.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
-            this.btnDkg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            this.btnWg.Caption = "鎵嬪姩瀹屽伐";
+            this.btnWg.Id = 45;
+            this.btnWg.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_trackchanges_32x32;
+            this.btnWg.Name = "btnWg";
+            this.btnWg.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
+            this.btnWg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
             // 
-            // btnZanTing
+            // btnZhongTai
             // 
-            this.btnZanTing.Caption = "宸ュ崟鏆傚仠";
-            this.btnZanTing.Id = 44;
-            this.btnZanTing.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_allmarkup_32x32;
-            this.btnZanTing.Name = "btnZanTing";
-            this.btnZanTing.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
-            this.btnZanTing.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            // 
-            // btnBdll
-            // 
-            this.btnBdll.Caption = "澶囧崟棰嗘枡";
-            this.btnBdll.Id = 45;
-            this.btnBdll.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_trackchanges_32x32;
-            this.btnBdll.Name = "btnBdll";
-            this.btnBdll.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
-            this.btnBdll.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            this.btnZhongTai.Caption = "鐘舵�佷慨鏀�";
+            this.btnZhongTai.Id = 44;
+            this.btnZhongTai.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_allmarkup_32x32;
+            this.btnZhongTai.Name = "btnZhongTai";
+            this.btnZhongTai.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
+            this.btnZhongTai.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
             // 
             // btnJieAn
             // 
@@ -482,6 +448,14 @@
             this.btnFjieAn.Name = "btnFjieAn";
             this.btnFjieAn.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.Name = "btnLayout";
+            // 
             // btnHelp
             // 
             this.btnHelp.Caption = "甯姪";
@@ -491,6 +465,15 @@
             this.btnHelp.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
             this.btnHelp.ItemAppearance.Normal.Options.UseFont = true;
             this.btnHelp.Name = "btnHelp";
+            // 
+            // 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.Name = "btnOa";
+            this.btnOa.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
             // 
             // barDockControlTop
             // 
@@ -504,7 +487,7 @@
             // 
             this.barDockControlBottom.CausesValidation = false;
             this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.barDockControlBottom.Location = new System.Drawing.Point(0, 60);
+            this.barDockControlBottom.Location = new System.Drawing.Point(0, 72);
             this.barDockControlBottom.Manager = this.barManager1;
             this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
             // 
@@ -524,20 +507,6 @@
             this.barDockControlRight.Manager = this.barManager1;
             this.barDockControlRight.Size = new System.Drawing.Size(0, 0);
             // 
-            // btnWg
-            // 
-            this.btnWg.Caption = "缁撴";
-            this.btnWg.Id = 46;
-            this.btnWg.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btnWg.ImageOptions.SvgImage")));
-            this.btnWg.Name = "btnWg";
-            this.btnWg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            // 
-            // btnFwg
-            // 
-            this.btnFwg.Caption = "鍙嶇粨妗�";
-            this.btnFwg.Id = 50;
-            this.btnFwg.Name = "btnFwg";
-            // 
             // UcToolBarMenu
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -547,7 +516,7 @@
             this.Controls.Add(this.barDockControlBottom);
             this.Controls.Add(this.barDockControlTop);
             this.Name = "UcToolBarMenu";
-            this.Size = new System.Drawing.Size(1543, 60);
+            this.Size = new System.Drawing.Size(1543, 72);
             ((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
@@ -569,7 +538,6 @@
         private DevExpress.XtraBars.BarLargeButtonItem btnHb;
         private DevExpress.XtraBars.BarLargeButtonItem btnIn;
         private DevExpress.XtraBars.BarLargeButtonItem btnLog;
-        private DevExpress.XtraBars.BarLargeButtonItem btnRole;
         private DevExpress.XtraBars.BarLargeButtonItem btnReport;
         private DevExpress.XtraBars.BarLargeButtonItem btnQuery;
         private DevExpress.XtraBars.BarLargeButtonItem btnDesign;
@@ -589,12 +557,10 @@
         private DevExpress.XtraBars.BarLargeButtonItem btnFjieAn;
         private DevExpress.XtraBars.BarLargeButtonItem btnTzbl;
         private DevExpress.XtraBars.BarLargeButtonItem btnKg;
-        private DevExpress.XtraBars.BarLargeButtonItem btnDkg;
-        private DevExpress.XtraBars.BarLargeButtonItem btnZanTing;
-        private DevExpress.XtraBars.BarLargeButtonItem btnBdll;
+        private DevExpress.XtraBars.BarLargeButtonItem btnZhongTai;
         private DevExpress.XtraBars.BarLargeButtonItem btnWg;
-        private DevExpress.XtraBars.BarLargeButtonItem btnFtzbl;
         private DevExpress.XtraBars.BarLargeButtonItem btnHelp;
-        private DevExpress.XtraBars.BarLargeButtonItem btnFwg;
+        private DevExpress.XtraBars.BarLargeButtonItem btnLayout;
+        private DevExpress.XtraBars.BarLargeButtonItem btnOa;
     }
 }

--
Gitblit v1.9.3