From db1141043a18e061f628b0fa164dd520d9c5941a Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期一, 30 六月 2025 09:31:42 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 10 + DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 12 - DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs | 21 ++ DevApp/Gs.DevApp/XtraForm1.Designer.cs | 64 ++++-- DevApp/Gs.DevApp/Resources/fullstackedbar3d_16x16.png | 0 DevApp/Gs.DevApp/Gs.DevApp.csproj | 7 DevApp/Gs.DevApp/App.config | 4 DevApp/Gs.DevApp/Properties/Resources.resx | 357 ++++++++++++++++++++------------------- DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs | 38 ++++ DevApp/Gs.DevApp/Program.cs | 4 DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs | 10 11 files changed, 303 insertions(+), 224 deletions(-) diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config index 3d80851..f77fd81 100644 --- a/DevApp/Gs.DevApp/App.config +++ b/DevApp/Gs.DevApp/App.config @@ -28,9 +28,9 @@ </assemblyBinding> </runtime> <appSettings> - <add key="WebApiUrl" value="http://localhost:5263/" /> + <!--<add key="WebApiUrl" value="http://localhost:5263/" />--> <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />--> - <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />--> + <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/FQC/Frm_FqcDetect01.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs index a7c743c..3e0ca04 100644 --- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs +++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs @@ -14,7 +14,7 @@ { public partial class Frm_FqcDetect01 : DevExpress.XtraEditors.XtraForm { - string _strTag= "N:涓嶅悎鏍�"; + string _strTag = "N:涓嶅悎鏍�"; string _webServiceName = "FqcManager/"; List<FilterEntity> _filterList = new List<FilterEntity>(); public Frm_FqcDetect01() @@ -28,7 +28,7 @@ this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick; this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; - toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick; + toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2); @@ -295,12 +295,12 @@ toolBarMenu1.guidKey = rowGuid; } /// <summary> - ///鎻愪氦妫�楠屼簨浠� + ///瀹℃牳浜嬩欢 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> /// <exception cref="NotImplementedException"></exception> - private void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e) + private void ToolBarMenu1_btnChkClick(object sender, EventArgs e) { toolBarMenu1.guidKey = ""; string rowGuid, rowName; @@ -611,7 +611,7 @@ txt_msg.Focus(); return; } - + if (txt_fngHandle.SelectedIndex <= 0) { Gs.DevApp.ToolBox.MsgHelper.Warning("褰撲笉鍚堟牸鏃讹紝璇烽�夋嫨澶勭疆缁撴灉锛�"); diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs new file mode 100644 index 0000000..aa53814 --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs @@ -0,0 +1,38 @@ +锘縩amespace Gs.DevApp.DevFrm.WOM +{ + partial class Frm_WomFanGong + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Text = "Frm_WomFanGong"; + } + + #endregion + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs new file mode 100644 index 0000000..786d887 --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs @@ -0,0 +1,21 @@ +锘縰sing DevExpress.XtraEditors; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Gs.DevApp.DevFrm.WOM +{ + public partial class Frm_WomFanGong : DevExpress.XtraEditors.XtraForm + { + public Frm_WomFanGong() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index ec8c5a6..edb345c 100644 --- a/DevApp/Gs.DevApp/Gs.DevApp.csproj +++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj @@ -939,6 +939,12 @@ <Compile Include="DevFrm\WOM\Frm_MesWorkProd.Designer.cs"> <DependentUpon>Frm_MesWorkProd.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\WOM\Frm_WomFanGong.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\WOM\Frm_WomFanGong.Designer.cs"> + <DependentUpon>Frm_WomFanGong.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\WOM\ShowJieAn.cs"> <SubType>Form</SubType> </Compile> @@ -2250,6 +2256,7 @@ <None Include="Resources\dayview_32x32.png" /> <None Include="Resources\dayview_16x16.png" /> <None Include="Resources\addfile_32x32.png" /> + <None Include="Resources\fullstackedbar3d_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 4dd0414..cb50951 100644 --- a/DevApp/Gs.DevApp/Program.cs +++ b/DevApp/Gs.DevApp/Program.cs @@ -51,8 +51,8 @@ fmLogin.ShowDialog(); if (fmLogin.DialogResult == DialogResult.OK) { - //Application.Run(new DevFrm.User.SysMenu()); - //return; + Application.Run(new DevFrm.User.SysMenu()); + return; bool IsWeight = false; try { diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs index 375a32c..7121f6a 100644 --- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs +++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs @@ -1463,6 +1463,16 @@ /// <summary> /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� /// </summary> + internal static System.Drawing.Bitmap fullstackedbar3d_16x16 { + get { + object obj = ResourceManager.GetObject("fullstackedbar3d_16x16", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� + /// </summary> internal static System.Drawing.Bitmap fullstackedcolumn3d_32x32 { get { object obj = ResourceManager.GetObject("fullstackedcolumn3d_32x32", resourceCulture); diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx index 563b753..44b6c7b 100644 --- a/DevApp/Gs.DevApp/Properties/Resources.resx +++ b/DevApp/Gs.DevApp/Properties/Resources.resx @@ -124,8 +124,21 @@ <data name="print_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\print_16x162.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="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> @@ -150,13 +163,16 @@ <data name="lookup&reference_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\lookup&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, + <data name="chartsshowlegend_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\chartsshowlegend_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> @@ -194,6 +210,9 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="addfile_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\addfile_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="fontsizeincrease_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\fontsizeincrease_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -223,14 +242,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> @@ -240,22 +251,22 @@ <data name="sortbyinvoice_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\sortbyinvoice_32x32.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, + <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="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="reset_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\reset_16x16.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="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> @@ -269,11 +280,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="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="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> @@ -286,8 +294,8 @@ <data name="historyitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\historyitem_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 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="csharp_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\csharp_16x16.png;System.Drawing.Bitmap, @@ -302,26 +310,30 @@ 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="sendpdf_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\sendpdf_32x32.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="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> @@ -338,6 +350,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> @@ -345,16 +362,11 @@ <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="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="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="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="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="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="encryptdocument_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\encryptdocument_32x32.png;System.Drawing.Bitmap, @@ -363,6 +375,9 @@ </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="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> @@ -385,10 +400,8 @@ <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> @@ -472,6 +485,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&reference_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\lookup&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, @@ -518,13 +539,13 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="addfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\addfooter_32x32.png;System.Drawing.Bitmap, + <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="groupbyresource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\groupbyresource_32x32.png;System.Drawing.Bitmap, + <data name="addfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\addfooter_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -555,18 +576,8 @@ <data name="usergroup_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\usergroup_16x161.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="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="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 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="printer_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\printer_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -576,16 +587,13 @@ 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="bodetails_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\bodetails_32x321.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> @@ -620,8 +628,8 @@ 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 name="reset_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\reset_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="trackingchanges_next_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\trackingchanges_next_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -657,9 +665,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> @@ -668,6 +673,9 @@ </data> <data name="checkbox2_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\checkbox2_16x162.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="forcetesting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\forcetesting_32x32.png;System.Drawing.Bitmap, @@ -680,8 +688,13 @@ <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 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="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> @@ -691,8 +704,8 @@ 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="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> @@ -705,10 +718,8 @@ <data name="bodetails_16x163" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\bodetails_16x163.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, - PublicKeyToken=b03f5f7f11d50a3a</value> + <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, @@ -745,9 +756,6 @@ <data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</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> <data name="selectvaluespivottable_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\selectvaluespivottable_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -768,19 +776,19 @@ <data name="printer_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\printer_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <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 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> @@ -811,9 +819,6 @@ <data name="sortasc_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\sortasc_32x32.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="trackingchanges_next_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\trackingchanges_next_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -835,10 +840,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> @@ -862,9 +865,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> @@ -873,8 +873,10 @@ 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="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="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> @@ -889,9 +891,6 @@ <value>..\Resources\checkbox2_32x32.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="exportfile_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\exportfile_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -911,21 +910,22 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="chartsshowlegend_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\chartsshowlegend_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> + <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="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="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> <data name="bodetails_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\bodetails_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\replace_16x16.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="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> @@ -934,19 +934,23 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</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="task_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\task_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap, 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="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="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, @@ -972,8 +976,10 @@ <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="print_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\print_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -992,6 +998,11 @@ <data name="refreshpivottable_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\refreshpivottable_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, + 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> @@ -1003,19 +1014,26 @@ <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="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="copy_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\copy_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="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="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 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> @@ -1042,10 +1060,8 @@ <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="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 name="bodetails_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\bodetails_32x321.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, @@ -1055,21 +1071,17 @@ <data name="ok123" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\ok123.jpg;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&reference_16x163" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\lookup&reference_16x163.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 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> + <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="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> @@ -1080,15 +1092,11 @@ <data name="print_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\print_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="lookup&reference_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\lookup&reference_16x16.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="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 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="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> @@ -1098,24 +1106,18 @@ 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&reference_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\lookup&reference_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -1125,6 +1127,11 @@ </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="print_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\print_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -1147,30 +1154,26 @@ <data name="chartselectdata_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\chartselectdata_16x16.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="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap, + <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="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="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 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="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="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="addfile_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\addfile_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="fullstackedbar3d_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\fullstackedbar3d_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/fullstackedbar3d_16x16.png b/DevApp/Gs.DevApp/Resources/fullstackedbar3d_16x16.png new file mode 100644 index 0000000..672f7a4 --- /dev/null +++ b/DevApp/Gs.DevApp/Resources/fullstackedbar3d_16x16.png Binary files differ diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs index ece6770..9052651 100644 --- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs +++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs @@ -839,18 +839,6 @@ /// </summary> public event EventHandler btnFChkClick; - - /// <summary> - /// 妫�楠� - /// </summary> - public event EventHandler btnJianYanClick; - - /// <summary> - /// 鍙嶆楠� - /// </summary> - public event EventHandler btnFjianYanClick; - - /// <summary> /// 鎵瑰噯 /// </summary> diff --git a/DevApp/Gs.DevApp/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/XtraForm1.Designer.cs index 252e7f0..b7e1014 100644 --- a/DevApp/Gs.DevApp/XtraForm1.Designer.cs +++ b/DevApp/Gs.DevApp/XtraForm1.Designer.cs @@ -31,15 +31,16 @@ this.components = new System.ComponentModel.Container(); this.dropDownButton1 = new DevExpress.XtraEditors.DropDownButton(); this.popupMenu1 = new DevExpress.XtraBars.PopupMenu(this.components); + this.barButtonItem1 = new DevExpress.XtraBars.BarButtonItem(); + this.barButtonItem2 = new DevExpress.XtraBars.BarButtonItem(); + this.barButtonItem3 = new DevExpress.XtraBars.BarButtonItem(); + this.barButtonItem4 = new DevExpress.XtraBars.BarButtonItem(); this.barManager1 = new DevExpress.XtraBars.BarManager(this.components); 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.barButtonItem1 = new DevExpress.XtraBars.BarButtonItem(); - this.barButtonItem2 = new DevExpress.XtraBars.BarButtonItem(); - this.barButtonItem3 = new DevExpress.XtraBars.BarButtonItem(); - this.barButtonItem4 = new DevExpress.XtraBars.BarButtonItem(); + this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton(); ((System.ComponentModel.ISupportInitialize)(this.popupMenu1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.barManager1)).BeginInit(); this.SuspendLayout(); @@ -62,6 +63,30 @@ new DevExpress.XtraBars.LinkPersistInfo(this.barButtonItem4)}); this.popupMenu1.Manager = this.barManager1; this.popupMenu1.Name = "popupMenu1"; + // + // barButtonItem1 + // + this.barButtonItem1.Caption = "barButtonItem1"; + this.barButtonItem1.Id = 0; + this.barButtonItem1.Name = "barButtonItem1"; + // + // barButtonItem2 + // + this.barButtonItem2.Caption = "barButtonItem2"; + this.barButtonItem2.Id = 1; + this.barButtonItem2.Name = "barButtonItem2"; + // + // barButtonItem3 + // + this.barButtonItem3.Caption = "barButtonItem3"; + this.barButtonItem3.Id = 2; + this.barButtonItem3.Name = "barButtonItem3"; + // + // barButtonItem4 + // + this.barButtonItem4.Caption = "barButtonItem4"; + this.barButtonItem4.Id = 3; + this.barButtonItem4.Name = "barButtonItem4"; // // barManager1 // @@ -109,35 +134,21 @@ this.barDockControlRight.Manager = this.barManager1; this.barDockControlRight.Size = new System.Drawing.Size(0, 659); // - // barButtonItem1 + // simpleButton1 // - this.barButtonItem1.Caption = "barButtonItem1"; - this.barButtonItem1.Id = 0; - this.barButtonItem1.Name = "barButtonItem1"; - // - // barButtonItem2 - // - this.barButtonItem2.Caption = "barButtonItem2"; - this.barButtonItem2.Id = 1; - this.barButtonItem2.Name = "barButtonItem2"; - // - // barButtonItem3 - // - this.barButtonItem3.Caption = "barButtonItem3"; - this.barButtonItem3.Id = 2; - this.barButtonItem3.Name = "barButtonItem3"; - // - // barButtonItem4 - // - this.barButtonItem4.Caption = "barButtonItem4"; - this.barButtonItem4.Id = 3; - this.barButtonItem4.Name = "barButtonItem4"; + this.simpleButton1.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.fullstackedbar3d_16x16; + this.simpleButton1.Location = new System.Drawing.Point(225, 257); + this.simpleButton1.Name = "simpleButton1"; + this.simpleButton1.Size = new System.Drawing.Size(94, 29); + this.simpleButton1.TabIndex = 5; + this.simpleButton1.Text = "simpleButton1"; // // XtraForm1 // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(887, 659); + this.Controls.Add(this.simpleButton1); this.Controls.Add(this.dropDownButton1); this.Controls.Add(this.barDockControlLeft); this.Controls.Add(this.barDockControlRight); @@ -165,5 +176,6 @@ private DevExpress.XtraBars.BarDockControl barDockControlBottom; private DevExpress.XtraBars.BarDockControl barDockControlLeft; private DevExpress.XtraBars.BarDockControl barDockControlRight; + private DevExpress.XtraEditors.SimpleButton simpleButton1; } } \ No newline at end of file -- Gitblit v1.9.3