From 7dd1bef6eb9f5f3b3d50599415fb42c2a5fa1c6e Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 10 五月 2025 07:49:42 +0800
Subject: [PATCH] 演示前优化bug

---
 DevApp/Gs.DevApp/Properties/Resources.Designer.cs              |   50 ++
 DevApp/Gs.DevApp/DevFrm/FrmMain.cs                             |  187 +++------
 DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.cs               |   30 +
 DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs                  |   74 +-
 DevApp/Gs.DevApp/Resources/bouser_16x163.png                   |    0 
 DevApp/Gs.DevApp/Gs.DevApp.csproj                              |    5 
 DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs                  |   20 
 DevApp/Gs.DevApp/Resources/trackingchanges_previous_32x321.png |    0 
 DevApp/Gs.DevApp/DevFrm/FrmMain.resx                           |   86 ----
 DevApp/Gs.DevApp/DevFrm/User/User.cs                           |    6 
 DevApp/Gs.DevApp/Resources/trackingchanges_previous_16x161.png |    0 
 DevApp/Gs.DevApp/DevFrm/FrmLogin.cs                            |   23 
 DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs                    |  181 --------
 DevApp/Gs.DevApp/Resources/bouser_32x32.png                    |    0 
 DevApp/Gs.DevApp/Properties/Resources.resx                     |  365 ++++++++++---------
 DevApp/Gs.DevApp/DevFrm/User/Role.cs                           |    7 
 DevApp/Gs.DevApp/Program.cs                                    |    6 
 DevApp/Gs.DevApp/Resources/article_16x16.png                   |    0 
 DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs              |   15 
 DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.Designer.cs      |   56 +-
 20 files changed, 474 insertions(+), 637 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
index 310adde..d1089b6 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
@@ -51,7 +51,6 @@
                 txtUser.Focus();
                 return;
             }
-
             if (string.IsNullOrEmpty(txtPwd.Text.Trim()))
             {
                 MsgHelper.Warning("瀵嗙爜涓嶈兘涓虹┖锛�");
@@ -90,7 +89,7 @@
             catch (Exception ex)
             {
                 DialogResult = DialogResult.Cancel;
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
 
@@ -110,7 +109,7 @@
             }
             catch (Exception ex)
             {
-                MessageBox.Show(ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
         /// <summary>
@@ -133,12 +132,14 @@
                 DevExpress.XtraEditors.WindowsFormsSettings.DefaultMenuFont = new System.Drawing.Font(ary[0], _ft);
                 DevExpress.XtraEditors.WindowsFormsSettings.DefaultPrintFont = new System.Drawing.Font(ary[0], _ft);
                 #endregion
-              
             }
-            catch (Exception)
+            catch (Exception ex)
             {
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
+
+        #region 鑷姩鏇存柊
         private void _autoUpdate()
         {
             _version = ConfigurationManager.AppSettings["Version"];
@@ -146,7 +147,6 @@
             AutoUpdater.Start(ConfigurationManager.AppSettings["AutoUpdaterXml"]);
             AutoUpdater.CheckForUpdateEvent += AutoUpdater_CheckForUpdateEvent;
         }
-
         private void AutoUpdater_CheckForUpdateEvent(UpdateInfoEventArgs args)
         {
             if (args == null || string.IsNullOrEmpty(args.DownloadURL))
@@ -156,12 +156,10 @@
                 Application.Exit();
                 return;
             }
-
             if (!args.IsUpdateAvailable)
             {
                 return;
             }
-
             var _strMsg =
                 string.Format(
                     $@"鏈夋柊鐗堟湰 {args.CurrentVersion} 鍙敤锛屾偍浣跨敤鐨勬槸 {args.InstalledVersion}鐗堟湰锛岃繖鏄繀闇�鐨勬洿鏂帮紝鎸夆�滄槸锛圷锛夆�濆紑濮嬫洿鏂板簲鐢ㄧ▼搴忋��");
@@ -171,7 +169,6 @@
                 Application.Exit();
                 return;
             }
-
             try
             {
                 if (AutoUpdater.DownloadUpdate(args))
@@ -193,7 +190,6 @@
                         config.Save(ConfigurationSaveMode.Modified);
                         ConfigurationManager.RefreshSection("appSettings");
                     }
-
                     Application.Exit();
                 }
                 else
@@ -211,6 +207,13 @@
             }
         }
 
+        #endregion
+
+
+        /// <summary>
+        /// 璇诲彇mac
+        /// </summary>
+        /// <returns></returns>
         private string GetMacAddress()
         {
             System.Text.StringBuilder sb = new System.Text.StringBuilder();
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
index 831a1d2..a25003b 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
@@ -38,24 +38,11 @@
             this.toolZhiChi = new System.Windows.Forms.ToolStripStatusLabel();
             this.toolTime = new System.Windows.Forms.ToolStripStatusLabel();
             this.fluentDesignFormControl1 = new DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl();
-            this.barSubItem1 = new DevExpress.XtraBars.BarSubItem();
-            this.barSubItem2 = new DevExpress.XtraBars.BarSubItem();
-            this.barAbout = new DevExpress.XtraBars.BarSubItem();
-            this.barMenu = new DevExpress.XtraBars.BarButtonItem();
-            this.barUs = new DevExpress.XtraBars.BarButtonItem();
-            this.barHelp = new DevExpress.XtraBars.BarButtonItem();
-            this.barEasy = new DevExpress.XtraBars.BarButtonItem();
             this.barMy = new DevExpress.XtraBars.BarSubItem();
             this.barExit = new DevExpress.XtraBars.BarButtonItem();
             this.barPwd = new DevExpress.XtraBars.BarButtonItem();
-            this.barToggleSwitchItem1 = new DevExpress.XtraBars.BarToggleSwitchItem();
-            this.barToolbarsListItem1 = new DevExpress.XtraBars.BarToolbarsListItem();
             this.barMsg = new DevExpress.XtraBars.BarListItem();
             this.barMsgXf = new DevExpress.XtraBars.BarButtonItem();
-            this.barSubItem4 = new DevExpress.XtraBars.BarSubItem();
-            this.barTxt = new DevExpress.XtraBars.BarStaticItem();
-            this.barOrg = new DevExpress.XtraBars.BarEditItem();
-            this.repositoryItemCheckedComboBoxEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit();
             this.fdm1 = new DevExpress.XtraBars.FluentDesignSystem.FluentFormDefaultManager(this.components);
             this.acrd = new DevExpress.XtraBars.Navigation.AccordionControl();
             this.cms1 = new System.Windows.Forms.ContextMenuStrip(this.components);
@@ -65,7 +52,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.tab)).BeginInit();
             this.strp1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.fluentDesignFormControl1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckedComboBoxEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.fdm1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.acrd)).BeginInit();
             this.cms1.SuspendLayout();
@@ -129,95 +115,25 @@
             // 
             this.fluentDesignFormControl1.FluentDesignForm = this;
             this.fluentDesignFormControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] {
-            this.barSubItem1,
-            this.barSubItem2,
-            this.barAbout,
-            this.barUs,
-            this.barHelp,
             this.barMy,
-            this.barToggleSwitchItem1,
-            this.barToolbarsListItem1,
             this.barExit,
             this.barPwd,
             this.barMsg,
-            this.barMsgXf,
-            this.barSubItem4,
-            this.barEasy,
-            this.barTxt,
-            this.barOrg,
-            this.barMenu});
+            this.barMsgXf});
             this.fluentDesignFormControl1.Location = new System.Drawing.Point(0, 0);
             this.fluentDesignFormControl1.Manager = this.fdm1;
             this.fluentDesignFormControl1.Name = "fluentDesignFormControl1";
-            this.fluentDesignFormControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemCheckedComboBoxEdit1});
             this.fluentDesignFormControl1.Size = new System.Drawing.Size(1230, 39);
             this.fluentDesignFormControl1.TabIndex = 2;
             this.fluentDesignFormControl1.TabStop = false;
-            this.fluentDesignFormControl1.TitleItemLinks.Add(this.barAbout);
             this.fluentDesignFormControl1.TitleItemLinks.Add(this.barMy);
             this.fluentDesignFormControl1.TitleItemLinks.Add(this.barMsgXf);
             this.fluentDesignFormControl1.TitleItemLinks.Add(this.barMsg);
-            this.fluentDesignFormControl1.TitleItemLinks.Add(this.barOrg, true);
-            // 
-            // barSubItem1
-            // 
-            this.barSubItem1.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right;
-            this.barSubItem1.Caption = "barSubItem1";
-            this.barSubItem1.Id = 4;
-            this.barSubItem1.Name = "barSubItem1";
-            // 
-            // barSubItem2
-            // 
-            this.barSubItem2.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right;
-            this.barSubItem2.Caption = "鏇村";
-            this.barSubItem2.Id = 6;
-            this.barSubItem2.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barSubItem2.ImageOptions.SvgImage")));
-            this.barSubItem2.Name = "barSubItem2";
-            // 
-            // barAbout
-            // 
-            this.barAbout.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right;
-            this.barAbout.Caption = "鍦ㄧ嚎甯姪";
-            this.barAbout.Id = 7;
-            this.barAbout.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barAbout.ImageOptions.Image")));
-            this.barAbout.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barAbout.ImageOptions.LargeImage")));
-            this.barAbout.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] {
-            new DevExpress.XtraBars.LinkPersistInfo(this.barMenu),
-            new DevExpress.XtraBars.LinkPersistInfo(this.barUs),
-            new DevExpress.XtraBars.LinkPersistInfo(this.barHelp),
-            new DevExpress.XtraBars.LinkPersistInfo(this.barEasy)});
-            this.barAbout.Name = "barAbout";
-            this.barAbout.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
-            // 
-            // barMenu
-            // 
-            this.barMenu.Caption = "鍔熻兘鑿滃崟";
-            this.barMenu.Id = 36;
-            this.barMenu.Name = "barMenu";
-            // 
-            // barUs
-            // 
-            this.barUs.Caption = "鍏充簬绋嬪簭";
-            this.barUs.Id = 8;
-            this.barUs.Name = "barUs";
-            // 
-            // barHelp
-            // 
-            this.barHelp.Caption = "鍦ㄧ嚎甯姪";
-            this.barHelp.Id = 9;
-            this.barHelp.Name = "barHelp";
-            // 
-            // barEasy
-            // 
-            this.barEasy.Caption = "EasyCode";
-            this.barEasy.Id = 33;
-            this.barEasy.Name = "barEasy";
             // 
             // barMy
             // 
             this.barMy.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right;
-            this.barMy.Caption = "鎴戠殑";
+            this.barMy.Caption = "鎴戠殑淇℃伅";
             this.barMy.Id = 20;
             this.barMy.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barMy.ImageOptions.Image")));
             this.barMy.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barMy.ImageOptions.LargeImage")));
@@ -231,27 +147,17 @@
             // 
             this.barExit.Caption = "閫�鍑虹郴缁�";
             this.barExit.Id = 25;
+            this.barExit.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_previous_16x161;
+            this.barExit.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.trackingchanges_previous_32x321;
             this.barExit.Name = "barExit";
             // 
             // barPwd
             // 
             this.barPwd.Caption = "淇敼瀵嗙爜";
             this.barPwd.Id = 26;
+            this.barPwd.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.bouser_16x163;
+            this.barPwd.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.bouser_32x32;
             this.barPwd.Name = "barPwd";
-            // 
-            // barToggleSwitchItem1
-            // 
-            this.barToggleSwitchItem1.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right;
-            this.barToggleSwitchItem1.Caption = "barToggleSwitchItem1";
-            this.barToggleSwitchItem1.Id = 22;
-            this.barToggleSwitchItem1.Name = "barToggleSwitchItem1";
-            // 
-            // barToolbarsListItem1
-            // 
-            this.barToolbarsListItem1.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right;
-            this.barToolbarsListItem1.Caption = "barToolbarsListItem1";
-            this.barToolbarsListItem1.Id = 23;
-            this.barToolbarsListItem1.Name = "barToolbarsListItem1";
             // 
             // barMsg
             // 
@@ -261,72 +167,22 @@
             // 
             // barMsgXf
             // 
-            this.barMsgXf.Caption = "barButtonItem5";
+            this.barMsgXf.Caption = "barMsgXf";
             this.barMsgXf.Id = 31;
             this.barMsgXf.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barMsgXf.ImageOptions.Image")));
             this.barMsgXf.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barMsgXf.ImageOptions.LargeImage")));
             this.barMsgXf.Name = "barMsgXf";
             // 
-            // barSubItem4
-            // 
-            this.barSubItem4.Caption = "barSubItem4";
-            this.barSubItem4.Id = 32;
-            this.barSubItem4.Name = "barSubItem4";
-            // 
-            // barTxt
-            // 
-            this.barTxt.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right;
-            this.barTxt.Caption = "鍒囨崲缁勭粐:";
-            this.barTxt.Id = 34;
-            this.barTxt.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.employee_16x16;
-            this.barTxt.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.employee_32x321;
-            this.barTxt.Name = "barTxt";
-            this.barTxt.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
-            // 
-            // barOrg
-            // 
-            this.barOrg.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right;
-            this.barOrg.Caption = "鍒囨崲缁勭粐";
-            this.barOrg.Edit = this.repositoryItemCheckedComboBoxEdit1;
-            this.barOrg.EditValue = "鍒囨崲缁勭粐";
-            this.barOrg.EditWidth = 120;
-            this.barOrg.Id = 35;
-            this.barOrg.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.publicfix_16x16;
-            this.barOrg.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.publicfix_32x321;
-            this.barOrg.Name = "barOrg";
-            this.barOrg.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
-            // 
-            // repositoryItemCheckedComboBoxEdit1
-            // 
-            this.repositoryItemCheckedComboBoxEdit1.AutoHeight = false;
-            this.repositoryItemCheckedComboBoxEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemCheckedComboBoxEdit1.Name = "repositoryItemCheckedComboBoxEdit1";
-            // 
             // fdm1
             // 
             this.fdm1.Form = this;
             this.fdm1.Items.AddRange(new DevExpress.XtraBars.BarItem[] {
-            this.barSubItem1,
-            this.barSubItem2,
-            this.barAbout,
-            this.barUs,
-            this.barHelp,
             this.barMy,
-            this.barToggleSwitchItem1,
-            this.barToolbarsListItem1,
             this.barExit,
             this.barPwd,
             this.barMsg,
-            this.barMsgXf,
-            this.barSubItem4,
-            this.barEasy,
-            this.barTxt,
-            this.barOrg,
-            this.barMenu});
+            this.barMsgXf});
             this.fdm1.MaxItemId = 37;
-            this.fdm1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemCheckedComboBoxEdit1});
             // 
             // acrd
             // 
@@ -351,20 +207,20 @@
             this.tabCloseCurrent,
             this.tabCloseAll});
             this.cms1.Name = "contextMenuStrip1";
-            this.cms1.Size = new System.Drawing.Size(215, 84);
+            this.cms1.Size = new System.Drawing.Size(158, 56);
             // 
             // tabCloseCurrent
             // 
             this.tabCloseCurrent.Image = global::Gs.DevApp.Properties.Resources.deletelist2_16x16;
             this.tabCloseCurrent.Name = "tabCloseCurrent";
-            this.tabCloseCurrent.Size = new System.Drawing.Size(214, 26);
+            this.tabCloseCurrent.Size = new System.Drawing.Size(157, 26);
             this.tabCloseCurrent.Text = "鍏抽棴褰撳墠椤�";
             // 
             // tabCloseAll
             // 
             this.tabCloseAll.Image = global::Gs.DevApp.Properties.Resources.forcetesting_16x161;
             this.tabCloseAll.Name = "tabCloseAll";
-            this.tabCloseAll.Size = new System.Drawing.Size(214, 26);
+            this.tabCloseAll.Size = new System.Drawing.Size(157, 26);
             this.tabCloseAll.Text = "鍏抽棴鍏跺畠椤�";
             // 
             // FrmMain
@@ -388,7 +244,6 @@
             this.strp1.ResumeLayout(false);
             this.strp1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.fluentDesignFormControl1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckedComboBoxEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.fdm1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.acrd)).EndInit();
             this.cms1.ResumeLayout(false);
@@ -403,29 +258,17 @@
         private DevExpress.XtraTab.XtraTabControl tab;
         private System.Windows.Forms.StatusStrip strp1;
         private DevExpress.XtraBars.Navigation.AccordionControl acrd;
-        private DevExpress.XtraBars.BarSubItem barSubItem1;
-        private DevExpress.XtraBars.BarSubItem barSubItem2;
-        private DevExpress.XtraBars.BarSubItem barAbout;
-        private DevExpress.XtraBars.BarButtonItem barUs;
-        private DevExpress.XtraBars.BarButtonItem barHelp;
         private DevExpress.XtraBars.BarSubItem barMy;
-        private DevExpress.XtraBars.BarToggleSwitchItem barToggleSwitchItem1;
-        private DevExpress.XtraBars.BarToolbarsListItem barToolbarsListItem1;
         private DevExpress.XtraBars.BarButtonItem barExit;
         private DevExpress.XtraBars.BarButtonItem barPwd;
         private DevExpress.XtraBars.BarListItem barMsg;
         private DevExpress.XtraBars.BarButtonItem barMsgXf;
         private System.Windows.Forms.ToolStripStatusLabel toolTime;
         private System.Windows.Forms.ToolStripStatusLabel tooLoading;
-        private DevExpress.XtraBars.BarButtonItem barEasy;
-        private DevExpress.XtraBars.BarSubItem barSubItem4;
         private System.Windows.Forms.ContextMenuStrip cms1;
         private System.Windows.Forms.ToolStripMenuItem tabCloseCurrent;
         private System.Windows.Forms.ToolStripMenuItem tabCloseAll;
         private System.Windows.Forms.ToolStripStatusLabel toolZhiChi;
-        private DevExpress.XtraBars.BarStaticItem barTxt;
-        private DevExpress.XtraBars.BarEditItem barOrg;
-        private DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit repositoryItemCheckedComboBoxEdit1;
-        private DevExpress.XtraBars.BarButtonItem barMenu;
+       
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index 98ded9d..68d8dff 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -21,8 +21,10 @@
 {
     public partial class FrmMain : FluentDesignForm
     {
-        private static readonly Dictionary<string, XtraTabPage> TabPageDic =
-            new Dictionary<string, XtraTabPage>();
+        /// <summary>
+        /// tab涓存椂閫夐」鍗�
+        /// </summary>
+        private static readonly Dictionary<string, XtraTabPage> TabPageDic = new Dictionary<string, XtraTabPage>();
         private string OldorgFids = "";
         public FrmMain()
         {
@@ -33,7 +35,6 @@
             barPwd.ItemClick += BarPwd_ItemClick;
             barExit.ItemClick += BarExit_ItemClick;
             FormClosing += FrmMain_FormClosing;
-            barEasy.ItemClick += BarEasy_ItemClick;
             getTree();
             tab.MouseDown += Tab_MouseDown;
             tabCloseCurrent.Click += (s, e) =>
@@ -60,48 +61,12 @@
                     }
                 }
             };
-            GetOrg();
-            barOrg.EditValueChanged += (s, e) =>
-            {
-                if (barOrg.EditValue == null)
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佺殑缁勭粐锛�");
-                    return;
-                }
-                string _val = barOrg.EditValue.ToString();
-                if (string.IsNullOrEmpty(_val))
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佺殑缁勭粐锛�");
-                    return;
-                }
-                if (OldorgFids == _val)
-                    return;
-                var _obj = new
-                {
-                    edtUserGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
-                    userGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
-                    userOrgFids = _val,
-                };
-                try
-                {
-                    var strJson = UtilityHelper.HttpPost("", "User/SetUserOrg",
-                        JsonConvert.SerializeObject(_obj));
-                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                    MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnData.outMsg);
-                }
-                catch (Exception ex)
-                {
-                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-                }
-            };
-            barMenu.ItemClick += (s, e) =>
-            {
-                Gs.DevApp.DevFrm.User.SysMenu frm = new SysMenu();
-                frm.ShowDialog();
-            };
-            //  tab.ContextMenuStrip = cms1;
         }
-
+        /// <summary>
+        /// 鏄剧ず鍙抽敭鑿滃崟
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void Tab_MouseDown(object sender, MouseEventArgs e)
         {
             if (e.Button == MouseButtons.Right)
@@ -109,13 +74,6 @@
                 cms1.Show(tab, e.Location);
             }
         }
-
-        private void BarEasy_ItemClick(object sender, ItemClickEventArgs e)
-        {
-            //var frm = new EasyCode();
-            //frm.ShowDialog();
-        }
-
         private void FrmMain_FormClosing(object sender, FormClosingEventArgs e)
         {
             if (MsgHelper.AskQuestion("纭畾瑕侀��鍑虹郴缁熷悧?"))
@@ -175,6 +133,9 @@
         {
             getTree();
         }
+        /// <summary>
+        /// 璇诲彇宸﹀垯妯″潡鑿滃崟
+        /// </summary>
         private void getTree()
         {
             toolTime.Text = "鐧诲綍鏃堕棿" + LoginInfoModel.CurrentUser.LoginTime;
@@ -295,14 +256,16 @@
         }
 
         /// <summary>
-        ///     鏂板閫夐」鍗￠〉
+        /// 鏂板閫夐」鍗￠〉
         /// </summary>
         /// <param name="tabControl">閫夐」鍗℃帶浠�</param>
         /// <param name="tabPageName">褰撴湡閫夐」鍗￠〉name鍚嶇О</param>
         /// <param name="tabText">褰撳墠閫夐」鍗￠〉Text鏍囬</param>
-        /// <param name="newFormName">褰撳墠閫夐」鍗′腑鐨勬柊绐椾綋璺緞锛岀被鍚�</param>
+        /// <param name="newFormName"></param>
+        /// <param name="imgIcon">褰撳墠閫夐」鍗′腑鐨勬柊绐椾綋璺緞锛岀被鍚�</param>
+        /// <param name="InitializeVal">鍒濆鍊硷紝鐢ㄤ簬瀛愮獥浣撲腑璋冪敤鐖剁獥浣撶殑鍊�</param>
         public void AddTabpage(XtraTabControl tabControl, string tabPageName,
-            string tabText, string newFormName, Image imgIcon,string InitializeVal="")
+            string tabText, string newFormName, Image imgIcon, string InitializeVal = "")
         {
             if (IsTabpageExsit(tabControl, tabPageName)) return;
             var newPage = new XtraTabPage();
@@ -367,7 +330,7 @@
         ///     鍦ㄩ�夐」鍗′腑鐢熸垚绐椾綋
         /// </summary>
         /// <param name="form">绐椾綋鍚嶇О</param>
-        private Form AddNewForm(string formName,string InitializeVal)
+        private Form AddNewForm(string formName, string InitializeVal)
         {
             try
             {
@@ -383,63 +346,20 @@
                 newForm.ControlBox = false;
                 newForm.Dock = DockStyle.Fill;
                 newForm.Visible = true;
-                //瀹炵幇瀛愮獥浣撶殑濮旀墭beg
-                EventInfo evt = newForm.GetType().GetEvent("ToUpdateParent",
-                    BindingFlags.NonPublic | BindingFlags.Instance
-                    | BindingFlags.Public
-                );
-                if (evt != null)
-                    evt.AddEventHandler(newForm, new EventHandler<UpdateParentEventArgs>(UpdateParent_OnChange));
-                if (!string.IsNullOrEmpty(InitializeVal)) {
-                    Assembly assembly = Assembly.GetExecutingAssembly();
-                    Type type = assembly.GetType(formName);
-                    MethodInfo method = type.GetMethod("Initialize"); // 鑾峰彇Initialize鏂规硶鐨勪俊鎭�
-                    if (method != null)
-                        method.Invoke(newForm, new object[] { InitializeVal }); // 璋冪敤Initialize鏂规硶骞朵紶閫掑弬鏁�
-                }
-                //瀹炵幇瀛愮獥浣撶殑濮旀墭end
+                shiXian(newForm, formName, InitializeVal);
                 return newForm;
             }
             catch (Exception)
             {
                 MsgHelper.ShowError("璇锋鏌ユ槸鍚﹀紑閫氫簡璇ユā鍧楋紒");
             }
-
             return null;
         }
-        //瀹炵幇瀛愮獥浣撶殑濮旀墭beg
-        private void UpdateParent_OnChange(object sender, UpdateParentEventArgs e)
-        {
-            List<string> _val = e.StringList;
-            string _formName = _val[0];//绫诲悕
-            string _parm1= _val[1];
-            var _obj = new
-            {
-                guid = _formName //涓诲缓
-            };
-            try
-            {
-                var strJson = UtilityHelper.HttpPost("", "MenuAction/GetModelByNameSpace",
-                    JsonConvert.SerializeObject(_obj));
-                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                if (_rtn.rtnCode > 0)
-                {
-                    var dy = _rtn.rtnData;
-                    string tabPageName = dy.guid.ToString() + "_page";
-                    string tabText = dy.name.ToString(); //褰撳墠閫夐」鍗￠〉Text鏍囬
-                    string newFormName = dy.formPath.ToString(); //瀛樿矾寰勶紝绫诲悕
-                    Image imgIcon = UtilityHelper.GetImgFromResource(dy.icon.ToString(), 2);
-                    //鍏堝叧闂�
-                    RemoveTabPage(tab, tabPageName);
-                    AddTabpage(tab, tabPageName, tabText,newFormName, imgIcon, _parm1);
-                }
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-        //瀹炵幇瀛愮獥浣撶殑濮旀墭end
+
+        /// <summary>
+        /// 鐢ㄦ埛閫�鍑�
+        /// </summary>
+        /// <returns></returns>
         private int _userOut()
         {
             var _obj = new
@@ -463,27 +383,58 @@
                 return 1;
             }
         }
-        private void GetOrg()
+
+        #region 瀹炵幇瀛愮獥浣撶殑濮旀墭锛屼富瑕佺敤浜庡瓙椤甸潰涓闂埗椤甸潰鏂规硶
+        private void UpdateParent_OnChange(object sender, UpdateParentEventArgs e)
         {
-            string userGuid = LoginInfoModel.CurrentUser.LoginUserGuid;
-            var pgq = new PageQueryModel(1, 999999, "FID", "asc", userGuid, " and IS_STATUS=1");
-            var json = JsonConvert.SerializeObject(pgq);
+            List<string> _val = e.StringList;
+            string _formName = _val[0];//绫诲悕
+            string _parm1 = _val[1];
+            var _obj = new
+            {
+                guid = _formName //涓诲缓
+            };
             try
             {
-                var strReturn = UtilityHelper.HttpPost("", "Organization/GetListPage", json);
-                var _rtn = UtilityHelper.ReturnToTablePage(strReturn);
-                var dt = _rtn.rtnData.list;
-                repositoryItemCheckedComboBoxEdit1.DataSource = dt;
-                repositoryItemCheckedComboBoxEdit1.DisplayMember = "name";
-                repositoryItemCheckedComboBoxEdit1.ValueMember = "fid";
-                var _obj = UtilityHelper.ReturnToDynamic(strReturn);
-                barOrg.EditValue = _obj.rtnData.extendText;
-                OldorgFids = _obj.rtnData.extendText;
+                var strJson = UtilityHelper.HttpPost("", "MenuAction/GetModelByNameSpace",
+                    JsonConvert.SerializeObject(_obj));
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    var dy = _rtn.rtnData;
+                    string tabPageName = dy.guid.ToString() + "_page";
+                    string tabText = dy.name.ToString(); //褰撳墠閫夐」鍗￠〉Text鏍囬
+                    string newFormName = dy.formPath.ToString(); //瀛樿矾寰勶紝绫诲悕
+                    Image imgIcon = UtilityHelper.GetImgFromResource(dy.icon.ToString(), 2);
+                    //鍏堝叧闂�
+                    RemoveTabPage(tab, tabPageName);
+                    AddTabpage(tab, tabPageName, tabText, newFormName, imgIcon, _parm1);
+                }
             }
             catch (Exception ex)
             {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
+
+        private void shiXian(Form newForm, string formName, string InitializeVal)
+        {
+            EventInfo evt = newForm.GetType().GetEvent("ToUpdateParent",
+                BindingFlags.NonPublic | BindingFlags.Instance
+                | BindingFlags.Public
+            );
+            if (evt != null)
+                evt.AddEventHandler(newForm, new EventHandler<UpdateParentEventArgs>(UpdateParent_OnChange));
+            if (!string.IsNullOrEmpty(InitializeVal))
+            {
+                Assembly assembly = Assembly.GetExecutingAssembly();
+                Type type = assembly.GetType(formName);
+                MethodInfo method = type.GetMethod("Initialize"); // 鑾峰彇Initialize鏂规硶鐨勪俊鎭�
+                if (method != null)
+                    method.Invoke(newForm, new object[] { InitializeVal }); // 璋冪敤Initialize鏂规硶骞朵紶閫掑弬鏁�
+            }
+        }
+        #endregion
+
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.resx b/DevApp/Gs.DevApp/DevFrm/FrmMain.resx
index 8332948..9206552 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.resx
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.resx
@@ -120,35 +120,8 @@
   <metadata name="strp1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>284, 17</value>
   </metadata>
-  <metadata name="strp1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>284, 17</value>
-  </metadata>
-  <assembly alias="DevExpress.Data.v22.2" name="DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="barSubItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIyLjIsIFZlcnNpb249MjIuMi4z
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKIDAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iQ2xlYXJUYWJsZVN0eWxlIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6
-        bmV3IDAgMCAzMiAzMiI+DQogIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmx1ZXtmaWxsOiMxMTc3
-        RDc7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNp
-        dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgY2xhc3M9InN0MCI+DQogICAgPHBhdGggZD0iTTI4LDEwaC04
-        VjRoOFYxMHogTTI0LjYsMTQuOWMwLjYtMC42LDEuNC0wLjksMi4yLTAuOWMwLjQsMCwwLjgsMC4xLDEu
-        MiwwLjJWMTJoLTh2NmgxLjVMMjQuNiwxNC45eiBNMCwyNiAgIGg4di02SDBWMjZ6IE0xNC45LDI0LjZs
-        My4xLTMuMVYyMGgtOHY2aDQuMUMxNC4zLDI1LjUsMTQuNSwyNSwxNC45LDI0LjZ6IiBjbGFzcz0iQmxh
-        Y2siIC8+DQogIDwvZz4NCiAgPHBhdGggZD0iTTAsNGg4djZIMFY0eiBNMCwxOGg4di02SDBWMTh6IE0x
-        MCwxMGg4VjRoLThWMTB6IE0xMCwxOGg4di02aC04VjE4eiBNMTksMjMuM0wxNi4zLDI2ICBjLTAuNCww
-        LjQtMC40LDEuMiwwLDEuNmw0LDRjMC40LDAuNCwxLjIsMC40LDEuNiwwbDIuNy0yLjdMMTksMjMuM3oi
-        IGNsYXNzPSJCbHVlIiAvPg0KICA8cGF0aCBkPSJNMzEuNywyMC40bC00LTRjLTAuNC0wLjQtMS4yLTAu
-        NC0xLjYsMGwtNi4xLDYuMWw1LjYsNS42bDYuMS02LjFDMzIuMSwyMS41LDMyLjEsMjAuOCwzMS43LDIw
-        LjR6IiBjbGFzcz0iUmVkIiAvPg0KPC9zdmc+Cw==
-</value>
-  </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="barAbout.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="barMy.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAOdEVYdFRpdGxlAERldGFpbHM7NJb/TAAAAxBJREFU
@@ -168,7 +141,7 @@
         4c3590llwYcAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="barAbout.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="barMy.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAOdEVYdFRpdGxlAERldGFpbHM7NJb/TAAACa9JREFU
@@ -214,61 +187,6 @@
         9YdSUwJl5FrIY7bRTj8Ah9jdEOlqYO1dCTOnHFhJAnu5wpElpDOS4D1n4KkJ5i3kQPgSQSwEs6AjxhJp
         w2w96s2loS2W8oQeC2VaP531flNx1I8mtgGXeBbObz+9jvlswOOOjPtD09jA/8uQYF7dlgTzQURFeD/F
         nWBePMOJP74+Pw0AnP8AExOfJqp7hEIAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="barMy.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAASdEVYdFRpdGxlAFVzZXI7UGVyc29uO0y2ImUAAAJ+
-        SURBVDhPdZJrSFNxGMb/c7nUTDMvNc2onG4aJBKSq22OYUtXCoolZFAiXanIpc7NSYMKI3W6WmalEnZF
-        zCK7QpiyfVgSJMQktDAMCi8l1KfKfDrv8TCs1gPP//zP+/6e58s5DAAzq0J5WzIXs+PrRMy6KXLPNePW
-        /m7bjvH2vRk9pWuDVjI/oix/2DeH8a5VS5hZGZb/8oYF4302jHXvg6veAKMyfDQtWlIgFomE6Jx8BeoV
-        Et4bopj4ekXe27EeIy5kM5QnM5zMXYXmknQ0bAyEPDwgW8jy8hXMU/BtS+6vrqPrYcqMRd1uNd71OvDJ
-        fQ7VGRGQBbEmgePlr4BZ1Etfd9lK8O2DG/h4Hz+GO/BzqBkdR7SIYcwhYLz8FigCWNFzZxU3HsZnjx2T
-        rjOY7jOjoTh1JoixdAHj5beAdFif2vt95AFmvE58ddVg8GIhDLLQu8Lap/8WxASLda1l+XBdOoCeE1mo
-        0sURlBvIHQvmfQm/BYnS2KJyc/XQZaMeD205qC+Ix660aBSX7vfqZbJCAeP1T8GhNas7b27RY/DNCF64
-        HqGxcjusO1VoddTimduDW3nbcJBjBPzPArVGU+512OHRqNFmtcIzMQ3raTtO1TkxMDmNFlMlPJkaEEPs
-        3wWSO4+fTAxcaUF/igL2pCRolUq8n5rCKGedSoUmhYLfEUMsZXwFUqk05wt3eXW1HZ2xy/E0IQFOsRgm
-        rZY33WlGO2KIpYyvIMdgcHJP7r8/i3sRS+BOSUa/XI62kEW86U4z2hFDEjJzBXHx8drG887JmiwdKkIW
-        zlqWRc+WRUXimGC604x2xBBLGV+BIO5PZXLOifNM7/5mxHJZsN86BZo6ADxq2AAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="barMy.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAASdEVYdFRpdGxlAFVzZXI7UGVyc29uO0y2ImUAAAdm
-        SURBVFhHxZcLUJTnGYUxjYLIhpsIBAx3kauCXAMKFTWNQowsoCKgiFwkIoqCi9cgCFirUUgwiiBRCUqC
-        plzUiuUipWhEQZTEZkJCaAhGiWWsYaZ1mNPv7CJjwmKhnUzemXf45vve85zz//vv/oMKgF+1hxap3hoj
-        9nZ3iUqqu4bKttmaZtvcJUkyd43iZFeNZvYmt0nHRc9NdNZQiZ8xUWW09b8EWJu9yAyl25eg9vB6tJal
-        o+XjNFzKicO+pTMgAuT+kgHeOBYze6DnWgG+qTuIu2e3oO1UDG7kL0dLfihuFMVgf7gbRIBYwX5B9Di5
-        y3NqLAH0dvsZPu6szcMXlbvwl73zUZvujcs7PHBpqxvKU5xRFGuLdyOmIc5h0pNou4m3V05XjxEeLyqs
-        lNewAFs9JCN18unUxfiq+g+oy5qLKmF4bp0dSmOsUBRhipygl5EVYIiUeRZIW2CA90KmYp2zBFILtRDh
-        8xuF3fAaFmCkkrlptN0o2Yabx2NRlmCHwlAT5L5pgOzf6SJjnhaSPTWxO8gZzad3IsldC7kBekiYOQlB
-        FmqVQj7iQzHaAOOS3ST9n1dmozzVC4eWvIwdvlrY4CpBnKM6wm3UkRM3D99fPYze6++jaLM/1jtpINZG
-        FUHmaveFXkuBGV6jDfDCJjeN7qsfyJAXaoYdv9VBdpgPPpCFoGJ/ND6rysLDm8eE+WHcv3oI39ZkI2Op
-        C8IsVSE1n/hE6KcoMMNr1AGSXCZdKc+ORHaAEQ7G+qP/2yb03SnBP24Vyc1/EFd+v+kQ7jXsQ/ef01Gd
-        uxrLbbX+vdh04r+E3lCBGV6jDpA4S31b3po5SPaajM8bz+Px15fR13YSD1t+av5dTQa+rpKh/r0wRLkZ
-        DCx6Ra1b6A0UmOE12gDjvC019Da6a3cnumiiq70J/+y4iIetx4duu/zKa9Lx9z9tR/uZt1CxZzHCnfT7
-        fA0nFAq9pgIzvEYbgPViqI16+EY3bXxadRKPOi7hhxv5iiu/8vsh887KZDQXRKBogy+CbbRvCZ05tXKC
-        khpLAP6qaa6d9VJn0a61eNxZL67+iLhymmfIzb+p3IzPSmJR904gMpc6YJ65ximh0ZGrR6ixBGCpLrHX
-        i9wR4nW/9WIRepsL8F3tnkHzZPztTBz+mheMkxu9Eemq3zdTTy1CaJ77YhhrAN4FrUBH/fdzEpeipfwd
-        dFXvwZd/TMKtE1FozA1GqcwHKfPN4GUwoUTMjvjwPa0xBZBIJCqWlpaqc9zdE2WvT0NG+FwU71qBiwdW
-        oCI9AO+ucUGijzHCHSbDSF9PJiTyq/eTqPOP0hptAL7ZVEUA3YCAgLPSIOnj/RGuOJsZih2L7bHKSRdh
-        9pqI89BH8nxTxHmZw9HR8UdjY+NyqafH/x1gvOgpArJSwL4oKytDcXExMiK80VWzF7c/TkFNzkqc3roQ
-        +etm49AqF0R6WSMzMxOcpYZaMgZZP6n/FmCC/vjxdqt0XqrfO80cm3x95OYDAwNIio9E6b5YNOS/hU/F
-        C+rygWUo2rQAu1Z4Yfmbi9DW1iafpYZaMsgiU4FW1PMC8BVqGj1Z8/aFqEi0ro7EuUULER4eLsaAvr4+
-        SAOliA0Pw4b165G0Zg3i/P2xcMF8NDY2oqGhQT5LDbVkkEXmIFteQ75DC0XxaddJSEgoPBAsRdvBg2gR
-        kIY5s+Hv7Iz29nb09/ejo6MDfn5+SNudJm+uucczznCWGmrJIItMsgc9Rgww3sTExCMvL+/HT97eiaPL
-        Q9AaHYUr3l7Y7WCPlJQU3Lt3D83NzXLTO3fuyJtr7vGMM5ylhloyyCKTbHrQaKQAOtHR0YV1dXW4fqYE
-        O2fNwM2o1aj3ehXnHRzgbGmJ+vp6eHp6yo2fFtfc4xlnOEsNtWSQRSbZ9KCRkA0LwFtjlZaW1t3V1YUv
-        r19DqqkxroeFokbAL9jbId3SAo7C4HUdHYg5IVMU19zjGWc4Sw21ZJBFJtn0oJeQDQug6uTkFFhQUCD/
-        LHs6O5FqNAVNgUtw2dUVVXa2qLCZjiJLK3wkjKTa2nJjNtfc4xlnOEsNtWSQRSbZ9KCXsgBay5Yty6uo
-        qMCjR4/wvfg8txjo4sprr+GisxMqbWzxibU1PrKyQomFOU6YmuINTU15c809nnGGs9RQSwZZZJJND3op
-        C2AcHx9/rampCb29vfjq7l1s0ddBjY8vzs9wRPl0a5wVBqXm5vhQGB43NcPRqVPlzTX3eMYZzlJDLRlk
-        kUk2PeilLIBVVlbWkwcPHqCnpwet9bXYrD8Z1R7uqLC3xTlrcestLPChmRlOmJigQBg/29zjGWc4Sw21
-        ZJBFJtn0oJeyAHpSqfTEkaPHUHGhGuW5OYibootTttNRKG7vEZNXkCeMco2McMDQEFmG4v+BZ5p7POMM
-        Z6mhlgyyyCSbHvRSFoDfz2nBwcHVMpkMUTMdEaUjwWq2tgSrRK8c7DAtCUJ/1tx7es5ZaqglgywyyaYH
-        vZQFYPH32kj0TNFuStr9mX71Z/3smTItmWTL3wkKX6j8B54pnZmRU85dAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="barMsgXf.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
index e751627..67e19b8 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
@@ -77,6 +77,7 @@
             this.lbGuid = new System.Windows.Forms.Label();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -190,7 +191,8 @@
             this.gv_createdBy,
             this.gv_createDate,
             this.gridColumn1,
-            this.gridColumn2});
+            this.gridColumn2,
+            this.gridColumn3});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
@@ -704,6 +706,16 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "涓婚敭GUID";
+            this.gridColumn3.FieldName = "guid";
+            this.gridColumn3.MinWidth = 25;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 11;
+            this.gridColumn3.Width = 94;
+            // 
             // DocNoRule
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -793,5 +805,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
         private UserControls.Data.UcPageBar pageBar1;
         private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
index 66a51f3..07a4eb5 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
@@ -30,17 +30,17 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -206,7 +206,7 @@
             this.rolRemark.OptionsColumn.AllowEdit = false;
             this.rolRemark.Tag = "query_role_Remark";
             this.rolRemark.Visible = true;
-            this.rolRemark.VisibleIndex = 0;
+            this.rolRemark.VisibleIndex = 1;
             this.rolRemark.Width = 300;
             // 
             // status
@@ -218,7 +218,7 @@
             this.status.OptionsColumn.AllowEdit = false;
             this.status.Tag = "query_is_Status";
             this.status.Visible = true;
-            this.status.VisibleIndex = 1;
+            this.status.VisibleIndex = 2;
             this.status.Width = 25;
             // 
             // roleCreateBy
@@ -230,7 +230,7 @@
             this.roleCreateBy.OptionsColumn.AllowEdit = false;
             this.roleCreateBy.Tag = "query_create_by";
             this.roleCreateBy.Visible = true;
-            this.roleCreateBy.VisibleIndex = 2;
+            this.roleCreateBy.VisibleIndex = 3;
             this.roleCreateBy.Width = 50;
             // 
             // createDate
@@ -242,7 +242,7 @@
             this.createDate.OptionsColumn.AllowEdit = false;
             this.createDate.Tag = "query_create_Time";
             this.createDate.Visible = true;
-            this.createDate.VisibleIndex = 3;
+            this.createDate.VisibleIndex = 4;
             this.createDate.Width = 180;
             // 
             // gridColumn1
@@ -258,10 +258,10 @@
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.bouser_16x162;
-            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.bouser_16x162;
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閰嶇疆鏉冮檺", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閰嶇疆鏉冮檺", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -355,7 +355,7 @@
             this.txt_roleRemark.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_roleRemark.Name = "txt_roleRemark";
             this.txt_roleRemark.Properties.Appearance.Options.UseFont = true;
-            this.txt_roleRemark.Properties.ScrollBars = System.Windows.Forms.ScrollBars.None;
+            this.txt_roleRemark.Properties.ScrollBars = System.Windows.Forms.ScrollBars.Both;
             this.txt_roleRemark.Size = new System.Drawing.Size(314, 39);
             this.txt_roleRemark.StyleController = this.layoutMx1;
             this.txt_roleRemark.TabIndex = 126;
@@ -391,26 +391,26 @@
             this.layoutControlItem4});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition7.Width = 100D;
-            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition8.Width = 100D;
-            columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition9.Width = 100D;
+            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1.Width = 100D;
+            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition2.Width = 100D;
+            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition3.Width = 100D;
             this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition7,
-            columnDefinition8,
-            columnDefinition9});
-            rowDefinition7.Height = 100D;
-            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition8.Height = 100D;
-            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition9.Height = 100D;
-            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1,
+            columnDefinition2,
+            columnDefinition3});
+            rowDefinition1.Height = 100D;
+            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition2.Height = 100D;
+            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition3.Height = 100D;
+            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition7,
-            rowDefinition8,
-            rowDefinition9});
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3});
             this.Root.Size = new System.Drawing.Size(1235, 149);
             this.Root.TextVisible = false;
             // 
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
index 0fc2ba0..415221a 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
@@ -334,6 +334,11 @@
                 if (node.Nodes.Count > 0) TraverseTreeViewNodes(node.Nodes);
             }
         }
+        /// <summary>
+        /// 寮瑰嚭閰嶇疆鏉冮檺
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
         {
             if (e.Button.Index == 0)
@@ -341,7 +346,7 @@
                 var rowhandle = gridView1.FocusedRowHandle;
                 var dr = gridView1.GetDataRow(rowhandle);
                 var roleGuid = dr["guid"].ToString();
-                var frm = new RoleSelectAction(roleGuid);
+                var frm = new RoleSelectAction(roleGuid,"璁剧疆瑙掕壊鏉冮檺");
                 frm.ShowDialog();
             }
         }
diff --git a/DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.Designer.cs
index 395568b..83c3570 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.Designer.cs
@@ -30,54 +30,57 @@
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RoleSelectAction));
             this.panel1 = new System.Windows.Forms.Panel();
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
             this.trv = new System.Windows.Forms.TreeView();
             this.panel2 = new System.Windows.Forms.Panel();
+            this.btnOpen = new DevExpress.XtraEditors.SimpleButton();
             this.btnCancel = new DevExpress.XtraEditors.SimpleButton();
             this.btnSave = new DevExpress.XtraEditors.SimpleButton();
             this.panel1.SuspendLayout();
-            this.groupBox1.SuspendLayout();
             this.panel2.SuspendLayout();
             this.SuspendLayout();
             // 
             // panel1
             // 
-            this.panel1.Controls.Add(this.groupBox1);
+            this.panel1.Controls.Add(this.trv);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(468, 643);
+            this.panel1.Size = new System.Drawing.Size(455, 589);
             this.panel1.TabIndex = 0;
-            // 
-            // groupBox1
-            // 
-            this.groupBox1.Controls.Add(this.trv);
-            this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.groupBox1.Location = new System.Drawing.Point(0, 0);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(468, 643);
-            this.groupBox1.TabIndex = 11;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "璇烽�夋嫨璇ヨ鑹茬殑鏉冮檺";
             // 
             // trv
             // 
             this.trv.CheckBoxes = true;
             this.trv.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.trv.Location = new System.Drawing.Point(3, 22);
+            this.trv.Location = new System.Drawing.Point(0, 0);
             this.trv.Name = "trv";
-            this.trv.Size = new System.Drawing.Size(462, 618);
+            this.trv.Size = new System.Drawing.Size(455, 589);
             this.trv.TabIndex = 2;
             // 
             // panel2
             // 
+            this.panel2.Controls.Add(this.btnOpen);
             this.panel2.Controls.Add(this.btnCancel);
             this.panel2.Controls.Add(this.btnSave);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panel2.Location = new System.Drawing.Point(0, 579);
+            this.panel2.Location = new System.Drawing.Point(0, 589);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(468, 64);
+            this.panel2.Size = new System.Drawing.Size(455, 54);
             this.panel2.TabIndex = 1;
+            // 
+            // btnOpen
+            // 
+            this.btnOpen.Appearance.Options.UseFont = true;
+            this.btnOpen.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
+            this.btnOpen.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnOpen.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.article_16x16;
+            this.btnOpen.Location = new System.Drawing.Point(44, 9);
+            this.btnOpen.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.btnOpen.Name = "btnOpen";
+            this.btnOpen.Size = new System.Drawing.Size(97, 37);
+            this.btnOpen.TabIndex = 241;
+            this.btnOpen.Text = "鍏ㄩ儴灞曞紑";
+            this.btnOpen.Click += new System.EventHandler(this.btnOpen_Click);
             // 
             // btnCancel
             // 
@@ -85,12 +88,12 @@
             this.btnCancel.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
             this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnCancel.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCancel.ImageOptions.Image")));
-            this.btnCancel.Location = new System.Drawing.Point(219, 16);
+            this.btnCancel.Location = new System.Drawing.Point(302, 9);
             this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.btnCancel.Name = "btnCancel";
             this.btnCancel.Size = new System.Drawing.Size(87, 37);
             this.btnCancel.TabIndex = 240;
-            this.btnCancel.Text = "鍙栨秷 (&C)";
+            this.btnCancel.Text = "鍙栨秷";
             this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
             // 
             // btnSave
@@ -99,21 +102,21 @@
             this.btnSave.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
             this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnSave.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnSave.ImageOptions.Image")));
-            this.btnSave.Location = new System.Drawing.Point(98, 16);
+            this.btnSave.Location = new System.Drawing.Point(173, 9);
             this.btnSave.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.btnSave.Name = "btnSave";
             this.btnSave.Size = new System.Drawing.Size(87, 37);
             this.btnSave.TabIndex = 239;
-            this.btnSave.Text = "纭畾 (&L)";
+            this.btnSave.Text = "淇濆瓨";
             this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
             // 
             // RoleSelectAction
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(468, 643);
-            this.Controls.Add(this.panel2);
+            this.ClientSize = new System.Drawing.Size(455, 643);
             this.Controls.Add(this.panel1);
+            this.Controls.Add(this.panel2);
             this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
             this.MaximizeBox = false;
             this.MinimizeBox = false;
@@ -122,7 +125,6 @@
             this.Text = "璁剧疆瑙掕壊鐨勬潈闄�";
             this.TopMost = true;
             this.panel1.ResumeLayout(false);
-            this.groupBox1.ResumeLayout(false);
             this.panel2.ResumeLayout(false);
             this.ResumeLayout(false);
 
@@ -131,10 +133,10 @@
         #endregion
 
         private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.GroupBox groupBox1;
         private System.Windows.Forms.TreeView trv;
         private System.Windows.Forms.Panel panel2;
         private DevExpress.XtraEditors.SimpleButton btnCancel;
         private DevExpress.XtraEditors.SimpleButton btnSave;
+        private DevExpress.XtraEditors.SimpleButton btnOpen;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.cs b/DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.cs
index 9ec9290..0d4d9c7 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.cs
@@ -11,14 +11,18 @@
     {
         private StringBuilder _actionLst = new StringBuilder();
         private readonly string _rightGuid;
-        public RoleSelectAction(string rightGuid)
+        public RoleSelectAction(string rightGuid,string formTxt)
         {
             InitializeComponent();
+            this.Text = formTxt;
             trv.AfterCheck += Trv_AfterCheck;
             _rightGuid = rightGuid;
             getTree(_rightGuid);
         }
-
+        /// <summary>
+        /// 璇诲彇鏉冮檺鍒楄〃
+        /// </summary>
+        /// <param name="roleGuid"></param>
         private void getTree(string roleGuid)
         {
             trv.Nodes.Clear();
@@ -106,6 +110,11 @@
                 if (node.Nodes.Count > 0) TraverseTreeViewNodes(node.Nodes);
             }
         }
+        /// <summary>
+        /// 淇濆瓨瑙掕壊鐨勬潈闄�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void btnSave_Click(object sender, EventArgs e)
         {
             string rowGuid = _rightGuid;
@@ -138,5 +147,22 @@
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
+
+        private void btnOpen_Click(object sender, EventArgs e)
+        {
+            if (btnOpen.Text == "鍏ㄩ儴灞曞紑")
+            {
+                trv.ExpandAll();
+                btnOpen.Text = "鍏ㄩ儴鏀舵嫝";
+                return;
+            }
+
+            if (btnOpen.Text == "鍏ㄩ儴鏀舵嫝")
+            {
+                trv.CollapseAll();
+                btnOpen.Text = "鍏ㄩ儴灞曞紑";
+                return;
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
index 46d7442..559dd17 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
@@ -84,6 +84,7 @@
             this.repositoryItemButtonEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -110,7 +111,6 @@
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
-            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -398,7 +398,7 @@
             editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             serializableAppearanceObject1.Options.UseFont = true;
             this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "瑙掕壊鏉冮檺", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "鍒嗛厤瑙掕壊", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -468,6 +468,14 @@
             this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
             this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "涓婚敭GUID";
+            this.gridColumn6.FieldName = "guid";
+            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Width = 94;
             // 
             // pageBar1
             // 
@@ -777,14 +785,6 @@
             this.layoutControlItem6.Size = new System.Drawing.Size(245, 40);
             this.layoutControlItem6.Text = "浣忓鍦板潃";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // gridColumn6
-            // 
-            this.gridColumn6.Caption = "涓婚敭GUID";
-            this.gridColumn6.FieldName = "guid";
-            this.gridColumn6.MinWidth = 25;
-            this.gridColumn6.Name = "gridColumn6";
-            this.gridColumn6.Width = 94;
             // 
             // User
             // 
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.cs b/DevApp/Gs.DevApp/DevFrm/User/User.cs
index 6f4a4e0..8e0156d 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.cs
@@ -132,7 +132,7 @@
             }
             catch (Exception ex)
             {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
 
@@ -257,7 +257,7 @@
             }
             catch (Exception ex)
             {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
 
@@ -387,7 +387,7 @@
                 var rowhandle = gridView1.FocusedRowHandle;
                 var dr = gridView1.GetDataRow(rowhandle);
                 var userGuid = dr["guid"].ToString();
-                var frm = new RoleSelectAction(userGuid);
+                var frm = new RoleSelectAction(userGuid, "璁剧疆涓汉鏉冮檺");
                 frm.ShowDialog();
             }
         }
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index d62c873..9ac13fa 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1938,6 +1938,11 @@
     <None Include="Resources\bodetails_16x162.png" />
     <None Include="Resources\boresume_32x32.png" />
     <None Include="Resources\boresume_16x16.png" />
+    <None Include="Resources\trackingchanges_previous_16x161.png" />
+    <None Include="Resources\trackingchanges_previous_32x321.png" />
+    <None Include="Resources\bouser_16x163.png" />
+    <None Include="Resources\bouser_32x32.png" />
+    <None Include="Resources\article_16x16.png" />
     <Content Include="Resources\user_16x16.png" />
   </ItemGroup>
   <ItemGroup />
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index 6832ec6..e41d69f 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -5,6 +5,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Windows.Forms;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement.ExplorerBar;
 
 namespace Gs.DevApp
 {
@@ -40,6 +41,11 @@
         {
             //Application.Run(new XtraForm1());
             //return;
+            //barMenu.ItemClick += (s, e) =>
+            //{
+            //    Gs.DevApp.DevFrm.User.SysMenu frm = new SysMenu();
+            //    frm.ShowDialog();
+            //};
             CefSettings settings = new CefSettings();
             settings.Locale = "zh-CN";
             Cef.Initialize(settings);
diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
index bbbca88..8c54959 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -221,6 +221,16 @@
         }
         
         /// <summary>
+        ///   鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+        /// </summary>
+        internal static System.Drawing.Bitmap article_16x16 {
+            get {
+                object obj = ResourceManager.GetObject("article_16x16", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
         ///   鏌ユ壘 DevExpress.Utils.Svg.SvgImage 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
         /// </summary>
         internal static DevExpress.Utils.Svg.SvgImage bo_dashboard {
@@ -446,6 +456,26 @@
         internal static System.Drawing.Bitmap bouser_16x162 {
             get {
                 object obj = ResourceManager.GetObject("bouser_16x162", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+        /// </summary>
+        internal static System.Drawing.Bitmap bouser_16x163 {
+            get {
+                object obj = ResourceManager.GetObject("bouser_16x163", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+        /// </summary>
+        internal static System.Drawing.Bitmap bouser_32x32 {
+            get {
+                object obj = ResourceManager.GetObject("bouser_32x32", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -2423,6 +2453,16 @@
         /// <summary>
         ///   鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
         /// </summary>
+        internal static System.Drawing.Bitmap trackingchanges_previous_16x161 {
+            get {
+                object obj = ResourceManager.GetObject("trackingchanges_previous_16x161", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+        /// </summary>
         internal static System.Drawing.Bitmap trackingchanges_previous_32x32 {
             get {
                 object obj = ResourceManager.GetObject("trackingchanges_previous_32x32", resourceCulture);
@@ -2433,6 +2473,16 @@
         /// <summary>
         ///   鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
         /// </summary>
+        internal static System.Drawing.Bitmap trackingchanges_previous_32x321 {
+            get {
+                object obj = ResourceManager.GetObject("trackingchanges_previous_32x321", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+        /// </summary>
         internal static System.Drawing.Bitmap trackingchanges_showmarkup_16x16 {
             get {
                 object obj = ResourceManager.GetObject("trackingchanges_showmarkup_16x16", resourceCulture);
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index d705fcd..c9be13c 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -121,16 +121,21 @@
   <data name="iconsetarrows3_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\iconsetarrows3_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="meeting_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\meeting_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
+  <data name="bodepartment_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bodepartment_32x32.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="bo_dashboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bo_dashboard.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="engineering_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\engineering_16x16.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="pie3_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\pie3_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="zoom100_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\zoom100_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -146,10 +151,8 @@
   <data name="checkbuttons_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\checkbuttons_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="inlinesizelegend_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\inlinesizelegend_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="updatetableofcontents_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\updatetableofcontents_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -157,16 +160,8 @@
   <data name="lookup&amp;reference_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\lookup&amp;reference_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="projectfile_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\projectfile_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="employee_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\employee_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="meeting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\meeting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -230,14 +225,6 @@
   <data name="error123" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\error123.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="boreport2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\boreport2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="bodetails_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bodetails_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -255,19 +242,17 @@
   <data name="alignhorizontalcenter1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\alignhorizontalcenter1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="botask_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\botask_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="employee_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\employee_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="bouser_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bouser_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="sortasc_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\sortasc_16x16.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="bouser_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bouser_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="login_bgOk" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\login_bgOk.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -278,13 +263,8 @@
   <data name="sortbyorderdate_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sortbyorderdate_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="mapit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\mapit_16x16.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap,
+  <data name="sortasc_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\sortasc_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -298,6 +278,9 @@
     <value>..\Resources\radiobuttons_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="chartswitchrowcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\chartswitchrowcolumn_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="csharp_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\csharp_16x16.png;System.Drawing.Bitmap,
@@ -318,17 +301,24 @@
   <data name="checkbox2_32x323" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\checkbox2_32x323.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="operatingsystem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\operatingsystem_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="trackingchanges_previous_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\trackingchanges_previous_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="bodepartment_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bodepartment_32x32.png;System.Drawing.Bitmap,
+  <data name="groupbyresource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\groupbyresource_32x32.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -345,6 +335,11 @@
   <data name="editname_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\editname_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="find_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\find_16x16.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="logo_png" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\logo_png.png;System.Drawing.Bitmap, System.Drawing,
             Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -352,19 +347,25 @@
   <data name="replace_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\replace_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="boresume_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\boresume_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="encryptdocument_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\encryptdocument_32x32.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="column2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\column2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="up2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\up2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="checkbox2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\checkbox2_32x32.png;System.Drawing.Bitmap,
@@ -377,30 +378,26 @@
   <data name="calculatenow" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\calculatenow.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="boresume_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\boresume_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="checkbox2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\checkbox2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="bouser_16x163" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bouser_16x163.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="deletelist2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\deletelist2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\show_32x32.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="time" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\time.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="globalcolorscheme_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\globalcolorscheme_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="lookup&amp;reference_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\lookup&amp;reference_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="alignhorizontalcenter" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\alignhorizontalcenter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="redtoblack" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\redtoblack.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -473,6 +470,14 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="deletetablecells_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\deletetablecells_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="lookup&amp;reference_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\lookup&amp;reference_16x16.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="cleartablestyle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\cleartablestyle_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -524,11 +529,6 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="groupbyresource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\groupbyresource_32x32.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="user_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\user_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -553,21 +553,21 @@
   <data name="boperson_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\boperson_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="chartswitchrowcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\chartswitchrowcolumn_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="employee_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\employee_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="serieslines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\serieslines_32x32.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="dafualtfax_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\dafualtfax_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -575,8 +575,8 @@
   <data name="user_16x163" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\user_16x163.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="clearformatting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\clearformatting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="meeting_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\meeting_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="refresh_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\refresh_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -589,18 +589,13 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="user_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\user_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="editingfillleft_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\editingfillleft_32x32.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="lookup&amp;reference_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\lookup&amp;reference_16x16.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="trackingchanges_previous_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\trackingchanges_previous_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="editrangepermission_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\editrangepermission_32x32.png;System.Drawing.Bitmap,
@@ -615,6 +610,9 @@
   </data>
   <data name="user_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\user_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="replace_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\replace_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="trackingchanges_previous_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\trackingchanges_previous_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -641,9 +639,6 @@
   <data name="viewmergeddata_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\viewmergeddata_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="employee_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\employee_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="fontsizeincrease_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\fontsizeincrease_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -661,19 +656,11 @@
   <data name="sortbyorderdate_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sortbyorderdate_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="sortasc_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\sortasc_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="knowledgebasearticle_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\knowledgebasearticle_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="area3d_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\area3d_16x16.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="deletetablecells_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\deletetablecells_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="boreport2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\boreport2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="subreport_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\subreport_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -683,6 +670,9 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="refresh_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\refresh_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -691,10 +681,11 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="engineering_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\engineering_16x16.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="clearformatting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\clearformatting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="last_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\last_16x16.png;System.Drawing.Bitmap,
@@ -717,10 +708,8 @@
   <data name="stackedsplinearea_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\stackedsplinearea_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="defaultprinter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\defaultprinter_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="removegroupfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\removegroupfooter_32x32.png;System.Drawing.Bitmap,
@@ -747,19 +736,22 @@
   <data name="deletetablecells_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\deletetablecells_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="showworktimeonly_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\showworktimeonly_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="salesperiodlifetime_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\salesperiodlifetime_16x16.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="sendxls_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sendxls_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="task_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\task_16x16.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -774,10 +766,8 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="alignhorizontalcenter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\alignhorizontalcenter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="first_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\first_16x16.png;System.Drawing.Bitmap,
@@ -813,10 +803,8 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="salesperiodlifetime_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\salesperiodlifetime_16x16.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="employee_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\employee_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="fontsizeincrease_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\fontsizeincrease_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -837,9 +825,6 @@
   <data name="snapmodifytablecellstyle_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\snapmodifytablecellstyle_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upload_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\upload_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="recurringappointment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\recurringappointment_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -847,6 +832,9 @@
     <value>..\Resources\bouser_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="close_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\close_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="wraptext2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\wraptext2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -880,9 +868,6 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="boresume_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\boresume_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -891,6 +876,11 @@
   </data>
   <data name="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\replace_16x16.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -909,24 +899,23 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="user_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\user_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="addcalculatedfield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\addcalculatedfield_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="statistical_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\statistical_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="doublenext_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\doublenext_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="loadfrom_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\loadfrom_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="dropandhighlowlines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\dropandhighlowlines_32x32.png;System.Drawing.Bitmap,
@@ -936,11 +925,16 @@
   <data name="boreport2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\boreport2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="3dclusteredcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\3dclusteredcolumn_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\convert_32x32.png;System.Drawing.Bitmap,
@@ -955,22 +949,34 @@
   <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="printlayoutview_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\printlayoutview_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="checkbuttons_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\checkbuttons_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
+  <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="inlinesizelegend_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\inlinesizelegend_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="loadfrom_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\loadfrom_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\show_32x32.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="changedatasourcepivottable_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\changedatasourcepivottable_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -980,6 +986,11 @@
   </data>
   <data name="pencolor_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\pencolor_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="convert_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\convert_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -992,8 +1003,10 @@
   <data name="down_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\down_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="area3d_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\area3d_16x16.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="checkbuttons_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\checkbuttons_16x16.png;System.Drawing.Bitmap,
@@ -1003,22 +1016,22 @@
   <data name="wordwrap_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\wordwrap_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="statistical_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\statistical_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="lookup&amp;reference_16x163" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\lookup&amp;reference_16x163.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="upload_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\upload_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="replace_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\replace_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="column2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\column2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="bodetails_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bodetails_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1026,41 +1039,45 @@
   <data name="trackingchanges_accept_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\trackingchanges_accept_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="close_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\close_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="mapit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\mapit_16x16.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="defaultprinter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\defaultprinter_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="sortasc_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\sortasc_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="forcetesting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\forcetesting_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="trackingchanges_showmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\trackingchanges_showmarkup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap,
+  <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="time" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\time.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="show_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\show_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="trackingchanges_trackchanges_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\trackingchanges_trackchanges_16x16.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="lookup&amp;reference_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\lookup&amp;reference_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="boperson_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\boperson_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="trackingchanges_previous_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\trackingchanges_previous_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="checkbox2_32x324" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\checkbox2_32x324.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1071,28 +1088,26 @@
   <data name="add_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\add_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="find_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\find_16x16.png;System.Drawing.Bitmap,
+  <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap,
+  <data name="botask_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\botask_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="trackingchanges_trackchanges_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\trackingchanges_trackchanges_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="pie3_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\pie3_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="trackingchanges_showmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\trackingchanges_showmarkup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="boresume_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\boresume_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="article_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\article_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Resources/article_16x16.png b/DevApp/Gs.DevApp/Resources/article_16x16.png
new file mode 100644
index 0000000..495dd20
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/article_16x16.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/bouser_16x163.png b/DevApp/Gs.DevApp/Resources/bouser_16x163.png
new file mode 100644
index 0000000..b9d5708
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/bouser_16x163.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/bouser_32x32.png b/DevApp/Gs.DevApp/Resources/bouser_32x32.png
new file mode 100644
index 0000000..6e26e11
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/bouser_32x32.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/trackingchanges_previous_16x161.png b/DevApp/Gs.DevApp/Resources/trackingchanges_previous_16x161.png
new file mode 100644
index 0000000..08cd629
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/trackingchanges_previous_16x161.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/trackingchanges_previous_32x321.png b/DevApp/Gs.DevApp/Resources/trackingchanges_previous_32x321.png
new file mode 100644
index 0000000..1d64196
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/trackingchanges_previous_32x321.png
Binary files differ

--
Gitblit v1.9.3