Permalink
Browse files

Merge pull request #6 from hefangli/master

所有内容提交
  • Loading branch information...
2 parents ebae449 + a7686e6 commit 411d94689bb6fc848c756abe97bac1d4112b54e2 @katway committed Oct 29, 2012
Showing with 3,531 additions and 342 deletions.
  1. +1 −1 Application/ClassDiagram1.cd
  2. +11 −0 Application/ClassDiagram2.cd
  3. +11 −0 Application/ClassDiagram3.cd
  4. +11 −0 Application/ClassDiagram4.cd
  5. +4 −0 Application/Program.cs.orig
  6. +3 −3 Application/SiteEditDelete.Designer.cs
  7. +1 −1 Application/SiteNew.Designer.cs
  8. +0 −12 Application/SiteNew.resx
  9. +76 −0 Application/WorkStation.csproj
  10. +66 −257 Application/WorkStation.csproj.orig
  11. +4 −4 Application/frmAddCard.Designer.cs
  12. +223 −0 Application/frmAddCompany.Designer.cs
  13. +60 −0 Application/frmAddCompany.cs
  14. +150 −0 Application/frmAddCompany.resx
  15. +225 −0 Application/frmAddEmployee.Designer.cs
  16. +92 −0 Application/frmAddEmployee.cs
  17. +135 −0 Application/frmAddEmployee.resx
  18. +193 −0 Application/frmAddPost.Designer.cs
  19. +62 −0 Application/frmAddPost.cs
  20. +132 −0 Application/frmAddPost.resx
  21. +3 −3 Application/frmEditAndDeleteCard.Designer.cs
  22. +249 −0 Application/frmEditOrDeleteCompany.Designer.cs
  23. +90 −0 Application/frmEditOrDeleteCompany.cs
  24. +150 −0 Application/frmEditOrDeleteCompany.resx
  25. +251 −0 Application/frmEditOrDeleteEmployee.Designer.cs
  26. +134 −0 Application/frmEditOrDeleteEmployee.cs
  27. +150 −0 Application/frmEditOrDeleteEmployee.resx
  28. +219 −0 Application/frmEditOrDeletePost.Designer.cs
  29. +96 −0 Application/frmEditOrDeletePost.cs
  30. +132 −0 Application/frmEditOrDeletePost.resx
  31. +1 −1 Application/frmEditOrDeleteTask.Designer.cs
  32. +1 −1 Application/frmIssueTask.Designer.cs
  33. +192 −51 Application/frmMain.Designer.cs
  34. +94 −8 Application/frmMain.cs
  35. +309 −0 Application/frmMain.cs.orig
@@ -3,7 +3,7 @@
<Class Name="WorkStation.frmEditAndDeleteCard" Collapsed="true">
<Position X="0.5" Y="0.5" Width="1.5" />
<TypeIdentifier>
- <HashCode>AQQAgCAAACIACBBQAACAgAACAAg5hgQAAHAAAAAAAAc=</HashCode>
+ <HashCode>AQAAgCAAACIACBBQAACAgAACAAg5hgAAAHAAAAAAAAY=</HashCode>
<FileName>frmEditAndDeleteCard.cs</FileName>
</TypeIdentifier>
</Class>
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram MajorVersion="1" MinorVersion="1">
+ <Class Name="WorkStation.frmAddPost" Collapsed="true">
+ <Position X="0.5" Y="0.5" Width="1.5" />
+ <TypeIdentifier>
+ <HashCode>IAEAAAAAACIAABEAAACAAEACAAg4BBgAAAAAAAIAAAQ=</HashCode>
+ <FileName>frmAddPost.cs</FileName>
+ </TypeIdentifier>
+ </Class>
+ <Font Name="宋体" Size="9" />
+</ClassDiagram>
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram MajorVersion="1" MinorVersion="1">
+ <Class Name="WorkStation.SiteNew" Collapsed="true">
+ <Position X="0.5" Y="0.5" Width="1.5" />
+ <TypeIdentifier>
+ <HashCode>gQQAASAABCIAQBEAAACAgMACAAA4BBQAAAAAAAIAAAU=</HashCode>
+ <FileName>SiteNew.cs</FileName>
+ </TypeIdentifier>
+ </Class>
+ <Font Name="宋体" Size="9" />
+</ClassDiagram>
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram MajorVersion="1" MinorVersion="1">
+ <Class Name="WorkStation.frmEditOrDeleteCompany" Collapsed="true">
+ <Position X="0.5" Y="0.5" Width="1.5" />
+ <TypeIdentifier>
+ <HashCode>AAAAgiAAACIAABEABACAAEACAAo4hgAiAQAAAAAAAAY=</HashCode>
+ <FileName>frmEditOrDeleteCompany.cs</FileName>
+ </TypeIdentifier>
+ </Class>
+ <Font Name="宋体" Size="9" />
+</ClassDiagram>
@@ -14,7 +14,11 @@ namespace WorkStation
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
+<<<<<<< HEAD
+ Application.Run(new frmain());
+=======
Application.Run(new frmMain());
+>>>>>>> weiyunbing/Develop
}
}
}

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -129,18 +129,6 @@
<metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
- <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
<metadata name="backgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
@@ -37,6 +37,7 @@
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="Microsoft.VisualBasic.PowerPacks.Vs, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="System" />
+ <Reference Include="System.configuration" />
<Reference Include="System.Core" />
<Reference Include="System.ServiceProcess" />
<Reference Include="System.Windows.Forms" />
@@ -57,12 +58,24 @@
<Compile Include="frmAddCard.Designer.cs">
<DependentUpon>frmAddCard.cs</DependentUpon>
</Compile>
+ <Compile Include="frmAddCompany.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="frmAddCompany.Designer.cs">
+ <DependentUpon>frmAddCompany.cs</DependentUpon>
+ </Compile>
<Compile Include="frmAddPoint.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmAddPoint.Designer.cs">
<DependentUpon>frmAddPoint.cs</DependentUpon>
</Compile>
+ <Compile Include="frmAddPost.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="frmAddPost.Designer.cs">
+ <DependentUpon>frmAddPost.cs</DependentUpon>
+ </Compile>
<Compile Include="frmAddRoute.cs">
<SubType>Form</SubType>
</Compile>
@@ -99,6 +112,18 @@
<Compile Include="frmEditAndDeleteCard.Designer.cs">
<DependentUpon>frmEditAndDeleteCard.cs</DependentUpon>
</Compile>
+ <Compile Include="frmEditOrDeleteCompany.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="frmEditOrDeleteCompany.Designer.cs">
+ <DependentUpon>frmEditOrDeleteCompany.cs</DependentUpon>
+ </Compile>
+ <Compile Include="frmEditOrDeleteEmployee.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="frmEditOrDeleteEmployee.Designer.cs">
+ <DependentUpon>frmEditOrDeleteEmployee.cs</DependentUpon>
+ </Compile>
<Compile Include="frmEditOrDeleteItem.cs">
<SubType>Form</SubType>
</Compile>
@@ -111,6 +136,12 @@
<Compile Include="frmEditOrDeletePoint.Designer.cs">
<DependentUpon>frmEditOrDeletePoint.cs</DependentUpon>
</Compile>
+ <Compile Include="frmEditOrDeletePost.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="frmEditOrDeletePost.Designer.cs">
+ <DependentUpon>frmEditOrDeletePost.cs</DependentUpon>
+ </Compile>
<Compile Include="frmEditOrDeleteRoute.cs">
<SubType>Form</SubType>
</Compile>
@@ -123,6 +154,12 @@
<Compile Include="frmEditOrDeleteTask.Designer.cs">
<DependentUpon>frmEditOrDeleteTask.cs</DependentUpon>
</Compile>
+ <Compile Include="frmAddEmployee.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="frmAddEmployee.Designer.cs">
+ <DependentUpon>frmAddEmployee.cs</DependentUpon>
+ </Compile>
<Compile Include="frmIssueTask.cs">
<SubType>Form</SubType>
</Compile>
@@ -137,12 +174,30 @@
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="SiteEditDelete.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="SiteEditDelete.Designer.cs">
+ <DependentUpon>SiteEditDelete.cs</DependentUpon>
+ </Compile>
+ <Compile Include="SiteNew.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="SiteNew.Designer.cs">
+ <DependentUpon>SiteNew.cs</DependentUpon>
+ </Compile>
<EmbeddedResource Include="frmAddCard.resx">
<DependentUpon>frmAddCard.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="frmAddCompany.resx">
+ <DependentUpon>frmAddCompany.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="frmAddPoint.resx">
<DependentUpon>frmAddPoint.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="frmAddPost.resx">
+ <DependentUpon>frmAddPost.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="frmAddRoute.resx">
<DependentUpon>frmAddRoute.cs</DependentUpon>
</EmbeddedResource>
@@ -161,18 +216,30 @@
<EmbeddedResource Include="frmEditAndDeleteCard.resx">
<DependentUpon>frmEditAndDeleteCard.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="frmEditOrDeleteCompany.resx">
+ <DependentUpon>frmEditOrDeleteCompany.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="frmEditOrDeleteEmployee.resx">
+ <DependentUpon>frmEditOrDeleteEmployee.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="frmEditOrDeleteItem.resx">
<DependentUpon>frmEditOrDeleteItem.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmEditOrDeletePoint.resx">
<DependentUpon>frmEditOrDeletePoint.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="frmEditOrDeletePost.resx">
+ <DependentUpon>frmEditOrDeletePost.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="frmEditOrDeleteRoute.resx">
<DependentUpon>frmEditOrDeleteRoute.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmEditOrDeleteTask.resx">
<DependentUpon>frmEditOrDeleteTask.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="frmAddEmployee.resx">
+ <DependentUpon>frmAddEmployee.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="frmIssueTask.resx">
<DependentUpon>frmIssueTask.cs</DependentUpon>
</EmbeddedResource>
@@ -189,7 +256,16 @@
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
+ <EmbeddedResource Include="SiteEditDelete.resx">
+ <DependentUpon>SiteEditDelete.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="SiteNew.resx">
+ <DependentUpon>SiteNew.cs</DependentUpon>
+ </EmbeddedResource>
<None Include="app.config" />
+ <None Include="ClassDiagram2.cd" />
+ <None Include="ClassDiagram3.cd" />
+ <None Include="ClassDiagram4.cd" />
<None Include="Properties\Settings.settings">
<Generator>PublicSettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
Oops, something went wrong.

0 comments on commit 411d946

Please sign in to comment.