From a8ed3d24ba97b9ee93de0f15fb15b46a9850b2fc Mon Sep 17 00:00:00 2001
From: lg <999544862qq.com>
Date: 星期二, 17 九月 2024 16:58:39 +0800
Subject: [PATCH] 基础资料
---
DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 40 ++++++--
DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.Designer.cs | 1
DevApp/Gs.DevApp/Resources/zoom100_16x16.png | 0
DevApp/Gs.DevApp/Gs.DevApp.csproj | 7 +
DevApp/Gs.DevApp/App.config | 2
DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs | 34 ++++++
DevApp/Gs.DevApp/DevFrm/User/User.cs | 8 +
DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs | 25 ++--
DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.Designer.cs | 3
DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs | 1
DevApp/Gs.DevApp/UserControl/ToolBarMenu.Designer.cs | 3
DevApp/Gs.DevApp/DevFrm/User/SysMenu.resx | 13 --
DevApp/Gs.DevApp/Properties/Resources.resx | 84 +++++++++-------
DevApp/Gs.DevApp/DevFrm/User/Role.cs | 8 +
DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs | 26 ++++
DevApp/Gs.DevApp/Resources/logo_png_black.png | 0
DevApp/Gs.DevApp/Resources/zoom100_32x32.png | 0
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs | 8 +
18 files changed, 182 insertions(+), 81 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 37df7e4..7fadd11 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -22,7 +22,7 @@
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<appSettings>
- <add key="WebApiUrl" value="http://localhost:5263/" />
+ <add key="WebApiUrl" value="http://localhost:5000/" />
<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/Sys/SysLog.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
index 26ffafa..1ab03fd 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
@@ -26,6 +26,14 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
pageBar1.PagerEvent += PageBar1_PagerEvent;
getPageList(1, UtilityHelper.GetPageSize());
+ gridView1.IndicatorWidth = 50;
+ gridView1.CustomDrawRowIndicator += (s, e) =>
+ {
+ if (e.Info.IsRowIndicator && e.RowHandle >= 0)
+ {
+ e.Info.DisplayText = (e.RowHandle + 1).ToString();
+ }
+ };
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
index 20ee0bc..bfc70e4 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
@@ -31,6 +31,14 @@
pageBar1.PagerEvent += PageBar1_PagerEvent;
getPageList(1, UtilityHelper.GetPageSize());
trv.AfterCheck += Trv_AfterCheck;
+ gridView1.IndicatorWidth = 50;
+ gridView1.CustomDrawRowIndicator += (s, e) =>
+ {
+ if (e.Info.IsRowIndicator && e.RowHandle >= 0)
+ {
+ e.Info.DisplayText = (e.RowHandle + 1).ToString();
+ }
+ };
}
/// <summary>
/// 鎹㈠垏鎹簨浠�
diff --git a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs
index ecad0d6..33fe503 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs
@@ -29,7 +29,6 @@
/// </summary>
private void InitializeComponent()
{
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SysMenu));
this.toolBarMenu1 = new Gs.DevApp.UserControl.ToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -43,6 +42,7 @@
this.tlcMenuType = new DevExpress.XtraTreeList.Columns.TreeListColumn();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.panel1 = new System.Windows.Forms.Panel();
+ this.label2 = new System.Windows.Forms.Label();
this.txt_formPath = new DevExpress.XtraEditors.ComboBoxEdit();
this.label3 = new System.Windows.Forms.Label();
this.txt_name = new DevExpress.XtraEditors.ComboBoxEdit();
@@ -66,7 +66,6 @@
this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
- this.label2 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -85,7 +84,6 @@
//
// toolBarMenu1
//
- //this.toolBarMenu1.actions = ((System.Collections.Generic.List<string>)(resources.GetObject("toolBarMenu1.actions")));
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
@@ -132,6 +130,7 @@
this.tlMenu.MinWidth = 23;
this.tlMenu.Name = "tlMenu";
this.tlMenu.OptionsBehavior.Editable = false;
+ this.tlMenu.OptionsView.TreeLineStyle = DevExpress.XtraTreeList.LineStyle.Solid;
this.tlMenu.Size = new System.Drawing.Size(1105, 475);
this.tlMenu.TabIndex = 3;
this.tlMenu.TreeLevelWidth = 21;
@@ -244,6 +243,15 @@
this.panel1.Size = new System.Drawing.Size(679, 411);
this.panel1.TabIndex = 2;
//
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(429, 163);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(197, 21);
+ this.label2.TabIndex = 135;
+ this.label2.Text = "锛堝缓璁粠涓嬫媺妗嗕腑閫夋嫨锛�";
+ //
// txt_formPath
//
this.txt_formPath.Location = new System.Drawing.Point(111, 160);
@@ -316,7 +324,7 @@
//
// txt_upGuid
//
- this.txt_upGuid.EditValue = "鏃犲彲濂堜綍鑺辫惤鍘�";
+ this.txt_upGuid.EditValue = "";
this.txt_upGuid.Location = new System.Drawing.Point(111, 11);
this.txt_upGuid.Name = "txt_upGuid";
this.txt_upGuid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -503,15 +511,6 @@
this.labelControl2.Size = new System.Drawing.Size(85, 21);
this.labelControl2.TabIndex = 94;
this.labelControl2.Text = "鑿滃崟鍚嶇О锛�";
- //
- // label2
- //
- this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(429, 163);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(197, 21);
- this.label2.TabIndex = 135;
- this.label2.Text = "锛堝缓璁粠涓嬫媺妗嗕腑閫夋嫨锛�";
//
// SysMenu
//
diff --git a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs
index 9fee2da..81f995e 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs
@@ -1,4 +1,5 @@
-锘縰sing DevExpress.XtraTreeList;
+锘縰sing DevExpress.XtraEditors.Controls;
+using DevExpress.XtraTreeList;
using DevExpress.XtraTreeList.Nodes;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
@@ -27,6 +28,27 @@
getTree();
getDownList();
getActionList();
+ txt_upGuid.Properties.PopupFormSize = new System.Drawing.Size(txt_upGuid.Width, 300);
+ txt_upGuid.Properties.ImmediatePopup = true;
+ txt_upGuid.Properties.TextEditStyle = TextEditStyles.Standard;
+ txt_upGuid.Properties.TreeList.IndicatorWidth = 50;
+ txt_upGuid.Properties.TreeList.CustomDrawNodeIndicator += (s, ee) =>
+ {
+ if (ee.IsNodeIndicator)
+ {
+ var index = ee.Node.TreeList.GetVisibleIndexByNode(ee.Node);
+ ee.Info.DisplayText = (index + 1).ToString();
+ }
+ };
+ tlMenu.IndicatorWidth = 50;
+ tlMenu.CustomDrawNodeIndicator += (s, ee) =>
+ {
+ if (ee.IsNodeIndicator)
+ {
+ var index = ee.Node.TreeList.GetVisibleIndexByNode(ee.Node);
+ ee.Info.DisplayText = (index + 1).ToString();
+ }
+ };
}
/// <summary>
@@ -36,7 +58,7 @@
/// <param name="e"></param>
private void Txt_category_TextChanged(object sender, EventArgs e)
{
- if (txt_category.SelectedIndex ==1)
+ if (txt_category.SelectedIndex == 1)
{
this.txt_formPath.Enabled = true;
this.txt_icon.Enabled = true;
diff --git a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.resx b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.resx
index 9fc8a0a..1af7de1 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.resx
+++ b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.resx
@@ -117,17 +117,4 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <data name="toolBarMenu1.actions" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>
- AAEAAAD/////AQAAAAAAAAAMAgAAAJoBbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1u
- ZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0sIG1zY29ybGliLCBWZXJzaW9u
- PTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OQUB
- AAAAMFN5c3RlbS5Db2xsZWN0aW9ucy5HZW5lcmljLkxpc3RgMVtbU3lzdGVtLlN0cmluZwMAAAAGX2l0
- ZW1zBV9zaXplCF92ZXJzaW9uBgAACAgCAAAACQMAAAAQAAAAEAAAABEDAAAAEAAAAAYEAAAABuWinuWK
- oAYFAAAABuWIoOmZpAYGAAAABuS/ruaUuQYHAAAABuS/neWtmAYIAAAABuWPlua2iAYJAAAABuWIt+aW
- sAYKAAAABuWvvOWHugYLAAAABuWuoeaguAYMAAAACeWPjeWuoeaguAYNAAAABuaJk+WNsAYOAAAABuWQ
- iOW5tgYPAAAABuWvvOWFpQYQAAAABuaXpeW/lwYRAAAABuW8gOW3pQYSAAAABuWIl+ihqAYTAAAADOS/
- neWtmOadg+mZkAs=
-</value>
- </data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.cs b/DevApp/Gs.DevApp/DevFrm/User/User.cs
index b0c400e..7e2a371 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.cs
@@ -29,6 +29,14 @@
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
pageBar1.PagerEvent += PageBar1_PagerEvent;
getPageList(1, UtilityHelper.GetPageSize());
+ gridView1.IndicatorWidth = 50;
+ gridView1.CustomDrawRowIndicator += (s, e) =>
+ {
+ if (e.Info.IsRowIndicator && e.RowHandle >= 0)
+ {
+ e.Info.DisplayText = (e.RowHandle + 1).ToString();
+ }
+ };
}
private void ToolBarMenu1_btnReportClick(object sender, EventArgs e)
diff --git a/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.Designer.cs
index 0cbc0d5..9bebb69 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.Designer.cs
@@ -114,6 +114,7 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(302, 458);
this.Controls.Add(this.xtraTabControl1);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "UserSelectRole";
diff --git a/DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.Designer.cs
index 541dc19..038f776 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.Designer.cs
@@ -149,11 +149,12 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(558, 381);
this.Controls.Add(this.panel1);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "UserSetPwd";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "UserSetPwd";
+ this.Text = "淇敼瀵嗙爜";
this.panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txtNewPwd.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtNewPwd2.Properties)).EndInit();
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 9253f79..50a8cea 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -354,6 +354,10 @@
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="TestForm\XtraForm1.resx">
+ <DependentUpon>XtraForm1.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\PageBar.resx">
<DependentUpon>PageBar.cs</DependentUpon>
@@ -381,6 +385,8 @@
</ItemGroup>
<ItemGroup>
<Content Include="logo_ico.ico" />
+ <None Include="Resources\zoom100_16x16.png" />
+ <None Include="Resources\zoom100_32x32.png" />
<None Include="Resources\user_16x161.png" />
<None Include="Resources\trackingchanges_allmarkup_32x32.png" />
<None Include="Resources\trackingchanges_allmarkup_16x16.png" />
@@ -451,6 +457,7 @@
<None Include="Resources\engineering_16x16.png" />
<None Include="Resources\cleartablestyle_16x16.png" />
<None Include="Resources\logo_png.png" />
+ <None Include="Resources\logo_png_black.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 8248674..8c3c2e0 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -431,16 +431,6 @@
}
/// <summary>
- /// 鏌ユ壘 DevExpress.Utils.Svg.SvgImage 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
- /// </summary>
- internal static DevExpress.Utils.Svg.SvgImage enablesearch {
- get {
- object obj = ResourceManager.GetObject("enablesearch", resourceCulture);
- return ((DevExpress.Utils.Svg.SvgImage)(obj));
- }
- }
-
- /// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
internal static System.Drawing.Bitmap encryptdocument_32x32 {
@@ -666,6 +656,16 @@
internal static System.Drawing.Bitmap logo_png {
get {
object obj = ResourceManager.GetObject("logo_png", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static System.Drawing.Bitmap logo_png_black {
+ get {
+ object obj = ResourceManager.GetObject("logo_png_black", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@@ -919,5 +919,25 @@
return ((System.Drawing.Bitmap)(obj));
}
}
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static System.Drawing.Bitmap zoom100_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("zoom100_16x16", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static System.Drawing.Bitmap zoom100_32x32 {
+ get {
+ object obj = ResourceManager.GetObject("zoom100_32x32", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
}
}
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index ca24683..ae518a0 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -124,8 +124,8 @@
<data name="forcetesting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\forcetesting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="first_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\first_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="saveall_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\saveall_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="trackingchanges_allmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_allmarkup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -142,8 +142,8 @@
<data name="boposition2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\boposition2_16x16.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 name="serieslines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\serieslines_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="show_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\show_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -157,14 +157,17 @@
<data name="forcetesting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\forcetesting_32x32.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, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="user_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\user_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\convert_32x32.png;System.Drawing.Bitmap, 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="zoom100_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\zoom100_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, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -175,8 +178,8 @@
<data name="time2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\time2_16x16.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 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="encryptdocument_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\encryptdocument_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -189,6 +192,9 @@
</data>
<data name="first_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\first_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="first_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\first_16x16.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>
@@ -205,6 +211,9 @@
<data name="formatnumbertime_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\formatnumbertime_16x16.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="removegroupfooter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\removegroupfooter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -217,8 +226,8 @@
<data name="meeting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\meeting_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="serieslines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\serieslines_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="listmultilevel_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\listmultilevel_16x16.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>
@@ -226,14 +235,14 @@
<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="enablesearch" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\enablesearch.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+ <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="trackingchanges_trackchanges_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_trackchanges_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 name="csharp_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\csharp_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="exportfile_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\exportfile_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -244,17 +253,14 @@
<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="3dcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\3dcolumn_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>
- <data name="doubleprev_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\doubleprev_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="user_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\user_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="editrangepermission_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\editrangepermission_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="bouser_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bouser_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -265,14 +271,8 @@
<data name="dropandhighlowlines_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\dropandhighlowlines_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="user_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\user_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="3dcylinder_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\3dcylinder_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="editname_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\editname_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</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>
@@ -283,11 +283,14 @@
<data name="convert_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\convert_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="trackingchanges_allmarkup_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\trackingchanges_allmarkup_16x16.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="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="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="first_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\first_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -307,6 +310,9 @@
<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="editrangepermission_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\editrangepermission_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="checkbox2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -322,11 +328,11 @@
<data name="doublenext_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\doublenext_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="listmultilevel_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\listmultilevel_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="editname_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\editname_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="saveall_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\saveall_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="editrangepermission_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\editrangepermission_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="publicfix_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\publicfix_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -334,8 +340,8 @@
<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="editrangepermission_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\editrangepermission_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="doubleprev_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\doubleprev_16x16.png;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>
@@ -352,8 +358,8 @@
<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="3dcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\3dcolumn_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="trackingchanges_allmarkup_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\trackingchanges_allmarkup_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="legendnone2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\legendnone2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -373,7 +379,7 @@
<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="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 name="zoom100_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\zoom100_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/logo_png_black.png b/DevApp/Gs.DevApp/Resources/logo_png_black.png
new file mode 100644
index 0000000..73f34bd
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/logo_png_black.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/zoom100_16x16.png b/DevApp/Gs.DevApp/Resources/zoom100_16x16.png
new file mode 100644
index 0000000..5cd84ec
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/zoom100_16x16.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/zoom100_32x32.png b/DevApp/Gs.DevApp/Resources/zoom100_32x32.png
new file mode 100644
index 0000000..d0a9d37
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/zoom100_32x32.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
index ffa131d..6d0a51e 100644
--- a/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
+++ b/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
@@ -29,11 +29,43 @@
/// </summary>
private void InitializeComponent()
{
- this.components = new System.ComponentModel.Container();
+ this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
+ this.simpleButton2 = new DevExpress.XtraEditors.SimpleButton();
+ this.SuspendLayout();
+ //
+ // simpleButton1
+ //
+ this.simpleButton1.Location = new System.Drawing.Point(61, 77);
+ this.simpleButton1.Name = "simpleButton1";
+ this.simpleButton1.Size = new System.Drawing.Size(94, 29);
+ this.simpleButton1.TabIndex = 0;
+ this.simpleButton1.Text = "simpleButton1";
+ //
+ // simpleButton2
+ //
+ this.simpleButton2.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.simpleButton2.Location = new System.Drawing.Point(75, 144);
+ this.simpleButton2.Name = "simpleButton2";
+ this.simpleButton2.Size = new System.Drawing.Size(94, 29);
+ this.simpleButton2.TabIndex = 1;
+ this.simpleButton2.Text = "simpleButton2";
+ //
+ // XtraForm1
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(298, 260);
+ this.Controls.Add(this.simpleButton2);
+ this.Controls.Add(this.simpleButton1);
+ this.Name = "XtraForm1";
this.Text = "XtraForm1";
+ this.ResumeLayout(false);
+
}
#endregion
+
+ private DevExpress.XtraEditors.SimpleButton simpleButton1;
+ private DevExpress.XtraEditors.SimpleButton simpleButton2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs b/DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs
index 2a1112f..96fac1f 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs
@@ -149,6 +149,7 @@
this.ClientSize = new System.Drawing.Size(511, 311);
this.Controls.Add(this.gcMain);
this.Controls.Add(this.panel1);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "ShowFilter";
diff --git a/DevApp/Gs.DevApp/UserControl/ToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/ToolBarMenu.Designer.cs
index 153a551..abc5bbe 100644
--- a/DevApp/Gs.DevApp/UserControl/ToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/ToolBarMenu.Designer.cs
@@ -303,7 +303,8 @@
//
this.btnQuery.Caption = "鏌ヨ";
this.btnQuery.Id = 23;
- this.btnQuery.ImageOptions.SvgImage = global::Gs.DevApp.Properties.Resources.enablesearch;
+ this.btnQuery.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
+ this.btnQuery.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.zoom100_32x32;
this.btnQuery.Name = "btnQuery";
this.btnQuery.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
--
Gitblit v1.9.3