From 01738c21cdb08fee76aa53ff870a38a00b4f5df4 Mon Sep 17 00:00:00 2001
From: lg <999544862qq.com>
Date: 星期五, 13 九月 2024 12:01:18 +0800
Subject: [PATCH] 基础资料
---
DevApp/Gs.DevApp/TestForm/XtraForm1.resx | 16 -
DevApp/Gs.DevApp/Resources/cleartablestyle_16x16.png | 0
DevApp/Gs.DevApp/Gs.DevApp.csproj | 95 ++++++---
DevApp/Gs.DevApp/Resources/bodepartment_16x161.png | 0
DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs | 106 ----------
DevApp/Gs.DevApp/Resources/find_16x16.png | 0
DevApp/Gs.DevApp/Resources/employee_32x32.png | 0
DevApp/Gs.DevApp/Resources/find_32x32.png | 0
/dev/null | 120 ------------
DevApp/Gs.DevApp/Resources/boposition2_16x16.png | 0
DevApp/Gs.DevApp/Properties/Resources1.Designer.cs | 130 ++++++++++---
DevApp/Gs.DevApp/Resources/engineering_16x16.png | 0
DevApp/Gs.DevApp/Resources/newitem_16x16.png | 0
DevApp/Gs.DevApp/Resources/replace_16x16.png | 0
DevApp/Gs.DevApp/Properties/Resources.resx | 85 +++++---
15 files changed, 221 insertions(+), 331 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 1b1dd82..0e9a6a6 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -75,17 +75,53 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="DevFrm\BasicData\FrmCustomer.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\BasicData\FrmCustomer.Designer.cs">
+ <DependentUpon>FrmCustomer.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\BasicData\FrmDepartment.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\BasicData\FrmDepartment.Designer.cs">
+ <DependentUpon>FrmDepartment.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\BasicData\FrmDictionary.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\BasicData\FrmDictionary.Designer.cs">
+ <DependentUpon>FrmDictionary.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\BasicData\FrmMesItems.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DevFrm\BasicData\FrmMesItems.Designer.cs">
<DependentUpon>FrmMesItems.cs</DependentUpon>
</Compile>
- <Compile Include="DevFrm\Rpt\RptUser.cs">
+ <Compile Include="DevFrm\BasicData\FrmStaff.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="DevFrm\Rpt\RptUser.Designer.cs">
- <DependentUpon>RptUser.cs</DependentUpon>
+ <Compile Include="DevFrm\BasicData\FrmStaff.Designer.cs">
+ <DependentUpon>FrmStaff.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\BasicData\FrmSupplier.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\BasicData\FrmSupplier.Designer.cs">
+ <DependentUpon>FrmSupplier.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\RptPreview.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\RptPreview.Designer.cs">
+ <DependentUpon>RptPreview.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Sys\EasyRpt.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Sys\EasyRpt.Designer.cs">
+ <DependentUpon>EasyRpt.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Sys\FileSelector.cs" />
<Compile Include="DevFrm\FrmLogin.cs">
@@ -167,24 +203,6 @@
</Compile>
<Compile Include="Query\MesItemQuery.cs" />
<Compile Include="Service\MesItemServices.cs" />
- <Compile Include="TestForm\print.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="TestForm\print.Designer.cs">
- <DependentUpon>print.cs</DependentUpon>
- </Compile>
- <Compile Include="TestForm\t1.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="TestForm\t1.Designer.cs">
- <DependentUpon>t1.cs</DependentUpon>
- </Compile>
- <Compile Include="TestForm\test.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="TestForm\test.Designer.cs">
- <DependentUpon>test.cs</DependentUpon>
- </Compile>
<Compile Include="TestForm\XtraForm1.cs">
<SubType>Form</SubType>
</Compile>
@@ -207,6 +225,12 @@
<Compile Include="UserControl\ShowDialogForm.designer.cs">
<DependentUpon>ShowDialogForm.cs</DependentUpon>
</Compile>
+ <Compile Include="UserControl\ShowFilter.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\ShowFilter.Designer.cs">
+ <DependentUpon>ShowFilter.cs</DependentUpon>
+ </Compile>
<Compile Include="UserControl\ToolBarMenu.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -222,14 +246,17 @@
<EmbeddedResource Include="DevFrm\FrmMain.resx">
<DependentUpon>FrmMain.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="DevFrm\Rpt\RptUser.resx">
- <DependentUpon>RptUser.cs</DependentUpon>
+ <EmbeddedResource Include="DevFrm\Rpt\RptPreview.resx">
+ <DependentUpon>RptPreview.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Sys\DocNoRule.resx">
<DependentUpon>DocNoRule.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Sys\EasyCode.resx">
<DependentUpon>EasyCode.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Sys\EasyRpt.resx">
+ <DependentUpon>EasyRpt.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Sys\SysLog.resx">
<DependentUpon>SysLog.cs</DependentUpon>
@@ -256,15 +283,6 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources1.Designer.cs</LastGenOutput>
</EmbeddedResource>
- <EmbeddedResource Include="TestForm\print.resx">
- <DependentUpon>print.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="TestForm\t1.resx">
- <DependentUpon>t1.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="TestForm\test.resx">
- <DependentUpon>test.cs</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="TestForm\XtraForm1.resx">
<DependentUpon>XtraForm1.cs</DependentUpon>
</EmbeddedResource>
@@ -273,6 +291,9 @@
</EmbeddedResource>
<EmbeddedResource Include="UserControl\ShowDialogForm.resx">
<DependentUpon>ShowDialogForm.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\ShowFilter.resx">
+ <DependentUpon>ShowFilter.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\ToolBarMenu.resx">
<DependentUpon>ToolBarMenu.cs</DependentUpon>
@@ -349,6 +370,16 @@
<None Include="Resources\bouser_16x161.png" />
<None Include="Resources\csharp_16x16.png" />
<None Include="Resources\formatnumbertime_16x16.png" />
+ <None Include="Resources\find_32x32.png" />
+ <None Include="Resources\find_16x16.png" />
+ <None Include="Resources\enablesearch.svg" />
+ <None Include="Resources\employee_32x32.png" />
+ <None Include="Resources\boposition2_16x16.png" />
+ <None Include="Resources\newitem_16x16.png" />
+ <None Include="Resources\replace_16x16.png" />
+ <None Include="Resources\bodepartment_16x161.png" />
+ <None Include="Resources\engineering_16x16.png" />
+ <None Include="Resources\cleartablestyle_16x16.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup>
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index 0535a3c..a36e961 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -136,11 +136,14 @@
<data name="checkbox2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="converttorange_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\converttorange_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="find_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\find_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 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="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>
@@ -160,6 +163,12 @@
<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="3dcylinder_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\3dcylinder_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>
</data>
@@ -169,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>
@@ -180,12 +189,6 @@
</data>
<data name="reviewingpane_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\reviewingpane_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="login_bg222" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\login_bg222.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>
<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>
@@ -199,8 +202,14 @@
<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="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>
+ <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="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>
@@ -214,8 +223,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>
@@ -223,14 +232,20 @@
<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>
<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>
+ </data>
+ <data name="employee_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\employee_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, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -256,14 +271,11 @@
<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="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="converttorange_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\converttorange_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="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="login_bg2" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\login_bg2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="dropandhighlowlines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\dropandhighlowlines_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -274,11 +286,11 @@
<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="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>
- </data>
- <data name="editingfillleft_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\editingfillleft_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="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>
@@ -289,6 +301,9 @@
<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="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>
@@ -297,6 +312,9 @@
</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="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="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>
@@ -307,6 +325,9 @@
<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>
+ </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>
@@ -316,8 +337,8 @@
<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="login_bg1" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\login_bg1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="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>
@@ -340,8 +361,8 @@
<data name="bouser_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bouser_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="3dcylinder_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\3dcylinder_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="editingfillleft_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\editingfillleft_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="download_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\download_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -349,7 +370,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="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 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, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Properties/Resources1.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources1.Designer.cs
index 0896c4f..88e670a 100644
--- a/DevApp/Gs.DevApp/Properties/Resources1.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources1.Designer.cs
@@ -163,9 +163,29 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap bodepartment_16x161 {
+ get {
+ object obj = ResourceManager.GetObject("bodepartment_16x161", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap bodepartment_32x32 {
get {
object obj = ResourceManager.GetObject("bodepartment_32x32", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static System.Drawing.Bitmap boposition2_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("boposition2_16x16", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@@ -236,6 +256,16 @@
internal static System.Drawing.Bitmap checkbox2_32x321 {
get {
object obj = ResourceManager.GetObject("checkbox2_32x321", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static System.Drawing.Bitmap cleartablestyle_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("cleartablestyle_16x16", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@@ -393,6 +423,26 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap employee_32x32 {
+ get {
+ object obj = ResourceManager.GetObject("employee_32x32", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <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 {
get {
object obj = ResourceManager.GetObject("encryptdocument_32x32", resourceCulture);
@@ -406,6 +456,16 @@
internal static System.Drawing.Bitmap encryptdocument_32x321 {
get {
object obj = ResourceManager.GetObject("encryptdocument_32x321", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static System.Drawing.Bitmap engineering_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("engineering_16x16", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@@ -436,6 +496,26 @@
internal static System.Drawing.Bitmap filledradarwithoutmarkers_32x32 {
get {
object obj = ResourceManager.GetObject("filledradarwithoutmarkers_32x32", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static System.Drawing.Bitmap find_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("find_16x16", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static System.Drawing.Bitmap find_32x32 {
+ get {
+ object obj = ResourceManager.GetObject("find_32x32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@@ -573,36 +653,6 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
- internal static System.Drawing.Bitmap login_bg1 {
- get {
- object obj = ResourceManager.GetObject("login_bg1", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- /// <summary>
- /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
- /// </summary>
- internal static System.Drawing.Bitmap login_bg2 {
- get {
- object obj = ResourceManager.GetObject("login_bg2", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- /// <summary>
- /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
- /// </summary>
- internal static System.Drawing.Bitmap login_bg222 {
- get {
- object obj = ResourceManager.GetObject("login_bg222", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- /// <summary>
- /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
- /// </summary>
internal static System.Drawing.Bitmap login_bg6 {
get {
object obj = ResourceManager.GetObject("login_bg6", resourceCulture);
@@ -626,6 +676,16 @@
internal static System.Drawing.Bitmap meeting_32x32 {
get {
object obj = ResourceManager.GetObject("meeting_32x32", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static System.Drawing.Bitmap newitem_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("newitem_16x16", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@@ -683,6 +743,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap replace_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("replace_16x16", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap reviewingpane_32x32 {
get {
object obj = ResourceManager.GetObject("reviewingpane_32x32", resourceCulture);
diff --git a/DevApp/Gs.DevApp/Resources/bodepartment_16x161.png b/DevApp/Gs.DevApp/Resources/bodepartment_16x161.png
new file mode 100644
index 0000000..d7d291e
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/bodepartment_16x161.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/boposition2_16x16.png b/DevApp/Gs.DevApp/Resources/boposition2_16x16.png
new file mode 100644
index 0000000..4685dd7
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/boposition2_16x16.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/cleartablestyle_16x16.png b/DevApp/Gs.DevApp/Resources/cleartablestyle_16x16.png
new file mode 100644
index 0000000..8868d78
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/cleartablestyle_16x16.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/employee_32x32.png b/DevApp/Gs.DevApp/Resources/employee_32x32.png
new file mode 100644
index 0000000..2af07b9
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/employee_32x32.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/engineering_16x16.png b/DevApp/Gs.DevApp/Resources/engineering_16x16.png
new file mode 100644
index 0000000..da34441
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/engineering_16x16.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/find_16x16.png b/DevApp/Gs.DevApp/Resources/find_16x16.png
new file mode 100644
index 0000000..450ba87
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/find_16x16.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/find_32x32.png b/DevApp/Gs.DevApp/Resources/find_32x32.png
new file mode 100644
index 0000000..b562ad5
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/find_32x32.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/login_bg1.png b/DevApp/Gs.DevApp/Resources/login_bg1.png
deleted file mode 100644
index 70993c4..0000000
--- a/DevApp/Gs.DevApp/Resources/login_bg1.png
+++ /dev/null
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/login_bg2.png b/DevApp/Gs.DevApp/Resources/login_bg2.png
deleted file mode 100644
index fc36548..0000000
--- a/DevApp/Gs.DevApp/Resources/login_bg2.png
+++ /dev/null
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/login_bg222.png b/DevApp/Gs.DevApp/Resources/login_bg222.png
deleted file mode 100644
index bdf5c85..0000000
--- a/DevApp/Gs.DevApp/Resources/login_bg222.png
+++ /dev/null
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/newitem_16x16.png b/DevApp/Gs.DevApp/Resources/newitem_16x16.png
new file mode 100644
index 0000000..1e8802c
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/newitem_16x16.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/replace_16x16.png b/DevApp/Gs.DevApp/Resources/replace_16x16.png
new file mode 100644
index 0000000..e004d2a
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/replace_16x16.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/TestForm/TEST.Designer.cs b/DevApp/Gs.DevApp/TestForm/TEST.Designer.cs
deleted file mode 100644
index 257026c..0000000
--- a/DevApp/Gs.DevApp/TestForm/TEST.Designer.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-锘�
-namespace Gs.DevApp.TestForm
-{
- partial class test
- {
- /// <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.button1 = new System.Windows.Forms.Button();
- this.button2 = new System.Windows.Forms.Button();
- this.SuspendLayout();
- //
- // button1
- //
- this.button1.Location = new System.Drawing.Point(75, 42);
- this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(194, 41);
- this.button1.TabIndex = 0;
- this.button1.Text = "鎵撳嵃璁捐";
- this.button1.UseVisualStyleBackColor = true;
- this.button1.Click += new System.EventHandler(this.button1_Click);
- //
- // button2
- //
- this.button2.Location = new System.Drawing.Point(75, 123);
- this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(194, 41);
- this.button2.TabIndex = 1;
- this.button2.Text = "鎵撳嵃棰勮";
- this.button2.UseVisualStyleBackColor = true;
- this.button2.Click += new System.EventHandler(this.button2_Click);
- //
- // test
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(627, 260);
- this.Controls.Add(this.button2);
- this.Controls.Add(this.button1);
- this.Name = "test";
- this.Text = "test";
- this.ResumeLayout(false);
-
- }
-
- #endregion
-
- private System.Windows.Forms.Button button1;
- private System.Windows.Forms.Button button2;
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/TestForm/TEST.cs b/DevApp/Gs.DevApp/TestForm/TEST.cs
deleted file mode 100644
index 5b8363f..0000000
--- a/DevApp/Gs.DevApp/TestForm/TEST.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-锘縰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.TestForm
-{
- public partial class test : DevExpress.XtraEditors.XtraForm
- {
- public test()
- {
- InitializeComponent();
- }
-
- private void button1_Click(object sender, EventArgs e)
- {
- t1 dd = new t1();
- dd.Show();
- }
-
- private void button2_Click(object sender, EventArgs e)
- {
- print dd = new print();
- dd.Show();
- }
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/TestForm/TEST.resx b/DevApp/Gs.DevApp/TestForm/TEST.resx
deleted file mode 100644
index 1af7de1..0000000
--- a/DevApp/Gs.DevApp/TestForm/TEST.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
-</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
index 0529239..e4bacc6 100644
--- a/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
+++ b/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
@@ -29,128 +29,32 @@
/// </summary>
private void InitializeComponent()
{
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(XtraForm1));
- this.button1 = new System.Windows.Forms.Button();
- this.pageBar1 = new UserControls.Data.PageBar();
this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
- this.treeListLookUpEdit1 = new DevExpress.XtraEditors.TreeListLookUpEdit();
- this.treeListLookUpEdit1TreeList = new DevExpress.XtraTreeList.TreeList();
- this.designerControl1 = new FastReport.Design.StandardDesigner.DesignerControl();
- this.previewControl1 = new FastReport.Preview.PreviewControl();
- this.report1 = new FastReport.Report();
- ((System.ComponentModel.ISupportInitialize)(this.treeListLookUpEdit1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.treeListLookUpEdit1TreeList)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.designerControl1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.report1)).BeginInit();
this.SuspendLayout();
- //
- // button1
- //
- this.button1.Location = new System.Drawing.Point(151, 89);
- this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(75, 23);
- this.button1.TabIndex = 0;
- this.button1.Text = "button1";
- this.button1.UseVisualStyleBackColor = true;
- //
- // pageBar1
- //
- this.pageBar1.CurrentPage = 0;
- this.pageBar1.Location = new System.Drawing.Point(12, 266);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.pageBar1.Name = "pageBar1";
- this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(954, 40);
- this.pageBar1.TabIndex = 2;
- this.pageBar1.TotalPages = 0;
//
// simpleButton1
//
- this.simpleButton1.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.formatnumbertime_16x16;
- this.simpleButton1.Location = new System.Drawing.Point(590, 128);
- this.simpleButton1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.simpleButton1.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.cleartablestyle_16x16;
+ this.simpleButton1.Location = new System.Drawing.Point(172, 118);
this.simpleButton1.Name = "simpleButton1";
- this.simpleButton1.Size = new System.Drawing.Size(118, 36);
- this.simpleButton1.TabIndex = 1;
+ this.simpleButton1.Size = new System.Drawing.Size(94, 29);
+ this.simpleButton1.TabIndex = 0;
this.simpleButton1.Text = "simpleButton1";
- //
- // treeListLookUpEdit1
- //
- this.treeListLookUpEdit1.Location = new System.Drawing.Point(326, 210);
- this.treeListLookUpEdit1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.treeListLookUpEdit1.Name = "treeListLookUpEdit1";
- this.treeListLookUpEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.treeListLookUpEdit1.Properties.TreeList = this.treeListLookUpEdit1TreeList;
- this.treeListLookUpEdit1.Size = new System.Drawing.Size(156, 24);
- this.treeListLookUpEdit1.TabIndex = 3;
- //
- // treeListLookUpEdit1TreeList
- //
- this.treeListLookUpEdit1TreeList.HorzScrollStep = 4;
- this.treeListLookUpEdit1TreeList.Location = new System.Drawing.Point(0, 0);
- this.treeListLookUpEdit1TreeList.MinWidth = 25;
- this.treeListLookUpEdit1TreeList.Name = "treeListLookUpEdit1TreeList";
- this.treeListLookUpEdit1TreeList.OptionsView.ShowIndentAsRowStyle = true;
- this.treeListLookUpEdit1TreeList.Size = new System.Drawing.Size(400, 200);
- this.treeListLookUpEdit1TreeList.TabIndex = 0;
- this.treeListLookUpEdit1TreeList.TreeLevelWidth = 22;
- //
- // designerControl1
- //
- this.designerControl1.AskSave = true;
- this.designerControl1.LayoutState = resources.GetString("designerControl1.LayoutState");
- this.designerControl1.Location = new System.Drawing.Point(0, 0);
- this.designerControl1.Name = "designerControl1";
- this.designerControl1.TabIndex = 0;
- this.designerControl1.UIStyle = FastReport.Utils.UIStyle.Office2007Black;
- //
- // previewControl1
- //
- this.previewControl1.BackColor = System.Drawing.SystemColors.AppWorkspace;
- this.previewControl1.Font = new System.Drawing.Font("瀹嬩綋", 7.2F);
- this.previewControl1.Location = new System.Drawing.Point(347, 314);
- this.previewControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.previewControl1.Name = "previewControl1";
- this.previewControl1.PageOffset = new System.Drawing.Point(10, 10);
- this.previewControl1.Size = new System.Drawing.Size(643, 262);
- this.previewControl1.TabIndex = 4;
- this.previewControl1.UIStyle = FastReport.Utils.UIStyle.Office2007Black;
- //
- // report1
- //
- this.report1.ReportResourceString = resources.GetString("report1.ReportResourceString");
//
// XtraForm1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(842, 424);
- this.Controls.Add(this.previewControl1);
- this.Controls.Add(this.treeListLookUpEdit1);
- this.Controls.Add(this.pageBar1);
+ this.ClientSize = new System.Drawing.Size(651, 260);
this.Controls.Add(this.simpleButton1);
- this.Controls.Add(this.button1);
this.Name = "XtraForm1";
this.Text = "XtraForm1";
- ((System.ComponentModel.ISupportInitialize)(this.treeListLookUpEdit1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.treeListLookUpEdit1TreeList)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.designerControl1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.report1)).EndInit();
this.ResumeLayout(false);
}
#endregion
- private System.Windows.Forms.Button button1;
private DevExpress.XtraEditors.SimpleButton simpleButton1;
- private UserControls.Data.PageBar pageBar1;
- private DevExpress.XtraEditors.TreeListLookUpEdit treeListLookUpEdit1;
- private DevExpress.XtraTreeList.TreeList treeListLookUpEdit1TreeList;
- private FastReport.Design.StandardDesigner.DesignerControl designerControl1;
- private FastReport.Preview.PreviewControl previewControl1;
- private FastReport.Report report1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm1.resx b/DevApp/Gs.DevApp/TestForm/XtraForm1.resx
index 9822d86..1af7de1 100644
--- a/DevApp/Gs.DevApp/TestForm/XtraForm1.resx
+++ b/DevApp/Gs.DevApp/TestForm/XtraForm1.resx
@@ -117,20 +117,4 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="designerControl1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
- </metadata>
- <data name="designerControl1.LayoutState" xml:space="preserve">
- <value>锘�<?xml version="1.0" encoding="utf-8"?><Config><Designer><DockNew Text="&lt;dotnetbarlayout version=&quot;6&quot; zorder=&quot;3,4,1,2&quot;&gt;&lt;docksite size=&quot;0&quot; dockingside=&quot;Top&quot; originaldocksitesize=&quot;0&quot; /&gt;&lt;docksite size=&quot;0&quot; dockingside=&quot;Bottom&quot; originaldocksitesize=&quot;0&quot;&gt;&lt;dockcontainer orientation=&quot;1&quot; w=&quot;0&quot; h=&quot;0&quot;&gt;&lt;barcontainer w=&quot;0&quot; h=&quot;95&quot;&gt;&lt;bar name=&quot;MessagesWindowBar&quot; dockline=&quot;0&quot; layout=&quot;2&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;4&quot; visible=&quot;false&quot;&gt;&lt;items&gt;&lt;item name=&quot;MessagesWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;0&quot; visible=&quot;false&quot; /&gt;&lt;/items&gt;&lt;/bar&gt;&lt;/barcontainer&gt;&lt;/dockcontainer&gt;&lt;/docksite&gt;&lt;docksite size=&quot;0&quot; dockingside=&quot;Left&quot; originaldocksitesize=&quot;0&quot; /&gt;&lt;docksite size=&quot;250&quot; dockingside=&quot;Right&quot; originaldocksitesize=&quot;0&quot;&gt;&lt;dockcontainer orientation=&quot;1&quot; w=&quot;0&quot; h=&quot;0&quot;&gt;&lt;barcontainer w=&quot;247&quot; h=&quot;61&quot;&gt;&lt;bar name=&quot;DictionaryWindowBar&quot; dockline=&quot;0&quot; layout=&quot;2&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;2&quot; visible=&quot;true&quot; seldocktab=&quot;0&quot;&gt;&lt;items&gt;&lt;item name=&quot;DictionaryWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;0&quot; /&gt;&lt;item name=&quot;ReportTreeWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;1&quot; /&gt;&lt;/items&gt;&lt;/bar&gt;&lt;/barcontainer&gt;&lt;barcontainer w=&quot;247&quot; h=&quot;-14&quot;&gt;&lt;bar name=&quot;PropertiesWindowBar&quot; dockline=&quot;0&quot; layout=&quot;2&quot; dockoffset=&quot;64&quot; state=&quot;2&quot; dockside=&quot;2&quot; visible=&quot;true&quot;&gt;&lt;items&gt;&lt;item name=&quot;PropertiesWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;0&quot; /&gt;&lt;/items&gt;&lt;/bar&gt;&lt;/barcontainer&gt;&lt;/dockcontainer&gt;&lt;/docksite&gt;&lt;bars&gt;&lt;bar name=&quot;StandardToolbar&quot; dockline=&quot;0&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;true&quot; /&gt;&lt;bar name=&quot;TextToolbar&quot; dockline=&quot;1&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;true&quot; /&gt;&lt;bar name=&quot;BorderToolbar&quot; dockline=&quot;1&quot; layout=&quot;0&quot; dockoffset=&quot;152&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;true&quot; /&gt;&lt;bar name=&quot;LayoutToolbar&quot; dockline=&quot;2&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;false&quot; /&gt;&lt;bar name=&quot;StyleToolbar&quot; dockline=&quot;2&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;false&quot; /&gt;&lt;bar name=&quot;ObjectsToolbar&quot; dockline=&quot;0&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;1&quot; visible=&quot;true&quot; /&gt;&lt;/bars&gt;&lt;/dotnetbarlayout&gt;"/></Designer></Config></value>
- </data>
- <metadata name="report1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>202, 17</value>
- </metadata>
- <data name="report1.ReportResourceString" xml:space="preserve">
- <value>锘�<?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="09/09/2024 23:04:30" ReportInfo.Modified="09/09/2024 23:04:32" ReportInfo.CreatorVersion="2013.2.5.0">
- <Dictionary/>
-</Report>
-</value>
- </data>
</root>
\ No newline at end of file
--
Gitblit v1.9.3