From c441404eed5793bea46e8be5d45774bd171c0559 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 28 十一月 2024 18:05:49 +0800
Subject: [PATCH] 图标

---
 DevApp/Gs.DevApp/Properties/Resources.Designer.cs           |   70 +++++++
 DevApp/Gs.DevApp/Resources/checkbox2_32x323.png             |    0 
 DevApp/Gs.DevApp/Resources/fill_32x321.png                  |    0 
 DevApp/Gs.DevApp/Resources/knowledgebasearticle_32x32.png   |    0 
 DevApp/Gs.DevApp/Resources/checkbuttons_32x322.png          |    0 
 DevApp/Gs.DevApp/Gs.DevApp.csproj                           |    7 
 DevApp/Gs.DevApp/App.config                                 |    4 
 DevApp/Gs.DevApp/Resources/loadfrom_32x32.png               |    0 
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs          |  103 +++++------
 DevApp/Gs.DevApp/Resources/copymodeldifferences_32x321.png  |    0 
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs      |  169 +++++++++---------
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs               |   12 
 DevApp/Gs.DevApp/Properties/Resources.resx                  |  145 +++++++++------
 DevApp/Gs.DevApp/Resources/trackingchanges_accept_32x32.png |    0 
 DevApp/Gs.DevApp/Resources/customizegrid_32x32.png          |    0 
 15 files changed, 301 insertions(+), 209 deletions(-)

diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index be56205..ae2dc82 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
 		</assemblyBinding>
 	</runtime>
     <appSettings>
-		 <add key="WebApiUrl" value="http://localhost:5263/" />
-	<!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
+		 <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
+	<add key="WebApiUrl" value="http://192.168.1.145:81/" />
         <add key="LogPath" value="logs" />
         <add key="ProductName" value="骞挎繁绉戞妧 G-MES V2.0" />
         <add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
index 8fc63cf..8544232 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -115,9 +115,7 @@
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -127,6 +125,7 @@
             this.txt_caa021 = new Gs.DevApp.UserControl.UcLookWorkshop();
             this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
             this.lbGuid = new System.Windows.Forms.Label();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -470,7 +469,7 @@
             this.gv_closeType.OptionsColumn.AllowEdit = false;
             this.gv_closeType.Tag = "query_a.CLOSE_TYPE";
             this.gv_closeType.Visible = true;
-            this.gv_closeType.VisibleIndex = 26;
+            this.gv_closeType.VisibleIndex = 28;
             this.gv_closeType.Width = 94;
             // 
             // gv_forceCloserid
@@ -484,7 +483,7 @@
             this.gv_forceCloserid.OptionsColumn.AllowEdit = false;
             this.gv_forceCloserid.Tag = "query_a.FORCE_CLOSERID";
             this.gv_forceCloserid.Visible = true;
-            this.gv_forceCloserid.VisibleIndex = 25;
+            this.gv_forceCloserid.VisibleIndex = 27;
             this.gv_forceCloserid.Width = 94;
             // 
             // gv_saleOrderEntryseq
@@ -498,7 +497,7 @@
             this.gv_saleOrderEntryseq.OptionsColumn.AllowEdit = false;
             this.gv_saleOrderEntryseq.Tag = "query_a.SALE_ORDER_ENTRYSEQ";
             this.gv_saleOrderEntryseq.Visible = true;
-            this.gv_saleOrderEntryseq.VisibleIndex = 24;
+            this.gv_saleOrderEntryseq.VisibleIndex = 26;
             this.gv_saleOrderEntryseq.Width = 94;
             // 
             // lb_saleOrderNo
@@ -531,7 +530,7 @@
             this.gv_saleOrderNo.OptionsColumn.AllowEdit = false;
             this.gv_saleOrderNo.Tag = "query_a.SALE_ORDER_NO";
             this.gv_saleOrderNo.Visible = true;
-            this.gv_saleOrderNo.VisibleIndex = 23;
+            this.gv_saleOrderNo.VisibleIndex = 25;
             this.gv_saleOrderNo.Width = 100;
             // 
             // gv_srcBillentryseq
@@ -545,7 +544,7 @@
             this.gv_srcBillentryseq.OptionsColumn.AllowEdit = false;
             this.gv_srcBillentryseq.Tag = "query_a.SRC_BILLENTRYSEQ";
             this.gv_srcBillentryseq.Visible = true;
-            this.gv_srcBillentryseq.VisibleIndex = 22;
+            this.gv_srcBillentryseq.VisibleIndex = 24;
             this.gv_srcBillentryseq.Width = 94;
             // 
             // gv_srcBillNo
@@ -559,7 +558,7 @@
             this.gv_srcBillNo.OptionsColumn.AllowEdit = false;
             this.gv_srcBillNo.Tag = "query_a.SRC_BILL_NO";
             this.gv_srcBillNo.Visible = true;
-            this.gv_srcBillNo.VisibleIndex = 21;
+            this.gv_srcBillNo.VisibleIndex = 23;
             this.gv_srcBillNo.Width = 100;
             // 
             // gv_srcBillType
@@ -573,7 +572,7 @@
             this.gv_srcBillType.OptionsColumn.AllowEdit = false;
             this.gv_srcBillType.Tag = "query_a.SRC_BILL_TYPE";
             this.gv_srcBillType.Visible = true;
-            this.gv_srcBillType.VisibleIndex = 20;
+            this.gv_srcBillType.VisibleIndex = 22;
             this.gv_srcBillType.Width = 94;
             // 
             // gv_createType
@@ -587,7 +586,7 @@
             this.gv_createType.OptionsColumn.AllowEdit = false;
             this.gv_createType.Tag = "query_a.CREATE_TYPE";
             this.gv_createType.Visible = true;
-            this.gv_createType.VisibleIndex = 19;
+            this.gv_createType.VisibleIndex = 21;
             this.gv_createType.Width = 100;
             // 
             // lb_stockInlimitl
@@ -620,7 +619,7 @@
             this.gv_stockInlimitl.OptionsColumn.AllowEdit = false;
             this.gv_stockInlimitl.Tag = "query_a.STOCK_INLIMITL";
             this.gv_stockInlimitl.Visible = true;
-            this.gv_stockInlimitl.VisibleIndex = 28;
+            this.gv_stockInlimitl.VisibleIndex = 30;
             this.gv_stockInlimitl.Width = 100;
             // 
             // lb_stockInlimith
@@ -653,7 +652,7 @@
             this.gv_stockInlimith.OptionsColumn.AllowEdit = false;
             this.gv_stockInlimith.Tag = "query_a.STOCK_INLIMITH";
             this.gv_stockInlimith.Visible = true;
-            this.gv_stockInlimith.VisibleIndex = 27;
+            this.gv_stockInlimith.VisibleIndex = 29;
             this.gv_stockInlimith.Width = 100;
             // 
             // lb_depotCode
@@ -700,7 +699,7 @@
             this.gv_caa024.OptionsColumn.AllowEdit = false;
             this.gv_caa024.Tag = "query_a.CAA024";
             this.gv_caa024.Visible = true;
-            this.gv_caa024.VisibleIndex = 14;
+            this.gv_caa024.VisibleIndex = 16;
             this.gv_caa024.Width = 94;
             // 
             // gv_checkUser
@@ -714,7 +713,7 @@
             this.gv_checkUser.OptionsColumn.AllowEdit = false;
             this.gv_checkUser.Tag = "query_a.CHECK_USER";
             this.gv_checkUser.Visible = true;
-            this.gv_checkUser.VisibleIndex = 15;
+            this.gv_checkUser.VisibleIndex = 17;
             this.gv_checkUser.Width = 94;
             // 
             // gv_fstatus
@@ -813,7 +812,7 @@
             this.gv_caa018.OptionsColumn.AllowEdit = false;
             this.gv_caa018.Tag = "query_a.CAA018";
             this.gv_caa018.Visible = true;
-            this.gv_caa018.VisibleIndex = 29;
+            this.gv_caa018.VisibleIndex = 31;
             this.gv_caa018.Width = 94;
             // 
             // lb_caa016
@@ -846,7 +845,7 @@
             this.gv_caa016.OptionsColumn.AllowEdit = false;
             this.gv_caa016.Tag = "query_a.CAA016";
             this.gv_caa016.Visible = true;
-            this.gv_caa016.VisibleIndex = 18;
+            this.gv_caa016.VisibleIndex = 20;
             this.gv_caa016.Width = 100;
             // 
             // gv_caa015
@@ -860,7 +859,7 @@
             this.gv_caa015.OptionsColumn.AllowEdit = false;
             this.gv_caa015.Tag = "query_a.CAA015";
             this.gv_caa015.Visible = true;
-            this.gv_caa015.VisibleIndex = 17;
+            this.gv_caa015.VisibleIndex = 19;
             this.gv_caa015.Width = 100;
             // 
             // lb_caa012
@@ -886,7 +885,7 @@
             // 
             this.gv_caa012.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_caa012.AppearanceCell.Options.UseFont = true;
-            this.gv_caa012.Caption = "宸ュ崟鏁伴噺";
+            this.gv_caa012.Caption = "宸ュ崟鎬绘暟";
             this.gv_caa012.FieldName = "caa012";
             this.gv_caa012.MinWidth = 50;
             this.gv_caa012.Name = "gv_caa012";
@@ -926,7 +925,7 @@
             this.gv_caa011.OptionsColumn.AllowEdit = false;
             this.gv_caa011.Tag = "query_a.CAA011";
             this.gv_caa011.Visible = true;
-            this.gv_caa011.VisibleIndex = 13;
+            this.gv_caa011.VisibleIndex = 15;
             this.gv_caa011.Width = 180;
             // 
             // lb_caa010
@@ -959,7 +958,7 @@
             this.gv_caa010.OptionsColumn.AllowEdit = false;
             this.gv_caa010.Tag = "query_a.CAA010";
             this.gv_caa010.Visible = true;
-            this.gv_caa010.VisibleIndex = 12;
+            this.gv_caa010.VisibleIndex = 14;
             this.gv_caa010.Width = 180;
             // 
             // lb_caa009
@@ -992,7 +991,7 @@
             this.gv_caa009.OptionsColumn.AllowEdit = false;
             this.gv_caa009.Tag = "query_a.CAA009";
             this.gv_caa009.Visible = true;
-            this.gv_caa009.VisibleIndex = 11;
+            this.gv_caa009.VisibleIndex = 13;
             this.gv_caa009.Width = 94;
             // 
             // lb_caa006
@@ -1058,7 +1057,7 @@
             this.gv_caa005.OptionsColumn.AllowEdit = false;
             this.gv_caa005.Tag = "query_a.CAA005";
             this.gv_caa005.Visible = true;
-            this.gv_caa005.VisibleIndex = 16;
+            this.gv_caa005.VisibleIndex = 18;
             this.gv_caa005.Width = 180;
             // 
             // lb_caa001
@@ -1158,6 +1157,8 @@
             this.gv_caa006,
             this.gridColumn3,
             this.gv_caa012,
+            this.gridColumn7,
+            this.gridColumn4,
             this.gv_caa009,
             this.gv_caa010,
             this.gv_caa011,
@@ -1176,10 +1177,7 @@
             this.gv_closeType,
             this.gv_stockInlimith,
             this.gv_stockInlimitl,
-            this.gv_caa018,
-            this.gridColumn6,
-            this.gridColumn5,
-            this.gridColumn4});
+            this.gv_caa018});
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -1220,35 +1218,15 @@
             this.gridColumn3.VisibleIndex = 9;
             this.gridColumn3.Width = 120;
             // 
-            // gridColumn6
+            // gridColumn7
             // 
-            this.gridColumn6.Caption = "鎺掍骇ID";
-            this.gridColumn6.MinWidth = 50;
-            this.gridColumn6.Name = "gridColumn6";
-            this.gridColumn6.OptionsColumn.AllowEdit = false;
-            this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 30;
-            this.gridColumn6.Width = 94;
-            // 
-            // gridColumn5
-            // 
-            this.gridColumn5.Caption = "鎺掍骇绾夸綋";
-            this.gridColumn5.MinWidth = 100;
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.OptionsColumn.AllowEdit = false;
-            this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 31;
-            this.gridColumn5.Width = 100;
-            // 
-            // gridColumn4
-            // 
-            this.gridColumn4.Caption = "鎺掍骇绾垮埆";
-            this.gridColumn4.MinWidth = 80;
-            this.gridColumn4.Name = "gridColumn4";
-            this.gridColumn4.OptionsColumn.AllowEdit = false;
-            this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 32;
-            this.gridColumn4.Width = 94;
+            this.gridColumn7.Caption = "宸叉帓鎬绘暟";
+            this.gridColumn7.FieldName = "caa012yp";
+            this.gridColumn7.MinWidth = 50;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 11;
+            this.gridColumn7.Width = 94;
             // 
             // xtraTabControl1
             // 
@@ -1369,6 +1347,16 @@
             this.lbGuid.Name = "lbGuid";
             this.lbGuid.Size = new System.Drawing.Size(0, 21);
             this.lbGuid.TabIndex = 1;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "鏈帓鎬绘暟";
+            this.gridColumn4.FieldName = "caa012wp";
+            this.gridColumn4.MinWidth = 50;
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 12;
+            this.gridColumn4.Width = 94;
             // 
             // Frm_Womcaa
             // 
@@ -1514,13 +1502,12 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
         private UserControl.UcLookWorkshop txt_caa021;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 7f3bd66..04fbb82 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -954,6 +954,13 @@
     <None Include="Resources\sortasc_32x321.png" />
     <None Include="Resources\sortasc_16x161.png" />
     <None Include="Resources\knowledgebasearticle_32x32.png" />
+    <None Include="Resources\loadfrom_32x32.png" />
+    <None Include="Resources\customizegrid_32x32.png" />
+    <None Include="Resources\fill_32x321.png" />
+    <None Include="Resources\copymodeldifferences_32x321.png" />
+    <None Include="Resources\trackingchanges_accept_32x32.png" />
+    <None Include="Resources\checkbox2_32x323.png" />
+    <None Include="Resources\checkbuttons_32x322.png" />
     <Content Include="Resources\user_16x16.png" />
   </ItemGroup>
   <ItemGroup />
diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
index 38fcf8b..1b36c75 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -343,6 +343,16 @@
         /// <summary>
         ///   鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
         /// </summary>
+        internal static System.Drawing.Bitmap checkbox2_32x323 {
+            get {
+                object obj = ResourceManager.GetObject("checkbox2_32x323", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+        /// </summary>
         internal static System.Drawing.Bitmap checkbuttons_16x16 {
             get {
                 object obj = ResourceManager.GetObject("checkbuttons_16x16", resourceCulture);
@@ -386,6 +396,16 @@
         internal static System.Drawing.Bitmap checkbuttons_32x321 {
             get {
                 object obj = ResourceManager.GetObject("checkbuttons_32x321", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+        /// </summary>
+        internal static System.Drawing.Bitmap checkbuttons_32x322 {
+            get {
+                object obj = ResourceManager.GetObject("checkbuttons_32x322", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -493,9 +513,29 @@
         /// <summary>
         ///   鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
         /// </summary>
+        internal static System.Drawing.Bitmap copymodeldifferences_32x321 {
+            get {
+                object obj = ResourceManager.GetObject("copymodeldifferences_32x321", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+        /// </summary>
         internal static System.Drawing.Bitmap csharp_16x16 {
             get {
                 object obj = ResourceManager.GetObject("csharp_16x16", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+        /// </summary>
+        internal static System.Drawing.Bitmap customizegrid_32x32 {
+            get {
+                object obj = ResourceManager.GetObject("customizegrid_32x32", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -726,6 +766,16 @@
         internal static System.Drawing.Bitmap fill_32x32 {
             get {
                 object obj = ResourceManager.GetObject("fill_32x32", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+        /// </summary>
+        internal static System.Drawing.Bitmap fill_32x321 {
+            get {
+                object obj = ResourceManager.GetObject("fill_32x321", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -996,6 +1046,16 @@
         internal static System.Drawing.Bitmap listmultilevel_16x16 {
             get {
                 object obj = ResourceManager.GetObject("listmultilevel_16x16", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+        /// </summary>
+        internal static System.Drawing.Bitmap loadfrom_32x32 {
+            get {
+                object obj = ResourceManager.GetObject("loadfrom_32x32", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -1433,6 +1493,16 @@
         /// <summary>
         ///   鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
         /// </summary>
+        internal static System.Drawing.Bitmap trackingchanges_accept_32x32 {
+            get {
+                object obj = ResourceManager.GetObject("trackingchanges_accept_32x32", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+        /// </summary>
         internal static System.Drawing.Bitmap trackingchanges_allmarkup_16x16 {
             get {
                 object obj = ResourceManager.GetObject("trackingchanges_allmarkup_16x16", resourceCulture);
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index 9ddc06a..4413357 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -118,13 +118,16 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <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="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <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="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="usergroup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\usergroup_32x32.png;System.Drawing.Bitmap,
@@ -137,8 +140,18 @@
   <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>
   <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>
+  </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="sortbyinvoice_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sortbyinvoice_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -169,16 +182,14 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="knowledgebasearticle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\knowledgebasearticle_16x16.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="sendxls_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sendxls_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="converttorange_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\converttorange_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="copymodeldifferences_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\copymodeldifferences_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="trackingchanges_showmarkup_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\trackingchanges_showmarkup_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -199,11 +210,6 @@
   </data>
   <data name="edit_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\edit_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>
@@ -231,21 +237,22 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <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="checkbox2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\checkbox2_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 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="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="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="3dcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\3dcolumn_32x32.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>
@@ -267,9 +274,6 @@
   <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>
-  </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="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap,
@@ -299,11 +303,21 @@
   <data name="sortasc_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sortasc_32x321.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="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="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="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>
@@ -335,10 +349,8 @@
   <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="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 name="fill_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\fill_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="download_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\download_32x32.png;System.Drawing.Bitmap,
@@ -362,6 +374,9 @@
     <value>..\Resources\bouser_16x161.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="customizegrid_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\customizegrid_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="first_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\first_32x32.png;System.Drawing.Bitmap,
@@ -513,6 +528,9 @@
   <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="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="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>
@@ -529,9 +547,6 @@
             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>
   <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,
@@ -542,8 +557,8 @@
             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,
+  <data name="knowledgebasearticle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\knowledgebasearticle_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -572,6 +587,11 @@
   </data>
   <data name="converttorange_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\converttorange_16x16.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,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -699,54 +719,55 @@
             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,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="login_bg6" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\login_bg6.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>
+  <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="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
+  <data name="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\convert_32x32.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="3dcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\3dcolumn_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="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
+  <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="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="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="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="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>
   </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="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="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="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="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
+  <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>
+  <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="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>
@@ -777,8 +798,8 @@
   <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="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
+  <data name="dropandhighlowlines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\dropandhighlowlines_32x32.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -790,7 +811,7 @@
             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 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>
 </root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Resources/checkbox2_32x323.png b/DevApp/Gs.DevApp/Resources/checkbox2_32x323.png
new file mode 100644
index 0000000..370f912
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/checkbox2_32x323.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/checkbuttons_32x322.png b/DevApp/Gs.DevApp/Resources/checkbuttons_32x322.png
new file mode 100644
index 0000000..4ffdad4
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/checkbuttons_32x322.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/copymodeldifferences_32x321.png b/DevApp/Gs.DevApp/Resources/copymodeldifferences_32x321.png
new file mode 100644
index 0000000..3df34a6
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/copymodeldifferences_32x321.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/customizegrid_32x32.png b/DevApp/Gs.DevApp/Resources/customizegrid_32x32.png
new file mode 100644
index 0000000..8979c81
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/customizegrid_32x32.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/fill_32x321.png b/DevApp/Gs.DevApp/Resources/fill_32x321.png
new file mode 100644
index 0000000..6b8bc13
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/fill_32x321.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/knowledgebasearticle_32x32.png b/DevApp/Gs.DevApp/Resources/knowledgebasearticle_32x32.png
new file mode 100644
index 0000000..21e6c07
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/knowledgebasearticle_32x32.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/loadfrom_32x32.png b/DevApp/Gs.DevApp/Resources/loadfrom_32x32.png
new file mode 100644
index 0000000..c3c2f2c
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/loadfrom_32x32.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/trackingchanges_accept_32x32.png b/DevApp/Gs.DevApp/Resources/trackingchanges_accept_32x32.png
new file mode 100644
index 0000000..2c27357
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/trackingchanges_accept_32x32.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 56531cf..b202928 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -57,20 +57,21 @@
             this.btnCaiGouChk = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnCaiGouFchk = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnLog = new DevExpress.XtraBars.BarLargeButtonItem();
-            this.btnJieAn = new DevExpress.XtraBars.BarLargeButtonItem();
-            this.btnFjieAn = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnTzbl = new DevExpress.XtraBars.BarLargeButtonItem();
+            this.btnFtzbl = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnKg = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnDkg = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnZanTing = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnBdll = new DevExpress.XtraBars.BarLargeButtonItem();
-            this.btnWg = new DevExpress.XtraBars.BarLargeButtonItem();
-            this.btnTb = new DevExpress.XtraBars.BarLargeButtonItem();
+            this.btnJieAn = new DevExpress.XtraBars.BarLargeButtonItem();
+            this.btnFjieAn = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnHelp = new DevExpress.XtraBars.BarLargeButtonItem();
             this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
             this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
             this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
             this.barDockControlRight = new DevExpress.XtraBars.BarDockControl();
+            this.btnWg = new DevExpress.XtraBars.BarLargeButtonItem();
+            this.btnFwg = new DevExpress.XtraBars.BarLargeButtonItem();
             ((System.ComponentModel.ISupportInitialize)(this.barManager1)).BeginInit();
             this.SuspendLayout();
             // 
@@ -116,10 +117,11 @@
             this.btnZanTing,
             this.btnBdll,
             this.btnWg,
-            this.btnTb,
-            this.btnHelp});
+            this.btnFtzbl,
+            this.btnHelp,
+            this.btnFwg});
             this.barManager1.MainMenu = this.bar2;
-            this.barManager1.MaxItemId = 50;
+            this.barManager1.MaxItemId = 51;
             // 
             // bar2
             // 
@@ -152,15 +154,14 @@
             new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiGouChk),
             new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiGouFchk),
             new DevExpress.XtraBars.LinkPersistInfo(this.btnLog),
-            new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnJieAn, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
-            new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnFjieAn, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
             new DevExpress.XtraBars.LinkPersistInfo(this.btnTzbl),
+            new DevExpress.XtraBars.LinkPersistInfo(this.btnFtzbl),
             new DevExpress.XtraBars.LinkPersistInfo(this.btnKg),
             new DevExpress.XtraBars.LinkPersistInfo(this.btnDkg),
             new DevExpress.XtraBars.LinkPersistInfo(this.btnZanTing),
             new DevExpress.XtraBars.LinkPersistInfo(this.btnBdll),
-            new DevExpress.XtraBars.LinkPersistInfo(this.btnWg),
-            new DevExpress.XtraBars.LinkPersistInfo(this.btnTb),
+            new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnJieAn, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
+            new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnFjieAn, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
             new DevExpress.XtraBars.LinkPersistInfo(this.btnHelp)});
             this.bar2.OptionsBar.MultiLine = true;
             this.bar2.OptionsBar.UseWholeRow = true;
@@ -408,6 +409,63 @@
             this.btnLog.Name = "btnLog";
             this.btnLog.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
             // 
+            // btnTzbl
+            // 
+            this.btnTzbl.Caption = "閫氱煡澶囨枡";
+            this.btnTzbl.Id = 41;
+            this.btnTzbl.ImageOptions.ImageUri.Uri = "business%20objects/bo_security_permission_object";
+            this.btnTzbl.Name = "btnTzbl";
+            this.btnTzbl.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
+            this.btnTzbl.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            // 
+            // btnFtzbl
+            // 
+            this.btnFtzbl.Caption = "鎾ゅ洖閫氱煡";
+            this.btnFtzbl.Id = 48;
+            this.btnFtzbl.ImageOptions.ImageUri.Uri = "business%20objects/bo_rules";
+            this.btnFtzbl.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.btnFtzbl.ItemAppearance.Normal.Options.UseFont = true;
+            this.btnFtzbl.ItemInMenuAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.btnFtzbl.ItemInMenuAppearance.Normal.Options.UseFont = true;
+            this.btnFtzbl.Name = "btnFtzbl";
+            this.btnFtzbl.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            // 
+            // btnKg
+            // 
+            this.btnKg.Caption = "寮�宸�";
+            this.btnKg.Id = 42;
+            this.btnKg.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbox2_32x323;
+            this.btnKg.Name = "btnKg";
+            this.btnKg.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
+            this.btnKg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            // 
+            // btnDkg
+            // 
+            this.btnDkg.Caption = "寰呭紑宸�";
+            this.btnDkg.Id = 43;
+            this.btnDkg.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_32x322;
+            this.btnDkg.Name = "btnDkg";
+            this.btnDkg.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
+            this.btnDkg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            // 
+            // btnZanTing
+            // 
+            this.btnZanTing.Caption = "宸ュ崟鏆傚仠";
+            this.btnZanTing.Id = 44;
+            this.btnZanTing.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_allmarkup_32x32;
+            this.btnZanTing.Name = "btnZanTing";
+            this.btnZanTing.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
+            this.btnZanTing.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            // 
+            // btnBdll
+            // 
+            this.btnBdll.Caption = "澶囧崟棰嗘枡";
+            this.btnBdll.Id = 45;
+            this.btnBdll.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_trackchanges_32x32;
+            this.btnBdll.Name = "btnBdll";
+            this.btnBdll.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
+            this.btnBdll.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            // 
             // btnJieAn
             // 
             this.btnJieAn.Caption = "缁撴";
@@ -423,74 +481,6 @@
             this.btnFjieAn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.wordwrap_32x32;
             this.btnFjieAn.Name = "btnFjieAn";
             this.btnFjieAn.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            // 
-            // btnTzbl
-            // 
-            this.btnTzbl.Caption = "閫氱煡澶囨枡";
-            this.btnTzbl.Id = 41;
-            this.btnTzbl.ImageOptions.ImageUri.Uri = "AddNewDataSource";
-            this.btnTzbl.Name = "btnTzbl";
-            this.btnTzbl.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
-            this.btnTzbl.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            // 
-            // btnKg
-            // 
-            this.btnKg.Caption = "寮�宸�";
-            this.btnKg.Id = 42;
-            this.btnKg.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
-            this.btnKg.ImageOptions.ImageUri.Uri = "Open";
-            this.btnKg.Name = "btnKg";
-            this.btnKg.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
-            this.btnKg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            // 
-            // btnDkg
-            // 
-            this.btnDkg.Caption = "寰呭紑宸�";
-            this.btnDkg.Id = 43;
-            this.btnDkg.ImageOptions.ImageUri.Uri = "NavigationBar";
-            this.btnDkg.ImageOptions.SvgImage = global::Gs.DevApp.Properties.Resources.open2;
-            this.btnDkg.Name = "btnDkg";
-            this.btnDkg.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
-            this.btnDkg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            // 
-            // btnZanTing
-            // 
-            this.btnZanTing.Caption = "宸ュ崟鏆傚仠";
-            this.btnZanTing.Id = 44;
-            this.btnZanTing.ImageOptions.ImageUri.Uri = "Up";
-            this.btnZanTing.Name = "btnZanTing";
-            this.btnZanTing.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
-            this.btnZanTing.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            // 
-            // btnBdll
-            // 
-            this.btnBdll.Caption = "澶囧崟棰嗘枡";
-            this.btnBdll.Id = 45;
-            this.btnBdll.ImageOptions.ImageUri.Uri = "EditDataSource";
-            this.btnBdll.Name = "btnBdll";
-            this.btnBdll.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
-            this.btnBdll.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            // 
-            // btnWg
-            // 
-            this.btnWg.Caption = "鎵嬪姩瀹屽伐";
-            this.btnWg.Id = 46;
-            this.btnWg.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btnWg.ImageOptions.SvgImage")));
-            this.btnWg.Name = "btnWg";
-            this.btnWg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            // 
-            // btnTb
-            // 
-            this.btnTb.Caption = "鍚屾";
-            this.btnTb.Id = 48;
-            this.btnTb.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.sortasc_16x161;
-            this.btnTb.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.sortasc_32x321;
-            this.btnTb.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.btnTb.ItemAppearance.Normal.Options.UseFont = true;
-            this.btnTb.ItemInMenuAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 12F);
-            this.btnTb.ItemInMenuAppearance.Normal.Options.UseFont = true;
-            this.btnTb.Name = "btnTb";
-            this.btnTb.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
             // 
             // btnHelp
             // 
@@ -514,7 +504,7 @@
             // 
             this.barDockControlBottom.CausesValidation = false;
             this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.barDockControlBottom.Location = new System.Drawing.Point(0, 66);
+            this.barDockControlBottom.Location = new System.Drawing.Point(0, 60);
             this.barDockControlBottom.Manager = this.barManager1;
             this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
             // 
@@ -534,6 +524,20 @@
             this.barDockControlRight.Manager = this.barManager1;
             this.barDockControlRight.Size = new System.Drawing.Size(0, 0);
             // 
+            // btnWg
+            // 
+            this.btnWg.Caption = "缁撴";
+            this.btnWg.Id = 46;
+            this.btnWg.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btnWg.ImageOptions.SvgImage")));
+            this.btnWg.Name = "btnWg";
+            this.btnWg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            // 
+            // btnFwg
+            // 
+            this.btnFwg.Caption = "鍙嶇粨妗�";
+            this.btnFwg.Id = 50;
+            this.btnFwg.Name = "btnFwg";
+            // 
             // UcToolBarMenu
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -543,7 +547,7 @@
             this.Controls.Add(this.barDockControlBottom);
             this.Controls.Add(this.barDockControlTop);
             this.Name = "UcToolBarMenu";
-            this.Size = new System.Drawing.Size(1543, 66);
+            this.Size = new System.Drawing.Size(1543, 60);
             ((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
@@ -589,7 +593,8 @@
         private DevExpress.XtraBars.BarLargeButtonItem btnZanTing;
         private DevExpress.XtraBars.BarLargeButtonItem btnBdll;
         private DevExpress.XtraBars.BarLargeButtonItem btnWg;
-        private DevExpress.XtraBars.BarLargeButtonItem btnTb;
+        private DevExpress.XtraBars.BarLargeButtonItem btnFtzbl;
         private DevExpress.XtraBars.BarLargeButtonItem btnHelp;
+        private DevExpress.XtraBars.BarLargeButtonItem btnFwg;
     }
 }
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 5e0fda8..f55031f 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -51,7 +51,7 @@
             btnZanTing.ItemClick += BtnZanTing_ItemClick;
             btnBdll.ItemClick += BtnBdll_ItemClick;
             btnWg.ItemClick += BtnWg_ItemClick;
-            btnTb.ItemClick += BtnTb_ItemClick;
+            btnFtzbl.ItemClick += BtnFtzbl_ItemClick;
 
             var lst = new List<string>();
             foreach (BarItem item in barManager1.Items)
@@ -454,9 +454,9 @@
         {
             if (btnQueryClick != null) btnQueryClick(this, e);
         }
-        private void BtnTb_ItemClick(object sender, ItemClickEventArgs e)
+        private void BtnFtzbl_ItemClick(object sender, ItemClickEventArgs e)
         {
-            if (btnTbClick != null) btnTbClick(this, e);
+            if (btnFtzblClick != null) btnFtzblClick(this, e);
         }
 
         private void BtnEsc_ItemClick(object sender, ItemClickEventArgs e)
@@ -924,8 +924,10 @@
         /// </summary>
         public event EventHandler btnWgClick;
 
-
-        public event EventHandler btnTbClick;
+        /// <summary>
+        /// 鍙嶉�氱煡澶囨枡
+        /// </summary>
+        public event EventHandler btnFtzblClick;
         #endregion
 
         #region 鍏叡灞炴��

--
Gitblit v1.9.3